From b69bc88b6626b5afaf862a16c755edbab6711cc0 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 29 May 2023 14:27:24 +0200 Subject: [PATCH] receive status --- api/index.js | 12 +++++++++++- api/views/index.ejs | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/api/index.js b/api/index.js index 8213e70a..abcee652 100644 --- a/api/index.js +++ b/api/index.js @@ -2,6 +2,8 @@ var express = require("express"); var app = express(); const WebSocket = require("ws"); +var last_status = {}; + app.use(express.static("public")); var ws = new WebSocket("ws://10.100.0.40:9001/"); @@ -14,7 +16,11 @@ ws.on("open", function open() { ws.on("message", function message(message) { var msg = JSON.parse(message); - console.log("got type: " + msg.type) + if (msg.type == "STATUS") { + last_status = msg.data; + } + + console.log("got type: " + msg.type); console.log("RECEIVED: " + msg.data); }); @@ -30,6 +36,10 @@ app.get("/", function (req, res) { res.render("index", { api_connected: api_connected }); }); +app.get("/status", function (req, res) { + res.json(last_status); +}); + app.post("/move_up", function (req, res) { console.log("got move up request"); var speed = req.data.speed; diff --git a/api/views/index.ejs b/api/views/index.ejs index cb44f01d..a4250834 100644 --- a/api/views/index.ejs +++ b/api/views/index.ejs @@ -55,8 +55,22 @@