aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/NeoRuntimeManager/RuntimeProcess.js4
-rw-r--r--src/NeoRuntimeManager/index.js8
-rw-r--r--src/SSLCert/index.js6
-rw-r--r--src/SelfUpdater/index.js4
-rw-r--r--src/SocketIO/index.js4
-rw-r--r--src/UserData/index.js48
6 files changed, 37 insertions, 37 deletions
diff --git a/src/NeoRuntimeManager/RuntimeProcess.js b/src/NeoRuntimeManager/RuntimeProcess.js
index 60c1de9..562bb0e 100644
--- a/src/NeoRuntimeManager/RuntimeProcess.js
+++ b/src/NeoRuntimeManager/RuntimeProcess.js
@@ -30,8 +30,8 @@ class RuntimeProcess {
"python3",
[
"-u", // This makes us able to get real-time output
- `${__basedir}/NeoRuntime/Runtime/neo_runtime.py`,
- `--strip-config="${__datadir}/config/strip.ini"`,
+ `${__appdir}/NeoRuntime/Runtime/neo_runtime.py`,
+ `--strip-config="${__configdir}/strip.ini"`,
`--mode-path="${this.modePath}"`,
`--mode-entry=script`
]
diff --git a/src/NeoRuntimeManager/index.js b/src/NeoRuntimeManager/index.js
index 6238323..4377b8a 100644
--- a/src/NeoRuntimeManager/index.js
+++ b/src/NeoRuntimeManager/index.js
@@ -9,7 +9,7 @@ const fs = require("fs");
const fsPromises = fs.promises;
const RuntimeProcess = require("./RuntimeProcess");
const IPC = require("./IPC");
-let logger = require(__basedir + "/src/logger");
+const logger = require(__appdir + "/src/Logger");
const EventEmitter = require('events');
/** @type {object} this should be a pointer to a object referencing all neoModules (see app.js) */
@@ -54,7 +54,7 @@ function isMode(path) {
*/
function listModes() {
let modeDirs = [
- ["builtin/", fs.readdirSync(__basedir + "/NeoRuntime/builtin")],
+ ["builtin/", fs.readdirSync(__appdir + "/NeoRuntime/builtin")],
["remote/", fs.readdirSync(__datadir + "/remoteCode")],
["user/", fs.readdirSync(__datadir + "/userCode")]
]
@@ -162,7 +162,7 @@ function getModePath(modeId) {
let location = path.splice(0, 1).toString();
if (location === "user") { path = __datadir + "/userCode/" + path.join("/"); }
if (location === "remote") { path = __datadir + "/remoteCode/" + path.join("/"); }
- if (location === "builtin") { path = __basedir + "/NeoRuntime/builtin/" + path.join("/"); }
+ if (location === "builtin") { path = __appdir + "/NeoRuntime/builtin/" + path.join("/"); }
return path;
}
@@ -308,4 +308,4 @@ module.exports = (_neoModules) => {
startDebugger, stopDebugger, saveModeCode,
startMode, stopMode, restartMode
}
-}; \ No newline at end of file
+};
diff --git a/src/SSLCert/index.js b/src/SSLCert/index.js
index 6dad579..d235c9b 100644
--- a/src/SSLCert/index.js
+++ b/src/SSLCert/index.js
@@ -7,7 +7,7 @@
* @author jakobst1n.
* @since 14.16.2019
*/
- let logger = require(__basedir + "/src/logger");
+ let logger = require(__appdir + "/src/Logger");
const fs = require("fs");
const { execSync } = require("child_process");
@@ -20,7 +20,7 @@ var neoModules;
class CertMon {
constructor(configPath, certPath, httpsConfig) {
- this.certPath = __datadir + "/config/certs/";
+ this.certPath = __configdir + "/certs/";
let valid = this.checkValidity();
if (!valid) {
@@ -141,4 +141,4 @@ module.exports = (_neoModules) => {
neoModules = _neoModules;
return new CertMon();
};
- \ No newline at end of file
+
diff --git a/src/SelfUpdater/index.js b/src/SelfUpdater/index.js
index 3c5546b..5a9baa3 100644
--- a/src/SelfUpdater/index.js
+++ b/src/SelfUpdater/index.js
@@ -2,14 +2,14 @@ let fs = require("fs-extra");
let url = require("url");
let request = require('request');
let exec = require("child_process").exec;
-let logger = require(__basedir + "/src/logger");
+let logger = require(__appdir + "/src/Logger");
let neoModules;
class VersionChecker {
constructor() {
- this.CPackageJson = JSON.parse(fs.readFileSync(__basedir + "/package.json"));
+ this.CPackageJson = JSON.parse(fs.readFileSync(__appdir + "/package.json"));
this.version = this.CPackageJson["version"];
this.repoLink = this.CPackageJson["repository"]["url"];
diff --git a/src/SocketIO/index.js b/src/SocketIO/index.js
index 8d06947..2a625ed 100644
--- a/src/SocketIO/index.js
+++ b/src/SocketIO/index.js
@@ -8,7 +8,7 @@
* @since 19.12.2019
*/
-let logger = require(__basedir + "/src/logger");
+let logger = require(__appdir + "/src/Logger");
var exec = require('child_process').exec;
var CryptoJS = require("crypto-js");
let fs = require("fs");
@@ -350,4 +350,4 @@ module.exports = (_neoModules, io) => {
authorizedNamespace: createAuthorizedNamespace(io)
}
};
- \ No newline at end of file
+
diff --git a/src/UserData/index.js b/src/UserData/index.js
index 704c5d5..751c265 100644
--- a/src/UserData/index.js
+++ b/src/UserData/index.js
@@ -6,7 +6,7 @@
* @since 19.12.2019
*/
-let logger = require(__basedir + "/src/logger");
+let logger = require(__appdir + "/src/Logger");
let fse = require("fs-extra");
let ini = require('ini');
@@ -16,7 +16,7 @@ let neoModules;
* This method will ensure that all required fields are in config.ini
*/
function ensureMainConfig() {
- var config = ini.decode(fse.readFileSync(__datadir + "/config/config.ini", 'utf-8'))
+ var config = ini.decode(fse.readFileSync(__configdir + "/config.ini", 'utf-8'))
if (config.instanceName == null) { config.instanceName = "neoStrip"; }
if (config.activeMode == null) { config.activeMode = "builtin/static"; }
@@ -43,14 +43,14 @@ function ensureMainConfig() {
if (config.neoRuntimeIPC == null) { config.neoRuntimeIPC = {}; }
if (config.neoRuntimeIPC.socketFile == null) { config.neoRuntimeIPC.socketFile = "/tmp/neo_runtime.sock"; }
- fse.writeFileSync(__datadir + "/config/config.ini", ini.encode(config))
+ fse.writeFileSync(__configdir + "/config.ini", ini.encode(config))
}
/**
* This method will ensure that all required fields are in config.ini
*/
function ensureStripConfig() {
- var config = ini.decode(fse.readFileSync(__datadir + "/config/strip.ini", 'utf-8'))
+ var config = ini.decode(fse.readFileSync(__configdir + "/strip.ini", 'utf-8'))
if (config.DEFAULT == null) { config.DEFAULT = {}; }
if (config.DEFAULT.led_pin == null) { config.DEFAULT.led_pin = 18; }
@@ -61,7 +61,7 @@ function ensureStripConfig() {
if (config.DEFAULT.segments == null) { config.DEFAULT.segments = ""; }
if (config.DEFAULT.matrix == null) { config.DEFAULT.matrix = ""; }
- fse.writeFileSync(__datadir + "/config/strip.ini", ini.encode(config))
+ fse.writeFileSync(__configdir + "/strip.ini", ini.encode(config))
}
/**
@@ -73,24 +73,24 @@ function init() {
logger.info("Ensuring all folder in UserDir exists...");
fse.ensureDirSync(__datadir + "/");
- fse.ensureDirSync(__datadir + "/config/");
- fse.ensureDirSync(__datadir + "/config/certs");
+ fse.ensureDirSync(__configdir);
+ fse.ensureDirSync(__configdir + "/certs");
fse.ensureDirSync(__datadir + "/userCode/");
fse.ensureDirSync(__datadir + "/remoteCode/");
// Generate config-files
- if (!fse.existsSync(__datadir + "/config/config.ini")) {
- fse.closeSync(fse.openSync(__datadir + "/config/config.ini", 'w'));
+ if (!fse.existsSync(__configdir + "/config.ini")) {
+ fse.closeSync(fse.openSync(__configdir + "/config.ini", 'w'));
}
ensureMainConfig();
- if (!fse.existsSync(__datadir + "/config/strip.ini")) {
- fse.closeSync(fse.openSync(__datadir + "/config/strip.ini", 'w'));
+ if (!fse.existsSync(__configdir + "/strip.ini")) {
+ fse.closeSync(fse.openSync(__configdir + "/strip.ini", 'w'));
}
ensureStripConfig();
- if (!fse.existsSync(__datadir + "/config/users.ini")) {
- fse.writeFileSync(__datadir + "/config/users.ini", ini.encode({
+ if (!fse.existsSync(__configdir + "/users.ini")) {
+ fse.writeFileSync(__configdir + "/users.ini", ini.encode({
"neo": {
"password": "5adbc90fb4716fff62d9cf634837e22f29b011803ba29cee51f921b920fa941651737bd15d00dc72e4cbeee5e64e06ec99cc50ea917285a029797a98740cce0f",
"salt": "59b6de1040f3ae3c63de984ca5d61ef46f41dc6ecead3a9d5dab69f0bb3636aa49017e179b74dbcdb407f62bc139a7d55aa78fe2bbdd5327609ea124b2fa03b1"
@@ -196,11 +196,11 @@ function getFullConfig(file, addSetters=true) {
* @return {object} Standardform return object
*/
function saveUser(username, salt, password) {
- let config = ini.decode(fse.readFileSync(__datadir + "/config/users.ini", 'utf-8'))
+ let config = ini.decode(fse.readFileSync(__configdir + "/users.ini", 'utf-8'))
config[username] = {}
config[username].salt = salt
config[username].password = password
- fse.writeFileSync(__datadir + "/config/users.ini", ini.encode(config))
+ fse.writeFileSync(__configdir + "/users.ini", ini.encode(config))
return {success: true}
}
@@ -210,7 +210,7 @@ function getFullConfig(file, addSetters=true) {
* @return {object} with username, salt and hash properties.
*/
function getUser(username) {
- let config = ini.decode(fse.readFileSync(__datadir + "/config/users.ini", 'utf-8'))
+ let config = ini.decode(fse.readFileSync(__configdir + "/users.ini", 'utf-8'))
if (Object.prototype.hasOwnProperty.call(config, username)) {
return {...config[username], username: username}
}
@@ -223,7 +223,7 @@ function getUser(username) {
* @return {array} usernames
*/
function getUsers() {
- let config = ini.decode(fse.readFileSync(__datadir + "/config/users.ini", "utf-8"));
+ let config = ini.decode(fse.readFileSync(__configdir + "/users.ini", "utf-8"));
let users = [];
for (const username of Object.keys(config)) {
users.push(username);
@@ -237,11 +237,11 @@ function getUsers() {
* @return {object} Standardform success object.
*/
function deleteUser(username) {
- let config = ini.decode(fse.readFileSync(__datadir + "/config/users.ini", 'utf-8'))
+ let config = ini.decode(fse.readFileSync(__configdir + "/users.ini", 'utf-8'))
if (config.length <= 1) { return {success: false, reason: "cannot delete only user"}; }
if (!Object.prototype.hasOwnProperty.call(config, username)) { return {success: false, reason: "user not found", detail: username}; }
delete config[username];
- fse.writeFileSync(__datadir + "/config/users.ini", ini.encode(config));
+ fse.writeFileSync(__configdir + "/users.ini", ini.encode(config));
return {success: true}
}
@@ -257,7 +257,7 @@ function deleteUser(username) {
function createNewUserMode(name, template) {
source_script = null;
if ((template === "template/base") || (template === "") || (template == null)) {
- source_script = __basedir + "/NeoRuntime/special/template_base/";
+ source_script = __appdir + "/NeoRuntime/special/template_base/";
} else {
source_script = neoModules.neoRuntimeManager.getModePath(template);
}
@@ -313,7 +313,7 @@ module.exports = (_neoModules) => {
},
strip: {
get: () => {
- let c = getFullConfig(`${__datadir}/config/strip.ini`, addSetters=false);
+ let c = getFullConfig(`${__configdir}/strip.ini`, addSetters=false);
c.DEFAULT.matrix = JSON.parse(c.DEFAULT.matrix);
c.DEFAULT.segments = c.DEFAULT.segments.split(" ");
return c.DEFAULT;
@@ -321,13 +321,13 @@ module.exports = (_neoModules) => {
set: (c) => {
c.segments = c.segments.join(" ");
c.matrix = JSON.stringify(c.matrix);
- return saveConfig(`${__datadir}/config/strip.ini`, {DEFAULT: c}, removeSetters=false);
+ return saveConfig(`${__configdir}/strip.ini`, {DEFAULT: c}, removeSetters=false);
},
},
- config: getFullConfig(`${__datadir}/config/config.ini`),
+ config: getFullConfig(`${__configdir}/config.ini`),
mode: {
create: createNewUserMode,
delete: deleteUserMode
}
}
-}; \ No newline at end of file
+};
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-27 17:41:07 +0000