kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-07-30 00:39:16 +02:00
Code Issues Activity

move rawcomm to helpers

Browse Source
This commit is contained in:
kuba
2026-04-03 23:02:56 +02:00
parent 0d6b89a7d3
commit 48c5f684b1
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/helpers.js
+24 -2
View File
@@ -1,6 +1,5 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const http = require('http');
const https = require('https'); const https = require('https');
const net = require('net'); const net = require('net');
const crypto = require('crypto'); const crypto = require('crypto');
@@ -9,6 +8,24 @@ const storage = require('./storage');
const consoleCmd = require('./console'); const consoleCmd = require('./console');
const { serverConfig, configSave } = require('./server_config'); 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; let geoip = null;
try { try {
geoip = require('geoip-lite'); geoip = require('geoip-lite');
@@ -274,7 +291,12 @@ function resolveDataBuffer(data, wss, rdsWss) {
} }
} else incompleteDataBuffer = ''; } 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) { function kickClient(ipAddress) {
server/index.js
-21
View File
@@ -28,13 +28,11 @@ const pjson = require('../package.json');
const client = new net.Socket(); const client = new net.Socket();
const wss = new WebSocket.Server({ noServer: true }); const wss = new WebSocket.Server({ noServer: true });
const rdsWss = 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 }); const pluginsWss = new WebSocket.Server({ noServer: true, perMessageDeflate: true });
storage.websocket_delegation.set("/text", wss); storage.websocket_delegation.set("/text", wss);
storage.websocket_delegation.set("/rds", rdsWss); storage.websocket_delegation.set("/rds", rdsWss);
storage.websocket_delegation.set("/rdsspy", rdsWss); storage.websocket_delegation.set("/rdsspy", rdsWss);
storage.websocket_delegation.set("/rawcomm", rawComm);
storage.websocket_delegation.set("/data_plugins", pluginsWss); storage.websocket_delegation.set("/data_plugins", pluginsWss);
require('./stream/ws.js'); require('./stream/ws.js');
@@ -148,9 +146,6 @@ function connectToSerial() {
serialport.on('data', (data) => { serialport.on('data', (data) => {
helpers.resolveDataBuffer(data, wss, rdsWss); helpers.resolveDataBuffer(data, wss, rdsWss);
rawComm.clients.forEach((client) => {
if (client.readyState === WebSocket.OPEN) client.send(data);
});
}); });
serialport.on('error', (error) => { serialport.on('error', (error) => {
@@ -196,9 +191,6 @@ client.on('data', (data) => {
const { xdrd } = serverConfig; const { xdrd } = serverConfig;
helpers.resolveDataBuffer(data, wss, rdsWss); 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; if (authFlags.authMsg == true && authFlags.messageCount > 1) return;
authFlags.messageCount++; authFlags.messageCount++;
@@ -296,19 +288,6 @@ setInterval(() => {
} }
}, 30 * 60 * 1000); // Run every half hour }, 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) => { wss.on('connection', (ws, request) => {
const output = serverConfig.xdrd.wirelessConnection ? client : serialport; const output = serverConfig.xdrd.wirelessConnection ? client : serialport;
let clientIp = helpers.getIpAddress(request); let clientIp = helpers.getIpAddress(request);