[actions] Fix missing timer identifier for UI scripts (#367)

Caused by openhab/openhab-core#4289. Signed-off-by: Florian Hotze <[email protected]>
openhab · Jul 28, 2024 · 795862a · 795862a
1 parent a9ca3e7
commit 795862a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/actions/actions.js b/src/actions/actions.js
@@ -266,6 +266,7 @@ class ScriptExecution {
    * @returns {*} a native openHAB Timer
    */
   static createTimer (identifier, zdt, functionRef, ...params) {
+    ThreadsafeTimers.setIdentifier(console.loggerName); // eslint-disable-line no-undef
     // Support method overloading as identifier is optional
     if (typeof identifier === 'string' && functionRef != null) {
       const callbackFn = () => functionRef(...params);

diff --git a/test/actions.spec.js b/test/actions.spec.js
@@ -7,11 +7,15 @@ jest.mock('../src/osgi');
 
 describe('actions.js', () => {
   describe('ScriptExecution', () => {
+    const defaultIdentifier = 'script-1';
+
     beforeAll(() => {
       jest.spyOn(JavaScriptExecution, 'callScript');
       jest.spyOn(JavaScriptExecution, 'createTimer');
 
+      console.loggerName = defaultIdentifier;
       ThreadsafeTimers = {
+        setIdentifier: jest.fn(),
         createTimer: jest.fn()
       };
     });
@@ -31,16 +35,29 @@ describe('actions.js', () => {
 
       ScriptExecution.createTimer(identifier, zdt, functionRef, 'prop1');
 
+      expect(ThreadsafeTimers.setIdentifier).toHaveBeenCalledWith(defaultIdentifier);
       expect(ThreadsafeTimers.createTimer).toHaveBeenCalled();
       expect(JavaScriptExecution.callScript).not.toHaveBeenCalled();
 
-      jest.clearAllMocks();
-
       ScriptExecution.createTimer(zdt, functionRef, 'prop1');
 
+      expect(ThreadsafeTimers.setIdentifier).toHaveBeenCalledWith(defaultIdentifier);
       expect(ThreadsafeTimers.createTimer).toHaveBeenCalled();
       expect(JavaScriptExecution.callScript).not.toHaveBeenCalled();
     });
+
+    it('sets default identifier for ThreadsafeTimers.', () => {
+      const zdt = {};
+      const functionRef = (foo) => foo;
+
+      ScriptExecution.createTimer(zdt, functionRef, 'prop1');
+
+      expect(ThreadsafeTimers.setIdentifier).toHaveBeenCalledWith(defaultIdentifier);
+
+      ScriptExecution.createTimer(zdt, functionRef, 'prop1');
+
+      expect(ThreadsafeTimers.setIdentifier).toHaveBeenCalledWith(defaultIdentifier);
+    });
   });
 
   describe('Transformation', () => {

diff --git a/types/actions/actions.d.ts.map b/types/actions/actions.d.ts.map