From 1c8229ad98c8576f0dac9b6521a1e82a54c93651 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Tue, 30 May 2023 22:33:15 +0200 Subject: [PATCH] comments --- api/index.js | 15 ++++++++------- api/views/index.ejs | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/index.js b/api/index.js index 2080333a..8bbd74d3 100644 --- a/api/index.js +++ b/api/index.js @@ -18,7 +18,7 @@ var ws; var api_connected = false; function send_events_to_clients(data) { - console.log("sending events to clients"); +// console.log("sending events to clients"); sse_clients.forEach((client) => { client.response.write("event: message\n"); client.response.write("data:" + JSON.stringify(data) + "\n\n") @@ -61,8 +61,13 @@ var connect_to_api = function () { ws.on("message", function message(message) { try { - var msg = JSON.parse(message); - send_events_to_clients(msg); + var msg = JSON.parse(message); + if (msg.type != "IMAGE") { + send_events_to_clients(msg); + } else { + console.log("got image"); + //TODO handle image + } } catch (error) { console.log("could not parse as json"); } @@ -85,10 +90,6 @@ app.get("/", function (req, res) { res.render("index", { api_connected: api_connected }); }); -app.get("/status", function (req, res) { - res.status(200).json(last_status); -}); - app.get("/events", handle_sse_client); app.get("/image", function (req, res) { diff --git a/api/views/index.ejs b/api/views/index.ejs index b7caed64..c318ad87 100644 --- a/api/views/index.ejs +++ b/api/views/index.ejs @@ -68,6 +68,7 @@ } events.onmessage = (event) => { + //TODO handling status, failsafe etc const parsedData = JSON.parse(event.data); console.log("RECEIVED EVENT"); console.log(parsedData);