node-red-contrib-homebridge-automation 0.1.12-beta.16 → 0.1.12-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.16",
+  "version": "0.1.12-beta.18",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -48,7 +48,7 @@
   "dependencies": {
     "better-queue": ">=3.8.12",
     "debug": "^4.3.5",
-    "hap-node-client": ">=0.2.7"
+    "@homebridge/hap-client": "2.0.4"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/hbConfigNode.js

@@ -1,7 +1,9 @@
 const hbBaseNode = require('./hbBaseNode');
-const HAPNodeJSClient = require('hap-node-client').HAPNodeJSClient;
+// const HAPNodeJSClient = require('hap-node-client').HAPNodeJSClient;
+const { HapClient } = require('@homebridge/hap-client');
 const debug = require('debug')('hapNodeRed:hbConfigNode');
 const { Homebridges } = require('./lib/Homebridges.js');
+const { Log } = require('./lib/logger.js');
 var Queue = require('better-queue');
 
 class HBConfigNode {
@@ -24,6 +26,8 @@ class HBConfigNode {
     this.ctDevices = [];
     this.hbDevices = [];
 
+    this.log = new Log(console, true);
+
     this.reqisterQueue = new Queue(function (node, cb) {
       this._register.call(node.that, node, cb);
     }, {
@@ -34,33 +38,37 @@ class HBConfigNode {
     });
     this.reqisterQueue.pause();
 
-    this.initHomebridge(config);
+    this.hapClient = new HapClient({
+      config: { debug: false },
+      pin: config.username,
+      logger: this.log,
+    });
+
+    this.waitForNoMoreDiscoveries();
+    this.hapClient.on('instance-discovered', () => this.waitForNoMoreDiscoveries);
   }
 
-  // Initialize the Homebridge client
-  initHomebridge(config) {
-    if (this.homebridge) {
-      if (this.macAddress) {
-        // Register additional PIN on existing instance
-        this.homebridge.RegisterPin(this.macAddress, config.username);
-      }
-    } else {
-      this.homebridge = new HAPNodeJSClient({
-        pin: config.username,
-        refresh: 900,
-        debug: false,
-        timeout: 5,
-        reqTimeout: 7000,
-      });
-
-      // Handle 'Ready' event
-      this.homebridge.on('Ready', this.handleReady.bind(this));
+  waitForNoMoreDiscoveries = () => {
+    // Clear any existing timeout
+    if (this.discoveryTimeout) {
+      clearTimeout(this.discoveryTimeout);
     }
-  }
+
+    // Set up the timeout
+    this.discoveryTimeout = setTimeout(() => {
+      this.log.debug('No more instances discovered, publishing services');
+      this.hapClient.removeListener('instance-discovered', this.waitForNoMoreDiscoveries);
+      debug('waitfornomore', this);
+      this.handleReady();
+      // this.requestSync();
+      // this.hapClient.on('instance-discovered', this.requestSync.bind(this));  // Request sync on new instance discovery
+    }, 5000);
+  };
 
   // Handle Homebridge 'Ready' event
   handleReady(accessories) {
-    this.hbDevices = new Homebridges(accessories);
+    debug('handleReady', this);
+    this.hbDevices = this.hapClient.getAllServices(accessories);
     debug('Discovered %s new evDevices', this.hbDevices.toList({ perms: 'ev' }).length);
 
     this.evDevices = this.hbDevices.toList({ perms: 'ev' });
@@ -68,6 +76,23 @@ class HBConfigNode {
     this.handleDuplicates(this.evDevices);
   }
 
+  /**
+  * Start processing
+  */
+  async start() {
+    this.services = await this.loadAccessories();
+    this.log.info(`Discovered ${this.services.length} accessories`);
+    this.ready = true;
+    await this.buildSyncResponse();
+    const evServices = this.services.filter(x => this.evTypes.some(uuid => x.serviceCharacteristics.find(c => c.uuid === uuid)));
+    this.log.debug(`Monitoring ${evServices.length} services for changes`);
+
+    const monitor = await this.hapClient.monitorCharacteristics(evServices);
+    monitor.on('service-update', (services) => {
+      this.reportStateSubject.next(services[0].uniqueId);
+    });
+  }
+
   // Handle duplicate devices
   handleDuplicates(list) {
     const seenFullNames = new Set();

package/src/lib/logger.js

@@ -0,0 +1,31 @@
+export class Log {
+
+  constructor(logger, debugMode) {
+    this.logger = logger;
+    this.debugMode = debugMode;
+  }
+
+  debug(msg) {
+    if (this.debugMode) {
+      this.logger.info(msg);
+    } else {
+      this.logger.debug(msg);
+    }
+  }
+
+  info(msg) {
+    this.logger.info(msg);
+  }
+
+  warn(msg) {
+    this.logger.warn(msg);
+  }
+
+  error(msg) {
+    this.logger.error(msg);
+  }
+
+  log(msg) {
+    this.logger.info(msg);
+  }
+}

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

@@ -81,7 +81,6 @@
         "id": "3d7babac3a298e60",
         "type": "hb-status",
         "z": "caef1e7b5b399e80",
-        "d": true,
         "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
@@ -119,7 +118,6 @@
         "id": "bb88544904b343a1",
         "type": "hb-event",
         "z": "caef1e7b5b399e80",
-        "d": true,
         "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
@@ -172,7 +170,6 @@
         "id": "0ed3cd7e0d60beda",
         "type": "hb-control",
         "z": "caef1e7b5b399e80",
-        "d": true,
         "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",

package/test/node-red/flows.json

@@ -81,13 +81,14 @@
         "id": "3d7babac3a298e60",
         "type": "hb-status",
         "z": "caef1e7b5b399e80",
-        "name": "West Bedroom",
+        "d": true,
+        "name": "",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "x": 480,
+        "x": 520,
         "y": 140,
         "wires": [
             [
@@ -118,14 +119,15 @@
         "id": "bb88544904b343a1",
         "type": "hb-event",
         "z": "caef1e7b5b399e80",
-        "name": "West Bedroom",
+        "d": true,
+        "name": "",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "sendInitialState": false,
-        "x": 220,
+        "x": 250,
         "y": 380,
         "wires": [
             []
@@ -135,13 +137,14 @@
         "id": "452e3e6171aa7a25",
         "type": "hb-resume",
         "z": "caef1e7b5b399e80",
-        "name": "West Bedroom",
+        "d": true,
+        "name": "",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "x": 480,
+        "x": 520,
         "y": 460,
         "wires": [
             [
@@ -170,14 +173,15 @@
         "id": "0ed3cd7e0d60beda",
         "type": "hb-control",
         "z": "caef1e7b5b399e80",
-        "name": "West Bedroom",
+        "d": true,
+        "name": "",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 500,
+        "x": 540,
         "y": 600,
         "wires": []
     },