iobroker.javascript 9.0.11 → 9.0.13

package/build/lib/crypto.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encryptText = encryptText;
+exports.decryptText = decryptText;
+/**
+ * Encrypt the password/value with given key
+ *
+ * @param password - Secret key
+ * @param plainText - value to encrypt
+ */
+function encryptText(password, plainText) {
+    let result = '';
+    for (let i = 0; i < plainText.length; i++) {
+        result += String.fromCharCode(password[i % password.length].charCodeAt(0) ^ plainText.charCodeAt(i));
+    }
+    return Buffer.from(result).toString('base64');
+}
+/**
+ * Decrypt the password/value with given key
+ *
+ * @param password - Secret key
+ * @param base64Text - value to decrypt
+ */
+function decryptText(password, base64Text) {
+    let result = '';
+    const plainText = Buffer.from(base64Text, 'base64').toString();
+    for (let i = 0; i < plainText.length; i++) {
+        result += String.fromCharCode(password[i % password.length].charCodeAt(0) ^ plainText.charCodeAt(i));
+    }
+    return result;
+}
+//# sourceMappingURL=crypto.js.map

package/build/lib/crypto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/lib/crypto.ts"],"names":[],"mappings":";;AAMA,kCAMC;AAQD,kCAOC;AA3BD;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,QAAgB,EAAE,SAAiB;IAC3D,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,QAAgB,EAAE,UAAkB;IAC5D,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC","sourcesContent":["/**\n * Encrypt the password/value with given key\n *\n * @param password - Secret key\n * @param plainText - value to encrypt\n */\nexport function encryptText(password: string, plainText: string): string {\n    let result = '';\n    for (let i = 0; i < plainText.length; i++) {\n        result += String.fromCharCode(password[i % password.length].charCodeAt(0) ^ plainText.charCodeAt(i));\n    }\n    return Buffer.from(result).toString('base64');\n}\n\n/**\n * Decrypt the password/value with given key\n *\n * @param password - Secret key\n * @param base64Text - value to decrypt\n */\nexport function decryptText(password: string, base64Text: string): string {\n    let result = '';\n    const plainText = Buffer.from(base64Text, 'base64').toString();\n    for (let i = 0; i < plainText.length; i++) {\n        result += String.fromCharCode(password[i % password.length].charCodeAt(0) ^ plainText.charCodeAt(i));\n    }\n    return result;\n}\n"]}

package/{build-backend → build}/lib/javascript.d.ts

@@ -1826,6 +1826,9 @@ declare global {
         interface ScriptObject extends BaseObject {
             type: 'script';
             common: ScriptCommon;
+            native: {
+                encrypted?: boolean;
+            };
         }
 
         interface PartialScriptObject extends Partial<Omit<ScriptObject, 'common'>> {

package/{build-backend → build}/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;AAyDA,8BASC;AAlED,qCAAmD;AACnD,yCAA0C;AAG1C,MAAM,UAAU,GAAG;IACf,QAAQ,EAAE,CAAC;IACX,uBAAuB,EAAE,EAAE;CAC9B,CAAC;AAEF;;;GAGG;AACH,SAAS,UAAU;IACf,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,SAAmB;IACzC,kCAAkC;IAClC,MAAM,aAAa,GAAG,CAAC,wBAAwB,EAAE,wBAAwB,CAAC,CAAC;IAC3E,IAAI,cAAkC,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAC9B,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,IAAA,oBAAU,EAAC,YAAY,CAAC,EAAE,CAAC;gBAC3B,cAAc,GAAG,YAAY,CAAC;gBAC9B,MAAM;YACV,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,eAAe;QACnB,CAAC;IACL,CAAC;IACD,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;IACL,CAAC;IAED,0BAA0B;IAC1B,OAAO,IAAA,mBAAO,EAAC,cAAc,CAAC,CAAC;AACnC,CAAC;AAEY,QAAA,OAAO,GAAG,UAAU,EAAE,CAAC;AACvB,QAAA,aAAa,GAAG,gBAAgB,CACzC,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CACvF,CAAC;AAEF;;GAEG;AACH,SAAgB,SAAS;IACrB,IAAI,UAAkB,CAAC;IACvB,IAAI,IAAA,oBAAU,EAAC,CAAC,UAAU,GAAG,IAAA,gBAAI,EAAC,qBAAa,EAAE,MAAM,EAAE,GAAG,eAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,IAAA,oBAAU,EAAC,CAAC,UAAU,GAAG,IAAA,gBAAI,EAAC,qBAAa,EAAE,MAAM,EAAE,GAAG,CAAC,eAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,eAAe,qBAAa,SAAS,eAAO,OAAO,CAAC,CAAC;AACzE,CAAC;AAEY,QAAA,OAAO,GAAG,OAAO,CAAC,IAAA,gBAAI,EAAC,qBAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC","sourcesContent":["import { existsSync, readFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport type { IoBJson } from '@iobroker/types/build/config';\n\nconst EXIT_CODES = {\n    NO_ERROR: 0,\n    CANNOT_FIND_ADAPTER_DIR: 10,\n};\n\n/**\n * Returns the application name\n * The name of the application can be different, and this function finds it out.\n */\nfunction getAppName(): string {\n    const parts = __dirname.replace(/\\\\/g, '/').split('/');\n    return parts[parts.length - 2].split('.')[0];\n}\n\n/**\n * looks for js-controller home folder\n */\nfunction getControllerDir(isInstall?: boolean): string {\n    // Find the js-controller location\n    const possibilities = ['iobroker.js-controller', 'ioBroker.js-controller'];\n    let controllerPath: string | undefined;\n    for (const pkg of possibilities) {\n        try {\n            const possiblePath = require.resolve(pkg);\n            if (existsSync(possiblePath)) {\n                controllerPath = possiblePath;\n                break;\n            }\n        } catch {\n            /* not found */\n        }\n    }\n    if (!controllerPath) {\n        if (!isInstall) {\n            console.log('Cannot find js-controller');\n            process.exit(EXIT_CODES.CANNOT_FIND_ADAPTER_DIR);\n        } else {\n            process.exit(EXIT_CODES.NO_ERROR);\n        }\n    }\n\n    // we found the controller\n    return dirname(controllerPath);\n}\n\nexport const appName = getAppName();\nexport const controllerDir = getControllerDir(\n    typeof process !== 'undefined' && process.argv && process.argv.includes('--install'),\n);\n\n/**\n * Reads controller base settings\n */\nexport function getConfig(): IoBJson {\n    let configPath: string;\n    if (existsSync((configPath = join(controllerDir, 'conf', `${appName}.json`)))) {\n        return JSON.parse(readFileSync(configPath, 'utf8'));\n    }\n    if (existsSync((configPath = join(controllerDir, 'conf', `${+appName.toLowerCase()}.json`)))) {\n        return JSON.parse(readFileSync(configPath, 'utf8'));\n    }\n    throw new Error(`Cannot find ${controllerDir}/conf/${appName}.json`);\n}\n\nexport const Adapter = require(join(controllerDir, 'lib/adapter.js'));\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;AAyDA,8BASC;AAlED,qCAAmD;AACnD,yCAA0C;AAG1C,MAAM,UAAU,GAAG;IACf,QAAQ,EAAE,CAAC;IACX,uBAAuB,EAAE,EAAE;CAC9B,CAAC;AAEF;;;GAGG;AACH,SAAS,UAAU;IACf,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,SAAmB;IACzC,kCAAkC;IAClC,MAAM,aAAa,GAAG,CAAC,wBAAwB,EAAE,wBAAwB,CAAC,CAAC;IAC3E,IAAI,cAAkC,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAC9B,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,IAAA,oBAAU,EAAC,YAAY,CAAC,EAAE,CAAC;gBAC3B,cAAc,GAAG,YAAY,CAAC;gBAC9B,MAAM;YACV,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,eAAe;QACnB,CAAC;IACL,CAAC;IACD,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;IACL,CAAC;IAED,0BAA0B;IAC1B,OAAO,IAAA,mBAAO,EAAC,cAAc,CAAC,CAAC;AACnC,CAAC;AAEY,QAAA,OAAO,GAAG,UAAU,EAAE,CAAC;AACvB,QAAA,aAAa,GAAG,gBAAgB,CACzC,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CACvF,CAAC;AAEF;;GAEG;AACH,SAAgB,SAAS;IACrB,IAAI,UAAkB,CAAC;IACvB,IAAI,IAAA,oBAAU,EAAC,CAAC,UAAU,GAAG,IAAA,gBAAI,EAAC,qBAAa,EAAE,MAAM,EAAE,GAAG,eAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,IAAA,oBAAU,EAAC,CAAC,UAAU,GAAG,IAAA,gBAAI,EAAC,qBAAa,EAAE,MAAM,EAAE,GAAG,CAAC,eAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,eAAe,qBAAa,SAAS,eAAO,OAAO,CAAC,CAAC;AACzE,CAAC;AAEY,QAAA,OAAO,GAAG,OAAO,CAAC,IAAA,gBAAI,EAAC,qBAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC","sourcesContent":["import { existsSync, readFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport type { IoBJson } from '@iobroker/types/build/config';\n\nconst EXIT_CODES = {\n    NO_ERROR: 0,\n    CANNOT_FIND_ADAPTER_DIR: 10,\n};\n\n/**\n * Returns the application name\n * The name of the application can be different, and this function finds it out.\n */\nfunction getAppName(): string {\n    const parts = __dirname.replace(/\\\\/g, '/').split('/');\n    return parts[parts.length - 2].split('.')[0];\n}\n\n/**\n * looks for js-controller home folder\n */\nfunction getControllerDir(isInstall?: boolean): string {\n    // Find the js-controller location\n    const possibilities = ['iobroker.js-controller', 'ioBroker.js-controller'];\n    let controllerPath: string | undefined;\n    for (const pkg of possibilities) {\n        try {\n            const possiblePath = require.resolve(pkg);\n            if (existsSync(possiblePath)) {\n                controllerPath = possiblePath;\n                break;\n            }\n        } catch {\n            /* not found */\n        }\n    }\n    if (!controllerPath) {\n        if (!isInstall) {\n            console.log('Cannot find js-controller');\n            process.exit(EXIT_CODES.CANNOT_FIND_ADAPTER_DIR);\n        } else {\n            process.exit(EXIT_CODES.NO_ERROR);\n        }\n    }\n\n    // we found the controller\n    return dirname(controllerPath);\n}\n\nexport const appName = getAppName();\nexport const controllerDir = getControllerDir(\n    typeof process !== 'undefined' && process.argv && process.argv.includes('--install'),\n);\n\n/**\n * Reads controller base settings\n */\nexport function getConfig(): IoBJson {\n    let configPath: string;\n    if (existsSync((configPath = join(controllerDir, 'conf', `${appName}.json`)))) {\n        return JSON.parse(readFileSync(configPath, 'utf8'));\n    }\n    if (existsSync((configPath = join(controllerDir, 'conf', `${+appName.toLowerCase()}.json`)))) {\n        return JSON.parse(readFileSync(configPath, 'utf8'));\n    }\n    throw new Error(`Cannot find ${controllerDir}/conf/${appName}.json`);\n}\n\nexport const Adapter = require(join(controllerDir, 'lib/adapter.js'));"]}

package/{build-backend → build}/main.js

@@ -83,6 +83,7 @@ const scheduler_1 = require("./lib/scheduler");
 const typescriptSettings_1 = require("./lib/typescriptSettings");
 const tools_1 = require("./lib/tools");
 const typescriptTools_1 = require("./lib/typescriptTools");
+const crypto_1 = require("./lib/crypto");
 /**
  * List of forbidden Locations for a mirror directory
  * relative to the default data directory
@@ -250,6 +251,7 @@ class JavaScript extends adapter_core_1.Adapter {
     _enums = [];
     names = {}; // name: id
     scripts = {};
+    password = '';
     messageBusHandlers = {};
     logSubscriptions = {};
     tempDirectories = {}; // name: path
@@ -1300,11 +1302,11 @@ class JavaScript extends adapter_core_1.Adapter {
                     const parts = id.split('.');
                     parts.pop();
                     const chn = parts.join('.');
-                    this.context.channels[chn] = this.context.channels[chn] || [];
+                    this.context.channels[chn] ||= [];
                     this.context.channels[chn].push(id);
                     parts.pop();
                     const dev = parts.join('.');
-                    this.context.devices[dev] = this.context.devices[dev] || [];
+                    this.context.devices[dev] ||= [];
                     this.context.devices[dev].push(id);
                 }
             }
@@ -1491,6 +1493,9 @@ class JavaScript extends adapter_core_1.Adapter {
             }
             this.addGetProperty(this.objects);
             const systemConfig = this.objects['system.config'];
+            this.password = systemConfig?.native?.javascriptPassword
+                ? this.decrypt(systemConfig?.native.javascriptPassword)
+                : '';
             // set language for debug messages
             if (systemConfig?.common?.language) {
                 (0, words_1.setLanguage)(systemConfig.common.language);
@@ -1526,14 +1531,14 @@ class JavaScript extends adapter_core_1.Adapter {
             else if (this.config.longitude < -180 || this.config.longitude > 180) {
                 this.log.warn(`Configured longitude "${this.config.longitude}" is invalid - check (instance/system) configuration`);
             }
-            this.config.sunriseEvent = this.config.sunriseEvent || 'nightEnd';
-            this.config.sunriseOffset = this.config.sunriseOffset || 0;
-            this.config.sunriseLimitStart = this.config.sunriseLimitStart || '06:00';
-            this.config.sunriseLimitEnd = this.config.sunriseLimitEnd || '12:00';
-            this.config.sunsetEvent = this.config.sunsetEvent || 'dusk';
-            this.config.sunsetOffset = this.config.sunsetOffset || 0;
-            this.config.sunsetLimitStart = this.config.sunsetLimitStart || '18:00';
-            this.config.sunsetLimitEnd = this.config.sunsetLimitEnd || '23:00';
+            this.config.sunriseEvent ||= 'nightEnd';
+            this.config.sunriseOffset ||= 0;
+            this.config.sunriseLimitStart ||= '06:00';
+            this.config.sunriseLimitEnd ||= '12:00';
+            this.config.sunsetEvent ||= 'dusk';
+            this.config.sunsetOffset ||= 0;
+            this.config.sunsetLimitStart ||= '18:00';
+            this.config.sunsetLimitEnd ||= '23:00';
             this.objectsInitDone = true;
             this.log.info('received all objects');
         })
@@ -2064,6 +2069,9 @@ class JavaScript extends adapter_core_1.Adapter {
             (obj.common.enabled || this.context.debugMode === obj._id) &&
             obj.common.engine === `system.adapter.${this.namespace}`) {
             const name = obj._id;
+            if (this.password && obj.native?.protected) {
+                obj.common.source = (0, crypto_1.decryptText)(this.password, obj.common.source);
+            }
             const nameId = name.substring(SCRIPT_CODE_MARKER.length);
             if (!nameId.length || nameId.endsWith('.')) {
                 this.log.error(`${name}: Script name "${name}" is invalid!`);
@@ -2074,7 +2082,7 @@ class JavaScript extends adapter_core_1.Adapter {
                 this.interimStateValues[idActive] = this.prepareStateObjectSimple(`${this.namespace}.${idActive}`, true, true);
             }
             await this.setState(idActive, true, true);
-            obj.common.engineType = obj.common.engineType || '';
+            obj.common.engineType ||= '';
             if (obj.common.engineType.toLowerCase().startsWith('javascript') ||
                 obj.common.engineType === 'Blockly' ||
                 obj.common.engineType === 'Rules') {
@@ -2506,7 +2514,7 @@ class JavaScript extends adapter_core_1.Adapter {
                 this.debugState.endTimeout = null;
                 this.debugState.child?.kill('SIGTERM');
             }, 500);
-            this.debugState.promiseOnEnd = this.debugState.promiseOnEnd || Promise.resolve(0);
+            this.debugState.promiseOnEnd ||= Promise.resolve(0);
         }
         else {
             this.debugState.promiseOnEnd = Promise.resolve(0);