{
+ d = outbound;
+ return d;
+ })
+
+
+ return d;
+ })
+
+ setTimeout(() => {
+ graph_step()
+ }, graph_interval);
+
+ }
+
+ graph_step()
+
+ return {
+ ...store,
+ freeze: ()=>{
+ freeze = true
+ },
+ unfreeze: ()=>{
+ freeze = false
+ },
+ push_inbound: (arr) => {
+
+ inbound_data_rate += arr.length
+ store.update(d => {
+ if (freeze == false){
+
+ let obj = {}
+ obj.data = arr;
+ obj.direction = "IN";
+
+ if(d.length >= 15){
+ d.pop()
+ }
+ d = [obj, ...d];
+
+ }
+ return d;
+ })
+ },
+ push_outbound: (arr) => {
+ outbound_data_rate += arr.length
+
+ store.update(d => {
+ if (freeze == false){
+
+ let obj = {}
+ obj.data = arr;
+ obj.direction = "OUT";
+
+ if(d.length >= 15){
+ d.pop()
+ }
+ d = [obj, ...d];
+
+ }
+ return d;
+ })
+ }
+
+ }
+}
+
+
+
+
+export const debug_monitor_store = createDebugMonitor();
+export const debug_lowlevel_store = createDebugLowlevel();
diff --git a/src/app/main/panels/WebsocketMonitor/WebsocketMonitor.svelte b/src/app/main/panels/WebsocketMonitor/WebsocketMonitor.svelte
new file mode 100644
index 000000000..8fdbdd739
--- /dev/null
+++ b/src/app/main/panels/WebsocketMonitor/WebsocketMonitor.svelte
@@ -0,0 +1,345 @@
+
+
+
+
+
+ Editor v{$appSettings.version.major}.{$appSettings.version.minor}.{$appSettings.version.patch}
+
+
+ Websocket Monitor
+
+
+
+
+
+
+
+
+
+
+
+
+ {#if frozen == false}
+
+ {:else}
+
+ {/if}
+
+
+
+
+ {#if $debug_monitor_store.length != 0}
+
+ Debug Text:
+
+
+ {#each $debug_monitor_store as debug, i}
+ {debug}
+ {/each}
+
+ {/if}
+
+ {#if $debug_lowlevel_store.length != 0}
+
+ Raw Packet:
+
+
+
+ {#each $debug_lowlevel_store as debug, i}
+
+
+
+ {#if display=="DEC"}
+ {toDecString(debug.data)}
+ {:else if display=="HEX"}
+ {toHexString(debug.data)}
+ {:else}
+ {toCharString(debug.data)}
+ {/if}
+
+
+ {/each}
+
+ {/if}
+
+
+
+
+
+
Show welcome on startup
+
+
+
Enable/Disable websocket monitor
+
diff --git a/src/app/runtime/app-helper.store.js b/src/app/runtime/app-helper.store.js
index 574285dff..33f6c989c 100644
--- a/src/app/runtime/app-helper.store.js
+++ b/src/app/runtime/app-helper.store.js
@@ -95,7 +95,8 @@ export const appSettings = writable({
pageActivatorCriteria_2 : "",
pageActivatorCriteria_3 : "",
keyboardLayout : "",
- pageActivatorInterval: 1000
+ pageActivatorInterval: 1000,
+ websocketMonitorEnabled: false
}
@@ -115,7 +116,8 @@ let persistant = {
pageActivatorCriteria_2 : "",
pageActivatorCriteria_3 : "",
keyboardLayout: "",
- pageActivatorInterval: 1000
+ pageActivatorInterval: 1000,
+ websocketMonitorEnabled: false
}
init_appsettings();
diff --git a/src/app/runtime/runtime.store.js b/src/app/runtime/runtime.store.js
index 089430571..2b756413c 100644
--- a/src/app/runtime/runtime.store.js
+++ b/src/app/runtime/runtime.store.js
@@ -11,6 +11,12 @@ import { appSettings } from './app-helper.store';
import { analytics } from './analytics_influx';
+import { initialize_ws } from './websocket';
+//import { initialize_wss } from './websocketserver';
+
+
+//initialize_wss();
+initialize_ws();
let firmware_required = {major: parseInt(process.env.FIRMWARE_REQUIRED_MAJOR), minor: parseInt(process.env.FIRMWARE_REQUIRED_MINOR), patch: parseInt(process.env.FIRMWARE_REQUIRED_PATCH)};
diff --git a/src/app/runtime/websocket.js b/src/app/runtime/websocket.js
new file mode 100644
index 000000000..99ea2eb4a
--- /dev/null
+++ b/src/app/runtime/websocket.js
@@ -0,0 +1,94 @@
+import {debug_lowlevel_store} from "../main/panels/WebsocketMonitor/WebsocketMonitor.store"
+
+const { ipcRenderer, app } = require('electron');
+
+
+export function initialize_ws(){
+
+ console.log("WS: initialize")
+
+}
+
+export function wss_send_message(msg){
+
+ ipcRenderer.send("websocket_tx", JSON.stringify(msg))
+
+}
+
+ipcRenderer.on('wss_rx', (event, args) => {
+
+ debug_lowlevel_store.push_inbound(new TextEncoder().encode(args))
+
+})
+
+ipcRenderer.on('wss_tx', (event, args) => {
+
+ debug_lowlevel_store.push_outbound(new TextEncoder().encode(args))
+
+})
+
+let heartbeatTimeout;
+
+const client = new WebSocket('ws://localhost:1337');
+
+console.log("WS: ", client);
+
+client.addEventListener('open', e => {
+
+ heartbeatTimeout = setTimeout(e=>{client.close()}, 5000 + 1000);
+
+ client.addEventListener('message', function message(data) {
+
+ const decoded = JSON.parse(data.data)
+
+
+ if (decoded.event === "grid_ping"){
+
+ //console.log("PING")
+ clearTimeout(heartbeatTimeout)
+ heartbeatTimeout = setTimeout(e=>{client.close()}, 5000 + 1000);
+
+ client.send(JSON.stringify({"event":"grid_pong"}))
+ }
+ });
+});
+
+
+client.addEventListener('close', function clear() {
+ console.log("CONNECTION CLOSED")
+ clearTimeout(heartbeatTimeout)
+});
+
+
+
+// let heartbeatTimeout2;
+
+// const client2 = new WebSocket('ws://localhost:1337');
+
+// console.log("WS: ", client2);
+
+// client2.addEventListener('open', e => {
+
+// heartbeatTimeout2 = setTimeout(e=>{client2.close()}, 5000 + 1000);
+
+// client2.addEventListener('message', function message(data) {
+
+// const decoded = JSON.parse(data.data)
+
+
+// if (decoded.event === "grid_ping"){
+
+// //console.log("PING")
+// clearTimeout(heartbeatTimeout2)
+// heartbeatTimeout2 = setTimeout(e=>{client2.close()}, 5000 + 1000);
+
+// client2.send(JSON.stringify({"event":"grid_pong"}))
+// }
+// });
+// });
+
+
+// client2.addEventListener('close', function clear() {
+// console.log("CONNECTION CLOSED")
+// clearTimeout(heartbeatTimeout2)
+// });
\ No newline at end of file
diff --git a/src/electron.js b/src/electron.js
index 9d6f699b3..f9f32bd76 100644
--- a/src/electron.js
+++ b/src/electron.js
@@ -4,7 +4,7 @@ const { trackEvent } = require('./analytics');
require('@electron/remote/main').initialize();
const { serial } = require('./ipcmain_serialport');
-//const { websocket } = require('./ipcmain_websocket');
+const { websocket } = require('./ipcmain_websocket');
const { store } = require('./main-store');
@@ -164,7 +164,7 @@ function createWindow() {
});
serial.mainWindow = mainWindow;
- //websocket.mainWindow = mainWindow;
+ websocket.mainWindow = mainWindow;
require("@electron/remote/main").enable(mainWindow.webContents);
diff --git a/src/ipcmain_websocket.js b/src/ipcmain_websocket.js
index f267e2620..eb07a40df 100644
--- a/src/ipcmain_websocket.js
+++ b/src/ipcmain_websocket.js
@@ -7,37 +7,81 @@ let websocket = {
};
-let connection = undefined;
let wss = new WebSocket.Server({port: 1337});
+console.log("WEBSOCKET")
+
wss.on("error", error => console.log("The server encountered an error!", error));
ipcMain.on('websocket_tx', (event, arg) => {
- if(connection !== undefined){
- connection.send('hello-' + arg)
- }
+ console.log(arg)
+ const decoded = JSON.parse(arg)
+
+ const data = JSON.stringify({"event":"message", "data": decoded})
+ websocket.mainWindow.webContents.send('wss_tx', data);
+
+ wss.clients.forEach(function each(ws) {
+ ws.send(data)
+ });
})
+function heartbeat(ws) {
+ ws.isAlive = true;
+}
wss.on('connection', function (ws) {
+ ws.isAlive = true;
+
+ console.warn('WS Client connected!')
+
connection = ws;
ws.on('message', function message(data) {
- console.log('received websocket data: ', data);
-
- websocket.mainWindow.webContents.send('websocket_rx', data);
+
+
+ websocket.mainWindow.webContents.send('wss_rx', data);
+
+ const decoded = JSON.parse(data)
+ if (decoded.event === "grid_pong"){
+ //console.log("WS PONG")
+ heartbeat(ws)
+ }
});
ws.on('close', function(){
console.warn('WS Client disconnected!')
+ clearInterval(ws.pingInterval);
+
})
+
});
+// close connections that have timed out
+const interval = setInterval(function ping() {
+
+ const data = JSON.stringify({"event":"grid_ping"})
+ websocket.mainWindow.webContents.send('wss_tx', data);
+
+ wss.clients.forEach(function each(ws) {
+ if (ws.isAlive === false) return ws.terminate();
+
+ ws.isAlive = false;
+ ws.send(data)
+ });
+}, 5000);
+
+
+
+wss.on('close', function close(){
+ clearInterval(interval);
+})
+
+
module.exports = {websocket};
\ No newline at end of file