Merge pull request #81 from wavelog/dev

V1.1.10

Author: int2001

main.js

@@ -4,14 +4,18 @@ const {ipcMain} = require('electron')
 const http = require('http');
 const xml = require("xml2js");
 const net = require('net');
+const WebSocket = require('ws');
 
 const gotTheLock = app.requestSingleInstanceLock();
 
 let powerSaveBlockerId;
 let s_mainWindow;
 let msgbacklog=[];
 let httpServer;
+let currentCAT=null;
 var WServer;
+let wsServer;
+let wsClients = new Set();
 
 const DemoAdif='<call:5>DJ7NT <gridsquare:4>JO30 <mode:3>FT8 <rst_sent:3>-15 <rst_rcvd:2>33 <qso_date:8>20240110 <time_on:6>051855 <qso_date_off:8>20240110 <time_off:6>051855 <band:3>40m <freq:8>7.155783 <station_callsign:5>TE1ST <my_gridsquare:6>JO30OO <eor>';
 
@@ -143,6 +147,12 @@ ipcMain.on("quit", async (event,arg) => {
 	event.returnValue=true;
 });
 
+ipcMain.on("radio_status_update", async (event,arg) => {
+	// Broadcast radio status updates from renderer to WebSocket clients
+	broadcastRadioStatus(arg);
+	event.returnValue=true;
+});
+
 function show_noti(arg) {
 	if (Notification.isSupported()) {
 		try {
@@ -477,11 +487,71 @@ function startserver() {
 				settrx(qrg,mode);
 			}
 		}).listen(54321);
+
+		// Start WebSocket server
+		startWebSocketServer();
 	} catch(e) {
 		tomsg('Some other Tool blocks Port 2333 or 54321. Stop it, and restart this');
 	}
 }
 
+function startWebSocketServer() {
+	try {
+		wsServer = new WebSocket.Server({ port: 54322, exclusive: true });
+
+		wsServer.on('connection', (ws) => {
+			wsClients.add(ws);
+			console.log('WebSocket client connected');
+
+			ws.on('close', () => {
+				wsClients.delete(ws);
+			});
+
+			ws.on('error', (error) => {
+				console.error('WebSocket error:', error);
+				wsClients.delete(ws);
+			});
+
+			// Send current radio status on connection
+			ws.send(JSON.stringify({
+				type: 'welcome',
+				message: 'Connected to WaveLogGate WebSocket server'
+			}));
+			broadcastRadioStatus(currentCAT);
+		});
+
+		wsServer.on('error', (error) => {
+			console.error('WebSocket server error:', error);
+		});
+
+	} catch(e) {
+		console.error('WebSocket server startup error:', e);
+	}
+}
+
+function broadcastRadioStatus(radioData) {
+	currentCAT=radioData;
+	let message = {
+		type: 'radio_status',
+		frequency: radioData.frequency ? parseInt(radioData.frequency) : null,
+		mode: radioData.mode || null,
+		power: radioData.power || null,
+		radio: radioData.radio || 'wlstream',
+		timestamp: Date.now()
+	};
+	// Only include frequency_rx if it's not null
+	if (radioData.frequency_rx) {
+		message.frequency_rx = parseInt(radioData.frequency_rx);
+	}
+
+	const messageStr = JSON.stringify(message);
+	wsClients.forEach((client) => {
+		if (client.readyState === WebSocket.OPEN) {
+			client.send(messageStr);
+		}
+	});
+}
+
 
 async function get_modes() {
 	return new Promise((resolve) => {
@@ -574,6 +644,8 @@ async function settrx(qrg, mode = '') {
 		client.on("close", () => {});
 	}
 
+	// Broadcast frequency/mode change to WebSocket clients
+
 	return true;
 }
 

package.json

@@ -4,7 +4,7 @@
   "description": "Gateway for connecting WSJT-* and FLRig to Wavelog",
   "keywords": [],
   "main": "./main.js",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "author": "DJ7NT",
   "scripts": {
     "start": "electron-forge start",
@@ -14,26 +14,27 @@
     "make": "electron-forge make"
   },
   "dependencies": {
-    "@electron-forge/maker-dmg": "^7.8.1",
+    "@electron-forge/maker-dmg": "^7.10.2",
     "bootstrap": "^4.6.2",
     "dgram": "^1.0.1",
     "electron-json-config": "^2.1.0",
     "electron-json-storage": "^4.6.0",
     "electron-squirrel-startup": "^1.0.1",
     "jquery": "^3.7.1",
     "popper.js": "^1.16.1",
-    "tcadif": "^2.2.0",
+    "tcadif": "^2.3.0",
+    "ws": "^8.18.3",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.8.1",
-    "@electron-forge/maker-deb": "^7.8.1",
-    "@electron-forge/maker-rpm": "^7.8.1",
-    "@electron-forge/maker-squirrel": "^7.8.1",
-    "@electron-forge/maker-zip": "^7.8.1",
-    "@electron-forge/plugin-auto-unpack-natives": "^7.8.1",
-    "@electron-forge/publisher-github": "^7.8.1",
-    "electron": "^35.7.0",
+    "@electron-forge/cli": "^7.10.2",
+    "@electron-forge/maker-deb": "^7.10.2",
+    "@electron-forge/maker-rpm": "^7.10.2",
+    "@electron-forge/maker-squirrel": "^7.10.2",
+    "@electron-forge/maker-zip": "^7.10.2",
+    "@electron-forge/plugin-auto-unpack-natives": "^7.10.2",
+    "@electron-forge/publisher-github": "^7.10.2",
+    "electron": "^35.7.5",
     "electron-rebuild": "^3.2.9"
   }
 }

renderer.js

@@ -183,6 +183,7 @@ async function get_trx() {
 	if (((Date.now()-lastCat) > (30*60*1000)) || (!(isDeepEqual(oldCat,currentCat)))) {
 		console.log(await informWavelog(currentCat));
 	}
+
 	oldCat=currentCat;
 	return currentCat;
 }
@@ -309,6 +310,10 @@ async function informWavelog(CAT) {
 		data.mode=CAT.mode;
 	}
 
+	const { ipcRenderer } = require('electron');
+	console.log(data);
+	ipcRenderer.send('radio_status_update', data);
+
 	let x=await fetch(cfg.profiles[active_cfg].wavelog_url + '/api/radio', {
 		method: 'POST',
 		rejectUnauthorized: false,