iobroker.javascript 7.2.0 → 7.3.0

package/lib/sandbox.js

@@ -53,7 +53,7 @@ function sandBox(script, name, verbose, debug, context) {
     const debugMode = context.debugMode;
 
     function errorInCallback(e) {
-        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'errorInCallback' });
         context.logError('Error in callback', e);
         context.debugMode && console.log(`error$$${name}$$Exception in callback: ${e}`, Date.now());
     }
@@ -528,7 +528,7 @@ function sandBox(script, name, verbose, debug, context) {
                     mods[md] = require(md);
                     return mods[md];
                 } catch (e) {
-                    adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+                    adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'require' });
                     context.logError(name, e, 6);
                 }
             }
@@ -2031,7 +2031,7 @@ function sandBox(script, name, verbose, debug, context) {
                     try {
                         result = JSON.parse(JSON.stringify(objects[id]));
                     } catch (err) {
-                        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+                        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'getObject' });
                         sandbox.log(`Object "${id}" can't be copied: ${JSON.stringify(err)}`, 'error');
                         return cb();
                     }
@@ -2065,7 +2065,7 @@ function sandBox(script, name, verbose, debug, context) {
                     try {
                         result = JSON.parse(JSON.stringify(objects[id]));
                     } catch (err) {
-                        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+                        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'getObject' });
                         sandbox.log(`Object "${id}" can't be copied: ${JSON.stringify(err)}`, 'error');
                         return null;
                     }
@@ -3537,7 +3537,7 @@ function sandBox(script, name, verbose, debug, context) {
                 try {
                     obj = JSON.parse(obj);
                 } catch (e) {
-                    adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+                    adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'getAttr' });
                     sandbox.log(`Cannot parse "${obj.substring(0, 30)}"${e}`, 'error');
                     return null;
                 }
@@ -3547,7 +3547,7 @@ function sandBox(script, name, verbose, debug, context) {
             try {
                 obj = obj[attr];
             } catch (e) {
-                adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+                adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'getAttr' });
                 sandbox.log(`Cannot get ${attr} of ${JSON.stringify(obj)}`, 'error');
                 return null;
             }

package/main.js

@@ -22,7 +22,6 @@ const CoffeeScript  = require('coffeescript');
 const tsc           = require('virtual-tsc');
 const Mirror        = require('./lib/mirror');
 const fork          = require('child_process').fork;
-const { astroList } = require('./lib/consts');
 
 const mods = {
     fs:               {},
@@ -67,6 +66,9 @@ const words     = require('./lib/words');
 const sandBox   = require('./lib/sandbox');
 const eventObj  = require('./lib/eventObj');
 const Scheduler = require('./lib/scheduler');
+const { targetTsLib, tsCompilerOptions, jsDeclarationCompilerOptions } = require('./lib/typescriptSettings');
+const { hashSource, isObject } = require('./lib/tools');
+const { isDeepStrictEqual } = require('node:util');
 const {
     resolveTypescriptLibs,
     resolveTypings,
@@ -74,14 +76,10 @@ const {
     transformScriptBeforeCompilation,
     transformGlobalDeclarations
 } = require('./lib/typescriptTools');
-const { targetTsLib, tsCompilerOptions, jsDeclarationCompilerOptions } = require('./lib/typescriptSettings');
-const { hashSource, isObject } = require('./lib/tools');
 
 const packageJson = require('./package.json');
-const { EXIT_CODES } = require('@iobroker/adapter-core');
-const { isDeepStrictEqual } = require('util');
-const adapterName = packageJson.name.split('.').pop();
-const scriptCodeMarker = 'script.js.';
+const SCRIPT_CODE_MARKER = 'script.js.';
+
 const stopCounters =  {};
 let setStateCountCheckInterval = null;
 
@@ -407,9 +405,7 @@ let adapter;
 function startAdapter(options) {
     options = options || {};
     Object.assign(options, {
-
-        name: adapterName,
-
+        name: 'javascript',
         useFormatDate: true, // load float formatting
 
         /**
@@ -515,12 +511,12 @@ function startAdapter(options) {
                     stop(id);
 
                     // delete scriptEnabled.blabla variable
-                    const idActive = 'scriptEnabled.' + id.substring('script.js.'.length);
+                    const idActive = 'scriptEnabled.' + id.substring(SCRIPT_CODE_MARKER.length);
                     adapter.delObject(idActive);
                     adapter.delState(idActive);
 
                     // delete scriptProblem.blabla variable
-                    const idProblem = 'scriptProblem.' + id.substring('script.js.'.length);
+                    const idProblem = 'scriptProblem.' + id.substring(SCRIPT_CODE_MARKER.length);
                     adapter.delObject(idProblem);
                     adapter.delState(idProblem);
                 }
@@ -688,7 +684,7 @@ function startAdapter(options) {
                                     const eventData = event.exception.values[0];
                                     if (eventData.stacktrace && eventData.stacktrace.frames && Array.isArray(eventData.stacktrace.frames) && eventData.stacktrace.frames.length) {
                                         // Exclude event if script Marker is included
-                                        if (eventData.stacktrace.frames.find(frame => frame.filename && frame.filename.includes(scriptCodeMarker))) {
+                                        if (eventData.stacktrace.frames.find(frame => frame.filename && frame.filename.includes(SCRIPT_CODE_MARKER))) {
                                             return null;
                                         }
                                         //Exclude event if own directory is included but not inside own node_modules
@@ -741,7 +737,7 @@ function startAdapter(options) {
                                                 handler.cb.call(handler.sandbox, obj.message.data, result => {/* nop */ });
                                             }
                                         } catch (e) {
-                                            adapter.setState('scriptProblem.' + name.substring('script.js.'.length), true, true);
+                                            adapter.setState('scriptProblem.' + name.substring(SCRIPT_CODE_MARKER.length), true, true);
                                             context.logError('Error in callback', e);
                                         }
                                     });
@@ -907,7 +903,7 @@ function startAdapter(options) {
             // Identify unhandled errors originating from callbacks in scripts
             // These are not caught by wrapping the execution code in try-catch
             if (err && typeof err.stack === 'string') {
-                const scriptCodeMarkerIndex = err.stack.indexOf(scriptCodeMarker);
+                const scriptCodeMarkerIndex = err.stack.indexOf(SCRIPT_CODE_MARKER);
                 if (scriptCodeMarkerIndex > -1) {
                     // This is a script error
                     let scriptName = err.stack.substr(scriptCodeMarkerIndex);
@@ -1091,6 +1087,7 @@ function main() {
         getData(() => {
             context.scheduler = new Scheduler(adapter.log, Date, mods.suncalc, adapter.config.latitude, adapter.config.longitude);
             dayTimeSchedules(adapter, context);
+            sunTimeSchedules(adapter, context);
             timeSchedule(adapter, context);
 
             // Warning. It could have a side-effect in compact mode, so all adapters will accept self signed certificates
@@ -1319,7 +1316,8 @@ let knownGlobalDeclarationsByScript = {};
 let globalScriptLines  = 0;
 // let activeRegEx     = null;
 let activeStr          = ''; // enabled state prefix
-let daySchedule        = null; // schedule for astrological day
+let dayScheduleTimer   = null; // schedule for astrological day
+let sunScheduleTimer   = null; // schedule for sun moment times
 let timeScheduleTimer  = null; // schedule for astrological day
 
 function getNextTimeEvent(time, useNextDay) {
@@ -1379,9 +1377,11 @@ function timeSchedule(adapter, context) {
         }
     }
     if (context.timeSettings.leadingZeros) {
-        hours = hours.toString().padStart(2, '0');
+        hours = parseInt(hours.toString().padStart(2, '0'));
     }
-    adapter.setState('variables.dayTime', `${hours}:${minutes.toString().padStart(2, '0')}`, true);
+
+    adapter.setState('variables.dayTime', {val: `${hours}:${minutes.toString().padStart(2, '0')}`, ack: true});
+
     now.setMinutes(now.getMinutes() + 1);
     now.setSeconds(0);
     now.setMilliseconds(0);
@@ -1433,17 +1433,17 @@ function dayTimeSchedules(adapter, context) {
         }
 
         const val = state ? !!state.val : false;
-        if (val !== isDay) {
-            adapter.setState('variables.isDayTime', isDay, true);
+        if (val !== isDay || state === null) {
+            adapter.setState('variables.isDayTime', {val: isDay, ack: true});
         }
     });
 
     adapter.getState('variables.isDaylightSaving', (err, state) => {
         const isDayLightSaving = dstOffsetAtDate(nowDate) !== 0;
-
         const val = state ? !!state.val : false;
-        if (val !== isDayLightSaving) {
-            adapter.setState('variables.isDaylightSaving', isDayLightSaving, true);
+
+        if (val !== isDayLightSaving || state === null) {
+            adapter.setState('variables.isDaylightSaving', {val: isDayLightSaving, ack: true});
         }
     });
 
@@ -1456,11 +1456,46 @@ function dayTimeSchedules(adapter, context) {
         nextTimeout = 3000;
     }
 
-    daySchedule = setTimeout(dayTimeSchedules, nextTimeout, adapter, context);
+    dayScheduleTimer = setTimeout(dayTimeSchedules, nextTimeout, adapter, context);
+}
+
+async function sunTimeSchedules(adapter, context) {
+    const todayDate = new Date();
+    todayDate.setHours(0);
+    todayDate.setMinutes(0);
+    todayDate.setSeconds(1);
+    todayDate.setDate(todayDate.getDate() + 1);
+
+    const times = mods.suncalc.getTimes(new Date(), adapter.config.latitude, adapter.config.longitude);
+
+    for (const t in times) {
+        const h = times[t].getHours();
+        const m = times[t].getMinutes();
+
+        const timeFormatted = `${h < 10 ? '0' + h : h}:${m < 10 ? '0' + m : m}`;
+        const objId = `variables.astro.${t}`;
+
+        await adapter.setObjectNotExistsAsync(objId, {
+            type: 'state',
+            common: {
+                name: `Astro ${t}`,
+                type: 'string',
+                role: 'value',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        await adapter.setStateAsync(objId, { val: timeFormatted, ack: true });
+    }
+
+    adapter.log.debug(`[sunTimeSchedules] Next: ${todayDate.toISOString()}`);
+    sunScheduleTimer = setTimeout(sunTimeSchedules, todayDate.getTime() - Date.now(), adapter, context);
 }
 
 function stopTimeSchedules() {
-    daySchedule && clearTimeout(daySchedule);
+    dayScheduleTimer && clearTimeout(dayScheduleTimer);
+    sunScheduleTimer && clearTimeout(sunScheduleTimer);
     timeScheduleTimer && clearTimeout(timeScheduleTimer);
 }
 
@@ -1553,13 +1588,13 @@ context.logError = function (msg, e, offs) {
 };
 
 function createActiveObject(id, enabled, cb) {
-    const idActive = `${adapter.namespace}.scriptEnabled.${id.substring('script.js.'.length)}`;
+    const idActive = `${adapter.namespace}.scriptEnabled.${id.substring(SCRIPT_CODE_MARKER.length)}`;
 
     if (!context.objects[idActive]) {
         context.objects[idActive] = {
             _id: idActive,
             common: {
-                name: `scriptEnabled.${id.substring('script.js.'.length)}`,
+                name: `scriptEnabled.${id.substring(SCRIPT_CODE_MARKER.length)}`,
                 desc: 'controls script activity',
                 type: 'boolean',
                 write: true,
@@ -1602,13 +1637,13 @@ function createActiveObject(id, enabled, cb) {
 }
 
 function createProblemObject(id, cb) {
-    const idProblem = adapter.namespace + '.scriptProblem.' + id.substring('script.js.'.length);
+    const idProblem = adapter.namespace + '.scriptProblem.' + id.substring(SCRIPT_CODE_MARKER.length);
 
     if (!context.objects[idProblem]) {
         context.objects[idProblem] = {
             _id: idProblem,
             common: {
-                name: 'scriptProblem.' + id.substring('script.js.'.length),
+                name: 'scriptProblem.' + id.substring(SCRIPT_CODE_MARKER.length),
                 desc: 'is the script has a problem',
                 type: 'boolean',
                 expert: true,
@@ -1754,7 +1789,8 @@ function installLibraries(callback) {
             if (libraries[lib] && libraries[lib].trim()) {
                 libraries[lib] = libraries[lib].trim();
                 let libName = libraries[lib];
-                let versionChunkPos = libName.indexOf('@', 1);
+
+                const versionChunkPos = libName.indexOf('@', 1);
                 if (versionChunkPos > -1) {
                     libName = libName.slice(0, versionChunkPos);
                 }
@@ -1826,7 +1862,7 @@ function execute(script, name, verbose, debug) {
     script.subscribesFile = {};
     script.setStatePerMinuteCounter = 0;
     script.setStatePerMinuteProblemCounter = 0;
-    adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: false, ack: true, expire: 1000 });
+    adapter.setState(`scriptProblem.${name.substring(SCRIPT_CODE_MARKER.length)}`, { val: false, ack: true, expire: 1000 });
 
     const sandbox = sandBox(script, name, verbose, debug, context);
 
@@ -1837,7 +1873,7 @@ function execute(script, name, verbose, debug) {
             // lineOffset: globalScriptLines
         });
     } catch (e) {
-        adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, true, true);
+        adapter.setState(`scriptProblem.${name.substring(SCRIPT_CODE_MARKER.length)}`, { val: true, ack: true, c: 'execute' });
         context.logError(name, e);
     }
 }
@@ -1897,7 +1933,7 @@ function updateLogSubscriptions() {
 function stop(name, callback) {
     adapter.log.info('Stop script ' + name);
 
-    adapter.setState('scriptEnabled.' + name.substring('script.js.'.length), false, true);
+    adapter.setState('scriptEnabled.' + name.substring(SCRIPT_CODE_MARKER.length), false, true);
 
     if (context.messageBusHandlers[name]) {
         delete context.messageBusHandlers[name];
@@ -2038,7 +2074,7 @@ function prepareScript(obj, callback) {
     ) {
         const name = obj._id;
 
-        const nameId = name.substring('script.js.'.length);
+        const nameId = name.substring(SCRIPT_CODE_MARKER.length);
         if (!nameId.length || nameId.endsWith('.')) {
             adapter.log.error(`Script name ${name} is invalid!`);
             typeof callback === 'function' && callback(false, name);
@@ -2139,7 +2175,7 @@ function prepareScript(obj, callback) {
         let _name;
         if (obj && obj._id) {
             _name = obj._id;
-            const scriptIdName = _name.substring('script.js.'.length);
+            const scriptIdName = _name.substring(SCRIPT_CODE_MARKER.length);
 
             if (!scriptIdName.length || scriptIdName.endsWith('.')) {
                 adapter.log.error(`Script name ${_name} is invalid!`);
@@ -2202,7 +2238,7 @@ async function getData(callback) {
         if (!adapter.config.subscribe) {
             if (err || !res) {
                 adapter.log.error(`Could not initialize states: ${err ? err.message : 'no result'}`);
-                adapter.terminate(EXIT_CODES.START_IMMEDIATELY_AFTER_STOP);
+                adapter.terminate(utils.EXIT_CODES.START_IMMEDIATELY_AFTER_STOP);
                 return;
             }
             context.states = Object.assign(res, context.states);
@@ -2226,7 +2262,7 @@ async function getData(callback) {
     adapter.getObjectList({ include_docs: true }, (err, res) => {
         if (err || !res || !res.rows) {
             adapter.log.error(`Could not initialize objects: ${err ? err.message : 'no result'}`);
-            adapter.terminate(EXIT_CODES.START_IMMEDIATELY_AFTER_STOP);
+            adapter.terminate(utils.EXIT_CODES.START_IMMEDIATELY_AFTER_STOP);
             return;
         }
         context.objects = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.javascript",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "description": "Rules Engine for ioBroker",
   "author": "bluefox <dogafox@gmail.com>",
   "contributors": [