iobroker.javascript 10.4.2 → 10.4.4

package/admin/tab.html

@@ -27,9 +27,9 @@
 
     <script type="text/javascript" onerror="setTimeout(function(){window.location.reload()}, 5000)" src="./../../lib/js/socket.io.js"></script>
         <title>Scripts</title>
-      <script type="module" crossorigin src="./assets/mf-entry-bootstrap-0-536f3328.js"></script>
+      <script type="module" crossorigin src="./assets/mf-entry-bootstrap-0-757148b7.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-BHhhebRG.css">
-    <link rel="modulepreload" crossorigin href="./assets/hostInit-CflF0J5w.js"><link rel="modulepreload" crossorigin href="./assets/index-_7Mh4AxK.js"><link rel="modulepreload" crossorigin href="./remoteEntry.js"><link rel="modulepreload" crossorigin href="./assets/_virtual_mf-localSharedImportMap___mfe_internal__iobroker_javascript__mf_owner__1-B7myBQHF.js"><link rel="modulepreload" crossorigin href="./assets/vite-preload-helper-BbbETgeG.js"><link rel="modulepreload" crossorigin href="./assets/helpers-DT5-3o-l.js"><link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-C0FnF6B9.js"><link rel="modulepreload" crossorigin href="./assets/_virtual_mf___mfe_internal__iobroker_javascript__mf_owner__57338878793567__loadShare___mf_0_iobroker_mf_1_gui_mf_2_components__loadShare__.js-8WiAnp-r.js"><link rel="modulepreload" crossorigin href="./assets/_virtual_mf___mfe_internal__iobroker_javascript__mf_owner__57338878793567__loadShare__react_mf_2_dom_mf_1_client__loadShare__.js-BCLgOrQh.js"><link rel="modulepreload" crossorigin href="./assets/dist-CSJEdwl2.js"><link rel="modulepreload" crossorigin href="./assets/utils-BFhwh2EC.js"></head>
+    <link rel="modulepreload" crossorigin href="./assets/hostInit-DHGIvBts.js"><link rel="modulepreload" crossorigin href="./assets/index-BAjPlTzo.js"><link rel="modulepreload" crossorigin href="./remoteEntry.js"><link rel="modulepreload" crossorigin href="./assets/_virtual_mf-localSharedImportMap___mfe_internal__iobroker_javascript__mf_owner__1-DCbVrrFZ.js"><link rel="modulepreload" crossorigin href="./assets/vite-preload-helper-BbbETgeG.js"><link rel="modulepreload" crossorigin href="./assets/helpers-DT5-3o-l.js"><link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-C0FnF6B9.js"><link rel="modulepreload" crossorigin href="./assets/_virtual_mf___mfe_internal__iobroker_javascript__mf_owner__244278364413149__loadShare___mf_0_iobroker_mf_1_gui_mf_2_components__loadShare__.js-Lnn-CkVR.js"><link rel="modulepreload" crossorigin href="./assets/_virtual_mf___mfe_internal__iobroker_javascript__mf_owner__244278364413149__loadShare__react_mf_2_dom_mf_1_client__loadShare__.js-z1D20r27.js"><link rel="modulepreload" crossorigin href="./assets/dist-CSJEdwl2.js"><link rel="modulepreload" crossorigin href="./assets/utils-BFhwh2EC.js"></head>
     <body>
         <noscript> You need to enable JavaScript to run this app. </noscript>
         <script>

package/build/lib/sandbox.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FORBIDDEN_CHARS = void 0;
+exports.withCallerStack = withCallerStack;
 exports.normalizeStateDefault = normalizeStateDefault;
 exports.isValidPattern = isValidPattern;
 exports.pattern2RegEx = pattern2RegEx;
@@ -49,6 +50,40 @@ const fbRuntime = __importStar(require("./fb/runtime"));
 const types_1 = require("./fb/types");
 const patternCompareFunctions_1 = require("./patternCompareFunctions");
 const SCRIPT_CODE_MARKER = 'script.js.';
+/**
+ * Lets the rejection of an asynchronous API function point to the script that called it.
+ *
+ * The errors are mostly created later, in a callback of the database or in a `setImmediate`, so their stack
+ * has no frame of the script. Unhandled by the script, such a rejection could not be told apart from one of
+ * the adapter itself (see the `error` handler in main.ts), and the controller terminated the adapter.
+ * The frames of the call are appended to the stack of the error, as long as they contain the script.
+ *
+ * @param fn The function returning a promise
+ */
+function withCallerStack(fn) {
+    const wrapped = function (...args) {
+        // Only the frames are captured here; they become a text when `stack` is read, i.e. only on a rejection
+        const caller = {};
+        Error.captureStackTrace(caller, wrapped);
+        return fn.apply(this, args).catch((err) => {
+            const stack = err?.stack;
+            const callerStack = caller.stack;
+            if (typeof stack === 'string' &&
+                !stack.includes(SCRIPT_CODE_MARKER) &&
+                callerStack?.includes(SCRIPT_CODE_MARKER)) {
+                try {
+                    // without the first line, it is the message of the captured object
+                    err.stack = stack + callerStack.substring(callerStack.indexOf('\n'));
+                }
+                catch {
+                    // the stack is read-only (e.g. of a frozen error, depending on the Node.js version): it stays as it is
+                }
+            }
+            throw err;
+        });
+    };
+    return wrapped;
+}
 /**
  * State types whose value - and therefore whose default - is stored as JSON, not as itself.
  *
@@ -1167,9 +1202,8 @@ function sandBox(script, name, verbose, debug, context, logCollector) {
                     callback = isAck;
                     isAck = undefined;
                 }
-                void result
-                    .setStateAsync(state, isAck)
-                    .then(() => typeof callback === 'function' && callback());
+                // setStateHelper has already logged the error; without a catch, it would terminate the adapter
+                void result.setStateAsync(state, isAck).then(() => typeof callback === 'function' && callback(), (err) => typeof callback === 'function' && callback(err));
                 return this;
             };
             result.setStateAsync = async function (state, isAck) {
@@ -1182,7 +1216,8 @@ function sandBox(script, name, verbose, debug, context, logCollector) {
                     callback = isAck;
                     isAck = undefined;
                 }
-                void result.setStateChangedAsync(state, isAck).then(() => typeof callback === 'function' && callback());
+                // setStateHelper has already logged the error; without a catch, it would terminate the adapter
+                void result.setStateChangedAsync(state, isAck).then(() => typeof callback === 'function' && callback(), () => { });
                 return this;
             };
             result.setStateChangedAsync = async function (state, isAck) {
@@ -1190,6 +1225,10 @@ function sandBox(script, name, verbose, debug, context, logCollector) {
                     await sandbox.setStateChangedAsync(this[i], state, isAck);
                 }
             };
+            // A rejection the script does not handle must be recognized as one of the script (see withCallerStack)
+            result.getStateAsync = withCallerStack(result.getStateAsync);
+            result.setStateAsync = withCallerStack(result.setStateAsync);
+            result.setStateChangedAsync = withCallerStack(result.setStateChangedAsync);
             result.setStateDelayed = function (state, isAck, delay, clearRunning, callback) {
                 if (typeof isAck !== 'boolean') {
                     callback = clearRunning;
@@ -4987,6 +5026,13 @@ function sandBox(script, name, verbose, debug, context, logCollector) {
     sandbox.getHistoryAsync = (0, tools_1.promisify)(sandbox.getHistory);
     sandbox.httpGetAsync = (0, tools_1.promisify)(sandbox.httpGet);
     sandbox.httpPostAsync = (0, tools_1.promisify)(sandbox.httpPost);
+    // A rejection the script does not handle must be recognized as one of the script (see withCallerStack)
+    for (const prop of Object.keys(sandbox)) {
+        const fn = sandbox[prop];
+        if ((prop.endsWith('Async') || prop === 'jsonataExpression') && typeof fn === 'function') {
+            sandbox[prop] = withCallerStack(fn);
+        }
+    }
     // Make all predefined properties and methods readonly so scripts cannot overwrite them
     for (const prop of Object.keys(sandbox)) {
         Object.defineProperty(sandbox, prop, {