node-red-contrib-homebridge-automation 0.2.1-beta.2 → 0.2.1-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.2.1-beta.2",
+  "version": "0.2.1-beta.3",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {

package/src/hbConfigNode.js

@@ -35,9 +35,9 @@ class HBConfigNode {
    * Wait for no more instance discoveries to be made before publishing services
    */
   waitForNoMoreDiscoveries = (instance) => {
-    debug('Instance discovered: %s - %s %s:%s', instance?.name, instance?.username, instance?.ipAddress, instance?.port);
+    if (instance)
+      debug('Instance discovered: %s - %s %s:%s', instance?.name, instance?.username, instance?.ipAddress, instance?.port);
     if (!this.discoveryTimeout) {
-      clearTimeout(this.discoveryTimeout);
       this.discoveryTimeout = setTimeout(() => {
         this.debug('No more instances discovered, publishing services');
         this.handleReady();
@@ -112,6 +112,7 @@ class HBConfigNode {
     debug('Register: %s type: %s', clientNode.type, clientNode.name);
     this.clientNodes[clientNode.id] = clientNode;
     clientNode.status({ fill: 'yellow', shape: 'ring', text: 'connecting' });
+    this.waitForNoMoreDiscoveries(); // Connect new nodes created after startup has ended ( Need a function to rather than brute forcing it )
   }
 
   async connectClientNodes() {
@@ -128,7 +129,7 @@ class HBConfigNode {
         clientNode.emit('hbReady', matchedDevice);
         debug('_Registered: %s type: %s', clientNode.type, matchedDevice.type, matchedDevice.serviceName);
       } else {
-        this.error(`ERROR: Device registration failed ${clientNode.name}`);
+        this.error(`ERROR: Device registration failed '${clientNode.fullName}'`);
       }
     };
 
@@ -145,7 +146,7 @@ class HBConfigNode {
       this.log(`Connected to ${Object.keys(monitorNodes).length} Homebridge devices`);
       // console.log('monitorNodes', monitorNodes);
       if (this.monitor) {
-        // This is kinda brute force, but it works
+        // This is kinda brute force, and should be refactored to only refresh the changed monitorNodes
         this.monitor.finish();
       }
       this.monitor = await this.hapClient.monitorCharacteristics(monitorNodes);

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

@@ -18,6 +18,8 @@
         },
         "debug": {
             "filter": "filterCurrent"
-        }
+        },
+        "menu-deploymenu-item-node": true,
+        "menu-deploymenu-item-full": false
     }
 }

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

@@ -15,6 +15,9 @@
             "tours": {
                 "welcome": "4.0.2"
             }
+        },
+        "debug": {
+            "filter": "filterCurrent"
         }
     }
 }

package/test/node-red/.flows.json.backup

@@ -453,7 +453,7 @@
         "statusVal": "payload",
         "statusType": "auto",
         "x": 800,
-        "y": 300,
+        "y": 320,
         "wires": []
     },
     {

package/test/node-red/flows.json

@@ -2250,13 +2250,13 @@
         "id": "7ceb11204ab233ad",
         "type": "hb-resume",
         "z": "efb3c9c5f6bdfd6c",
-        "name": "Bunkie Lower",
+        "name": "Bunkie Fan",
         "Homebridge": "homebridge",
-        "Manufacturer": "WLED",
-        "Service": "Lightbulb",
-        "device": "homebridge0E:03:4B:B3:AF:4CWLEDBunkie Lower00000043",
+        "Manufacturer": "Tasmota",
+        "Service": "Fan",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaBunkie Fan00000040",
         "conf": "7e647d67.f33acc",
-        "x": 580,
+        "x": 570,
         "y": 680,
         "wires": [
             [
@@ -2351,14 +2351,14 @@
         "id": "2abd3edc55335405",
         "type": "hb-control",
         "z": "efb3c9c5f6bdfd6c",
-        "name": "Bunkie Lower",
+        "name": "Bunkie Fan",
         "Homebridge": "homebridge",
-        "Manufacturer": "WLED",
-        "Service": "Lightbulb",
-        "device": "homebridge0E:03:4B:B3:AF:4CWLEDBunkie Lower00000043",
+        "Manufacturer": "Tasmota",
+        "Service": "Fan",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaBunkie Fan00000040",
         "conf": "7e647d67.f33acc",
         "outputs": 0,
-        "x": 800,
+        "x": 790,
         "y": 680,
         "wires": []
     },