aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/NeoRuntimeManager/IPC.js16
-rw-r--r--src/NeoRuntimeManager/RuntimeProcess.js9
-rw-r--r--src/NeoRuntimeManager/index.js74
-rw-r--r--src/SocketIO/index.js42
-rw-r--r--src/UserData/index.js4
5 files changed, 76 insertions, 69 deletions
diff --git a/src/NeoRuntimeManager/IPC.js b/src/NeoRuntimeManager/IPC.js
index 6428a13..56c8b5d 100644
--- a/src/NeoRuntimeManager/IPC.js
+++ b/src/NeoRuntimeManager/IPC.js
@@ -61,7 +61,7 @@ class IPC {
.on('connect', () => {
clearInterval(this.reconnectInterval);
this.reconnectInterval = false;
- // logger.info("IPC Connected.");
+ logger.info("IPC Connected.");
})
.on("ready", () => {
this.connected = true;
@@ -100,30 +100,30 @@ class IPC {
}
this.eventEmitter.emit("matrix", json_data);
break;
-
+
case DATATYPE.STRIP_BUF:
this.eventEmitter.emit("strip_buffer", Array.from(data.values()).slice(1));
break;
-
+
default:
logger.info(data);
}
-
+
})
.on("timeout", () => {
logger.info("IPC Timeout");
})
.on("close", (hadError) => {
- // logger.info("IPC Close, hadError: ", hadError);
+ logger.info("IPC Close, hadError: ", hadError);
this.connected = false;
this.reconnect();
})
.on("end", () => {
- // logger.info("IPC End");
+ logger.info("IPC End");
this.connected = false;
})
.on('error', (data) => {
- // logger.info('IPC Server not active.');
+ logger.info('IPC Server not active.');
this.connected = false;
this.reconnect();
})
@@ -137,7 +137,7 @@ class IPC {
sendCommand(commandType, name, value) {
if (this.connected) {
let buf;
-
+
switch (commandType) {
case (COMMAND.SET_GLOB):
buf = Buffer.allocUnsafe(3);
diff --git a/src/NeoRuntimeManager/RuntimeProcess.js b/src/NeoRuntimeManager/RuntimeProcess.js
index c5c4749..be78fa9 100644
--- a/src/NeoRuntimeManager/RuntimeProcess.js
+++ b/src/NeoRuntimeManager/RuntimeProcess.js
@@ -23,12 +23,12 @@ class RuntimeProcess {
start() {
if (this.isRunning) {
console.log("PROCESS ALREADY RUNNING");
- return;
+ return {success: false, reason: "already running"};
}
this.isRunning = true;
this.proc = spawn.spawn(
- `${__appdir}/NeoRuntime/Runtime/venv/bin/python`,
- //"python",
+ // `${__appdir}/NeoRuntime/Runtime/venv/bin/python`,
+ "python3",
[
"-u", // This makes us able to get real-time output
`${__appdir}/NeoRuntime/Runtime/neo_runtime.py`,
@@ -75,6 +75,7 @@ class RuntimeProcess {
this.exitCode = code;
});
+ return {success: true};
}
stop(restart=false) {
@@ -85,8 +86,10 @@ class RuntimeProcess {
});
}
this.proc.kill("SIGINT");
+ return {success: true}
} catch (err) {
console.log(err);
+ return {success:false, reason:err}
}
}
}
diff --git a/src/NeoRuntimeManager/index.js b/src/NeoRuntimeManager/index.js
index a178bf1..eb38632 100644
--- a/src/NeoRuntimeManager/index.js
+++ b/src/NeoRuntimeManager/index.js
@@ -39,9 +39,9 @@ eventEmitter.on("matrix", (_matrix) => matrix = _matrix);
/**
* Check if a path id actually a mode (if it is a folder with a script.py file)
- *
+ *
* @param {string} path - Path to check.
- *
+ *
* @return {boolean} wether the path points to a valid mode.
*/
function isMode(path) {
@@ -54,7 +54,7 @@ function isMode(path) {
/**
* Get all ids of modes that can be set.
- *
+ *
* @returns {array} All modeids
*/
function listModes() {
@@ -77,9 +77,9 @@ function listModes() {
/**
* Change mode, stop the old one and start the new one.
- *
+ *
* @param {string} _modeId - Id of the mode to change to.
- *
+ *
* @return {object} A standardform return object.
*/
function setMode(_modeId) {
@@ -93,7 +93,7 @@ function setMode(_modeId) {
logger.info(`Changing mode to "${_modeId}".`);
stopMode();
-
+
modeId = _modeId;
neoModules.userData.config.activeMode = modeId;
eventEmitter.emit("change", "mode", modeId);
@@ -106,7 +106,7 @@ function setMode(_modeId) {
/**
* Get current mode
- *
+ *
* @return {string} current modeId
*/
function currentMode() {
@@ -115,7 +115,7 @@ function currentMode() {
/**
* Will attempt to stop current mode
- *
+ *
* @return {object} A standardform return object.
*/
function stopMode(restart=false) {
@@ -127,18 +127,17 @@ function stopMode(restart=false) {
/**
* Will attempt to start current mode
- *
+ *
* @return {object} A standardform return object.
*/
function startMode() {
if (runtimeProcess === null) { return {success: false, reason: "no runtimeprocess", detail: "Runtimeprocess not set, did you mean to call setMode?"}; }
- runtimeProcess.start();
- return {success: true}
+ return runtimeProcess.start();
};
/**
* Will attempt to restart current mode
- *
+ *
* @return {object} A standardform return object.
*/
function restartMode() {
@@ -147,7 +146,7 @@ function restartMode() {
/**
* Checks if mode is running currently
- *
+ *
* @return {boolean} if mode is running
*/
function modeRunning() {
@@ -157,9 +156,9 @@ function modeRunning() {
/**
* Get the full system path to a mode
- *
+ *
* @param {string} modeId
- *
+ *
* @return {string} Full path of mode
*/
function getModePath(modeId) {
@@ -172,24 +171,9 @@ function getModePath(modeId) {
}
/**
- * This should be called by RuntimeProcess when a variable changes in the mode
- *
- * @param {string} location - This is globvars/variables
- * @param {string} name - Name of the variable
- * @param {any} newValue - The new value of the variable
- */
-function onVariableChange(location, name, newValue) {
- if (location == "variables") {
- eventEmitter.emit("change", `variable/${name}`, newValue)
- } else if (location == "globvars") {
- eventEmitter.emit("change", `${name}`, newValue)
- }
-}
-
-/**
* Function that returns all globvars (brightness, power_on) as the values they
* had last time we heard from the python script.
- *
+ *
* @return {object}
*/
function getGlobvars() {
@@ -199,15 +183,15 @@ function getGlobvars() {
/**
* Sets value of a globvar power_on/brightness.
- *
+ *
* @param {string} name - Name of the variable power_on/brightness
* @param {any} value - The value the variable should be set to
- *
+ *
* @return {object} Standardform return object
*/
function setGlobvar(name, value) {
if (!modeRunning()) { return; }
-
+
switch(name) {
case "power_on":
return ipc.sendCommand(IPC.COMMAND.SET_GLOB, IPC.GLOBVAR.POWER_ON, (value) ? 1 : 0);
@@ -220,7 +204,7 @@ function setGlobvar(name, value) {
/**
* Get all variables declared in mode
- *
+ *
* @return {object}
*/
function getVariables() {
@@ -230,10 +214,10 @@ function getVariables() {
/**
* Sets value of a variable
- *
+ *
* @param {string} name - Name of the variable
* @param {any} value - The value the variable should be set to
- *
+ *
* @return {object} Standardform return object
*/
function setVariable(name, value) {
@@ -243,9 +227,9 @@ function setVariable(name, value) {
/**
* Start debugger for a mode
- *
+ *
* @param {string} modeId - The mode to debug
- *
+ *
* @return {object} Standardform return object
*/
function startDebugger(debuggerModeId) {
@@ -258,17 +242,17 @@ function startDebugger(debuggerModeId) {
modeDebuggerProcStartHandler = eventEmitter.on("proc:start", () => {
setTimeout(() => {
ipc.sendCommand(IPC.COMMAND.SET_SEND_STRIP_BUF, true);
- }, 500);
+ }, 2000);
});
+ } else {
+ console.log(modeDebuggerProcStartHandler);
}
modeDebuggerActive = true;
modeDebuggerId = debuggerModeId;
- if (debuggerModeId != modeId) {
+ setTimeout(() => {
setMode(debuggerModeId);
- } else {
- restartMode();
- }
+ }, 300);
return {success: true, code: fs.readFileSync(getModePath(debuggerModeId) + "/script.py").toString()}
}
@@ -284,7 +268,7 @@ function saveModeCode(_modeId, code) {
/**
* Stop the active debugger
- *
+ *
* @return {object} Standardform return object
*/
function stopDebugger() {
diff --git a/src/SocketIO/index.js b/src/SocketIO/index.js
index 88b5459..ff8f378 100644
--- a/src/SocketIO/index.js
+++ b/src/SocketIO/index.js
@@ -12,6 +12,7 @@ let logger = require(__appdir + "/src/Logger");
var exec = require('child_process').exec;
var CryptoJS = require("crypto-js");
let fs = require("fs");
+const { performance } = require("perf_hooks");
let neoModules;
@@ -82,7 +83,7 @@ function createOpenSocketNamespace(io) {
}
session_tokens[token] = {
- expire: (~~Date.now())+(86400),
+ expire: (~~Date.now())+(2678400),
host: socket.handshake.headers.host,
user: {username: user.username}
};
@@ -139,7 +140,7 @@ function authorize_middleware(socket, next) {
const token = socket.handshake.auth.token;
if (session_tokens.hasOwnProperty(token) &&
- session_tokens[token].host === socket.handshake.headers.host &&
+ // session_tokens[token].host === socket.handshake.headers.host &&
session_tokens[token].expire > (~~(Date.now()))) {
socket.data.user = session_tokens[token].user;
next();
@@ -266,8 +267,8 @@ function createAuthorizedNamespace(io) {
/* Editor/debugger */
let onProcStart = () => socket.emit("editor:proc:start");
let onProcStop = (code) => socket.emit("editor:proc:exit", code);
- let onProcStdout = (stdout) => socket.emit("editor:proc:stdout", stdout);
- let onProcStderr = (stderr) => socket.emit("editor:proc:stderr", stderr);
+ let onProcStdout = (stdout) => socket.volatile.emit("editor:proc:stdout", stdout);
+ let onProcStderr = (stderr) => socket.volatile.emit("editor:proc:stderr", stderr);
let closeDebugger = () => {
debuggerOpen = false;
neoModules.neoRuntimeManager.event.removeListener("proc:start", onProcStart);
@@ -277,6 +278,10 @@ function createAuthorizedNamespace(io) {
return neoModules.neoRuntimeManager.stopDebugger();
};
socket.on("editor:open", (modeId, fn) => {
+ neoModules.neoRuntimeManager.event.on("proc:start", onProcStart);
+ neoModules.neoRuntimeManager.event.on("proc:exit", onProcStop);
+ neoModules.neoRuntimeManager.event.on("proc:stdout", onProcStdout);
+ neoModules.neoRuntimeManager.event.on("proc:stderr", onProcStderr);
let res = neoModules.neoRuntimeManager.startDebugger(modeId);
if (!res.success) { fn(res); return; }
logger.info(`Starting debugger for ${modeId}.`)
@@ -284,20 +289,21 @@ function createAuthorizedNamespace(io) {
fn({success: true})
socket.emit("editor:code", modeId, res.code);
- neoModules.neoRuntimeManager.event.on("proc:start", onProcStart);
- neoModules.neoRuntimeManager.event.on("proc:exit", onProcStop);
- neoModules.neoRuntimeManager.event.on("proc:stdout", onProcStdout);
- neoModules.neoRuntimeManager.event.on("proc:stderr", onProcStderr);
if (neoModules.neoRuntimeManager.modeRunning()) {
socket.emit("editor:proc:start");
}
});
socket.on("editor:save", (modeId, code, fn) => {
- if (!debuggerOpen) { fn({success: false, reason: "Debugger not open"}); return; };
+ if (!debuggerOpen) { fn({success: false, reason: "debugger not open"}); return; };
fn(neoModules.neoRuntimeManager.saveModeCode(modeId, code));
});
socket.on("editor:startmode", (fn) => {
- fn(neoModules.neoRuntimeManager.startMode());
+ if (neoModules.neoRuntimeManager.modeRunning()) {
+ fn({success: true});
+ socket.emit("editor:proc:start");
+ } else {
+ fn(neoModules.neoRuntimeManager.startMode());
+ }
});
socket.on("editor:stopmode", (fn) => {
fn(neoModules.neoRuntimeManager.stopMode());
@@ -327,8 +333,12 @@ function createAuthorizedNamespace(io) {
neoModules.neoRuntimeManager.event.on("matrix", (matrix) => {
authorizedNamespace.emit("matrix", matrix);
});
+ let lastStripBufferEmit = performance.now();
neoModules.neoRuntimeManager.event.on("strip_buffer", (strip_buffer) => {
- authorizedNamespace.emit("strip_buffer", strip_buffer);
+ if ((performance.now() - lastStripBufferEmit) > 50) {
+ authorizedNamespace.volatile.emit("strip_buffer", strip_buffer);
+ lastStripBufferEmit = performance.now();
+ } // We just drop packets
});
neoModules.selfUpdater.updater.event.on("step", (step) => {
authorizedNamespace.emit("updater:step", step);
@@ -342,6 +352,16 @@ function createAuthorizedNamespace(io) {
}
/**
+ * Protect
+ */
+function limitEmits(fn) {
+ let lastEmit = performance.now();
+
+ return {
+ }
+}
+
+/**
* Creates an access-token from the clients host-name and the current EPOCH.
*
* @param {client}
diff --git a/src/UserData/index.js b/src/UserData/index.js
index 5ac32f6..e442a79 100644
--- a/src/UserData/index.js
+++ b/src/UserData/index.js
@@ -57,8 +57,8 @@ function ensureStripConfig() {
if (config.DEFAULT.led_dma == null) { config.DEFAULT.led_dma = 10; }
if (config.DEFAULT.led_invert == null) { config.DEFAULT.led_invert = false; }
if (config.DEFAULT.led_channel == null) { config.DEFAULT.led_channel = 0 }
- if (config.DEFAULT.segments == null) { config.DEFAULT.segments = ""; }
- if (config.DEFAULT.matrix == null) { config.DEFAULT.matrix = ""; }
+ if (config.DEFAULT.segments == null) { config.DEFAULT.segments = "50 50"; }
+ if (config.DEFAULT.matrix == null) { config.DEFAULT.matrix = "[[[0,false]],[[1,false]]]"; }
fse.writeFileSync(__configdir + "/strip.ini", ini.encode(config))
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-27 17:36:28 +0000