diff --git a/web-service/server/npm-debug.log b/web-service/server/npm-debug.log
deleted file mode 100644
index 7381f664f7027445d6e638bd05999bef75555536..0000000000000000000000000000000000000000
--- a/web-service/server/npm-debug.log
+++ /dev/null
@@ -1,45 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'start' ]
-2 info using npm@3.5.2
-3 info using node@v8.10.0
-4 verbose run-script [ 'prestart', 'start', 'poststart' ]
-5 info lifecycle @ftl/web-service@0.0.1~prestart: @ftl/web-service@0.0.1
-6 silly lifecycle @ftl/web-service@0.0.1~prestart: no script for prestart, continuing
-7 info lifecycle @ftl/web-service@0.0.1~start: @ftl/web-service@0.0.1
-8 verbose lifecycle @ftl/web-service@0.0.1~start: unsafe-perm in lifecycle true
-9 verbose lifecycle @ftl/web-service@0.0.1~start: PATH: /usr/share/npm/bin/node-gyp-bin:/home/sami/work/ftl/web-service/server/node_modules/.bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
-10 verbose lifecycle @ftl/web-service@0.0.1~start: CWD: /home/sami/work/ftl/web-service/server
-11 silly lifecycle @ftl/web-service@0.0.1~start: Args: [ '-c', 'node src/index.js' ]
-12 silly lifecycle @ftl/web-service@0.0.1~start: Returned: code: 1 signal: null
-13 info lifecycle @ftl/web-service@0.0.1~start: Failed to exec start script
-14 verbose stack Error: @ftl/web-service@0.0.1 start: `node src/index.js`
-14 verbose stack Exit status 1
-14 verbose stack at EventEmitter.<anonymous> (/usr/share/npm/lib/utils/lifecycle.js:232:16)
-14 verbose stack at emitTwo (events.js:126:13)
-14 verbose stack at EventEmitter.emit (events.js:214:7)
-14 verbose stack at ChildProcess.<anonymous> (/usr/share/npm/lib/utils/spawn.js:24:14)
-14 verbose stack at emitTwo (events.js:126:13)
-14 verbose stack at ChildProcess.emit (events.js:214:7)
-14 verbose stack at maybeClose (internal/child_process.js:925:16)
-14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:209:5)
-15 verbose pkgid @ftl/web-service@0.0.1
-16 verbose cwd /home/sami/work/ftl/web-service/server
-17 error Linux 4.15.0-66-generic
-18 error argv "/usr/bin/node" "/usr/bin/npm" "start"
-19 error node v8.10.0
-20 error npm v3.5.2
-21 error code ELIFECYCLE
-22 error @ftl/web-service@0.0.1 start: `node src/index.js`
-22 error Exit status 1
-23 error Failed at the @ftl/web-service@0.0.1 start script 'node src/index.js'.
-23 error Make sure you have the latest version of node.js and npm installed.
-23 error If you do, this is most likely a problem with the @ftl/web-service package,
-23 error not with npm itself.
-23 error Tell the author that this fails on your system:
-23 error node src/index.js
-23 error You can get information on how to open an issue for this project with:
-23 error npm bugs @ftl/web-service
-23 error Or if that isn't available, you can get their info via:
-23 error npm owner ls @ftl/web-service
-23 error There is likely additional logging output above.
-24 verbose exit [ 1, true ]
diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index a1eab33660a36520e65867142a6b1cdc031862a1..e1743be877bfffeb08c878a7eba852e2e913c59c 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -364,9 +364,11 @@ function broadcastExcept(exc, name, ...args) {
app.ws('/', (ws, req) => {
console.log("New web socket request");
//console.log('WEBSOCKET',ws)
+
let p = new Peer(ws);
peer_data.push(p);
- console.log(peer_data)
+ //console.log(peer_data)
+
p.on("connect", (peer) => {
console.log("Node connected...", peer.string_id);
peer_uris[peer.string_id] = [];
diff --git a/web-service/server/src/peer.js b/web-service/server/src/peer.js
index 8de7303e5ce1659e4d70637f63640cfe3787f044..8ee9aaea43b363d27df0ca43397fe459e795e372 100644
--- a/web-service/server/src/peer.js
+++ b/web-service/server/src/peer.js
@@ -58,12 +58,13 @@ function Peer(ws) {
}
}
- let close = () => {
+ let close = (event) => {
+ console.log(event)
this.status = kDisconnected;
this._notify("disconnect", this);
}
- let error = () => {
+ let error = (event) => {
console.error("Socket error");
this.sock.close();
this.status = kDisconnected;
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index 5ffc55e3bb734a03c055e73ff3db49d9209a9c12..ba6ec45672c821427bf9c46ec0f31ef38b247986 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -4305,12 +4305,13 @@ function Peer(ws) {
}
}
- let close = () => {
+ let close = (event) => {
+ console.log(event)
this.status = kDisconnected;
this._notify("disconnect", this);
}
- let error = () => {
+ let error = (event) => {
console.error("Socket error");
this.sock.close();
this.status = kDisconnected;
@@ -4642,7 +4643,7 @@ const createCard = (url, viewers) => {
}
connectToStream = () => {
- const ws = new WebSocket('ws://localhost:8080/');
+ const ws = new WebSocket('ws://localhost:8080');
current_data.frames = 10;
peer_data = new Peer(ws);
console.log(peer_data)
diff --git a/web-service/server/src/public/js/index.js b/web-service/server/src/public/js/index.js
index 4da28814a8feabdba5954f988770a9d323fd3e47..8368f705a5168066ef85e2934d5c2ef346b5e710 100644
--- a/web-service/server/src/public/js/index.js
+++ b/web-service/server/src/public/js/index.js
@@ -130,7 +130,7 @@ const createCard = (url, viewers) => {
}
connectToStream = () => {
- const ws = new WebSocket('ws://localhost:8080/');
+ const ws = new WebSocket('ws://localhost:8080');
current_data.frames = 10;
peer_data = new Peer(ws);
console.log(peer_data)