From e0713cd79084edaeb79cffc9c6a98edcdde18f2d Mon Sep 17 00:00:00 2001
From: Sami Spets <savasp@utu.fi>
Date: Tue, 29 Oct 2019 11:07:00 +0200
Subject: [PATCH] .
---
web-service/server/src/public/index.html | 2 +-
web-service/server/src/public/js/index.js | 2 +-
web-service/server/src/public/js/lib/Peer.js | 11 +++++++++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/web-service/server/src/public/index.html b/web-service/server/src/public/index.html
index d90dc6f9d..8456f778f 100644
--- a/web-service/server/src/public/index.html
+++ b/web-service/server/src/public/index.html
@@ -10,6 +10,6 @@
</body>
<script src="./js/lib/libde265.min.js"></script>
<script src="./js/lib/msgpack5.min.js"></script>
- <script src="../peer.js"></script>
+ <script type="application/javascript" src="./../peer.js"></script>
<script src="./js/index.js"></script>
</html>
\ No newline at end of file
diff --git a/web-service/server/src/public/js/index.js b/web-service/server/src/public/js/index.js
index d4e1c5ffa..eb5e54580 100644
--- a/web-service/server/src/public/js/index.js
+++ b/web-service/server/src/public/js/index.js
@@ -132,7 +132,7 @@ const createCard = (url, viewers) => {
const connectToStream = () => {
const ws = new WebSocket('ws://localhost:8080/');
let p = new Peer(ws);
- p.send('connect', [0,'__handshake__'])
+ p.send('message', ([0,'__handshake__']));
current_data.frames = 10;
//setTimeout 1s, ask for the amount of frames user has selected
diff --git a/web-service/server/src/public/js/lib/Peer.js b/web-service/server/src/public/js/lib/Peer.js
index e82165e5a..ff14903ac 100644
--- a/web-service/server/src/public/js/lib/Peer.js
+++ b/web-service/server/src/public/js/lib/Peer.js
@@ -6,6 +6,10 @@ const kConnecting = 1;
const kConnected = 2;
const kDisconnected = 3;
+// Generate a unique id for this webservice
+// let my_uuid = new Uint8Array(16);
+// my_uuid[0] = 44;
+// my_uuid = Buffer.from(my_uuid);
const kMagic = 0x0009340053640912;
const kVersion = 0;
@@ -29,7 +33,9 @@ function Peer(ws) {
this.name = "unknown";
this.master = false;
- this.sock.on("message", (raw) => {
+ console.log(this.sock.send("message"));
+
+ this.sock.send("message", (raw) => {
// console.log(raw)
let msg = decode(raw);
console.log("MSG", msg)
@@ -77,9 +83,10 @@ function Peer(ws) {
}
});
- this.send("__handshake__", kMagic, kVersion);
+ this.send("__handshake__", kMagic, kVersion, /*[my_uuid]*/);
}
+// Peer.uuid = my_uuid;
/**
* @private
--
GitLab