From 23de867da36b7a8ed67442458cdc272828ef7381 Mon Sep 17 00:00:00 2001
From: Sami Spets <savasp@utu.fi>
Date: Thu, 24 Oct 2019 17:38:18 +0300
Subject: [PATCH] debugging
---
web-service/server/public/js/index.js | 10 +++++-----
web-service/server/src/index.js | 9 +++++----
web-service/server/src/peer.js | 3 +++
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/web-service/server/public/js/index.js b/web-service/server/public/js/index.js
index ebed70530..77d11715c 100644
--- a/web-service/server/public/js/index.js
+++ b/web-service/server/public/js/index.js
@@ -41,7 +41,7 @@ const getAvailableStreams = async () => {
const videoPlayer = () => {
const containerDiv = document.getElementById('container')
- containerDiv.innerHTML = `<h1>Stream ${current_uri} is live right here!</h1><br><button onclick="renderThumbnails()">Go back</button><br>
+ containerDiv.innerHTML = `<h1>Stream ${current_data.uri} is live right here!</h1><br><button onclick="renderThumbnails()">Go back</button><br>
<canvas id="ftlab-stream-video" width="0" height="0"></canvas>`;
containerDiv.innerHTML += '<br>'
containerDiv.innerHTML += ''
@@ -73,7 +73,7 @@ const renderThumbnails = async () => {
console.log('BLOB', myBlob)
const objectURL = URL.createObjectURL(myBlob);
// containerDiv.innerHTML += createCard()
- containerDiv.innerHTML += createCard(objectURL, i+4, encodedURI)
+ containerDiv.innerHTML += createCard(objectURL, i+4)
}catch(err){
console.log("Couldn't create thumbnail");
console.log(err)
@@ -119,7 +119,7 @@ const renderLogin = () => {
}
//FOR DESKTOP
-const createCard = (url, viewers, uri) => {
+const createCard = (url, viewers) => {
return `<div class='ftlab-card-component' >
<img src='${url}' class="thumbnail-img" alt="Hups" width="250px"></img>
<p>Viewers: ${viewers}</p>
@@ -129,10 +129,10 @@ const createCard = (url, viewers, uri) => {
const connectToStream = () => {
let ws = new WebSocket('ws://localhost:8080/', 'get_stream');
- current_data.frames = 24;
+ current_data.frames = 10;
console.log()
ws.onopen = (e) => {
- ws.send("get_stream", current_data.uri, current_data.frames, 9, current_data.uri);
+ ws.send(['get_stream', "__handshake__", current_data.uri, current_data.frames, 9, current_data.uri]);
}
//setTimeout 1s, ask for the amount of frames user has selected
}
diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index 5f655967b..8b83adb02 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -191,7 +191,7 @@ app.get('/stream/rgb', (req, res) => {
let uri = req.query.uri;
console.log("URI", uri)
if (uri_data.hasOwnProperty(uri)) {
- uri_data[uri].peer.send("get_stream", uri, 10, 9, [Peer.uuid], 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);
@@ -223,7 +223,7 @@ app.post('/stream/config', async (req, res) => {
return res.status(200).json('Your configurations were saved successfully')
}catch(err){
console.log(err)
- return res.status(500).json('Somethings wrong I can feel it')
+ return res.status(500).json("Something's wrong I can feel it")
}
})
@@ -362,7 +362,7 @@ function broadcastExcept(exc, name, ...args) {
app.ws('/', (ws, req) => {
console.log("New web socket request");
-
+ console.log('WEBSOCKET',ws)
let p = new Peer(ws);
p.on("connect", (peer) => {
@@ -453,8 +453,9 @@ app.ws('/', (ws, req) => {
});
// Request from frames from a source
- p.bind("get_stream", (uri, N, rate, /*pid,*/ dest) => {
+ p.bind("get_stream", (uri, N, rate, pid, dest) => {
let peer = uri_data[uri].peer;
+ console.log('PEER', peer);
if (peer) {
uri_data[uri].addClient(p, N, rate, dest);
//peer.send("get_stream", uri, N, rate, [Peer.uuid], dest);
diff --git a/web-service/server/src/peer.js b/web-service/server/src/peer.js
index 51cd78e6a..cbaa018d6 100644
--- a/web-service/server/src/peer.js
+++ b/web-service/server/src/peer.js
@@ -34,7 +34,10 @@ function Peer(ws) {
this.master = false;
this.sock.on("message", (raw) => {
+ console.log(raw)
let msg = decode(raw);
+ console.log('MSG[0]', msg[0])
+ console.log("MSG[1]", msg[1])
if (this.status == kConnecting) {
if (msg[1] != "__handshake__") {
console.log("Bad handshake");
--
GitLab