@iobroker/dm-gui-components 9.0.2 → 9.0.3

package/build/StateOrObjectHandler.js

@@ -1,3 +1,6 @@
+const emptySubscription = {
+    unsubscribe: () => { },
+};
 export class StateOrObjectHandler {
     socket;
     objectSubs = new Map();
@@ -8,134 +11,151 @@ export class StateOrObjectHandler {
     async addListener(item, callback) {
         if (item === undefined) {
             callback(undefined);
-            return;
+            return emptySubscription;
         }
         if (typeof item !== 'object') {
             callback(item);
-            return;
+            return emptySubscription;
         }
         if ('en' in item) {
             callback(item);
-            return;
+            return emptySubscription;
         }
         try {
             if ('objectId' in item) {
-                const notifyValue = (obj) => {
-                    if (!obj) {
-                        callback(undefined);
-                        return;
-                    }
-                    const parts = item.property.split('.');
-                    let current = obj;
-                    for (const part of parts) {
-                        if (current[part] === undefined) {
-                            callback(undefined);
-                            return;
-                        }
-                        current = current[part];
-                    }
-                    callback(current);
-                };
-                const existing = this.objectSubs.get(item.objectId);
-                if (existing) {
-                    existing.notifiers.push(notifyValue);
-                    if (existing.loaded) {
-                        // Already have the value — notify immediately without re-fetching
-                        notifyValue(existing.cached);
-                    }
-                    // If still loading, notifyValue will be called once the load completes
-                    return;
-                }
-                const sub = {
-                    notifiers: [notifyValue],
-                    handler: null,
-                    loaded: false,
-                    cached: undefined,
-                };
-                this.objectSubs.set(item.objectId, sub);
-                const handler = (_id, obj) => {
-                    sub.cached = obj;
-                    for (const n of sub.notifiers) {
-                        n(obj);
-                    }
-                };
-                sub.handler = handler;
-                const obj = await this.socket.getObject(item.objectId);
-                sub.cached = obj;
-                sub.loaded = true;
-                // Notify all notifiers (including any added while the fetch was in progress)
-                for (const n of sub.notifiers) {
-                    n(obj);
-                }
-                await this.socket.subscribeObject(item.objectId, handler);
-                return;
+                return this.addObjectListener(item.objectId, item.property, callback);
             }
             if ('stateId' in item) {
-                const notifyValue = (state) => {
-                    let val = state?.val;
-                    if (val === undefined || val === null) {
-                        callback(undefined);
-                        return;
-                    }
-                    if (item.mapping) {
-                        if (typeof val === 'boolean') {
-                            val = val.toString();
-                        }
-                        callback(item.mapping[val]);
-                    }
-                    else {
-                        callback(val);
-                    }
-                };
-                const existing = this.stateSubs.get(item.stateId);
-                if (existing) {
-                    existing.notifiers.push(notifyValue);
-                    if (existing.loaded) {
-                        // Already have the value — notify immediately without re-fetching
-                        notifyValue(existing.cached);
-                    }
-                    // If still loading, notifyValue will be called once the load completes
-                    return;
-                }
-                const sub = {
-                    notifiers: [notifyValue],
-                    handler: null,
-                    loaded: false,
-                    cached: undefined,
-                };
-                this.stateSubs.set(item.stateId, sub);
-                const handler = (_id, state) => {
-                    sub.cached = state;
-                    for (const n of sub.notifiers) {
-                        n(state);
-                    }
-                };
-                sub.handler = handler;
-                const state = await this.socket.getState(item.stateId);
-                sub.cached = state;
-                sub.loaded = true;
-                // Notify all notifiers (including any added while the fetch was in progress)
-                for (const n of sub.notifiers) {
-                    n(state);
-                }
-                await this.socket.subscribeState(item.stateId, handler);
-                return;
+                return this.addStateListener(item.stateId, item.mapping, callback);
             }
         }
         catch (error) {
             console.error('Error in StateOrObjectHandler:', item, error);
         }
         callback(undefined);
+        return emptySubscription;
     }
-    async unsubscribe() {
-        for (const [id, sub] of this.objectSubs) {
-            await this.socket.unsubscribeObject(id, sub.handler);
+    async addObjectListener(objectId, property, callback) {
+        const notifyValue = (obj) => {
+            if (!obj) {
+                callback(undefined);
+                return;
+            }
+            const parts = property.split('.');
+            let current = obj;
+            for (const part of parts) {
+                if (current[part] === undefined) {
+                    callback(undefined);
+                    return;
+                }
+                current = current[part];
+            }
+            callback(current);
+        };
+        const existing = this.objectSubs.get(objectId);
+        if (existing) {
+            existing.notifiers.push(notifyValue);
+            if (existing.loaded) {
+                // Already have the value — notify immediately without re-fetching
+                notifyValue(existing.cached);
+            }
+            // If still loading, notifyValue will be called once the load completes
+            return { unsubscribe: () => existing.unsubscribe(notifyValue) };
         }
-        this.objectSubs.clear();
-        for (const [id, sub] of this.stateSubs) {
-            this.socket.unsubscribeState(id, sub.handler);
+        const sub = {
+            notifiers: [notifyValue],
+            handler: null,
+            unsubscribe: null,
+            loaded: false,
+            cached: undefined,
+        };
+        this.objectSubs.set(objectId, sub);
+        sub.handler = (_id, obj) => {
+            sub.cached = obj;
+            for (const n of sub.notifiers) {
+                n(obj);
+            }
+        };
+        sub.unsubscribe = async (notifier) => {
+            const index = sub.notifiers.indexOf(notifier);
+            if (index !== -1) {
+                sub.notifiers.splice(index, 1);
+            }
+            if (sub.notifiers.length === 0) {
+                this.objectSubs.delete(objectId);
+                await this.socket.unsubscribeObject(objectId, sub.handler);
+            }
+        };
+        const obj = await this.socket.getObject(objectId);
+        sub.cached = obj;
+        sub.loaded = true;
+        // Notify all notifiers (including any added while getObject was in progress)
+        for (const n of sub.notifiers) {
+            n(obj);
+        }
+        await this.socket.subscribeObject(objectId, sub.handler);
+        return { unsubscribe: () => sub.unsubscribe(notifyValue) };
+    }
+    async addStateListener(stateId, mapping, callback) {
+        const notifyValue = (state) => {
+            let val = state?.val;
+            if (val === undefined || val === null) {
+                callback(undefined);
+                return;
+            }
+            if (mapping) {
+                if (typeof val === 'boolean') {
+                    val = val.toString();
+                }
+                callback(mapping[val]);
+            }
+            else {
+                callback(val);
+            }
+        };
+        const existing = this.stateSubs.get(stateId);
+        if (existing) {
+            existing.notifiers.push(notifyValue);
+            if (existing.loaded) {
+                // Already have the value — notify immediately without re-fetching
+                notifyValue(existing.cached);
+            }
+            // If still loading, notifyValue will be called once the load completes
+            return { unsubscribe: () => existing.unsubscribe(notifyValue) };
+        }
+        const sub = {
+            notifiers: [notifyValue],
+            handler: null,
+            unsubscribe: null,
+            loaded: false,
+            cached: undefined,
+        };
+        this.stateSubs.set(stateId, sub);
+        sub.handler = (_id, state) => {
+            sub.cached = state;
+            for (const n of sub.notifiers) {
+                n(state);
+            }
+        };
+        sub.unsubscribe = notifier => {
+            const index = sub.notifiers.indexOf(notifier);
+            if (index !== -1) {
+                sub.notifiers.splice(index, 1);
+            }
+            if (sub.notifiers.length === 0) {
+                this.stateSubs.delete(stateId);
+                this.socket.unsubscribeState(stateId, sub.handler);
+            }
+        };
+        const state = await this.socket.getState(stateId);
+        sub.cached = state;
+        sub.loaded = true;
+        // Notify all notifiers (including any added while the fetch was in progress)
+        for (const n of sub.notifiers) {
+            n(state);
         }
-        this.stateSubs.clear();
+        await this.socket.subscribeState(stateId, sub.handler);
+        return { unsubscribe: () => sub.unsubscribe(notifyValue) };
     }
 }
 //# sourceMappingURL=StateOrObjectHandler.js.map

package/build/StateOrObjectHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"StateOrObjectHandler.js","sourceRoot":"./src/","sources":["StateOrObjectHandler.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAO,oBAAoB;IAIA;IAHZ,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAC;IACnD,SAAS,GAAG,IAAI,GAAG,EAA6B,CAAC;IAElE,YAA6B,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;IAE5C,KAAK,CAAC,WAAW,CACpB,IAAyC,EACzC,QAAwC;QAExC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpB,OAAO;QACX,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,OAAO;QACX,CAAC;QAED,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACf,QAAQ,CAAC,IAAS,CAAC,CAAC;YACpB,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,WAAW,GAAG,CAAC,GAA4B,EAAQ,EAAE;oBACvD,IAAI,CAAC,GAAG,EAAE,CAAC;wBACP,QAAQ,CAAC,SAAS,CAAC,CAAC;wBACpB,OAAO;oBACX,CAAC;oBAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvC,IAAI,OAAO,GAAQ,GAAG,CAAC;oBACvB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;wBACvB,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;4BAC9B,QAAQ,CAAC,SAAS,CAAC,CAAC;4BACpB,OAAO;wBACX,CAAC;wBACD,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC5B,CAAC;oBAED,QAAQ,CAAC,OAAY,CAAC,CAAC;gBAC3B,CAAC,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,QAAQ,EAAE,CAAC;oBACX,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACrC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAClB,kEAAkE;wBAClE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACjC,CAAC;oBACD,uEAAuE;oBACvE,OAAO;gBACX,CAAC;gBAED,MAAM,GAAG,GAAuB;oBAC5B,SAAS,EAAE,CAAC,WAAW,CAAC;oBACxB,OAAO,EAAE,IAAK;oBACd,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE,SAAS;iBACpB,CAAC;gBACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAExC,MAAM,OAAO,GAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC9C,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;oBACjB,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;wBAC5B,CAAC,CAAC,GAAG,CAAC,CAAC;oBACX,CAAC;gBACL,CAAC,CAAC;gBACF,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;gBAEtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvD,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBACjB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;gBAClB,6EAA6E;gBAC7E,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;oBAC5B,CAAC,CAAC,GAAG,CAAC,CAAC;gBACX,CAAC;gBACD,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAC1D,OAAO;YACX,CAAC;YAED,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACpB,MAAM,WAAW,GAAG,CAAC,KAA6B,EAAQ,EAAE;oBACxD,IAAI,GAAG,GAAG,KAAK,EAAE,GAAG,CAAC;oBACrB,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACpC,QAAQ,CAAC,SAAS,CAAC,CAAC;wBACpB,OAAO;oBACX,CAAC;oBAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;wBACf,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;4BAC3B,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;wBACzB,CAAC;wBAED,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;oBAChC,CAAC;yBAAM,CAAC;wBACJ,QAAQ,CAAC,GAAQ,CAAC,CAAC;oBACvB,CAAC;gBACL,CAAC,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAClD,IAAI,QAAQ,EAAE,CAAC;oBACX,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACrC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAClB,kEAAkE;wBAClE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACjC,CAAC;oBACD,uEAAuE;oBACvE,OAAO;gBACX,CAAC;gBAED,MAAM,GAAG,GAAsB;oBAC3B,SAAS,EAAE,CAAC,WAAW,CAAC;oBACxB,OAAO,EAAE,IAAK;oBACd,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE,SAAS;iBACpB,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAEtC,MAAM,OAAO,GAAgC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACxD,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC;oBACnB,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;wBAC5B,CAAC,CAAC,KAAK,CAAC,CAAC;oBACb,CAAC;gBACL,CAAC,CAAC;gBACF,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;gBAEtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvD,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC;gBACnB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;gBAClB,6EAA6E;gBAC7E,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;oBAC5B,CAAC,CAAC,KAAK,CAAC,CAAC;gBACb,CAAC;gBACD,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACxD,OAAO;YACX,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QAED,QAAQ,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAExB,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CACJ","sourcesContent":["import type { Connection, ObjectChangeHandler } from '@iobroker/adapter-react-v5';\nimport type { ValueOrStateOrObject } from '@iobroker/dm-utils';\n\ninterface ObjectSubscription {\n    notifiers: ((obj?: ioBroker.Object | null) => void)[];\n    handler: ObjectChangeHandler;\n    loaded: boolean;\n    cached: ioBroker.Object | null | undefined;\n}\n\ninterface StateSubscription {\n    notifiers: ((state?: ioBroker.State | null) => void)[];\n    handler: ioBroker.StateChangeHandler;\n    loaded: boolean;\n    cached: ioBroker.State | null | undefined;\n}\n\nexport class StateOrObjectHandler {\n    private readonly objectSubs = new Map<string, ObjectSubscription>();\n    private readonly stateSubs = new Map<string, StateSubscription>();\n\n    constructor(private readonly socket: Connection) {}\n\n    public async addListener<T extends ioBroker.StringOrTranslated | number | boolean>(\n        item: ValueOrStateOrObject<T> | undefined,\n        callback: (value: T | undefined) => void,\n    ): Promise<void> {\n        if (item === undefined) {\n            callback(undefined);\n            return;\n        }\n\n        if (typeof item !== 'object') {\n            callback(item);\n            return;\n        }\n\n        if ('en' in item) {\n            callback(item as T);\n            return;\n        }\n\n        try {\n            if ('objectId' in item) {\n                const notifyValue = (obj?: ioBroker.Object | null): void => {\n                    if (!obj) {\n                        callback(undefined);\n                        return;\n                    }\n\n                    const parts = item.property.split('.');\n                    let current: any = obj;\n                    for (const part of parts) {\n                        if (current[part] === undefined) {\n                            callback(undefined);\n                            return;\n                        }\n                        current = current[part];\n                    }\n\n                    callback(current as T);\n                };\n\n                const existing = this.objectSubs.get(item.objectId);\n                if (existing) {\n                    existing.notifiers.push(notifyValue);\n                    if (existing.loaded) {\n                        // Already have the value — notify immediately without re-fetching\n                        notifyValue(existing.cached);\n                    }\n                    // If still loading, notifyValue will be called once the load completes\n                    return;\n                }\n\n                const sub: ObjectSubscription = {\n                    notifiers: [notifyValue],\n                    handler: null!,\n                    loaded: false,\n                    cached: undefined,\n                };\n                this.objectSubs.set(item.objectId, sub);\n\n                const handler: ObjectChangeHandler = (_id, obj) => {\n                    sub.cached = obj;\n                    for (const n of sub.notifiers) {\n                        n(obj);\n                    }\n                };\n                sub.handler = handler;\n\n                const obj = await this.socket.getObject(item.objectId);\n                sub.cached = obj;\n                sub.loaded = true;\n                // Notify all notifiers (including any added while the fetch was in progress)\n                for (const n of sub.notifiers) {\n                    n(obj);\n                }\n                await this.socket.subscribeObject(item.objectId, handler);\n                return;\n            }\n\n            if ('stateId' in item) {\n                const notifyValue = (state?: ioBroker.State | null): void => {\n                    let val = state?.val;\n                    if (val === undefined || val === null) {\n                        callback(undefined);\n                        return;\n                    }\n\n                    if (item.mapping) {\n                        if (typeof val === 'boolean') {\n                            val = val.toString();\n                        }\n\n                        callback(item.mapping[val]);\n                    } else {\n                        callback(val as T);\n                    }\n                };\n\n                const existing = this.stateSubs.get(item.stateId);\n                if (existing) {\n                    existing.notifiers.push(notifyValue);\n                    if (existing.loaded) {\n                        // Already have the value — notify immediately without re-fetching\n                        notifyValue(existing.cached);\n                    }\n                    // If still loading, notifyValue will be called once the load completes\n                    return;\n                }\n\n                const sub: StateSubscription = {\n                    notifiers: [notifyValue],\n                    handler: null!,\n                    loaded: false,\n                    cached: undefined,\n                };\n                this.stateSubs.set(item.stateId, sub);\n\n                const handler: ioBroker.StateChangeHandler = (_id, state) => {\n                    sub.cached = state;\n                    for (const n of sub.notifiers) {\n                        n(state);\n                    }\n                };\n                sub.handler = handler;\n\n                const state = await this.socket.getState(item.stateId);\n                sub.cached = state;\n                sub.loaded = true;\n                // Notify all notifiers (including any added while the fetch was in progress)\n                for (const n of sub.notifiers) {\n                    n(state);\n                }\n                await this.socket.subscribeState(item.stateId, handler);\n                return;\n            }\n        } catch (error) {\n            console.error('Error in StateOrObjectHandler:', item, error);\n        }\n\n        callback(undefined);\n    }\n\n    public async unsubscribe(): Promise<void> {\n        for (const [id, sub] of this.objectSubs) {\n            await this.socket.unsubscribeObject(id, sub.handler);\n        }\n        this.objectSubs.clear();\n\n        for (const [id, sub] of this.stateSubs) {\n            this.socket.unsubscribeState(id, sub.handler);\n        }\n        this.stateSubs.clear();\n    }\n}\n"]}
+{"version":3,"file":"StateOrObjectHandler.js","sourceRoot":"./src/","sources":["StateOrObjectHandler.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Connection, ObjectChangeHandler } from '@iobroker/adapter-react-v5';\nimport type { ValueOrStateOrObject } from '@iobroker/dm-utils';\n\ntype ObjectSubscriptionNotifier = (obj?: ioBroker.Object | null) => void;\n\ninterface ObjectSubscription {\n    notifiers: ObjectSubscriptionNotifier[];\n    handler: ObjectChangeHandler;\n    unsubscribe: (notifier: ObjectSubscriptionNotifier) => Promise<void>;\n    loaded: boolean;\n    cached: ioBroker.Object | null | undefined;\n}\n\ntype StateSubscriptionNotifier = (state?: ioBroker.State | null) => void;\n\ninterface StateSubscription {\n    notifiers: StateSubscriptionNotifier[];\n    handler: ioBroker.StateChangeHandler;\n    unsubscribe: (notifier: StateSubscriptionNotifier) => void;\n    loaded: boolean;\n    cached: ioBroker.State | null | undefined;\n}\n\nexport interface StateOrObjectSubscription {\n    unsubscribe: () => Promise<void> | void;\n}\n\nconst emptySubscription: StateOrObjectSubscription = {\n    unsubscribe: () => {},\n};\n\nexport class StateOrObjectHandler {\n    private readonly objectSubs = new Map<string, ObjectSubscription>();\n    private readonly stateSubs = new Map<string, StateSubscription>();\n\n    constructor(private readonly socket: Connection) {}\n\n    public async addListener<T extends ioBroker.StringOrTranslated | number | boolean>(\n        item: ValueOrStateOrObject<T> | undefined,\n        callback: (value: T | undefined) => void,\n    ): Promise<StateOrObjectSubscription> {\n        if (item === undefined) {\n            callback(undefined);\n            return emptySubscription;\n        }\n\n        if (typeof item !== 'object') {\n            callback(item);\n            return emptySubscription;\n        }\n\n        if ('en' in item) {\n            callback(item as T);\n            return emptySubscription;\n        }\n\n        try {\n            if ('objectId' in item) {\n                return this.addObjectListener(item.objectId, item.property, callback);\n            }\n\n            if ('stateId' in item) {\n                return this.addStateListener(item.stateId, item.mapping, callback);\n            }\n        } catch (error) {\n            console.error('Error in StateOrObjectHandler:', item, error);\n        }\n\n        callback(undefined);\n        return emptySubscription;\n    }\n\n    private async addObjectListener<T extends ioBroker.StringOrTranslated | number | boolean>(\n        objectId: string,\n        property: string,\n        callback: (value: T | undefined) => void,\n    ): Promise<StateOrObjectSubscription> {\n        const notifyValue = (obj?: ioBroker.Object | null): void => {\n            if (!obj) {\n                callback(undefined);\n                return;\n            }\n\n            const parts = property.split('.');\n            let current: any = obj;\n            for (const part of parts) {\n                if (current[part] === undefined) {\n                    callback(undefined);\n                    return;\n                }\n                current = current[part];\n            }\n\n            callback(current as T);\n        };\n\n        const existing = this.objectSubs.get(objectId);\n        if (existing) {\n            existing.notifiers.push(notifyValue);\n            if (existing.loaded) {\n                // Already have the value — notify immediately without re-fetching\n                notifyValue(existing.cached);\n            }\n            // If still loading, notifyValue will be called once the load completes\n            return { unsubscribe: () => existing.unsubscribe(notifyValue) };\n        }\n\n        const sub: ObjectSubscription = {\n            notifiers: [notifyValue],\n            handler: null!,\n            unsubscribe: null!,\n            loaded: false,\n            cached: undefined,\n        };\n        this.objectSubs.set(objectId, sub);\n\n        sub.handler = (_id, obj) => {\n            sub.cached = obj;\n            for (const n of sub.notifiers) {\n                n(obj);\n            }\n        };\n        sub.unsubscribe = async notifier => {\n            const index = sub.notifiers.indexOf(notifier);\n            if (index !== -1) {\n                sub.notifiers.splice(index, 1);\n            }\n            if (sub.notifiers.length === 0) {\n                this.objectSubs.delete(objectId);\n                await this.socket.unsubscribeObject(objectId, sub.handler);\n            }\n        };\n\n        const obj = await this.socket.getObject(objectId);\n        sub.cached = obj;\n        sub.loaded = true;\n        // Notify all notifiers (including any added while getObject was in progress)\n        for (const n of sub.notifiers) {\n            n(obj);\n        }\n        await this.socket.subscribeObject(objectId, sub.handler);\n        return { unsubscribe: () => sub.unsubscribe(notifyValue) };\n    }\n\n    private async addStateListener<T extends ioBroker.StringOrTranslated | number | boolean>(\n        stateId: string,\n        mapping: Record<string | number, T> | undefined,\n        callback: (value: T | undefined) => void,\n    ): Promise<StateOrObjectSubscription> {\n        const notifyValue = (state?: ioBroker.State | null): void => {\n            let val = state?.val;\n            if (val === undefined || val === null) {\n                callback(undefined);\n                return;\n            }\n\n            if (mapping) {\n                if (typeof val === 'boolean') {\n                    val = val.toString();\n                }\n\n                callback(mapping[val]);\n            } else {\n                callback(val as T);\n            }\n        };\n\n        const existing = this.stateSubs.get(stateId);\n        if (existing) {\n            existing.notifiers.push(notifyValue);\n            if (existing.loaded) {\n                // Already have the value — notify immediately without re-fetching\n                notifyValue(existing.cached);\n            }\n            // If still loading, notifyValue will be called once the load completes\n            return { unsubscribe: () => existing.unsubscribe(notifyValue) };\n        }\n\n        const sub: StateSubscription = {\n            notifiers: [notifyValue],\n            handler: null!,\n            unsubscribe: null!,\n            loaded: false,\n            cached: undefined,\n        };\n        this.stateSubs.set(stateId, sub);\n\n        sub.handler = (_id, state) => {\n            sub.cached = state;\n            for (const n of sub.notifiers) {\n                n(state);\n            }\n        };\n        sub.unsubscribe = notifier => {\n            const index = sub.notifiers.indexOf(notifier);\n            if (index !== -1) {\n                sub.notifiers.splice(index, 1);\n            }\n            if (sub.notifiers.length === 0) {\n                this.stateSubs.delete(stateId);\n                this.socket.unsubscribeState(stateId, sub.handler);\n            }\n        };\n\n        const state = await this.socket.getState(stateId);\n        sub.cached = state;\n        sub.loaded = true;\n        // Notify all notifiers (including any added while the fetch was in progress)\n        for (const n of sub.notifiers) {\n            n(state);\n        }\n        await this.socket.subscribeState(stateId, sub.handler);\n        return { unsubscribe: () => sub.unsubscribe(notifyValue) };\n    }\n}\n"]}

package/build/hooks.js

@@ -2,8 +2,9 @@ import { useEffect, useState } from 'react';
 export function useStateOrObject(item, stateOrObjectHandler) {
     const [value, setValue] = useState();
     useEffect(() => {
-        void stateOrObjectHandler.addListener(item, value => setValue(value));
-        return () => void stateOrObjectHandler.unsubscribe();
+        let subscription = undefined;
+        void stateOrObjectHandler.addListener(item, value => setValue(value)).then(sub => (subscription = sub));
+        return () => void subscription?.unsubscribe();
     }, [stateOrObjectHandler, item]);
     return value;
 }

package/build/hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.js","sourceRoot":"./src/","sources":["hooks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG5C,MAAM,UAAU,gBAAgB,CAC5B,IAAyC,EACzC,oBAA0C;IAE1C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAK,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACX,KAAK,oBAAoB,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACtE,OAAO,GAAG,EAAE,CAAC,KAAK,oBAAoB,CAAC,WAAW,EAAE,CAAC;IACzD,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC;IAEjC,OAAO,KAAK,CAAC;AACjB,CAAC","sourcesContent":["import type { ValueOrStateOrObject } from '@iobroker/dm-utils';\nimport { useEffect, useState } from 'react';\nimport type { StateOrObjectHandler } from './StateOrObjectHandler';\n\nexport function useStateOrObject<T extends ioBroker.StringOrTranslated | number | boolean>(\n    item: ValueOrStateOrObject<T> | undefined,\n    stateOrObjectHandler: StateOrObjectHandler,\n): T | undefined {\n    const [value, setValue] = useState<T>();\n\n    useEffect(() => {\n        void stateOrObjectHandler.addListener(item, value => setValue(value));\n        return () => void stateOrObjectHandler.unsubscribe();\n    }, [stateOrObjectHandler, item]);\n\n    return value;\n}\n"]}
+{"version":3,"file":"hooks.js","sourceRoot":"./src/","sources":["hooks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG5C,MAAM,UAAU,gBAAgB,CAC5B,IAAyC,EACzC,oBAA0C;IAE1C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAK,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,YAAY,GAA0C,SAAS,CAAC;QACpE,KAAK,oBAAoB,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC;QACxG,OAAO,GAAG,EAAE,CAAC,KAAK,YAAY,EAAE,WAAW,EAAE,CAAC;IAClD,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC;IAEjC,OAAO,KAAK,CAAC;AACjB,CAAC","sourcesContent":["import type { ValueOrStateOrObject } from '@iobroker/dm-utils';\nimport { useEffect, useState } from 'react';\nimport type { StateOrObjectHandler, StateOrObjectSubscription } from './StateOrObjectHandler';\n\nexport function useStateOrObject<T extends ioBroker.StringOrTranslated | number | boolean>(\n    item: ValueOrStateOrObject<T> | undefined,\n    stateOrObjectHandler: StateOrObjectHandler,\n): T | undefined {\n    const [value, setValue] = useState<T>();\n\n    useEffect(() => {\n        let subscription: StateOrObjectSubscription | undefined = undefined;\n        void stateOrObjectHandler.addListener(item, value => setValue(value)).then(sub => (subscription = sub));\n        return () => void subscription?.unsubscribe();\n    }, [stateOrObjectHandler, item]);\n\n    return value;\n}\n"]}

package/build/protocol/DmProtocolV1.js

@@ -12,11 +12,75 @@ export class DmProtocolV1 extends DmProtocolBase {
         const devices = await this.send('dm:listDevices');
         await callback(devices.map(d => ({ ...d, identifier: d.id })));
     }
-    sendAction(command, messageToSend) {
-        return this.send(command, messageToSend);
+    async sendAction(command, messageToSend) {
+        const response = await this.send(command, messageToSend);
+        switch (response.type) {
+            case 'message':
+                return {
+                    type: 'message',
+                    message: response.message || '',
+                    origin: response.origin, // origin was accidentally set to string in V1
+                };
+            case 'confirm':
+                return {
+                    type: 'confirm',
+                    confirm: response.confirm || '',
+                    origin: response.origin, // origin was accidentally set to string in V1
+                };
+            case 'progress':
+                return {
+                    type: 'progress',
+                    progress: response.progress || { open: false, indeterminate: true },
+                    origin: response.origin, // origin was accidentally set to string in V1
+                };
+            case 'form':
+                return {
+                    type: 'form',
+                    form: response.form || { title: '', schema: { type: 'panel', items: {} } },
+                    origin: response.origin, // origin was accidentally set to string in V1
+                };
+            case 'result':
+                if (response.result.error) {
+                    return {
+                        type: 'result',
+                        result: { error: response.result.error },
+                        origin: response.origin, // origin was accidentally set to string in V1
+                    };
+                }
+                switch (response.result.refresh) {
+                    case true:
+                        return {
+                            type: 'result',
+                            result: { refresh: true },
+                            origin: response.origin, // origin was accidentally set to string in V1
+                        };
+                    case 'device':
+                        return {
+                            type: 'result',
+                            result: { refresh: 'devices' },
+                            origin: response.origin, // origin was accidentally set to string in V1
+                        };
+                    case 'instance':
+                        return {
+                            type: 'result',
+                            result: { refresh: 'instance' },
+                            origin: response.origin, // origin was accidentally set to string in V1
+                        };
+                    default:
+                        return {
+                            type: 'result',
+                            result: { refresh: false },
+                            origin: response.origin, // origin was accidentally set to string in V1
+                        };
+                }
+            default:
+                throw new Error(`Unknown response type: ${response.type}`);
+        }
     }
-    sendControl(command, messageToSend) {
-        return this.send(command, messageToSend);
+    async sendControl(command, messageToSend) {
+        const response = await this.send(command, messageToSend);
+        // contents matches, types unfortunately don't, so we need to cast here
+        return response;
     }
 }
 //# sourceMappingURL=DmProtocolV1.js.map

package/build/protocol/DmProtocolV1.js.map

@@ -1 +1 @@
-{"version":3,"file":"DmProtocolV1.js","sourceRoot":"./src/","sources":["protocol/DmProtocolV1.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAA4D,MAAM,kBAAkB,CAAC;AAE5G,MAAM,OAAO,YAAa,SAAQ,cAAc;IAC5B,sBAAsB,CAAC,OAAY;QAC/C,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,EAAE,GAAG,OAA6B,CAAC;QACzC,OAAO,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACvC,CAAC;IAEe,KAAK,CAAC,WAAW,CAAC,QAA6B;QAC3D,yFAAyF;QACzF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAkB,gBAAgB,CAAC,CAAC;QACnE,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEe,UAAU,CAAC,OAAoB,EAAE,aAAsB;QACnE,OAAO,IAAI,CAAC,IAAI,CAAmB,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC;IAEM,WAAW,CACd,OAAoB,EACpB,aAA4E;QAE5E,OAAO,IAAI,CAAC,IAAI,CAAoB,OAAO,EAAE,aAAa,CAAC,CAAC;IAChE,CAAC;CACJ","sourcesContent":["/* eslint-disable class-methods-use-this */\nimport type * as V1 from '@iobroker/dm-utils-v1/build/types/api';\nimport type { ControlState, DeviceInfo, DmActionResponse, DmControlResponse, InstanceDetails } from './api';\nimport { DmProtocolBase, type CommandName, type LoadDevicesCallback, type Message } from './DmProtocolBase';\n\nexport class DmProtocolV1 extends DmProtocolBase {\n    public override convertInstanceDetails(details: any): InstanceDetails {\n        if (details.apiVersion !== 'v1') {\n            throw new Error(`Unsupported API version: ${details.apiVersion ?? 'unknown'}`);\n        }\n\n        const v1 = details as V1.InstanceDetails;\n        return { ...v1, apiVersion: 'v3' };\n    }\n\n    public override async loadDevices(callback: LoadDevicesCallback): Promise<void> {\n        // in V1, devices come in a single batch; thus we can simply call the callback with those\n        const devices = await this.send<V1.DeviceInfo[]>('dm:listDevices');\n        await callback(devices.map<DeviceInfo>(d => ({ ...d, identifier: d.id })));\n    }\n\n    public override sendAction(command: CommandName, messageToSend: Message): Promise<DmActionResponse> {\n        return this.send<DmActionResponse>(command, messageToSend);\n    }\n\n    public sendControl(\n        command: CommandName,\n        messageToSend: { deviceId: string; controlId: string; state?: ControlState },\n    ): Promise<DmControlResponse> {\n        return this.send<DmControlResponse>(command, messageToSend);\n    }\n}\n"]}
+{"version":3,"file":"DmProtocolV1.js","sourceRoot":"./src/","sources":["protocol/DmProtocolV1.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable class-methods-use-this */\nimport type { DeviceRefresh as DeviceRefreshV1 } from '@iobroker/dm-utils-v1';\nimport type * as V1 from '@iobroker/dm-utils-v1/build/types/api';\nimport type {\n    CommunicationForm,\n    ControlState,\n    DeviceInfo,\n    DmActionResponse,\n    DmControlResponse,\n    InstanceDetails,\n} from './api';\nimport { DmProtocolBase, type CommandName, type LoadDevicesCallback, type Message } from './DmProtocolBase';\n\ninterface DmResponseV1 {\n    /* Type of message */\n    type: 'message' | 'confirm' | 'progress' | 'result' | 'form';\n    /* Origin */\n    origin: string;\n}\n\ninterface DmControlResponseV1 extends DmResponseV1 {\n    result: {\n        error?: {\n            code: number;\n            message: string;\n        };\n        state?: ioBroker.State;\n        deviceId: string;\n        controlId: string;\n    };\n}\n\ninterface DmActionResponseV1 extends DmResponseV1 {\n    result: {\n        refresh?: DeviceRefreshV1;\n        error?: {\n            code: number;\n            message: string;\n        };\n    };\n    message?: string;\n    confirm?: string;\n    form?: CommunicationForm;\n    progress?:\n        | {\n              open: boolean;\n              indeterminate: boolean;\n          }\n        | {\n              open: boolean;\n              progress: number;\n          };\n}\n\nexport class DmProtocolV1 extends DmProtocolBase {\n    public override convertInstanceDetails(details: any): InstanceDetails {\n        if (details.apiVersion !== 'v1') {\n            throw new Error(`Unsupported API version: ${details.apiVersion ?? 'unknown'}`);\n        }\n\n        const v1 = details as V1.InstanceDetails;\n        return { ...v1, apiVersion: 'v3' };\n    }\n\n    public override async loadDevices(callback: LoadDevicesCallback): Promise<void> {\n        // in V1, devices come in a single batch; thus we can simply call the callback with those\n        const devices = await this.send<V1.DeviceInfo[]>('dm:listDevices');\n        await callback(devices.map<DeviceInfo>(d => ({ ...d, identifier: d.id })));\n    }\n\n    public override async sendAction(command: CommandName, messageToSend: Message): Promise<DmActionResponse> {\n        const response = await this.send<DmActionResponseV1>(command, messageToSend);\n        switch (response.type) {\n            case 'message':\n                return {\n                    type: 'message',\n                    message: response.message || '',\n                    origin: response.origin as any, // origin was accidentally set to string in V1\n                };\n            case 'confirm':\n                return {\n                    type: 'confirm',\n                    confirm: response.confirm || '',\n                    origin: response.origin as any, // origin was accidentally set to string in V1\n                };\n            case 'progress':\n                return {\n                    type: 'progress',\n                    progress: response.progress || { open: false, indeterminate: true },\n                    origin: response.origin as any, // origin was accidentally set to string in V1\n                };\n            case 'form':\n                return {\n                    type: 'form',\n                    form: response.form || { title: '', schema: { type: 'panel', items: {} } },\n                    origin: response.origin as any, // origin was accidentally set to string in V1\n                };\n            case 'result':\n                if (response.result.error) {\n                    return {\n                        type: 'result',\n                        result: { error: response.result.error },\n                        origin: response.origin as any, // origin was accidentally set to string in V1\n                    };\n                }\n                switch (response.result.refresh) {\n                    case true:\n                        return {\n                            type: 'result',\n                            result: { refresh: true },\n                            origin: response.origin as any, // origin was accidentally set to string in V1\n                        };\n                    case 'device':\n                        return {\n                            type: 'result',\n                            result: { refresh: 'devices' },\n                            origin: response.origin as any, // origin was accidentally set to string in V1\n                        };\n                    case 'instance':\n                        return {\n                            type: 'result',\n                            result: { refresh: 'instance' },\n                            origin: response.origin as any, // origin was accidentally set to string in V1\n                        };\n                    default:\n                        return {\n                            type: 'result',\n                            result: { refresh: false },\n                            origin: response.origin as any, // origin was accidentally set to string in V1\n                        };\n                }\n            default:\n                throw new Error(`Unknown response type: ${(response as any).type}`);\n        }\n    }\n\n    public async sendControl(\n        command: CommandName,\n        messageToSend: { deviceId: string; controlId: string; state?: ControlState },\n    ): Promise<DmControlResponse> {\n        const response = await this.send<DmControlResponseV1>(command, messageToSend);\n        // contents matches, types unfortunately don't, so we need to cast here\n        return response as any;\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/dm-gui-components",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "description": "ReactJS components to develop admin interface for ioBroker device manager.",
   "author": {
     "name": "Jey Cee",
@@ -53,7 +53,7 @@
   "homepage": "https://github.com/ioBroker/dm-gui-components#readme",
   "dependencies": {
     "@iobroker/adapter-react-v5": "^8.1.1",
-    "@iobroker/json-config": "^8.2.1"
+    "@iobroker/json-config": "^8.2.3"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^5.1.1",