mirror of
https://github.com/KubaPro010/fm-dx-webserver.git
synced 2026-07-30 08:49:16 +02:00
now?
This commit is contained in:
+1
-2
@@ -12,7 +12,6 @@ const WebSocket = require('ws');
|
|||||||
const rawComm = new WebSocket.Server({ noServer: true });
|
const rawComm = new WebSocket.Server({ noServer: true });
|
||||||
|
|
||||||
rawComm.on('connection', (ws, request) => {
|
rawComm.on('connection', (ws, request) => {
|
||||||
const output = serverConfig.xdrd.wirelessConnection ? client : serialport;
|
|
||||||
const { isAdminAuthenticated } = request.session || {};
|
const { isAdminAuthenticated } = request.session || {};
|
||||||
if(!isAdminAuthenticated) {
|
if(!isAdminAuthenticated) {
|
||||||
ws.close(1008, "No admin");
|
ws.close(1008, "No admin");
|
||||||
@@ -20,7 +19,7 @@ rawComm.on('connection', (ws, request) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ws.on('message', (message) => {
|
ws.on('message', (message) => {
|
||||||
output.write(`${message.toString()}\n`);
|
storage.ctl_output.write(`${message.toString()}\n`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
const { EventEmitter } = require('events');
|
const { EventEmitter } = require('events');
|
||||||
const { logWarn, logError } = require('./console');
|
const { logWarn, logError } = require('./console');
|
||||||
|
const { storage } = require('./storage');
|
||||||
|
|
||||||
let output = null;
|
let output = null;
|
||||||
let wss = null;
|
let wss = null;
|
||||||
@@ -30,10 +31,12 @@ function registerServerContext(ctx) {
|
|||||||
|
|
||||||
function setOutput(newOutput) {
|
function setOutput(newOutput) {
|
||||||
output = newOutput;
|
output = newOutput;
|
||||||
|
storage.ctl_output = newOutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
function clearOutput() {
|
function clearOutput() {
|
||||||
output = null;
|
output = null;
|
||||||
|
storage.ctl_output = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- accessors plugin side ----
|
// ---- accessors plugin side ----
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
let connectedUsers = [];
|
let connectedUsers = [];
|
||||||
let chatHistory = [];
|
let chatHistory = [];
|
||||||
let websocket_delegation = new Map();
|
let websocket_delegation = new Map();
|
||||||
|
var ctl_output;
|
||||||
|
|
||||||
module.exports = { connectedUsers, chatHistory, websocket_delegation };
|
module.exports = { connectedUsers, chatHistory, websocket_delegation, ctl_output };
|
||||||
Reference in New Issue
Block a user