node-red-contrib-homebridge-automation 0.1.12-beta.26 → 0.1.12-beta.27

package/package.json

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

package/src/hbBaseNode.js

@@ -23,6 +23,9 @@ class HbBaseNode {
     if (this.handleInput) {
       this.on('input', this.handleInput.bind(this));
     }
+    if (this.handleHbReady) {
+      this.on('hbReady', this.handleHbReady.bind(this))
+    }
     this.on('close', this.handleClose.bind(this));
     this.on('hbEvent', this.handleHBEventMessage.bind(this));
   }

package/src/hbControlNode.js

@@ -6,7 +6,7 @@ class HbControlNode extends hbBaseNode {
     super(config, RED);
   }
 
-  async handleInput(message) {
+  async handleInput(message, send) {
     debug('handleInput', message.payload, this.name);
     if (!this.hbDevice) {
       this.error('HB not initialized');

package/src/hbEventNode.js

@@ -5,7 +5,6 @@ class HbEventNode extends hbBaseNode {
   constructor(config, RED) {
     super(config, RED);
     this.sendInitialState = config.sendInitialState === true;
-    this.on('hbReady', this.handleHbReady.bind(this))
   }
 
   handleHbReady(service) {

package/src/hbResumeNode.js

@@ -5,12 +5,7 @@ class HbResumeNode extends HbBaseNode {
   constructor(config, RED) {
     super(config, RED);
 
-
-    this.state = null;
-    this.lastMessageTime = null;
-    this.lastMessageValue = null;
-    this.lastPayload = { On: false };
-    this.timeout = null;
+    this.storedState = null;
 
     // Set up input and command handlers
     // this.on('input', this.handleInput.bind(this));
@@ -18,127 +13,45 @@ class HbResumeNode extends HbBaseNode {
 
     // Handle device registration
     debug('hbResume - hbConfigNode', this.hbConfigNode);
-    // debug('hbResume - hbConfigNode', this.configNode.hbConfigNode);
-
   }
 
-  handleHBEventMessage(service) {
-    debug('topic for', this.id, service.serviceName, service.values);
+  handleInput(message, send) {
+    debug('handleInput', message.payload, this.name);
 
-    this.status({
-      text: JSON.stringify(service.values),
-      shape: 'dot',
-      fill: 'green',
-    });
-    this.send({ payload: service.values });
-  }
-
-  handleInput(msg, send) {
-    this.msg = msg;
-    debug("hbResume.input: %s input", this.fullName, JSON.stringify(msg));
-
-    if (typeof msg.payload === "object") {
-      if (this.hbDevice) {
-        const message = this._createControlMessage.call(this, msg.payload, this, this.hbDevice);
-
-        if (message.characteristics.length > 0) {
-          let newMsg;
-          if (!msg.payload.On) {
-            if (this.lastPayload.On) {
-              newMsg = {
-                name: this.name,
-                _device: this.device,
-                _confId: this.confId,
-                payload: this.state,
-                Homebridge: this.hbDevice?.homebridge,
-                Manufacturer: this.hbDevice?.manufacturer,
-                Type: this.hbDevice?.deviceType,
-              };
-            } else {
-              this.state = JSON.parse(JSON.stringify(msg.payload));
-              newMsg = msg;
-            }
-          } else {
-            newMsg = msg;
-          }
-
-          send(newMsg.payload.On ? newMsg : { ...newMsg, payload: { On: false } });
-          debug("hbResume.input: %s output", this.fullName, JSON.stringify(newMsg));
-          this.updateStatus(newMsg.payload);
-          this.lastMessageValue = newMsg.payload;
-          this.lastMessageTime = Date.now();
-          this.lastPayload = JSON.parse(JSON.stringify(msg.payload));
-        }
-      } else {
-        this.handleError("Homebridge not initialized - 1");
-      }
-    } else {
-      this.handleError(
-        "Payload should be a JSON object containing device characteristics and values, e.g., {\"On\":false, \"Brightness\":0 }"
-      );
+    if (!this.hbDevice) {
+      this.warn('HB not initialized');
+      this.status({ text: 'HB not initialized', shape: 'ring', fill: 'red' });
+      return;
     }
-  }
-
-  handleCommand(event) {
-    const payload = { ...this.state, ...this._convertHBcharactericToNode([event], this) };
-    debug("hbResume.event: %s %s -> %s", this.fullName, JSON.stringify(this.state), JSON.stringify(payload));
 
-    if (event.status === true && event.value !== undefined) {
-      if (Date.now() - this.lastMessageTime > 5000) {
-        debug("hbResume.update: %s - updating stored event >5", this.fullName, payload);
-        this.state = JSON.parse(JSON.stringify(payload));
-      }
-    } else if (event.status === true) {
-      this.updateStatus({ text: 'connected', shape: 'dot', fill: 'green' });
-    } else {
-      this.updateStatus({ text: `disconnected: ${event.status}`, shape: 'ring', fill: 'red' });
+    if (typeof message.payload !== 'object') {
+      const validNames = Object.keys(this.hbDevice.values)
+        .filter(key => key !== 'ConfiguredName')
+        .join(', ');
+      this.warn(`Payload should be a JSON object containing device characteristics and values, e.g. {"On":false, "Brightness":0}. Valid values: ${validNames}`);
+      this.status({ text: 'Invalid payload', shape: 'dot', fill: 'red' });
+      return;
     }
-  }
-
-  handleDeviceRegistration() {
-    debug("hbResume.register:", this.fullName);
-    this.hbDevice = hbDevices.findDevice(this.device, { perms: 'pw' });
-
-    if (this.hbDevice) {
-      this._status(this.device, this, { perms: 'pw' }, (err, message) => {
-        if (!err) {
-          this.state = this._convertHBcharactericToNode(message.characteristics, this);
-          debug("hbResume received: %s = %s", this.fullName, JSON.stringify(message.characteristics).slice(0, 80) + '...');
-        } else {
-          this.error(err);
-        }
-      });
-
-      this.deviceType = this.hbDevice.deviceType;
-      this.listener = this.command;
-      this.eventName = [];
 
-      this.hbDevice.eventRegisters.forEach((event) => {
-        homebridge.on(this.hbDevice.id + event.aid + event.iid, this.command);
-        this.eventName.push(this.hbDevice.id + event.aid + event.iid);
-      });
+    // if on, store the current values object to storedState before passing
+    // if off, if storedState, then send stored state else passthru
 
-      this.updateStatus({ text: 'connected', shape: 'dot', fill: 'green' });
-      this.resetTimeout(30000);
-    } else {
-      this.error(`Can't find device ${this.device}`);
+    if (message.payload.On) {
+      this.storedState = this.hbDevice.values;
+      debug('Storing', this.storedState);
+    } else if (!message.payload.On && this.storedState) {
+      debug('Restoring', this.storedState)
+      message.payload = { ...message.payload, ...this.storedState }
+      this.storedState = null;
     }
+    this.status({
+      text: JSON.stringify(message.payload),
+      shape: 'dot',
+      fill: 'green',
+    });
+    send(message);
   }
 
-  updateStatus(status) {
-    this.status(status);
-    this.resetTimeout(10000);
-  }
-
-  resetTimeout(duration) {
-    clearTimeout(this.timeout);
-    this.timeout = setTimeout(() => this.status({}), duration);
-  }
-
-  handleError(message) {
-    this.error(message, this.msg);
-    this.updateStatus({ text: message, shape: 'ring', fill: 'red' });
-  }
 }
 
 module.exports = HbResumeNode;

package/test/node-red/flows.json

@@ -168,9 +168,7 @@
         "x": 210,
         "y": 460,
         "wires": [
-            [
-                "452e3e6171aa7a25"
-            ]
+            []
         ]
     },
     {
@@ -439,34 +437,5 @@
                 "a866ae0bb24ce682"
             ]
         ]
-    },
-    {
-        "id": "56633636bd2e624c",
-        "type": "inject",
-        "z": "caef1e7b5b399e80",
-        "name": "",
-        "props": [
-            {
-                "p": "payload"
-            },
-            {
-                "p": "topic",
-                "vt": "str"
-            }
-        ],
-        "repeat": "60",
-        "crontab": "",
-        "once": true,
-        "onceDelay": "60",
-        "topic": "",
-        "payload": "",
-        "payloadType": "date",
-        "x": 190,
-        "y": 280,
-        "wires": [
-            [
-                "452e3e6171aa7a25"
-            ]
-        ]
     }
 ]