diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index e1743be877bfffeb08c878a7eba852e2e913c59c..502a2d11c7405b11502f74d7d6a8c91e1afff887 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -194,7 +194,6 @@ app.get('/stream/rgb', (req, res) => {
if (uri_data.hasOwnProperty(uri)) {
uri_data[uri].peer.send("get_stream", uri, 3, 9, [Peer.uuid], uri);
res.writeHead(200, {'Content-Type': 'image/jpeg'});
- console.log("URIDATA", uri_data[uri].rgb);
res.end(uri_data[uri].rgb);
}
res.end();
@@ -367,7 +366,7 @@ app.ws('/', (ws, req) => {
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);
@@ -409,6 +408,7 @@ app.ws('/', (ws, req) => {
// Used to sync clocks
p.bind("__ping__", () => {
+ console.log(peer_data)
return Date.now();
});
diff --git a/web-service/server/src/peer.js b/web-service/server/src/peer.js
index db8e50667f54a7bdf1c907b7f4bd18d708e76845..1543de2ab33fcd665445e502451220b9b3960e14 100644
--- a/web-service/server/src/peer.js
+++ b/web-service/server/src/peer.js
@@ -36,16 +36,20 @@ function Peer(ws) {
let message = (raw) => {
console.log(raw)
+ //Gets right data for client
+ if(this.sock.on === undefined){
+ raw = raw.data;
+ }
let msg = decode(raw);
- console.log("MSG", msg)
+ console.log('MSG', msg)
if (this.status == kConnecting) {
if (msg[1] != "__handshake__") {
console.log("Bad handshake");
this.close();
}
}
- //console.log("MSG", msg);
if (msg[0] == 0) {
+ console.log("MSG", msg[1]);
// Notification
if (msg.length == 3) {
this._dispatchNotification(msg[1], msg[2]);
@@ -69,17 +73,13 @@ function Peer(ws) {
this.status = kDisconnected;
}
- //if undefined, client is using peer
+ //if undefined, peer is being used by client
if(this.sock.on === undefined){
- console.log("THIS.SOCK", this.sock);
+ this.sock.onmessage = message;
this.sock.onopen = (event) => {
- console.log("socket opened")
- this.sock.send(encode([0, '__handshake__']));
- this.sock.send('get_stream');
+ this.sock.send(encode([0, "__handshake__"]))
}
- this.sock.onerror = error;
- console.log("Ready state", this.sock)
- //Server is using peer
+ //else peer is being used by server
}else{
this.sock.on("message", message);
this.sock.on("close", close);
@@ -228,7 +228,7 @@ Peer.prototype.send = function(name, ...args) {
}
//This was a problem and needed to change it so that
-//this.sock.close() can only be called by server (!=undefined)
+//this.sock.close() can only be called by server (this.sock.on !== undefined)
Peer.prototype.close = function() {
if(this.sock.on !== undefined){
this.sock.close();
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index df925f24df11fa503677a67b9c21a5e85f5134c0..0492cd450cea7e0e67c2fc9f22154449e00f2db7 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -4283,16 +4283,20 @@ function Peer(ws) {
let message = (raw) => {
console.log(raw)
+ //Gets right data for client
+ if(this.sock.on === undefined){
+ raw = raw.data;
+ }
let msg = decode(raw);
- console.log("MSG", msg)
+ console.log('MSG', msg)
if (this.status == kConnecting) {
if (msg[1] != "__handshake__") {
console.log("Bad handshake");
this.close();
}
}
- //console.log("MSG", msg);
if (msg[0] == 0) {
+ console.log("MSG", msg[1]);
// Notification
if (msg.length == 3) {
this._dispatchNotification(msg[1], msg[2]);
@@ -4316,17 +4320,13 @@ function Peer(ws) {
this.status = kDisconnected;
}
- //if undefined, client is using peer
+ //if undefined, peer is being used by client
if(this.sock.on === undefined){
- console.log("THIS.SOCK", this.sock);
+ this.sock.onmessage = message;
this.sock.onopen = (event) => {
- console.log("socket opened")
- this.sock.send(encode([0, '__handshake__']));
- this.sock.send('get_stream');
+ this.sock.send(encode([0, "__handshake__"]))
}
- this.sock.onerror = error;
- console.log("Ready state", this.sock)
- //Server is using peer
+ //else peer is being used by server
}else{
this.sock.on("message", message);
this.sock.on("close", close);
@@ -4475,7 +4475,7 @@ Peer.prototype.send = function(name, ...args) {
}
//This was a problem and needed to change it so that
-//this.sock.close() can only be called by server (!=undefined)
+//this.sock.close() can only be called by server (this.sock.on !== undefined)
Peer.prototype.close = function() {
if(this.sock.on !== undefined){
this.sock.close();
@@ -4656,11 +4656,21 @@ createCard = (url, viewers) => {
// }
+createPeer = () => {
+ const ws = new WebSocket('ws://localhost:8080/');
+ ws.binaryType = "arraybuffer";
+ peer = new Peer(ws)
+}
+
+/**
+ *setTimeout 1s, ask for the amount of frames user has selected
+ *
+ *@param uri the uri where that should be called
+ *
+ * */
connectToStream = () => {
- const ws = new WebSocket('ws://localhost:8080/')
- current_data.peer = new Peer(ws);
- console.log("currentData", current_data.peer)
- //setTimeout 1s, ask for the amount of frames user has selected
+ peer.send("__ping__")
+ console.log(peer);
}
const cardLogic = () => {
diff --git a/web-service/server/src/public/js/index.js b/web-service/server/src/public/js/index.js
index 0ec435d953f4779666ca03ba635a7f231e2afdec..e6a7c5aaaa66f93d1d052cca87137b3b467e713d 100644
--- a/web-service/server/src/public/js/index.js
+++ b/web-service/server/src/public/js/index.js
@@ -140,11 +140,21 @@ createCard = (url, viewers) => {
// }
+createPeer = () => {
+ const ws = new WebSocket('ws://localhost:8080/');
+ ws.binaryType = "arraybuffer";
+ peer = new Peer(ws)
+}
+
+/**
+ *setTimeout 1s, ask for the amount of frames user has selected
+ *
+ *@param uri the uri where that should be called
+ *
+ * */
connectToStream = () => {
- const ws = new WebSocket('ws://localhost:8080/')
- current_data.peer = new Peer(ws);
- console.log("currentData", current_data.peer)
- //setTimeout 1s, ask for the amount of frames user has selected
+ peer.send("__ping__")
+ console.log(peer);
}
const cardLogic = () => {