]> git.basschouten.com Git - openhab-addons.git/commitdiff
[jsscripting] Fix timerId not returned by JS timer methods (#15308)
authorFlorian Hotze <florianh_dev@icloud.com>
Wed, 26 Jul 2023 14:28:46 +0000 (16:28 +0200)
committerGitHub <noreply@github.com>
Wed, 26 Jul 2023 14:28:46 +0000 (16:28 +0200)
Regression from #15193.
Reported on the community, see https://community.openhab.org/t/openhab-4-0-release-discussion/147957/53?u=florian-h05.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js

index 53750484d19ac943f61c71438a211154ce9b1a9e..840f316c2c5bd30d0de499009e024e74442590a5 100644 (file)
@@ -29,7 +29,7 @@
       }
       // JSON.stringify all objects that do not polyfill toString()
       const str = value.toString();
-      if (typeof value === 'object' && (str === '[object Object]') || str === '[object Java]') {
+      if (typeof value === 'object' && (str === '[object Object]' || str === '[object Java]')) {
         return JSON.stringify(value, null, 2);
       }
       return str;
   // Polyfill common NodeJS functions onto the global object
   globalThis.console = console;
   globalThis.setTimeout = function (functionRef, delay, ...args) {
-    ThreadsafeTimers.setTimeout(() => functionRef(...args), delay);
+    return ThreadsafeTimers.setTimeout(() => functionRef(...args), delay);
   };
   globalThis.clearTimeout = ThreadsafeTimers.clearTimeout;
   globalThis.setInterval = function (functionRef, delay, ...args) {
-    ThreadsafeTimers.setInterval(() => functionRef(...args), delay);
+    return ThreadsafeTimers.setInterval(() => functionRef(...args), delay);
   };
   globalThis.clearInterval = ThreadsafeTimers.clearInterval;