node-red-contrib-homebridge-automation 0.1.12-beta.17 → 0.1.12-beta.19

package/package.json

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

package/src/HAP-NodeRed.js

@@ -2,7 +2,7 @@ var debug = require('debug')('hapNodeRed');
 
 // var register = require('./lib/register.js');
 
-const HBConfigNode = require('./hbConfigNode');
+const HBConfigNode = require('./hbConfigNode.js');
 const HbEventNode = require('./hbEventNode'); // Import the class
 const HbResumeNode = require('./hbResumeNode'); // Import the class
 const HbControlNode = require('./hbControlNode');

package/src/HapDeviceRoutes.js

@@ -88,7 +88,7 @@ class HapDeviceRoutes {
   getCtDeviceById(req, res) {
     debug('getCtDeviceById', req.params.id);
     const ctDevices = this.RED.nodes.getNode(req.params.id).ctDevices;
-    debug('ctDevices', ctDevices);
+    // debug('ctDevices', ctDevices);
     debug("ctDevices", ctDevices.length);
     if (ctDevices) {
       res.send(ctDevices);

package/src/hbBaseNode.js

@@ -5,6 +5,9 @@ class HbBaseNode {
     debug("HbBaseNode - constructor", config);
     // RED.nodes.createNode(this, config);
     RED.nodes.createNode(this, config);
+    if (!config.conf) {
+      debug('Warning: %s @ %s.%s not connected to a HB Configuration Node', config.type, config.x, config.y);
+    }
     this.hbConfigNode = RED.nodes.getNode(config.conf); // The configuration node
     // console.log("HbBaseNode - conf", this.conf);
     this.config = config;
@@ -14,9 +17,11 @@ class HbBaseNode {
     this.name = config.name;
     this.fullName = `${config.name} - ${config.Service}`;
 
-    this.node = this;
-
-    this.on('input', this.handleInput.bind(this));
+    this.hbDevice = null;
+    this.hbConfigNode.register(this);
+    if (this.handleInput) {
+      this.on('input', this.handleInput.bind(this));
+    }
     this.on('close', this.handleClose.bind(this));
   }
 

package/src/hbConfigNode.js

@@ -1,67 +1,59 @@
-const hbBaseNode = require('./hbBaseNode');
+const hbBaseNode = require('./hbBaseNode.js');
 // 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');
+const { manualSync } = require('rimraf');
 
 class HBConfigNode {
   constructor(config, RED) {
-    RED.nodes.createNode(this, config);
-    this.username = config.username;
-    this.macAddress = config.macAddress || '';
-    this.password = this.password;
-    this.on('close', function () {
-      this.hbConf.close(); // Close any open connections
-    });
-
-    // console.log('HBConfNode', config);
-    this.username = config.username;
-    this.macAddress = config.macAddress || '';
-    // this.password = config.credentials.password;
-    this.users = {};
-    this.homebridge = null;
-    this.evDevices = [];
-    this.ctDevices = [];
-    this.hbDevices = [];
-
-    this.log = new Log(console, true);
-
-    this.reqisterQueue = new Queue(function (node, cb) {
-      this._register.call(node.that, node, cb);
-    }, {
-      concurrent: 1,
-      autoResume: false,
-      maxRetries: 1000,
-      retryDelay: 30000
-    });
-    this.reqisterQueue.pause();
-
-    this.initHomebridge(config);
-  }
-
-  // Initialize the Homebridge client
-  initHomebridge(config) {
-
-    //this.homebridge = new HAPNodeJSClient({
-    //  pin: config.username,
-    //  refresh: 900,
-    //  debug: false,
-    //  timeout: 5,
-    //  reqTimeout: 7000,
-    // });
-    debug('initHomebridge - hapClient', config);
-    this.hapClient = new HapClient({
-      config: { debug: false },
-      pin: config.username,
-      logger: this.log,
-    });
-
-    this.waitForNoMoreDiscoveries();
-    this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
-    // Handle 'Ready' event
-    this.homebridge.on('Ready', this.handleReady.bind(this));
+    if (!config.jest) {
+      RED.nodes.createNode(this, config);
+      this.username = config.username;
+      this.macAddress = config.macAddress || '';
+      this.password = this.password;
+      this.on('close', function () {
+        this.hbConf.close(); // Close any open connections
+      });
+
+      // console.log('HBConfNode', config);
+      this.username = config.username;
+      this.macAddress = config.macAddress || '';
+      // this.password = config.credentials.password;
+      this.users = {};
+      this.homebridge = null;
+      this.evDevices = [];
+      this.ctDevices = [];
+      this.hbDevices = [];
+
+      this.clientNodes = []; // An array of client nodes attached
+
+      this.log = new Log(console, true);
+
+      this.reqisterQueue = new Queue((clientNode, cb) => {
+        // debug('Queue execute', clientNode);
+        this._register(clientNode, cb);
+      }, {
+        concurrent: 1,
+        autoResume: false,
+        maxRetries: 1000,
+        retryDelay: 30000,
+        batchDelay: 2000,
+        batchSize: 150
+      });
+      this.reqisterQueue.pause();
+
+      this.hapClient = new HapClient({
+        config: { debug: false },
+        pin: config.username,
+        logger: this.log,
+      });
+
+      this.waitForNoMoreDiscoveries();
+      this.hapClient.on('instance-discovered', () => this.waitForNoMoreDiscoveries);
+    }
   }
 
   waitForNoMoreDiscoveries = () => {
@@ -74,22 +66,77 @@ class HBConfigNode {
     this.discoveryTimeout = setTimeout(() => {
       this.log.debug('No more instances discovered, publishing services');
       this.hapClient.removeListener('instance-discovered', this.waitForNoMoreDiscoveries);
-      this.start();
-      this.requestSync();
-      this.hapClient.on('instance-discovered', this.requestSync.bind(this));  // Request sync on new instance discovery
+      // 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('Discovered %s new evDevices', this.hbDevices.toList({ perms: 'ev' }).length);
+  async handleReady(accessories) {
+    this.hbDevices = await this.hapClient.getAllServices(accessories);
+    // debug('handleReady', JSON.stringify(this.hbDevices, null, 2));
+    debug('Discovered %s new evDevices', this.toList({ perms: 'ev' }).length);
 
-    this.evDevices = this.hbDevices.toList({ perms: 'ev' });
-    this.ctDevices = this.hbDevices.toList({ perms: 'pw' });
+    this.evDevices = this.toList({ perms: 'ev' });
+    this.ctDevices = this.toList({ perms: 'pw' });
     this.handleDuplicates(this.evDevices);
+    debug('Queue', this.reqisterQueue.getStats());
+    this.reqisterQueue.resume();
   }
 
+
+
+  toList(perms) {
+
+    function supportedServiceType(service) {
+      switch (service.humanType) {
+        case 'Battery':
+        case 'Carbon Dioxide Sensor':
+        case 'Carbon Monoxide Sensor':
+        case 'Doorbell':
+        case 'Fan':
+        case 'Fanv2':
+        case 'Garage Door Opener':
+        case 'Humidity Sensor':
+        case 'Input Source':
+        case 'Leak Sensor':
+        case 'Lightbulb':
+        case 'Lock Mechanism':
+        case 'Motion Sensor':
+        case 'Occupancy Sensor':
+        case 'Outlet':
+        case 'Smoke Sensor':
+        case 'Speaker':
+        case 'Stateless Programmable Switch':
+        case 'Switch':
+        case 'Switch':
+        case 'Television':
+        case 'Temperature Sensor':
+        case 'Thermostat':
+        case 'Contact Sensor':
+          return true;
+        case 'Camera Operating Mode':
+        case 'Camera Rtp Stream Management':
+        case 'Protocol Information':
+
+          return false;
+        default:
+          debug('Unsupport HomeKit Service Type \'%s\':', service.humanType);
+      }
+    }
+
+    // debug('toList', this.hbDevices);
+    return this.hbDevices.filter(service => supportedServiceType(service)).map(service => ({
+      name: `${service.serviceName}`,
+      fullName: `${service.serviceName} - ${service.type}`,
+      sortName: `${service.serviceName}:${service.type}`,
+      uniqueId: `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`, homebridge: `${service.instance.name}`,
+      service: `${service.type}`,
+      manufacturer: `${service.accessoryInformation.Manufacturer}`
+    })).sort((a, b) => (a.sortName > b.sortName) ? 1 : ((b.sortName > a.sortName) ? -1 : 0));;
+  }
   /**
   * Start processing
   */
@@ -130,24 +177,46 @@ class HBConfigNode {
   }
 
   // Register a device node
-  register(deviceNode, callback) {
-    debug('hbConf.register', deviceNode);
-    this.users[deviceNode.id] = deviceNode;
-    debug('Register %s -> %s', deviceNode.type, deviceNode.name);
-
+  register(clientNode) {
+    // debug('hbConf.register', clientNode);
+    debug('Register %s -> %s', clientNode.type, clientNode.name);
+    this.clientNodes[clientNode.id] = clientNode;
     this.reqisterQueue.push(
-      {
-        that: this,
-        device: deviceNode.device,
-        type: deviceNode.type,
-        name: deviceNode.name,
-        fullName: deviceNode.fullName,
-        node: this,
-      },
-      callback
+      clientNode
     );
   }
 
+  /**
+   * Process batched event registration messages
+   */
+  async _register(clientNodes, cb) {
+    // debug('_register', clientNodes);
+
+    // debug('clientNodes', this.clientNodes);
+
+    for (const clientNode of clientNodes) {
+      debug('_Register %s -> %s', clientNode.type, clientNode.name);
+      clientNode.hbDevice = this.hbDevices.find(service => {
+
+        // console.log('clientNodeDevice', clientNode);
+        // debug('Testing:', { clientNodeDevice: clientNode.device, serviceName: service });
+        const testValue = `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`;
+        // debug('Testing - final:', { clientNodeDevice: clientNode.device, testValue });
+        return clientNode.device === testValue;
+      });
+      // debug('Updated clientNode', clientNode);
+      if (!clientNode.hbDevice) {
+        console.log('ERROR: _register - HB Device Missing', clientNode.name);
+      }
+    }
+    // const monitor = await this.hapClient.monitorCharacteristics(clientNodes);
+    // monitor.on('service-update', (services) => {
+    //   debug('service-update', services);
+    // });
+
+    cb(null);
+  }
+
   // Deregister a device node
   deregister(deviceNode, callback) {
     deviceNode.status({
@@ -156,11 +225,7 @@ class HBConfigNode {
       fill: 'red',
     });
 
-    for (const event of deviceNode.eventName) {
-      this.homebridge.removeListener(event, deviceNode.listener);
-    }
-
-    callback();
+    this.clientNodes[clientNode.id] = {};
   }
 
   // Clean up resources

package/src/hbConfigNode.test.js

@@ -0,0 +1,185 @@
+const debug = require('debug')('hapNodeRed:JEST');
+
+const HBConfigNode = require('./hbConfigNode.js');
+
+describe("toList", () => {
+  var hbConfigNode;
+  createNode = function () {
+  };
+  beforeAll(async () => {
+    // eslint-disable-next-line no-console
+    console.log('init');
+    hbConfigNode = new HBConfigNode({ jest: true });
+  });
+
+  test("should return an empty array when inputs is empty", () => {
+    const inputs = [];
+    const perms = [];
+    const result = hbConfigNode.toList(inputs, perms);
+    expect(result).toEqual([]);
+  });
+
+  test("should map inputs to the expected output format", () => {
+    const inputs = [
+      {
+        "aid": 167,
+        "iid": 8,
+        "uuid": "00000040-0000-1000-8000-0026BB765291",
+        "type": "Fan",
+        "humanType": "Fan",
+        "serviceName": "Bunkie Fan",
+        "serviceCharacteristics": [
+          {
+            "aid": 167,
+            "iid": 10,
+            "uuid": "00000025-0000-1000-8000-0026BB765291",
+            "type": "On",
+            "serviceType": "Fan",
+            "serviceName": "Bunkie Fan",
+            "description": "On",
+            "value": 1,
+            "format": "bool",
+            "perms": [
+              "ev",
+              "pr",
+              "pw"
+            ],
+            "canRead": true,
+            "canWrite": true,
+            "ev": true
+          },
+          {
+            "aid": 167,
+            "iid": 11,
+            "uuid": "000000E3-0000-1000-8000-0026BB765291",
+            "type": "ConfiguredName",
+            "serviceType": "Fan",
+            "serviceName": "Bunkie Fan",
+            "description": "Configured Name",
+            "value": "Bunkie Fan",
+            "format": "string",
+            "perms": [
+              "ev",
+              "pr",
+              "pw"
+            ],
+            "canRead": true,
+            "canWrite": true,
+            "ev": true
+          },
+          {
+            "aid": 167,
+            "iid": 12,
+            "uuid": "00000029-0000-1000-8000-0026BB765291",
+            "type": "RotationSpeed",
+            "serviceType": "Fan",
+            "serviceName": "Bunkie Fan",
+            "description": "Rotation Speed",
+            "value": 33,
+            "format": "float",
+            "perms": [
+              "ev",
+              "pr",
+              "pw"
+            ],
+            "unit": "percentage",
+            "maxValue": 100,
+            "minValue": 0,
+            "minStep": 1,
+            "canRead": true,
+            "canWrite": true,
+            "ev": true
+          }
+        ],
+        "accessoryInformation": {
+          "Manufacturer": "Tasmota",
+          "Model": "Sonoff iFan03",
+          "Name": "Bunkie Fan",
+          "Serial Number": "302D6B-jessie",
+          "Firmware Revision": "9.5.0tasmota"
+        },
+        "values": {
+          "On": 1,
+          "ConfiguredName": "Bunkie Fan",
+          "RotationSpeed": 33
+        },
+        "instance": {
+          "name": "homebridge",
+          "username": "1C:22:3D:E3:CF:34",
+          "ipAddress": "192.168.1.11",
+          "port": 35215,
+          "services": [],
+          "connectionFailedCount": 0
+        },
+        "uniqueId": "9fd9e494282f14d80d438aad8ffde153893f99a97195b816749786e9a012aa2f"
+      },
+      // Add more inputs here if needed
+    ];
+
+    const perms = { perms: 'ev' };
+
+    const result = hbConfigNode.toList(inputs, perms);
+    /*
+    {
+    "homebridge": "homebridge",
+    "host": "192.168.1.11",
+    "port": 35215,
+    "id": "1C:22:3D:E3:CF:34",
+    "manufacturer": "Tasmota",
+    "aid": 75,
+    "type": "00000043",
+    "name": "West Bedroom",
+    "service": "Lightbulb",
+    "fullName": "West Bedroom - Lightbulb",
+    "sortName": "West Bedroom:Lightbulb",
+    "uniqueId": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
+    "descriptions": "On",
+    "characteristics": {
+        "75.10": {
+            "characteristic": "On",
+            "iid": 10
+        }
+    },
+    "getCharacteristics": "75.10",
+    "eventRegisters": [{
+        "aid": 75,
+        "iid": 10,
+        "ev": true
+    }]
+    }
+        */
+
+    expect(result).toHaveLength(1);
+    console.log(result);
+    /*
+    expect(result).toEqual([
+      {
+        uniqueId: "1",
+        serviceName: "Service 1",
+        characteristics: [
+          {
+            id: "1.1",
+            type: "Type 1",
+            description: "Description 1",
+            value: "Value 1",
+            format: "Format 1",
+            unit: "Unit 1",
+            perms: ["perm1", "perm2"],
+            canRead: true,
+            canWrite: false,
+            ev: true
+          },
+          // Add more expected characteristics here if needed
+        ]
+      },
+      // Add more expected outputs here if needed
+    ]);
+    */
+  });
+
+  afterAll(async () => {
+    // eslint-disable-next-line no-console
+    console.log('destroy');
+    // await hap.destroy();
+  });
+});

package/src/hbControlNode.js

@@ -6,16 +6,61 @@ class HbControlNode extends hbBaseNode {
     super(config, RED);
 
     // Register the node-specific input and close handlers
-    this.on('input', this.handleInput.bind(this));
-
+    // this.on('input', this.handleInput.bind(this));
     // Register the node with the configuration
-    this.hbConfigNode.register(this.config, this.registerNode.bind(this));
   }
 
   // Handle input messages
-  handleInput(msg) {
-    this.msg = msg;
-    debug('handleInput', msg);
+  async handleInput(message) {
+    debug('handleInput', message, this.hbDevice);
+    if (this.hbDevice) {
+      var results = [];
+      if (typeof message.payload === "object") {
+        var fill = 'green';
+        for (const key of Object.keys(message.payload)) {
+          const characteristic = this.hbDevice.serviceCharacteristics.find(
+            c => c.type === key
+          );
+
+          if (characteristic) {
+            const result = await characteristic.setValue(message.payload[key]);
+            results.push({ [result.type]: result.value })
+          } else {
+            console.log('Not Found', key);
+            this.error('Invalid Characteristic \'' + key + '\' found in the message ' + JSON.stringify(message));
+            results.push({ 'Invalid Key': key });
+            fill = 'red';
+          };
+        }
+        this.status({
+          text: JSON.stringify(Object.assign({}, ...results)),
+          shape: 'dot',
+          fill: fill
+        });
+
+      } else {
+        // Improper object
+        const validNames = Object.keys(this.hbDevice.values)
+          .filter(key => key !== 'ConfiguredName')
+          .join(', ');
+        this.error("Payload should be an JSON object containing device characteristics and values, ie {\"On\":false, \"Brightness\":0 }\nValid values include: " + validNames);
+        this.status({
+          text: 'Invalid payload',
+          shape: 'ring',
+          fill: 'red'
+        });
+
+      }
+    } else {
+      this.error("HB not initialized");
+      this.status({
+        text: 'HB not initialized',
+        shape: 'ring',
+        fill: 'red',
+      });
+
+    }
+    /*
     this._control.call(this, this.node, msg.payload, (err, data) => {
       if (!err && data && (this.deviceType === '00000110' || this.deviceType === '00000111')) {
         const outputMsg = this.createOutputMessage(data);
@@ -24,44 +69,13 @@ class HbControlNode extends hbBaseNode {
         this.error(err, this.msg);
       }
     });
+    */
   }
 
   // Handle node closure
   handleClose(callback) {
     callback();
   }
-
-  // Register the node with the configuration and find the device
-  registerNode() {
-    debug('hbControl.register:', this.node.fullName);
-
-    this.node.hbDevice = this.findDevice(this.node.device);
-
-    if (this.node.hbDevice) {
-      this.node.deviceType = this.node.hbDevice.type;
-    } else {
-      this.error(`437: Can't find device ${this.node.device}`);
-    }
-  }
-
-  // Create an output message based on the received data
-  createOutputMessage(data) {
-    const outputMsg = {
-      name: this.node.name,
-      payload: this.node.state,
-      _device: this.node.device,
-      _confId: this.node.confId,
-    };
-
-    if (this.node.hbDevice) {
-      outputMsg.Homebridge = this.node.hbDevice.homebridge;
-      outputMsg.Manufacturer = this.node.hbDevice.manufacturer;
-      outputMsg.Service = this.node.hbDevice.deviceType;
-    }
-
-    outputMsg.payload = data;
-    return outputMsg;
-  }
 }
 
 module.exports = HbControlNode;

package/test/node-red/flows.json

@@ -82,13 +82,13 @@
         "type": "hb-status",
         "z": "caef1e7b5b399e80",
         "d": true,
-        "name": "",
+        "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "x": 520,
+        "x": 480,
         "y": 140,
         "wires": [
             [
@@ -138,13 +138,13 @@
         "type": "hb-resume",
         "z": "caef1e7b5b399e80",
         "d": true,
-        "name": "",
+        "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "x": 520,
+        "x": 480,
         "y": 460,
         "wires": [
             [
@@ -173,16 +173,59 @@
         "id": "0ed3cd7e0d60beda",
         "type": "hb-control",
         "z": "caef1e7b5b399e80",
-        "d": true,
+        "name": "West Bedroom Fan",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Tasmota",
+        "Service": "Fan",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom Fan00000040",
+        "conf": "557aec8e8c47e61e",
+        "outputs": 0,
+        "x": 510,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "d9f8181e9e6b3cfd",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
         "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "60",
+        "crontab": "",
+        "once": true,
+        "onceDelay": "60",
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 210,
+        "y": 460,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
+    },
+    {
+        "id": "6703815a8874b156",
+        "type": "hb-control",
+        "z": "caef1e7b5b399e80",
+        "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 540,
-        "y": 600,
+        "x": 740,
+        "y": 660,
         "wires": []
     },
     {
@@ -204,10 +247,10 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "",
-        "payloadType": "date",
-        "x": 200,
-        "y": 600,
+        "payload": "{\"On\": true, \"RotationSpeed\": 33}",
+        "payloadType": "json",
+        "x": 190,
+        "y": 580,
         "wires": [
             [
                 "0ed3cd7e0d60beda"
@@ -215,7 +258,7 @@
         ]
     },
     {
-        "id": "d9f8181e9e6b3cfd",
+        "id": "8c0ecac45b01df73",
         "type": "inject",
         "z": "caef1e7b5b399e80",
         "name": "",
@@ -228,18 +271,135 @@
                 "vt": "str"
             }
         ],
-        "repeat": "60",
+        "repeat": "",
         "crontab": "",
-        "once": true,
-        "onceDelay": "60",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": false}",
+        "payloadType": "json",
+        "x": 210,
+        "y": 640,
+        "wires": [
+            [
+                "0ed3cd7e0d60beda"
+            ]
+        ]
+    },
+    {
+        "id": "b14ebf264be0c60d",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": true}",
+        "payloadType": "json",
+        "x": 350,
+        "y": 800,
+        "wires": [
+            [
+                "6703815a8874b156"
+            ]
+        ]
+    },
+    {
+        "id": "f872545e74246764",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": false}",
+        "payloadType": "json",
+        "x": 350,
+        "y": 860,
+        "wires": [
+            [
+                "6703815a8874b156"
+            ]
+        ]
+    },
+    {
+        "id": "7eae7b87f319966e",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 210,
-        "y": 460,
+        "x": 520,
+        "y": 540,
         "wires": [
             [
-                "452e3e6171aa7a25"
+                "6703815a8874b156",
+                "0ed3cd7e0d60beda"
+            ]
+        ]
+    },
+    {
+        "id": "6a7b40f6149f2d36",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"Off\": false}",
+        "payloadType": "json",
+        "x": 490,
+        "y": 920,
+        "wires": [
+            [
+                "6703815a8874b156"
             ]
         ]
     }