From 48c5f684b1fd51e0da268ffe02fa8dae5ca3f97c Mon Sep 17 00:00:00 2001
From: KubaPro010 <kuba.pro010@gmail.com>
Date: Fri, 3 Apr 2026 23:02:56 +0200
Subject: [PATCH] move rawcomm to helpers

---
 server/helpers.js | 26 ++++++++++++++++++++++++--
 server/index.js   | 21 ---------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/server/helpers.js b/server/helpers.js
index 4bb7613..baa664b 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const http = require('http');
 const https = require('https');
 const net = require('net');
 const crypto = require('crypto');
@@ -9,6 +8,24 @@ const storage = require('./storage');
 const consoleCmd = require('./console');
 const { serverConfig, configSave } = require('./server_config');
 
+const WebSocket = require('ws');
+const rawComm = new WebSocket.Server({ noServer: true });
+
+rawComm.on('connection', (ws, request) => {
+  const output = serverConfig.xdrd.wirelessConnection ? client : serialport;
+  const { isAdminAuthenticated } = request.session || {};
+  if(!isAdminAuthenticated) {
+    ws.close(1008, "No admin");
+    return;
+  }
+
+  ws.on('message', (message) => {
+    output.write(`${message.toString()}\n`);
+  });
+});
+
+storage.websocket_delegation.set("/rawcomm", rawComm);
+
 let geoip = null;
 try {
   geoip = require('geoip-lite');
@@ -274,7 +291,12 @@ function resolveDataBuffer(data, wss, rdsWss) {
     }
   } else incompleteDataBuffer = '';
 
-  if (receivedData.length) dataHandler.handleData(wss, receivedData, rdsWss);
+  if (receivedData.length) {
+    dataHandler.handleData(wss, receivedData, rdsWss);
+    rawComm.clients.forEach((client) => {
+      if (client.readyState === WebSocket.OPEN) client.send(receivedData);
+    });
+  }
 }
 
 function kickClient(ipAddress) {
diff --git a/server/index.js b/server/index.js
index fa0cbe9..3066b56 100644
--- a/server/index.js
+++ b/server/index.js
@@ -28,13 +28,11 @@ const pjson = require('../package.json');
 const client = new net.Socket();
 const wss = new WebSocket.Server({ noServer: true });
 const rdsWss = new WebSocket.Server({ noServer: true });
-const rawComm = new WebSocket.Server({ noServer: true });
 const pluginsWss = new WebSocket.Server({ noServer: true, perMessageDeflate: true });
 
 storage.websocket_delegation.set("/text", wss);
 storage.websocket_delegation.set("/rds", rdsWss);
 storage.websocket_delegation.set("/rdsspy", rdsWss);
-storage.websocket_delegation.set("/rawcomm", rawComm);
 storage.websocket_delegation.set("/data_plugins", pluginsWss);
 require('./stream/ws.js');
 
@@ -148,9 +146,6 @@ function connectToSerial() {
 
     serialport.on('data', (data) => {
       helpers.resolveDataBuffer(data, wss, rdsWss);
-      rawComm.clients.forEach((client) => {
-        if (client.readyState === WebSocket.OPEN) client.send(data);
-      });
     });
 
     serialport.on('error', (error) => {
@@ -196,9 +191,6 @@ client.on('data', (data) => {
   const { xdrd } = serverConfig;
 
   helpers.resolveDataBuffer(data, wss, rdsWss);
-  rawComm.clients.forEach((client) => {
-    if (client.readyState === WebSocket.OPEN) client.send(data);
-  });
   if (authFlags.authMsg == true && authFlags.messageCount > 1) return;
 
   authFlags.messageCount++;
@@ -296,19 +288,6 @@ setInterval(() => {
   }
 }, 30 * 60 * 1000); // Run every half hour
 
-rawComm.on('connection', (ws, request) => {
-  const output = serverConfig.xdrd.wirelessConnection ? client : serialport;
-  const { isAdminAuthenticated } = request.session || {};
-  if(!isAdminAuthenticated) {
-    ws.close(1008, "No admin");
-    return;
-  }
-
-  ws.on('message', (message) => {
-    output.write(`${message.toString()}\n`);
-  });
-});
-
 wss.on('connection', (ws, request) => {
     const output = serverConfig.xdrd.wirelessConnection ? client : serialport;
     let clientIp = helpers.getIpAddress(request);