node-red-contrib-homebridge-automation 0.1.12-beta.37 → 0.1.12-beta.38

package/README.md

@@ -179,6 +179,10 @@ With a plugin, you can see if it supports Real Time events, by opening the Home
 
 - Workaround for #111
 
+### Dec 15, 2024 - Version 0.2.0
+
+- Major code base refresh, and migration from hap-node-client to hap-client ( Potential fix for #120 )
+
 # Backlog / Roadmap
 
 * [x] - Update Node Information with Homebridge Accessory Details ( hapEndpoint, deviceType, description )

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.37",
+  "version": "0.1.12-beta.38",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
     "document": "./gh-md-toc --insert --no-backup --hide-footer README.md",
     "watch": "nodemon",
-    "coverage": "nyc npm t",
-    "format": "prettier --write {.,test}/*.js *.html *.md",
     "lint": "eslint --max-warnings=10 .",
     "lint:fix": "eslint --fix --max-warnings=0 .",
     "test": "jest --detectOpenHandles",
@@ -46,7 +44,7 @@
   "dependencies": {
     "better-queue": ">=3.8.12",
     "debug": "^4.3.5",
-    "@homebridge/hap-client": "2.0.5-beta.18"
+    "@homebridge/hap-client": "2.0.5-beta.20"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/HAP-NodeRed.html

@@ -190,7 +190,7 @@
             $('#node-input-device').val(node.device);
           }
         }).fail(function(jqXHR, textStatus, errorThrown) {
-          console.log("problem getting evDevices");
+          console.log("[hb-config] problem getting evDevices");
           console.log(textStatus);
         });
 
@@ -342,7 +342,7 @@
             $('#node-input-device').val(node.device);
           }
         }).fail(function(jqXHR, textStatus, errorThrown) {
-          console.log("problem getting evDevices");
+          console.log("[hb-config] problem getting evDevices");
           console.log(textStatus);
         });
 
@@ -492,7 +492,7 @@
             $('#node-input-device').val(node.device);
           }
         }).fail(function(jqXHR, textStatus, errorThrown) {
-          console.log("problem getting ctDevices");
+          console.log("[hb-config] problem getting ctDevices");
           console.log(textStatus);
         });
 
@@ -645,7 +645,7 @@
             $('#node-input-device').val(node.device);
           }
         }).fail(function(jqXHR, textStatus, errorThrown) {
-          console.log("problem getting ctDevices");
+          console.log("[hb-config] problem getting ctDevices");
           console.log(textStatus);
         });
 

package/src/hbConfigNode.js

@@ -21,12 +21,13 @@ class HBConfigNode {
 
       // Initialize HAP client
       this.hapClient = new HapClient({
-        config: { debug: true },
+        config: { debug: false },
         pin: config.username,
         logger: this.log,
       });
 
       this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
+      this.hapClient.on('discovery-ended', this.hapClient.refreshInstances);
       this.waitForNoMoreDiscoveries();
       this.on('close', this.close.bind(this));
       this.refreshInProcess = true; // Prevents multiple refreshes, hapClient kicks of a discovery on start
@@ -41,7 +42,7 @@ class HBConfigNode {
     if (!this.refreshInProcess) {
 
       this.monitor.finish();
-      this.log.debug('Monitor reported homebridge stability issues, refreshing devices');
+      this.log.debug('[hb-config] Monitor reported homebridge stability issues, refreshing devices');
       this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
       this.hapClient.resetInstancePool();
       this.waitForNoMoreDiscoveries();
@@ -55,7 +56,7 @@ class HBConfigNode {
     if (!this.discoveryTimeout) {
       clearTimeout(this.discoveryTimeout);
       this.discoveryTimeout = setTimeout(() => {
-        this.log.debug('No more instances discovered, publishing services');
+        this.log.debug('[hb-config] No more instances discovered, publishing services');
         this.hapClient.removeListener('instance-discovered', this.waitForNoMoreDiscoveries);
         this.handleReady();
         this.discoveryTimeout = null;
@@ -80,7 +81,7 @@ class HBConfigNode {
 
     this.evDevices = this.toList({ perms: 'ev' });
     this.ctDevices = this.toList({ perms: 'pw' });
-    this.log.info(`Devices initialized: evDevices: ${this.evDevices.length}, ctDevices: ${this.ctDevices.length}`);
+    this.log.info(`[hb-config] Devices initialized: evDevices: ${this.evDevices.length}, ctDevices: ${this.ctDevices.length}`);
     this.handleDuplicates(this.evDevices);
     this.connectClientNodes();
   }
@@ -116,10 +117,10 @@ class HBConfigNode {
       const { fullName, uniqueId } = endpoint;
 
       if (seen.has(fullName)) {
-        this.log.warn(`Duplicate device name detected: ${fullName}`);
+        this.log.warn(`[hb-config] Duplicate device name detected: ${fullName}`);
       }
       if (seen.has(uniqueId)) {
-        this.log.error(`Duplicate uniqueId detected: ${uniqueId}`);
+        this.log.error(`[hb-config] Duplicate uniqueId detected: ${uniqueId}`);
       }
 
       seen.set(fullName, true);

package/test/node-red/.config.nodes.json

@@ -429,8 +429,8 @@
     },
     "node-red-contrib-homebridge-automation": {
         "name": "node-red-contrib-homebridge-automation",
-        "version": "0.1.12",
-        "local": true,
+        "version": "0.2.0",
+        "local": false,
         "user": false,
         "nodes": {
             "HAP-NodeRed": {
@@ -443,10 +443,10 @@
                     "hb-control"
                 ],
                 "enabled": true,
-                "local": true,
+                "local": false,
                 "user": false,
                 "module": "node-red-contrib-homebridge-automation",
-                "file": "/Users/sgracey/Code/node-red-contrib-homebridge-automation/test/node-red/node_modules/node-red-contrib-homebridge-automation/src/HAP-NodeRed.js"
+                "file": "/Users/sgracey/npm/lib/node_modules/node-red-contrib-homebridge-automation/src/HAP-NodeRed.js"
             }
         }
     }

package/test/node-red/.config.nodes.json.backup

@@ -430,7 +430,7 @@
     "node-red-contrib-homebridge-automation": {
         "name": "node-red-contrib-homebridge-automation",
         "version": "0.1.12",
-        "local": true,
+        "local": false,
         "user": false,
         "nodes": {
             "HAP-NodeRed": {
@@ -440,14 +440,13 @@
                     "hb-event",
                     "hb-resume",
                     "hb-status",
-                    "hb-control",
-                    "hb-configNode"
+                    "hb-control"
                 ],
                 "enabled": true,
-                "local": true,
+                "local": false,
                 "user": false,
                 "module": "node-red-contrib-homebridge-automation",
-                "file": "/Users/sgracey/Code/node-red-contrib-homebridge-automation/test/node-red/node_modules/node-red-contrib-homebridge-automation/src/HAP-NodeRed.js"
+                "file": "/Users/sgracey/npm/lib/node_modules/node-red-contrib-homebridge-automation/src/HAP-NodeRed.js"
             }
         }
     }