From ff79182602acb5a936471a07b92d7bfa8fb2195d Mon Sep 17 00:00:00 2001
From: Sami Spets <savasp@utu.fi>
Date: Sun, 3 Nov 2019 23:37:25 +0200
Subject: [PATCH] Minor changes into peer
---
web-service/server/src/peer.js | 6 ++++--
web-service/server/src/public/js/bundle.js | 15 +++++++++------
web-service/server/src/public/js/index.js | 5 +++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/web-service/server/src/peer.js b/web-service/server/src/peer.js
index 1543de2ab..53f1fb79e 100644
--- a/web-service/server/src/peer.js
+++ b/web-service/server/src/peer.js
@@ -77,13 +77,15 @@ function Peer(ws) {
if(this.sock.on === undefined){
this.sock.onmessage = message;
this.sock.onopen = (event) => {
- this.sock.send(encode([0, "__handshake__"]))
+ console.log("piippiip")
+ this.send("__handshake__", kMagic, kVersion, [my_uuid]);
}
//else peer is being used by server
}else{
this.sock.on("message", message);
this.sock.on("close", close);
this.sock.on("error", error);
+ this.send("__handshake__", kMagic, kVersion, [my_uuid]);
}
this.bind("__handshake__", (magic, version, id) => {
@@ -98,7 +100,7 @@ function Peer(ws) {
this.close();
}
});
- this.send("__handshake__", kMagic, kVersion, [my_uuid]);
+ // this.send("__handshake__", kMagic, kVersion, [my_uuid]);
}
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index 0492cd450..b52014ba1 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -493,8 +493,8 @@ function objectToString(o) {
return Object.prototype.toString.call(o);
}
-}).call(this,{"isBuffer":require("../../../../../../../../../../../usr/lib/node_modules/watchify/node_modules/is-buffer/index.js")})
-},{"../../../../../../../../../../../usr/lib/node_modules/watchify/node_modules/is-buffer/index.js":33}],3:[function(require,module,exports){
+}).call(this,{"isBuffer":require("../../../../../../../../../usr/local/lib/node_modules/watchify/node_modules/is-buffer/index.js")})
+},{"../../../../../../../../../usr/local/lib/node_modules/watchify/node_modules/is-buffer/index.js":33}],3:[function(require,module,exports){
if (typeof Object.create === 'function') {
// implementation from standard node.js 'util' module
module.exports = function inherits(ctor, superCtor) {
@@ -4324,13 +4324,15 @@ function Peer(ws) {
if(this.sock.on === undefined){
this.sock.onmessage = message;
this.sock.onopen = (event) => {
- this.sock.send(encode([0, "__handshake__"]))
+ console.log("piippiip")
+ this.send("__handshake__", kMagic, kVersion, [my_uuid]);
}
//else peer is being used by server
}else{
this.sock.on("message", message);
this.sock.on("close", close);
this.sock.on("error", error);
+ this.send("__handshake__", kMagic, kVersion, [my_uuid]);
}
this.bind("__handshake__", (magic, version, id) => {
@@ -4345,7 +4347,7 @@ function Peer(ws) {
this.close();
}
});
- this.send("__handshake__", kMagic, kVersion, [my_uuid]);
+ // this.send("__handshake__", kMagic, kVersion, [my_uuid]);
}
@@ -4660,6 +4662,7 @@ createPeer = () => {
const ws = new WebSocket('ws://localhost:8080/');
ws.binaryType = "arraybuffer";
peer = new Peer(ws)
+ console.log("peer", peer)
}
/**
@@ -4669,8 +4672,8 @@ createPeer = () => {
*
* */
connectToStream = () => {
- peer.send("__ping__")
- console.log(peer);
+ const data = peer.send("node_details")
+ console.log(data);
}
const cardLogic = () => {
diff --git a/web-service/server/src/public/js/index.js b/web-service/server/src/public/js/index.js
index e6a7c5aaa..ba0cb620f 100644
--- a/web-service/server/src/public/js/index.js
+++ b/web-service/server/src/public/js/index.js
@@ -144,6 +144,7 @@ createPeer = () => {
const ws = new WebSocket('ws://localhost:8080/');
ws.binaryType = "arraybuffer";
peer = new Peer(ws)
+ console.log("peer", peer)
}
/**
@@ -153,8 +154,8 @@ createPeer = () => {
*
* */
connectToStream = () => {
- peer.send("__ping__")
- console.log(peer);
+ const data = peer.send("node_details")
+ console.log(data);
}
const cardLogic = () => {
--
GitLab