hm2mqtt 3.8.1 → 3.8.3

package/lib/rpc.js

@@ -26,6 +26,12 @@ const TX_METHODS = new Set(['setValue', 'putParamset', 'activateLinkParamset']);
 const INIT_BACKOFF_MS = [1000, 2000, 4000, 8000];
 export const INIT_RETRY_MS = 15000;
 const DEINIT_TIMEOUT_MS = 1500;
+/**
+ * How long after an init the interface process's listDevices/newDevices still belong to it: hmipserver answers the
+ * init at once and calls listDevices and newDevices afterwards. Such a call later than this is the process calling on
+ * its own - it restarted and kept the subscription (B-5).
+ */
+export const INIT_GRACE_MS = 30000;
 const CALL_TIMEOUT_MS = 30000;
 
 /**
@@ -185,11 +191,13 @@ export class RpcServers {
                 const answer = connection.listDevices();
                 this.log.debug('rpc >', connection.name, 'listDevices', answer.length, 'devices');
                 done(answer);
+                connection.unsolicited(method);
                 break;
             }
             case 'newDevices':
                 connection.newDevices(Array.isArray(params[1]) ? params[1] : []);
                 done('');
+                connection.unsolicited(method);
                 break;
             case 'deleteDevices':
                 connection.deleteDevices(Array.isArray(params[1]) ? params[1] : []);
@@ -319,6 +327,8 @@ export class RpcConnection extends EventEmitter {
         this.lastInitError = null;
         this.initFailures = 0;
         this.everInitialized = false;
+        this.initInFlight = false;
+        this.lastInitAt = 0;
     }
 
     /** Closes the client (binrpc: its socket and reconnect timer); the next call creates a new one. */
@@ -412,7 +422,13 @@ export class RpcConnection extends EventEmitter {
             this.servers.register(this.initId, this);
             this.lastEvent = this.timers.now();
             this.log.info('rpc', this.name, '> init', url, this.initId);
-            await this.methodCall('init', [url, this.initId]);
+            this.initInFlight = true;
+            try {
+                await this.methodCall('init', [url, this.initId]);
+            } finally {
+                this.initInFlight = false;
+            }
+            this.lastInitAt = this.timers.now();
             this.initialized = true;
             this.everInitialized = true;
             if (this.initFailures > 0) {
@@ -501,6 +517,30 @@ export class RpcConnection extends EventEmitter {
         return this.listDevicesAnswer();
     }
 
+    /**
+     * The interface process called listDevices or newDevices. Outside our own init it restarted and kept the
+     * subscription: hmipserver restores its subscribers from its handlers file, calls listDevices and newDevices on
+     * them and answers their pings (the PONG arrives), but delivers no event to such a kept subscription until a fresh
+     * init (B-5; openccu-lite B-286, measured). So init again at once instead of waiting for the ping watchdog, which
+     * the PONGs keep satisfied. A newDevices for a device paired just now costs one init the same way.
+     * @param {string} method
+     */
+    unsolicited(method) {
+        if (!this.wantInit || this.stopped || !this.initialized || this.initInFlight || this.initTimer) {
+            return;
+        }
+        if (this.timers.now() - this.lastInitAt < INIT_GRACE_MS) {
+            return;
+        }
+        this.log.info(
+            'rpc',
+            this.name,
+            method,
+            'outside our init: the interface process restarted and kept the subscription - subscribing afresh',
+        );
+        this.initTimer = this.timers.setTimeout(() => this.init(), 0);
+    }
+
     newDevices(devices) {
         this.log.debug('rpc <', this.name, 'newDevices', devices.length);
         this.emit('newDevices', devices);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hm2mqtt",
-  "version": "3.8.1",
+  "version": "3.8.3",
   "description": "Interface between Homematic CCU and MQTT",
   "type": "module",
   "main": "index.js",