iobroker.javascript 9.3.0 → 10.0.0

package/build/main.js

@@ -335,6 +335,7 @@ class JavaScript extends adapter_core_1.Adapter {
     executeCounter = 0;
     // compiler instance for typescript
     tsServer;
+    logCollectors = [];
     ignoreObjectChange = new Set();
     debugState = {
         scriptName: '',
@@ -947,7 +948,9 @@ class JavaScript extends adapter_core_1.Adapter {
                             this.messageBusHandlers[name][obj.message.message]) {
                             this.messageBusHandlers[name][obj.message.message].forEach(handler => {
                                 const sandbox = handler.sandbox;
-                                sandbox.verbose && sandbox.log(`onMessage: ${JSON.stringify(obj.message)}`, 'info');
+                                if (sandbox.verbose) {
+                                    sandbox.log(`onMessage: ${JSON.stringify(obj.message)}`, 'info');
+                                }
                                 try {
                                     if (obj.callback) {
                                         handler.cb.call(sandbox, obj.message.data, (result) => {
@@ -959,8 +962,9 @@ class JavaScript extends adapter_core_1.Adapter {
                                     }
                                     else {
                                         handler.cb.call(sandbox, obj.message.data, (result) => {
-                                            sandbox.verbose &&
+                                            if (sandbox.verbose) {
                                                 sandbox.log(`onMessage result: ${JSON.stringify(result)}`, 'info');
+                                            }
                                         });
                                     }
                                 }
@@ -1461,6 +1465,14 @@ class JavaScript extends adapter_core_1.Adapter {
                 }
             }
         }
+        // Special case if some script is executed now with "execute" command, and we see "script.js.__execute_X:" at the beginning
+        if (this.logCollectors.length) {
+            for (const logCollector of this.logCollectors) {
+                if (msg.message.includes(`${logCollector.name}:`)) {
+                    logCollector.collector(msg.severity, msg.message);
+                }
+            }
+        }
     }
     logError(scriptName, msg, e, offs) {
         const stack = e.stack ? e.stack.toString().split('\n') : e ? e.toString() : '';
@@ -2370,19 +2382,7 @@ class JavaScript extends adapter_core_1.Adapter {
                 expire: 1000,
             });
         }
-        const sandbox = (0, sandbox_1.sandBox)(script, name, verbose, debug, this.context);
-        // Redirect every log line into the collector. As `console.*`, the global `log()` and all
-        // `sandbox.verbose && sandbox.log(...)` calls go through `sandbox.log`, this captures the
-        // full picture for the caller while keeping the adapter log clean.
-        if (logCollector) {
-            sandbox.log = (msg, severity) => {
-                let text = msg;
-                if (text && typeof text !== 'string') {
-                    text = util.format(text);
-                }
-                logCollector(severity || 'info', text);
-            };
-        }
+        const sandbox = (0, sandbox_1.sandBox)(script, name, verbose, debug, this.context, logCollector);
         try {
             script.script.runInNewContext(sandbox, {
                 filename: name,
@@ -2488,6 +2488,8 @@ class JavaScript extends adapter_core_1.Adapter {
             }
             logs.push({ ts: Date.now(), severity, message: msg });
         };
+        this.logCollectors.push({ name, collector });
+        this.updateLogSubscriptions();
         this.scripts[name] = createdScript;
         this.execute(createdScript, name, engineType, verbose, false, collector);
         // Let asynchronous output (timeouts, awaited code, triggered subscriptions) accumulate
@@ -2496,6 +2498,11 @@ class JavaScript extends adapter_core_1.Adapter {
         }
         // Stop and clean up the ephemeral script (timers, subscriptions, schedules, …)
         await this.stopScript(name, true);
+        const pos = this.logCollectors.findIndex(it => it.name === name);
+        if (pos !== -1) {
+            this.logCollectors.splice(pos, 1);
+        }
+        this.updateLogSubscriptions();
         const minIdx = LEVELS.indexOf(minLevel);
         const filtered = logs.filter(entry => {
             const idx = LEVELS.indexOf(entry.severity);
@@ -2584,26 +2591,31 @@ class JavaScript extends adapter_core_1.Adapter {
     }
     // Analyze if logs are still required or not
     updateLogSubscriptions() {
-        let found = false;
-        // go through all scripts and check if some script still requires logs
-        Object.keys(this.logSubscriptions).forEach(scriptName => {
-            if (!this.logSubscriptions?.[scriptName] || !this.logSubscriptions[scriptName].length) {
-                delete this.logSubscriptions[scriptName];
-            }
-            else {
-                found = true;
-            }
-        });
+        let found = '';
+        if (this.logCollectors.length) {
+            found = this.logCollectors[0].name;
+        }
+        else {
+            // go through all scripts and check if some script still requires logs
+            Object.keys(this.logSubscriptions).forEach(scriptName => {
+                if (!this.logSubscriptions?.[scriptName] || !this.logSubscriptions[scriptName].length) {
+                    delete this.logSubscriptions[scriptName];
+                }
+                else {
+                    found = scriptName;
+                }
+            });
+        }
         if (this.requireLog) {
             if (found && !this.logSubscribed) {
                 this.logSubscribed = true;
                 void this.requireLog(this.logSubscribed);
-                this.log.info(`Subscribed to log messages (found logSubscriptions)`);
+                this.log.info(`Subscribed to log messages (at least because of ${found})`);
             }
             else if (!found && this.logSubscribed) {
                 this.logSubscribed = false;
                 void this.requireLog(this.logSubscribed);
-                this.log.info(`Unsubscribed from log messages (not found logSubscriptions)`);
+                this.log.info(`Unsubscribed from log messages (not found any subscribers)`);
             }
         }
     }
@@ -3080,7 +3092,7 @@ class JavaScript extends adapter_core_1.Adapter {
         if (stat?.size !== 73452 || dbFile?.byteLength !== 73452) {
             try {
                 const buffer = Buffer.from(JSON.parse((0, node_fs_1.readFileSync)(jsonFileName).toString()), 'base64');
-                const jszip = await Promise.resolve().then(() => __importStar(require('jszip')));
+                const jszip = await import('jszip');
                 const zip = await jszip.loadAsync(buffer);
                 let data;
                 if (zip) {
@@ -3108,7 +3120,7 @@ class JavaScript extends adapter_core_1.Adapter {
     }
     async sunTimeSchedules() {
         if (this.config.createAstroStates) {
-            if (!isNaN(this.config.longitude) && !isNaN(this.config.longitude)) {
+            if (!isNaN(this.config.longitude) && !isNaN(this.config.latitude)) {
                 const calcDate = getAstroStartOfDay();
                 const times = this.mods.suncalc.getTimes(calcDate, this.config.latitude, this.config.longitude);
                 this.log.debug(`[sunTimeSchedules] Times: ${JSON.stringify(times)}`);