iobroker.pro-bravia 0.0.1 → 0.0.2

package/README.md

@@ -33,6 +33,8 @@ run REST-only.
 
 Install from the ioBroker admin **Adapters** tab, then create an instance.
 
+Requires Node.js 22 or later, js-controller 6.0.11 or later and admin 7.6.20 or later.
+
 ## Setup
 
 On the display:
@@ -111,6 +113,13 @@ Protocol notes gathered from Sony's documentation live in [docs/PROTOCOL.md](doc
 ## Changelog
 
 <!-- **WORK IN PROGRESS** -->
+### 0.0.2 (2026-09-30)
+
+- Wake-on-LAN now works when the display was already suspended when the adapter started
+- A configured Wake-on-LAN MAC or broadcast address now takes precedence over the one the display reports
+- The adapter now reconnects within 5 minutes of a display coming back, including right after Wake-on-LAN and with long poll intervals
+- Object IDs built from app titles now use only characters ioBroker accepts
+- Dependency updates; tested on Node.js 22, 24 and 26
 
 ### 0.0.1
 

package/build/device.js

@@ -38,6 +38,11 @@ class BraviaDevice {
      * poll; without this the log fills with identical lines indefinitely.
      */
     reportedContexts = new Set();
+    /**
+     * Handles the writes that must work before discovery. A display suspended at startup never
+     * answers discovery, and Wake-on-LAN is the only way to bring it back.
+     */
+    preDiscovery;
     constructor(options, store) {
         this.options = options;
         this.store = store;
@@ -58,6 +63,11 @@ class BraviaDevice {
                 timeoutMs: options.requestTimeoutMs,
             })
             : null;
+        this.preDiscovery = new system_1.SystemModule(this.context());
+    }
+    /** Create the objects that must exist before the display has been reached. */
+    async prepare() {
+        await this.preDiscovery.initWake();
     }
     context() {
         return {
@@ -202,15 +212,18 @@ class BraviaDevice {
      * @returns true when a module claimed and executed the write
      */
     async write(id, value) {
-        if (!this.ready) {
-            throw new errors_1.BraviaError('Display is not initialised yet', 'retryable');
-        }
         const separator = id.indexOf('.');
         if (separator === -1) {
             return false;
         }
         const root = id.slice(0, separator);
         const path = id.slice(separator + 1);
+        if (!this.ready) {
+            if (root === 'power' && (await this.preDiscovery.writeBeforeDiscovery(path, value))) {
+                return true;
+            }
+            throw new errors_1.BraviaError('Display is not initialised yet', 'retryable');
+        }
         const handler = this.writeHandlers.get(root);
         if (!handler) {
             return false;

package/build/device.js.map

@@ -1 +1 @@
-{"version":3,"file":"device.js","sourceRoot":"","sources":["../src/device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../src/device.ts"],"names":[],"mappings":"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"}

package/build/devices/appcontrol.js

@@ -52,7 +52,10 @@ class AppControlModule {
                 if (!application.uri) {
                     continue;
                 }
-                const id = (0, state_mapper_1.sanitiseId)(application.title || application.uri);
+                // A title in a non-Latin script sanitises to underscores only, and two such
+                // titles would collide, so fall back to the URI, which is unique.
+                const fromTitle = (0, state_mapper_1.sanitiseId)(application.title ?? '');
+                const id = /[A-Za-z0-9]/.test(fromTitle) ? fromTitle : (0, state_mapper_1.sanitiseId)(application.uri);
                 if (this.idToUri.has(id)) {
                     continue;
                 }

package/build/devices/appcontrol.js.map

@@ -1 +1 @@
-{"version":3,"file":"appcontrol.js","sourceRoot":"","sources":["../../src/devices/appcontrol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appcontrol.js","sourceRoot":"","sources":["../../src/devices/appcontrol.ts"],"names":[],"mappings":"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"}

package/build/devices/system.js

@@ -98,13 +98,7 @@ class SystemModule {
                 write: true,
             });
         }
-        await store.ensureState('power.wake', {
-            name: 'Wake on LAN',
-            type: 'boolean',
-            role: 'button',
-            read: false,
-            write: true,
-        });
+        await this.initWake();
         await store.ensureChannel('system', 'System settings');
         if (capabilities.supports('system', 'setPowerSavingMode')) {
             await store.ensureState('system.powerSavingMode', {
@@ -379,14 +373,48 @@ class SystemModule {
         }
         await store.setAck('power.state', false);
     }
+    /**
+     * The objects Wake-on-LAN needs. Created before discovery as well as during it, because a
+     * display that is suspended when the instance starts never answers discovery at all.
+     */
+    async initWake() {
+        await this.ctx.store.ensureChannel('power', 'Power');
+        await this.ctx.store.ensureState('power.wake', {
+            name: 'Wake on LAN',
+            type: 'boolean',
+            role: 'button',
+            read: false,
+            write: true,
+        });
+    }
+    /**
+     * The only writes that can work before discovery: waking the display. Anything else needs
+     * the HTTP server that a suspended display has shut down.
+     */
+    async writeBeforeDiscovery(path, value) {
+        if (path === 'wake' || (path === 'state' && Boolean(value))) {
+            await this.wakeDisplay();
+            return true;
+        }
+        return false;
+    }
     async wakeDisplay() {
-        const mac = this.macAddress ?? this.ctx.config.macAddress;
+        // Before discovery nothing has been read from the display in this run, but the MAC it
+        // reported in an earlier run is still in the store.
+        const stored = await this.ctx.store.getValue('info.macAddress');
+        // A configured MAC is an override ("leave blank to read it from the display"), so it
+        // wins over the one the display reports, the same rule as the broadcast address.
+        const mac = this.ctx.config.macAddress ??
+            this.macAddress ??
+            (typeof stored === 'string' && stored ? stored : undefined);
         if (!mac) {
             throw new errors_1.BraviaError('Cannot send Wake-on-LAN: the display MAC address is unknown. ' +
                 'Set it in the instance configuration, or power the display on once so it can be read.', 'badRequest');
         }
         await (0, wol_1.wake)(mac, {
-            broadcastAddress: this.broadcastAddress ?? this.ctx.config.broadcastAddress,
+            // A configured address is a deliberate override (e.g. a unicast relay across VLANs),
+            // so it wins over the one the display reports.
+            broadcastAddress: this.ctx.config.broadcastAddress ?? this.broadcastAddress,
             // Framework timers, so the inter-packet waits cannot outlive the instance.
             timers: this.ctx.timers,
         });

package/build/devices/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/devices/system.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAC5C,8DAMoC;AACpC,0CAAwC;AA2BxC,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;AACpF,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAEhE,MAAa,YAAY;IAOe;IANpB,IAAI,GAAG,OAAO,CAAC;IACf,IAAI,GAAG,QAAQ,CAAC;IAExB,UAAU,CAAU;IACpB,gBAAgB,CAAU;IAElC,YAAoC,GAAkB;QAAlB,QAAG,GAAH,GAAG,CAAe;IAAG,CAAC;IAEnD,KAAK,CAAC,IAAI;QACb,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAEzC,MAAM,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QACxD,MAAM,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE;YAClC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;YACd,+EAA+E;YAC/E,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YACnC,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,WAAW,CAAC,iBAAiB,EAAE;YACvC,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,WAAW,CAAC,gBAAgB,EAAE;YACtC,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,WAAW,CAAC,iBAAiB,EAAE;YACvC,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,WAAW,CAAC,iBAAiB,EAAE;YACvC,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,0EAA0E;QAC1E,wFAAwF;QAExF,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,KAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YACnC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI;SACd,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,WAAW,CAAC,cAAc,EAAE;YACpC,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,sFAAsF;QACtF,uCAAuC;QACvC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAChB,MAAM,KAAK,CAAC,WAAW,CAAC,cAAc,EAAE;gBACpC,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,IAAI;aACd,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,CAAC;YACnD,MAAM,KAAK,CAAC,WAAW,CAAC,cAAc,EAAE;gBACpC,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,IAAI;aACd,CAAC,CAAC;QACP,CAAC;QAED,MAAM,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE;YAClC,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACvD,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxD,MAAM,KAAK,CAAC,WAAW,CAAC,wBAAwB,EAAE;gBAC9C,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aAC3E,CAAC,CAAC;QACP,CAAC;aAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC;YAC/D,MAAM,KAAK,CAAC,WAAW,CAAC,wBAAwB,EAAE;gBAC9C,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACf,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC,WAAW,CAAC,gBAAgB,EAAE;gBACtC,IAAI,EAAE,qBAAqB;gBAC3B,IAAI,EAAE,SAAS;gBACf,+EAA+E;gBAC/E,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW;gBACvC,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;aAClB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC,EAAE,CAAC;YAC3D,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;YAC1E,MAAM,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC,WAAW,CAAC,iBAAiB,EAAE;gBACvC,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;gBACf,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aAClE,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,WAAW,CAAC,mBAAmB,EAAE;gBACzC,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW;gBACvC,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;aAClB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACpD,MAAM,KAAK,CAAC,WAAW,CAAC,oBAAoB,EAAE;gBAC1C,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACf,CAAC,CAAC;QACP,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACvC,CAAC;IAED,uFAAuF;IAC/E,KAAK,CAAC,qBAAqB;QAC/B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAE/C,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC,EAAE,CAAC;YAC1D,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;YACpG,IAAI,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAoB,QAAQ,EAAE,sBAAsB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBACpG,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;gBACnD,MAAM,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;gBACrD,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;gBACvD,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;gBAC7D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACf,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;oBAC/B,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACxD,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,6BAA6B,CAAC,CAAC;YAC3D,CAAC;QACL,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC;gBACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAuB,QAAQ,EAAE,oBAAoB,EAAE;oBACrF,EAAE,KAAK,EAAE,EAAE,EAAE;iBAChB,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnC,IAAI,KAAK,EAAE,QAAQ,EAAE,CAAC;oBAClB,MAAM,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACzD,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;oBACpC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;oBAC/B,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBACxD,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,2BAA2B,CAAC,CAAC;YACzD,CAAC;QACL,CAAC;QAED,oFAAoF;QACpF,kEAAkE;QAClE,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC;YACjD,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,6BAAa,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;gBACzF,MAAM,GAAG,GAAG,IAAA,iCAAiB,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAChD,IAAI,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACvC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;oBACtB,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACL,0EAA0E;YAC9E,CAAC;QACL,CAAC;QAED,sFAAsF;QACtF,4BAA4B;QAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,6BAAa,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;gBAC/F,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACpD,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBACvC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;gBACpC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACL,mFAAmF;YACvF,CAAC;QACL,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAE/C,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC;gBACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAEpC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAC/B,MAAM,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;gBAC3C,MAAM,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC;YAC3D,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;QAED,0EAA0E;QAC1E,IAAI,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACjD,OAAO;QACX,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,CAAC,QAAQ,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;gBACrD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAElC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAErC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBAC3B,OAAO,OAAO,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAG7B,QAAQ,EAAE,uBAAuB,CAAC,CAAC;gBACtC,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;gBACtD,mEAAmE;gBACnE,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAClD,MAAM,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;gBACnE,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,8BAA8B,CAAC,CAAC;YAC5D,CAAC;QACL,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;gBACjD,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;gBAC9F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAY,QAAQ,EAAE,gBAAgB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBACnF,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,OAAO,OAAO,KAAK,KAAK,QAAQ;oBAC5B,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,CACI,KAGH,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,EAAU,EAAE,IAAwC;QACvE,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,KAA0B;QACvD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAE1B,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,OAAO;gBACR,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpC,OAAO,IAAI,CAAC;YAEhB,KAAK,QAAQ;gBACT,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;oBAChB,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,6BAAa,CAAC,WAAW,CAAC,CAAC;oBAC9D,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,OAAO,KAAK,CAAC;YAEjB,KAAK,QAAQ;gBACT,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAC3C,OAAO,IAAI,CAAC;YAEhB,KAAK,MAAM;gBACP,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC;YAEhB;gBACI,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,KAA0B;QAC7D,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAEjC,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,iBAAiB;gBAClB,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC3E,MAAM,KAAK,CAAC,MAAM,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;gBACpD,OAAO,IAAI,CAAC;YAEhB,KAAK,SAAS;gBACV,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvE,MAAM,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBACrD,OAAO,IAAI,CAAC;YAEhB,KAAK,UAAU,CAAC;YAChB,KAAK,YAAY,CAAC,CAAC,CAAC;gBAChB,MAAM,OAAO,GACT,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,uBAAuB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;gBAClG,gFAAgF;gBAChF,MAAM,IAAI,GACN,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC;gBACtG,MAAM,EAAE,GACJ,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,IAAI,CAAC;gBAClG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,uBAAuB,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;gBACvG,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;gBAC5C,MAAM,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC;YAChB,CAAC;YAED;gBACI,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,EAAW;QAC9B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAErD,sFAAsF;QACtF,6CAA6C;QAC7C,IAAI,EAAE,EAAE,CAAC;YACL,IAAI,CAAC;gBACD,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;oBACpD,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;oBAChE,MAAM,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;oBACxC,OAAO;gBACX,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,KAAK,GAAG,CAAgB,CAAC;gBAC/B,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC5D,MAAM,CAAC,CAAC;gBACZ,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CACnB,uFAAuF,CAC1F,CAAC;YACN,CAAC;YACD,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC;aAAM,IAAI,IAAI,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,cAAc,CAAC,6BAAa,CAAC,KAAK,EAAE,IAAA,kCAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,oBAAW,CAAC,8CAA8C,EAAE,aAAa,CAAC,CAAC;QACzF,CAAC;QACD,MAAM,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,WAAW;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC;QAC1D,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,MAAM,IAAI,oBAAW,CACjB,+DAA+D;gBAC3D,uFAAuF,EAC3F,YAAY,CACf,CAAC;QACN,CAAC;QACD,MAAM,IAAA,UAAI,EAAC,GAAG,EAAE;YACZ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB;YAC3E,2EAA2E;YAC3E,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;SAC1B,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,OAAoB;QACtC,IAAI,OAAO,CAAC,OAAO,KAAK,6BAAa,CAAC,KAAK,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,KAAK,GAAG,IAAA,kCAAkB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA9bD,oCA8bC"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/devices/system.ts"],"names":[],"mappings":"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"}

package/build/discovery/state-mapper.js

@@ -14,11 +14,13 @@ exports.humaniseTarget = humaniseTarget;
 exports.describeSetting = describeSetting;
 exports.describeSettings = describeSettings;
 /**
- * Characters ioBroker does not permit in object ids.
+ * An object id segment built from display data. An allowlist rather than a blocklist: ioBroker
+ * also rejects symbols such as ™ or ’ and letters outside Latin/Greek/Cyrillic case, all of
+ * which turn up in app titles.
  *
  */
 function sanitiseId(target) {
-    const cleaned = target.replace(/[[\]*,;'"`<>\\?\s.]/g, '_');
+    const cleaned = target.replace(/[^A-Za-z0-9_-]/g, '_');
     return cleaned.length > 0 ? cleaned : 'unknown';
 }
 /**

package/build/discovery/state-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-mapper.js","sourceRoot":"","sources":["../../src/discovery/state-mapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;AAmCH,gCAGC;AAMD,wCAWC;AAoCD,0CAsFC;AAMD,4CAgBC;AAxKD;;;GAGG;AACH,SAAgB,UAAU,CAAC,MAAc;IACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;IAC5D,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,MAAc;IACzC,MAAM,MAAM,GAAG,MAAM;SAChB,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC;SACtC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,IAAI,EAAE,CAAC;IACZ,0FAA0F;IAC1F,MAAM,OAAO,GAAG,MAAM;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;SAC/D,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAC,SAA2B,EAAW,EAAE,CAChE,OAAO,SAAS,CAAC,GAAG,KAAK,QAAQ;IACjC,OAAO,SAAS,CAAC,GAAG,KAAK,QAAQ;IACjC,SAAS,CAAC,GAAG,KAAK,CAAC,CAAC;IACpB,SAAS,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;AAEzB,4EAA4E;AAC5E,MAAM,aAAa,GAAuB;IACtC,CAAC,IAAI,EAAE,KAAK,CAAC;IACb,CAAC,MAAM,EAAE,OAAO,CAAC;IACjB,CAAC,SAAS,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,SAAS,iBAAiB,CAAC,MAAgB;IACvC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IACvD,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;YACpC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,KAAmB,EAAE,QAAQ,GAAG,IAAI;IAChE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;IAEzC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACpD,IAAI,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7F,OAAO;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE;gBACJ,IAAI;gBACJ,IAAI,EAAE,QAAQ;gBACd,2EAA2E;gBAC3E,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;gBAClC,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;gBACf,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC1C;YACD,UAAU,EAAE,GAAG,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC;YACD,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SACvD,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,UAAU;SACpB,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAEnE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,IAAI,EAAE,CAAC;YACP,OAAO;gBACH,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,EAAE;gBACF,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE;oBACJ,IAAI;oBACJ,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW;oBACvC,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,QAAQ;iBAClB;gBACD,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE;gBAC9D,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;aAClD,CAAC;QACN,CAAC;QAED,OAAO;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,EAAE;YACF,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE;gBACJ,IAAI;gBACJ,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;gBACf,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClF;YACD,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG;YACtB,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;SACnC,CAAC;IACN,CAAC;IAED,sFAAsF;IACtF,OAAO;QACH,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,EAAE;QACF,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE;YACJ,IAAI;YACJ,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,QAAQ;SAClB;QACD,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG;QACtB,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;KACnC,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,OAAuB,EAAE,QAAQ,GAAG,IAAI;IACrE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,WAAW,GAAwB,EAAE,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YACpE,SAAS;QACb,CAAC;QACD,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACpD,mEAAmE;QACnE,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1B,SAAS;QACb,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACxB,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC"}
+{"version":3,"file":"state-mapper.js","sourceRoot":"","sources":["../../src/discovery/state-mapper.ts"],"names":[],"mappings":"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"}

package/build/lib/config.js

@@ -49,7 +49,8 @@ exports.MAX_RETRY_SECONDS = 300;
  * @param current the previous delay, or 0 when this is the first failure of a run
  */
 function nextRetrySeconds(current, pollSeconds) {
-    const floor = Math.max(exports.MIN_RETRY_SECONDS, pollSeconds);
+    // Capped too: a long poll interval (SSIP pushes changes anyway) must not delay reconnecting.
+    const floor = Math.min(exports.MAX_RETRY_SECONDS, Math.max(exports.MIN_RETRY_SECONDS, pollSeconds));
     if (current <= 0) {
         return floor;
     }

package/build/lib/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAmBH,oCAMC;AAqBD,4CAMC;AAlDD,+FAA+F;AAClF,QAAA,gBAAgB,GAAG,CAAC,CAAC;AACrB,QAAA,gBAAgB,GAAG,IAAI,CAAC;AACxB,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAEvC,0CAA0C;AAC7B,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,mBAAmB,GAAG,EAAE,CAAC;AACzB,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,KAAc,EAAE,GAAW,EAAE,GAAW,EAAE,QAAgB;IACnF,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC1C,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAEM,MAAM,eAAe,GAAG,CAAC,KAAc,EAAU,EAAE,CACtD,YAAY,CAAC,KAAK,EAAE,wBAAgB,EAAE,wBAAgB,EAAE,4BAAoB,CAAC,CAAC;AADrE,QAAA,eAAe,mBACsD;AAE3E,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAU,EAAE,CACzD,YAAY,CAAC,KAAK,EAAE,2BAAmB,EAAE,2BAAmB,EAAE,+BAAuB,CAAC,CAAC;AAD9E,QAAA,kBAAkB,sBAC4D;AAE3F,wCAAwC;AAC3B,QAAA,iBAAiB,GAAG,EAAE,CAAC;AACvB,QAAA,iBAAiB,GAAG,GAAG,CAAC;AAErC;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,OAAe,EAAE,WAAmB;IACjE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAiB,EAAE,WAAW,CAAC,CAAC;IACvD,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,EAAE,yBAAiB,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAmBH,oCAMC;AAqBD,4CAOC;AAnDD,+FAA+F;AAClF,QAAA,gBAAgB,GAAG,CAAC,CAAC;AACrB,QAAA,gBAAgB,GAAG,IAAI,CAAC;AACxB,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAEvC,0CAA0C;AAC7B,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,mBAAmB,GAAG,EAAE,CAAC;AACzB,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,KAAc,EAAE,GAAW,EAAE,GAAW,EAAE,QAAgB;IACnF,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC1C,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAEM,MAAM,eAAe,GAAG,CAAC,KAAc,EAAU,EAAE,CACtD,YAAY,CAAC,KAAK,EAAE,wBAAgB,EAAE,wBAAgB,EAAE,4BAAoB,CAAC,CAAC;AADrE,QAAA,eAAe,mBACsD;AAE3E,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAU,EAAE,CACzD,YAAY,CAAC,KAAK,EAAE,2BAAmB,EAAE,2BAAmB,EAAE,+BAAuB,CAAC,CAAC;AAD9E,QAAA,kBAAkB,sBAC4D;AAE3F,wCAAwC;AAC3B,QAAA,iBAAiB,GAAG,EAAE,CAAC;AACvB,QAAA,iBAAiB,GAAG,GAAG,CAAC;AAErC;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,OAAe,EAAE,WAAmB;IACjE,6FAA6F;IAC7F,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,yBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IACpF,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,EAAE,yBAAiB,CAAC,CAAC;AACpD,CAAC"}

package/build/main.js

@@ -93,6 +93,7 @@ class ProBraviaAdapter extends utils.Adapter {
         }, this.store);
         this.attachSsip();
         this.subscribeStates('*');
+        await this.device.prepare();
         await this.initialiseDevice();
     }
     attachSsip() {
@@ -121,7 +122,8 @@ class ProBraviaAdapter extends utils.Adapter {
      * that is powered down or still booting does not leave the adapter permanently dead.
      */
     async initialiseDevice() {
-        if (!this.device || this.unloading) {
+        // isReady: a retry brought forward by a wake can fire after discovery already succeeded.
+        if (!this.device || this.unloading || this.device.isReady) {
             return;
         }
         try {
@@ -180,6 +182,18 @@ class ProBraviaAdapter extends utils.Adapter {
             void this.initialiseDevice();
         }, this.retryDelaySeconds * 1000);
     }
+    /**
+     * A display just woken over Wake-on-LAN boots within a minute or so, but by then an overnight
+     * backoff has reached its ceiling. Start the schedule again so it is picked up promptly.
+     */
+    retrySoon() {
+        if (this.retryTimer) {
+            this.clearTimeout(this.retryTimer);
+            this.retryTimer = undefined;
+        }
+        this.retryDelaySeconds = 0;
+        this.scheduleRetry();
+    }
     /**
      * Re-arming timeout rather than setInterval: a full refresh against an unresponsive
      * display can exceed the interval, and setInterval would stack overlapping refreshes
@@ -246,6 +260,10 @@ class ProBraviaAdapter extends utils.Adapter {
                 this.log.warn(`No handler for state ${relative}; the command was ignored`);
                 return;
             }
+            // Before discovery only a wake is accepted, so this display is on its way back.
+            if (!this.device.isReady) {
+                this.retrySoon();
+            }
             // Buttons are momentary: acknowledging them would leave them stuck "pressed".
             const object = await this.getObjectAsync(relative);
             if (object?.common?.role !== 'button') {

package/build/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "pro-bravia",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "news": {
+      "0.0.2": {
+        "en": "Wake-on-LAN now works when the display was already suspended when the adapter started\nA configured Wake-on-LAN MAC or broadcast address now takes precedence over the one the display reports\nThe adapter now reconnects within 5 minutes of a display coming back, including right after Wake-on-LAN and with long poll intervals\nObject IDs built from app titles now use only characters ioBroker accepts\nDependency updates; tested on Node.js 22, 24 and 26",
+        "de": "Wake-on-LAN funktioniert jetzt auch, wenn sich das Display beim Start des Adapters bereits im Ruhezustand befand\nEine konfigurierte Wake-on-LAN-MAC- oder Broadcast-Adresse hat jetzt Vorrang vor der vom Display gemeldeten\nDer Adapter verbindet sich jetzt innerhalb von 5 Minuten neu, sobald das Display wieder erreichbar ist, auch direkt nach Wake-on-LAN und bei langen Abfrageintervallen\nAus App-Namen gebildete Objekt-IDs verwenden jetzt nur noch Zeichen, die ioBroker akzeptiert\nAbhängigkeiten aktualisiert; getestet mit Node.js 22, 24 und 26",
+        "ru": "Wake-on-LAN теперь работает, даже если дисплей уже находился в режиме ожидания при запуске адаптера\nНастроенный MAC-адрес или широковещательный адрес Wake-on-LAN теперь имеет приоритет над адресом, сообщаемым дисплеем\nАдаптер теперь переподключается в течение 5 минут после того, как дисплей снова становится доступен, в том числе сразу после Wake-on-LAN и при длинных интервалах опроса\nИдентификаторы объектов, созданные из названий приложений, теперь содержат только допустимые в ioBroker символы\nОбновлены зависимости; протестировано на Node.js 22, 24 и 26",
+        "pt": "O Wake-on-LAN agora funciona quando o ecrã já estava suspenso ao iniciar o adaptador\nUm endereço MAC ou de broadcast Wake-on-LAN configurado tem agora prioridade sobre o comunicado pelo ecrã\nO adaptador volta agora a ligar-se no prazo de 5 minutos depois de o ecrã voltar a estar disponível, incluindo logo após o Wake-on-LAN e com intervalos de consulta longos\nOs IDs de objetos criados a partir dos nomes das aplicações usam agora apenas caracteres aceites pelo ioBroker\nDependências atualizadas; testado com Node.js 22, 24 e 26",
+        "nl": "Wake-on-LAN werkt nu ook als het scherm al in de sluimerstand stond toen de adapter startte\nEen geconfigureerd Wake-on-LAN-MAC- of broadcastadres heeft nu voorrang boven het adres dat het scherm meldt\nDe adapter maakt nu binnen 5 minuten opnieuw verbinding zodra het scherm weer bereikbaar is, ook direct na Wake-on-LAN en bij lange pollingintervallen\nObject-ID's die uit app-namen worden gevormd, gebruiken nu alleen tekens die ioBroker accepteert\nAfhankelijkheden bijgewerkt; getest met Node.js 22, 24 en 26",
+        "fr": "Le Wake-on-LAN fonctionne désormais lorsque l'écran était déjà en veille au démarrage de l'adaptateur\nUne adresse MAC ou de diffusion Wake-on-LAN configurée est désormais prioritaire sur celle signalée par l'écran\nL'adaptateur se reconnecte désormais dans les 5 minutes qui suivent le retour de l'écran, y compris juste après un Wake-on-LAN et avec de longs intervalles d'interrogation\nLes identifiants d'objets issus des noms d'applications n'utilisent plus que des caractères acceptés par ioBroker\nDépendances mises à jour ; testé avec Node.js 22, 24 et 26",
+        "it": "Il Wake-on-LAN ora funziona anche se il display era già in sospensione all'avvio dell'adattatore\nUn indirizzo MAC o di broadcast Wake-on-LAN configurato ha ora la precedenza su quello comunicato dal display\nL'adattatore ora si riconnette entro 5 minuti dal ritorno del display, anche subito dopo un Wake-on-LAN e con intervalli di polling lunghi\nGli ID degli oggetti ricavati dai nomi delle app usano ora solo caratteri accettati da ioBroker\nDipendenze aggiornate; testato con Node.js 22, 24 e 26",
+        "es": "Wake-on-LAN ahora funciona aunque la pantalla ya estuviera suspendida al iniciar el adaptador\nUna dirección MAC o de difusión Wake-on-LAN configurada tiene ahora prioridad sobre la que indica la pantalla\nEl adaptador ahora se reconecta en un plazo de 5 minutos cuando la pantalla vuelve a estar disponible, incluso justo después de Wake-on-LAN y con intervalos de sondeo largos\nLos ID de objeto generados a partir de los nombres de las aplicaciones usan ahora solo caracteres que acepta ioBroker\nDependencias actualizadas; probado con Node.js 22, 24 y 26",
+        "pl": "Wake-on-LAN działa teraz również wtedy, gdy wyświetlacz był już uśpiony w chwili uruchomienia adaptera\nSkonfigurowany adres MAC lub adres rozgłoszeniowy Wake-on-LAN ma teraz pierwszeństwo przed adresem zgłaszanym przez wyświetlacz\nAdapter łączy się teraz ponownie w ciągu 5 minut od ponownej dostępności wyświetlacza, także zaraz po Wake-on-LAN i przy długich interwałach odpytywania\nIdentyfikatory obiektów tworzone z nazw aplikacji zawierają teraz tylko znaki akceptowane przez ioBroker\nZaktualizowano zależności; przetestowano na Node.js 22, 24 i 26",
+        "uk": "Wake-on-LAN тепер працює, навіть якщо дисплей уже був у режимі очікування під час запуску адаптера\nНалаштована MAC-адреса або широкомовна адреса Wake-on-LAN тепер має пріоритет над адресою, яку повідомляє дисплей\nАдаптер тепер перепідключається протягом 5 хвилин після того, як дисплей знову стає доступним, зокрема одразу після Wake-on-LAN і за довгих інтервалів опитування\nІдентифікатори об'єктів, утворені з назв застосунків, тепер містять лише символи, які приймає ioBroker\nОновлено залежності; протестовано на Node.js 22, 24 і 26",
+        "zh-cn": "现在即使适配器启动时显示器已处于待机状态，网络唤醒也能正常工作\n配置的网络唤醒 MAC 地址或广播地址现在优先于显示器报告的地址\n显示器恢复可用后，适配器现在会在 5 分钟内重新连接，包括网络唤醒之后以及轮询间隔较长时\n由应用名称生成的对象 ID 现在仅使用 ioBroker 接受的字符\n更新依赖项；已在 Node.js 22、24 和 26 上测试"
+      },
       "0.0.1": {
         "en": "Initial release",
         "de": "Erstveröffentlichung",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.pro-bravia",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Control and monitor Sony BRAVIA Professional Displays via REST API, Simple IP Control, IRCC-IP and Wake-on-LAN",
   "author": {
     "name": "Alan Paris",
@@ -44,10 +44,10 @@
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^6.3.0",
-    "@iobroker/types": "^7.0.6",
+    "@iobroker/types": "^7.2.3",
     "@tsconfig/node22": "^22.0.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.10.5",
+    "@types/node": "^22.20.4",
     "jest": "^29.7.0",
     "rimraf": "^6.1.3",
     "ts-jest": "^29.2.5",