From bd1bdbd0e82353f1a2b11854e2ce66e302574a97 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Thu, 25 May 2023 16:13:26 +0200
Subject: [PATCH 1/4] connect to websocket

---
 api/index.js | 9 +++++++++
 src/px4_msgs | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/api/index.js b/api/index.js
index e8ea6be3..1af6232b 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,6 +1,15 @@
 var express = require('express');
 var app = express();
 
+websocket = new WebSocket("ws://10.100.0.40:9001/");
+
+websocket.onopen = (evt) => { log("OPENED websocket"); };
+
+websocket.onmessage = (message) => {
+    var msg = JSON.parse(message.data);
+    log("RECEIVED: " + msg);
+}
+
 // set the view engine to ejs
 app.set('view engine', 'ejs');
 
diff --git a/src/px4_msgs b/src/px4_msgs
index ffc3a4cd..b64ef047 160000
--- a/src/px4_msgs
+++ b/src/px4_msgs
@@ -1 +1 @@
-Subproject commit ffc3a4cd578776213a444abe17d7eabf9621b266
+Subproject commit b64ef0475c1d44605688f4770899fe453d532be4

From cccd06541eca24ed797ddbd27f422c28e4f43f05 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Thu, 25 May 2023 16:18:17 +0200
Subject: [PATCH 2/4] use npm websocket library

---
 api/index.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/api/index.js b/api/index.js
index 1af6232b..df20f608 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,24 +1,29 @@
-var express = require('express');
+var express = require("express");
 var app = express();
+import WebSocket from "ws";
 
-websocket = new WebSocket("ws://10.100.0.40:9001/");
+var ws = new WebSocket("ws://10.100.0.40:9001/");
 
-websocket.onopen = (evt) => { log("OPENED websocket"); };
+ws.on('open', function open() {
+    console.log("connected");
+  });
 
-websocket.onmessage = (message) => {
-    var msg = JSON.parse(message.data);
-    log("RECEIVED: " + msg);
-}
+ws.on("message", function message(message) {
+  var msg = JSON.parse(message);
+  console.log("RECEIVED: " + msg);
+});
+
+ws.on("error", console.error);
 
 // set the view engine to ejs
-app.set('view engine', 'ejs');
+app.set("view engine", "ejs");
 
 // use res.render to load up an ejs view file
 
 // index page
-app.get('/', function(req, res) {
-  res.render('index');
+app.get("/", function (req, res) {
+  res.render("index");
 });
 
 app.listen(8080);
-console.log('Server is listening on port 8080');
+console.log("Server is listening on port 8080");

From c2c2a606cf41e11ba3c3547b378cfcaf7c7bebc8 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Thu, 25 May 2023 16:18:55 +0200
Subject: [PATCH 3/4] use npm websocket library

---
 api/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/index.js b/api/index.js
index df20f608..dbab9d91 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,6 +1,6 @@
 var express = require("express");
 var app = express();
-import WebSocket from "ws";
+import WebSocket from 'ws';
 
 var ws = new WebSocket("ws://10.100.0.40:9001/");
 

From d15d5511da3ed07fb2dd67d1f8acc83c2073cab2 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Thu, 25 May 2023 16:22:20 +0200
Subject: [PATCH 4/4] use require

---
 api/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/index.js b/api/index.js
index dbab9d91..70f863ba 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,6 +1,6 @@
 var express = require("express");
 var app = express();
-import WebSocket from 'ws';
+const WebSocket = require("ws");
 
 var ws = new WebSocket("ws://10.100.0.40:9001/");