From e1c9213cfcdc094f290c8ff7a6e5a2b5b1796c9e Mon Sep 17 00:00:00 2001 From: Florian Hotze Date: Wed, 26 Jul 2023 16:28:46 +0200 Subject: [PATCH] [jsscripting] Fix timerId not returned by JS timer methods (#15308) 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 --- .../src/main/resources/node_modules/@jsscripting-globals.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js b/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js index 53750484d19..840f316c2c5 100644 --- a/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js +++ b/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js @@ -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; @@ -164,11 +164,11 @@ // 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;