node-red-contrib-homebridge-automation 0.1.12-beta.24 → 0.1.12-beta.25

package/package.json

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

package/src/HAP-NodeRed.js

@@ -11,10 +11,7 @@ const HbStatusNode = require('./hbStatusNode');
 const HapDeviceRoutes = require('./HapDeviceRoutes');
 
 module.exports = function (RED) {
-  var evDevices = [];
-  var ctDevices = [];
   var hbDevices;
-  var homebridge;
 
   /**
    * hbConf - Configuration

package/src/hbBaseNode.js

@@ -24,11 +24,11 @@ class HbBaseNode {
       this.on('input', this.handleInput.bind(this));
     }
     this.on('close', this.handleClose.bind(this));
-    this.on('event', this.handleHBEventMessage.bind(this));
+    this.on('hbEvent', this.handleHBEventMessage.bind(this));
   }
 
   handleHBEventMessage(service) {
-    debug('topic for', this.id, service.serviceName, service.values);
+    debug('hbEvent for', this.id, service.serviceName, service.values);
 
     this.status({
       text: JSON.stringify(service.values),
@@ -38,6 +38,18 @@ class HbBaseNode {
     this.send({ payload: service.values });
   }
 
+  createMessage(event, isInitialState = false) {
+    return {
+      name: this.node.name,
+      payload: this.state,
+      Homebridge: this.node.hbDevice.homebridge,
+      Manufacturer: this.node.hbDevice.manufacturer,
+      Service: this.node.hbDevice.deviceType,
+      _device: this.node.device,
+      _confId: this.node.confId,
+      _rawEvent: isInitialState ? event : undefined,
+    };
+  }
 
   registerNode() {
     debug("Registering node:", this.fullName);

package/src/hbConfigNode.js

@@ -117,7 +117,10 @@ class HBConfigNode {
       debug('_Register %s -> %s', clientNode.type, clientNode.name);
       clientNode.hbDevice = this.hbDevices.find(service => {
         const deviceUnique = `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`;
-        clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
+        if (clientNode.device === deviceUnique) {
+          clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
+          clientNode.emit('hbReady', service);
+        }
         return clientNode.device === deviceUnique;
       });
 
@@ -141,7 +144,7 @@ class HBConfigNode {
 
           eventNodes.forEach((eventNode) => {
             if (eventNode._events && typeof eventNode.emit === 'function') {
-              eventNode.emit('event', service);
+              eventNode.emit('hbEvent', service);
             }
           });
         }

package/src/hbEventNode.js

@@ -3,87 +3,21 @@ const debug = require('debug')('hapNodeRed:hbEventNode');
 
 class HbEventNode extends hbBaseNode {
   constructor(config, RED) {
-    // console.log('HbEventNode', config);
     super(config, RED);
     this.sendInitialState = config.sendInitialState === true;
-    this.hbConfigNode.register(this.config, this.registerNode.bind(this));
+    this.on('hbReady', this.handleHbReady.bind(this))
   }
 
-  // Handle event command processing
-  command(event) {
-    if (event.status === true && event.value !== undefined) {
-      this.state = { ...this.state, ...this._convertHBcharacteristicToNode([event]) };
-      const msg = this.createMessage(event);
-      this.updateStatus({ text: `${JSON.stringify(msg.payload).slice(0, 30)}...`, shape: 'dot', fill: 'green' });
-      this.send(msg);
-    } else if (event.status === true) {
-      this.updateStatus({ text: 'connected', shape: 'dot', fill: 'green' });
-    } else {
-      this.updateStatus({ text: `disconnected: ${event.status}`, shape: 'ring', fill: 'red' });
-    }
-  }
-
-  // Handle device registration logic
-  handleDeviceRegistration() {
-    debug('hbEvent.register', this);
-    this.node.hbDevice = this.findDevice(this.node.device, { perms: 'pr' });
-
-    if (this.node.hbDevice) {
-      this.registerEventHandlers();
-      this.fetchInitialState();
-    } else {
-      this.node.error(`Can't find device ${this.node.device}`);
-    }
-  }
-
-  // Register for device events
-  registerEventHandlers() {
-    this.node.deviceType = this.node.hbDevice.deviceType;
-    this.node.listener = this.command;
-    this.node.eventName = [];
-
-    this.node.hbDevice.eventRegisters.forEach((event) => {
-      this.registerEvent(this.node.hbDevice.id + event.aid + event.iid);
-    });
-
-    this.updateStatus({ text: 'connected', shape: 'dot', fill: 'green' });
-  }
-
-  // Fetch and send initial state if required
-  fetchInitialState() {
-    this.fetchStatus(this.node.device, { perms: 'ev' }, (err, message) => {
-      if (!err) {
-        this.state = this._convertHBcharacteristicToNode(message.characteristics);
-        debug(
-          'hbEvent received: %s = %s',
-          this.node.fullName,
-          `${JSON.stringify(message.characteristics).slice(0, 80)}...`
-        );
-
-        if (this.sendInitialState) {
-          const msg = this.createMessage(message, true);
-          this.updateStatus({ text: `${JSON.stringify(msg.payload).slice(0, 30)}...`, shape: 'dot', fill: 'green' });
-          this.send(msg);
-        }
-      } else {
-        this.node.error('hbEvent _status: error', this.node.fullName, err);
-      }
+  handleHbReady(service) {
+    this.status({
+      text: JSON.stringify(service.values),
+      shape: 'dot',
+      fill: 'green',
     });
+    this.send({ payload: service.values });
   }
-
   // Create a message payload for event or initial state
-  createMessage(event, isInitialState = false) {
-    return {
-      name: this.node.name,
-      payload: this.state,
-      Homebridge: this.node.hbDevice.homebridge,
-      Manufacturer: this.node.hbDevice.manufacturer,
-      Service: this.node.hbDevice.deviceType,
-      _device: this.node.device,
-      _confId: this.node.confId,
-      _rawEvent: isInitialState ? event : undefined,
-    };
-  }
+
 }
 
 module.exports = HbEventNode;

package/src/hbResumeNode.js

@@ -19,10 +19,21 @@ class HbResumeNode extends HbBaseNode {
     // Handle device registration
     debug('hbResume - hbConfigNode', this.hbConfigNode);
     // debug('hbResume - hbConfigNode', this.configNode.hbConfigNode);
-    this.hbConfigNode.register(this.config, this.registerNode.bind(this));
+
+  }
+
+  handleHBEventMessage(service) {
+    debug('topic for', this.id, service.serviceName, service.values);
+
+    this.status({
+      text: JSON.stringify(service.values),
+      shape: 'dot',
+      fill: 'green',
+    });
+    this.send({ payload: service.values });
   }
 
-  handleInput(msg) {
+  handleInput(msg, send) {
     this.msg = msg;
     debug("hbResume.input: %s input", this.fullName, JSON.stringify(msg));
 
@@ -51,7 +62,7 @@ class HbResumeNode extends HbBaseNode {
             newMsg = msg;
           }
 
-          this.send(newMsg.payload.On ? newMsg : { ...newMsg, payload: { On: false } });
+          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;

package/test/node-red/flows.json

@@ -95,48 +95,10 @@
             ]
         ]
     },
-    {
-        "id": "696e04753d952daf",
-        "type": "hb-status",
-        "z": "caef1e7b5b399e80",
-        "d": true,
-        "name": "West Bedroom",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Tasmota",
-        "Service": "Lightbulb",
-        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
-        "conf": "557aec8e8c47e61e",
-        "x": 480,
-        "y": 300,
-        "wires": [
-            [
-                "a866ae0bb24ce682"
-            ]
-        ]
-    },
-    {
-        "id": "bb88544904b343a1",
-        "type": "hb-event",
-        "z": "caef1e7b5b399e80",
-        "d": true,
-        "name": "",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Tasmota",
-        "Service": "Lightbulb",
-        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
-        "conf": "557aec8e8c47e61e",
-        "sendInitialState": false,
-        "x": 250,
-        "y": 380,
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "452e3e6171aa7a25",
         "type": "hb-resume",
         "z": "caef1e7b5b399e80",
-        "d": true,
         "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
@@ -179,7 +141,7 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom Fan00000040",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 510,
+        "x": 810,
         "y": 600,
         "wires": []
     },
@@ -223,8 +185,8 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 740,
-        "y": 660,
+        "x": 800,
+        "y": 680,
         "wires": []
     },
     {
@@ -401,5 +363,82 @@
                 "6703815a8874b156"
             ]
         ]
+    },
+    {
+        "id": "80ffdbb93cd24b48",
+        "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": 150,
+        "y": 340,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
+    },
+    {
+        "id": "d0e413b3c28f757a",
+        "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": 150,
+        "y": 400,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
+    },
+    {
+        "id": "82638dac6ac32bb1",
+        "type": "hb-event",
+        "z": "caef1e7b5b399e80",
+        "name": "West Bedroom",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Tasmota",
+        "Service": "Lightbulb",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
+        "conf": "557aec8e8c47e61e",
+        "sendInitialState": true,
+        "x": 500,
+        "y": 260,
+        "wires": [
+            [
+                "a866ae0bb24ce682"
+            ]
+        ]
     }
 ]

package/src/hbDevices.js

@@ -1,10 +0,0 @@
-const { Homebridges } = require('./lib/Homebridges.js');
-const HAPNodeJSClient = require('hap-node-client').HAPNodeJSClient;
-
-class hbDevices {
-
-
-
-}
-
-modules.export = hbDevices;

package/src/lib/Accessory.js

@@ -1,126 +0,0 @@
-var debug = require('debug')('Accessory');
-var Service = require('./Service.js').Service;
-
-module.exports = {
-  Accessory: Accessory
-};
-
-/*
- * Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
- */
-
-function Accessory(devices, context) {
-  // debug("Accessory", devices);
-  this.aid = devices.aid;
-  this.host = context.host;
-  this.port = context.port;
-  this.homebridge = context.homebridge;
-  this.id = context.id;
-  this.services = [];
-  devices.services.forEach(function (element) {
-    // debug("Service", element);
-    switch (element.type.substring(0, 8)) {
-      case "0000003E": // Accessory Information
-        this.info = information(element.characteristics);
-        break;
-      case "00000110": // Camera RTPStream Management generates duplicates
-        var service = new Service(element, this);
-        // console.log('services', this.services);
-        if (this.services.some(e => e.type === '00000110')) {
-
-        } else {
-          this.services.push(service);
-        }
-        break;
-      case "000000D9": // Input Source from webosTV has a dummy input source
-        var service = new Service(element, this);
-        if (service.name !== "dummy") {
-          this.services.push(service);
-        }
-        break;
-      default:
-        var service = new Service(element, this);
-        this.services.push(service);
-    }
-  }.bind(this));
-  // debug("Info", this.info);
-}
-
-Accessory.prototype.toList = function (context) {
-  var list = [];
-  // debug("toList", context);
-  context.aid = this.aid;
-  if (!this.info) {
-    console.log("ERROR: incorrect version of plugin, please upgrade");
-  }
-  context.name = this.info.Name;
-  context.manufacturer = this.info.Manufacturer;
-  for (var index in this.services) {
-    var service = this.services[index].toList(context);
-    if (service) {
-      list = list.concat(service);
-    }
-  }
-
-  // debug('toList', new Error('test'));
-  // debug("opt",context.opt,list.length);
-  return (list);
-};
-
-/*
-[ { iid: 2,
-    type: '00000014-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'bool',
-    description: 'Identify' },
-  { iid: 3,
-    type: '00000020-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'NorthernMan54',
-    description: 'Manufacturer' },
-  { iid: 4,
-    type: '00000021-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'dht22',
-    description: 'Model' },
-  { iid: 5,
-    type: '00000023-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'Basement',
-    description: 'Name' },
-  { iid: 6,
-    type: '00000030-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'penny-Basement',
-    description: 'Serial Number' },
-  { iid: 7,
-    type: '00000052-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: '0.1.21',
-    description: 'Firmware Revision' } ],
-    */
-
-/*
-{ Identify: undefined,
-  Manufacturer: 'Default-Manufacturer',
-  Model: 'Default-Model',
-  Name: 'FHall',
-  SerialNumber: 'Default-SerialNumber',
-  FirmwareRevision: '1.0' }
-  */
-
-function information(characteristics) {
-  var result = {};
-  characteristics.forEach(function (characteristic) {
-    if (characteristic.description) {
-      var key = characteristic.description.replace(/ /g, '').replace(/\./g, '_');
-      result[key] = characteristic.value;
-    }
-  });
-  return result;
-}

package/src/lib/Characteristic.js

@@ -1,30 +0,0 @@
-var debug = require('debug')('Characteristic');
-// var Service = require('./Service.js').Service;
-
-module.exports = {
-  Characteristic: Characteristic
-};
-
-/*
-* Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
-*/
-
-function Characteristic(devices, context) {
-  // debug("Characteristic", devices);
-  this.iid = devices.iid;
-  this.type = devices.type.substring(0, 8);
-  this.perms = devices.perms;
-  this.value = devices.value;
-  this.description = (devices.description ? devices.description : this.type);
-  this.characteristic = {};
-  this.getCharacteristic = context.aid + '.' + this.iid;
-  this.characteristic[this.getCharacteristic] = {
-    characteristic: this.description.replace(/ /g, "").replace(/\./g, "_"),
-    iid: this.iid
-  };
-  this.eventRegister = {
-    aid: context.aid,
-    iid: this.iid,
-    "ev": true
-  };
-}

package/src/lib/HbAccessories.js

@@ -1,167 +0,0 @@
-var debug = require('debug')('HbAccessories');
-
-module.exports = {
-  HbAccessories: HbAccessories
-};
-
-function HbAccessories(devices, opt) {
-  debug("HbAccessories", devices);
-  if (typeof devices === 'array') {
-    devices.forEach(function(element) {
-      // debug('Device', element);
-      events = events.concat(_instance(element, perms));
-    });
-  }
-}
-
-/*
-function registerEv(homebridge, devices) {
-  return register(homebridge, devices, 'ev');
-}
-
-function registerCt(homebridge, devices) {
-  return register(homebridge, devices, 'pw');
-}
-*/
-
-function register(homebridge, devices, perms) {
-  // debug('Discovered', devices);
-  var events = [];
-  devices.forEach(function(element) {
-    // debug('Device', element);
-    events = events.concat(_instance(element, perms));
-  });
-  return (events);
-}
-
-function _instance(instance, perms) {
-  // debug('Accessories', instance.accessories.accessories);
-  var events = [];
-  instance.accessories.accessories.forEach(function(accessory) {
-    // debug('Accessory', instance.instance.txt);
-    events = events.concat(_service({
-      "host": instance.ipAddress,
-      "port": instance.instance.port,
-      "homebridge": instance.instance.txt.md,
-      "id": instance.instance.txt.id,
-      "aid": accessory.aid
-    }, accessory.services, perms));
-  });
-  return (events);
-}
-
-function _service(context, accessory, perms) {
-  var events = [];
-  accessory.forEach(function(service) {
-    // debug('Service', service);
-    switch (service.type.substring(0, 8)) {
-      case "00000043": // Lightbulb
-      case "00000047": // Outlet
-      case "00000049": // Switch
-      case "00000040": // Fan
-      case "0000008C": // WindowCovering
-      case "0000008A": // TemperatureSensor
-      case "000000B7": // Fan 2 aka Dyson
-      case "00000041": // Garage Door
-      case "000000D0": // Valve aka sprinkler
-        // case "0000003E": // AccessoryInformation
-      case "0000004A": // Thermostat
-      case "00000080": // Contact Sensor
-      case "00000085": // Motion Sensor
-      case "00000111": // Camera
-        // debug('Supported Service', service);
-        events = events.concat(_characteristics(context, service, perms));
-        // debug("Events", events);
-        break;
-      case "0000003E": // AccessoryInformation
-        _name(context, service);
-        // debug("Events", events);
-        break;
-      default:
-    }
-  });
-  return (events);
-}
-
-function _characteristics(context, service, perms) {
-  // debug("Char", service, Array.isArray(service));
-
-  var events = [];
-  service.characteristics.forEach(function(characteristic) {
-    switch (characteristic.type.substring(0, 8)) {
-      case "00000020": // manufacturer
-        context.manufacturer = characteristic.value;
-        break;
-      case "00000023": // name
-        context.name = characteristic.value;
-        break;
-    }
-
-    if (characteristic.perms.includes(perms)) {
-      context.iid = characteristic.iid;
-      context.function = characteristic.description;
-      context.service = service.type.substring(0, 8);
-      context.characteristic = characteristic.type.substring(0, 8);
-      context.deviceType = _normalizeName(context.service);
-      // debug("Register", context);
-      context.fullName = context.name + ' - ' + _normalizeName(context.service) + ' - ' + context.function;
-      context.sortName = context.name + ':' + _normalizeName(context.service) + ':' + context.function;
-      context.uniqueId = context.homebridge + context.id + context.manufacturer + context.name + context.service + context.characteristic;
-      // debug("Perms ", context.fullName, characteristic.perms);
-      events.push(JSON.parse(JSON.stringify(context)));
-    }
-  });
-  // debug("Char Events", events);
-  return (events);
-}
-
-function _name(context, service) {
-  // debug("Char", service, Array.isArray(service));
-
-  var manufacturer, name;
-  service.characteristics.forEach(function(characteristic) {
-    switch (characteristic.type.substring(0, 8)) {
-      case "00000020": // manufacturer
-        context.manufacturer = characteristic.value;
-        break;
-      case "00000023": // name
-        context.name = characteristic.value;
-        break;
-    }
-  });
-  // debug("Char Events", events);
-  // return ({ "manufacturer": manufacturer, "name": name});
-}
-
-function _normalizeName(id) {
-  switch (id) {
-    case "00000043": // Lightbulb
-      return ("Lightbulb");
-    case "00000047": // Outlet
-      return ("Outlet");
-    case "00000049": // Switch
-      return ("Switch");
-    case "000000B7": // Fan 2 aka Dyson
-    case "00000040": // Fan
-      return ("Fan");
-    case "0000008C": // WindowCovering
-      return ("Blinds");
-    case "0000008A": // TemperatureSensor
-      return ("Temperature");
-    case "00000041": // Garage Door
-      return ("Garage Door");
-    case "000000D0": // Valve aka sprinkler
-      return ("Sprinkler");
-      // case "0000003E": // AccessoryInformation
-    case "0000004A": // Thermostat
-      return ("Thermostat");
-    case "00000080": // Contact Sensor
-      return ("Contact");
-    case "00000085": // Motion Sensor
-      return ("Motion");
-    case "00000111": // Camera
-      return ("Camera");
-    default:
-      debug("Missing HB Type", id);
-  }
-}

package/src/lib/Homebridge.js

@@ -1,71 +0,0 @@
-var debug = require('debug')('Homebridge');
-var Accessory = require('./Accessory.js').Accessory;
-
-module.exports = {
-  Homebridge: Homebridge
-};
-
-/*
-* Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
-*/
-
-/*
-
-{ ipAddress: '192.168.1.202',
-  instance:
-   { addresses: [ '192.168.1.202', 'fe80::eab6:f43b:eb39:9d7f' ],
-     name: 'Leonard-Aztest-A6F3',
-     fqdn: 'Leonard-Aztest-A6F3._hap._tcp.local',
-     host: 'AC_22_3D_E3_CE_32.local',
-     referer:
-      { address: '192.168.1.202',
-        family: 'IPv4',
-        port: 5353,
-        size: 374 },
-     port: 51828,
-     type: 'hap',
-     protocol: 'tcp',
-     subtypes: [],
-     rawTxt: <Buffer 11 6d 64 3d 4c 65 6f 6e 61 72 64 2d 41 7a 74 65 73 74 06 70 76 3d 31 2e 30 14 69 64 3d 41 43 3a 32 32 3a 33 44 3a 45 33 3a 43 45 3a 33 32 04 63 23 3d ... >,
-     txt:
-      { md: 'Leonard-Aztest',
-        pv: '1.0',
-        id: 'AC:22:3D:E3:CE:32',
-        'c#': '5',
-        's#': '1',
-        ff: '0',
-        ci: '2',
-        sf: '1',
-        sh: 'HjMYzQ==' } },
-  accessories: { accessories: [ [Object], [Object] ] } }
-*/
-
-function Homebridge(devices) {
-  // debug("Homebridge", devices);
-  this.accessories = [];
-  this.host = devices.ipAddress;
-  this.port = devices.instance.port;
-  this.homebridge = devices.instance.txt.md;
-  this.id = devices.instance.txt.id;
-  devices.accessories.accessories.forEach(function(element) {
-    var accessory = new Accessory(element, this);
-    this.accessories.push(accessory);
-  }.bind(this));
-}
-
-Homebridge.prototype.toList = function(opt) {
-  var list = [];
-  for (var index in this.accessories) {
-    var accessory = this.accessories[index];
-    list = list.concat(accessory.toList({
-      host: this.host,
-      port: this.port,
-      homebridge: this.homebridge,
-      id: this.id,
-      opt: opt
-    }));
-    // list.push(accessory.toList());
-  }
-  // debug("opt",opt,list.length);
-  return (list);
-};

package/src/lib/Homebridges.js

@@ -1,68 +0,0 @@
-// var debug = require('debug')('Homebridges');
-var Homebridge = require('./Homebridge.js').Homebridge;
-
-module.exports = {
-  Homebridges: Homebridges
-};
-
-/*
-* Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
-*/
-
-function Homebridges(devices) {
-  // debug("Homebridges", devices);
-  this.homebridges = [];
-  devices.forEach(function(element) {
-    var homebridge = new Homebridge(element);
-    this.homebridges.push(homebridge);
-  }.bind(this));
-}
-
-/**
- * Homebridges.toList - description
- *
- * @param  {type} opt description
- * @return {type}     description
- */
-
-Homebridges.prototype.toList = function(opt) {
-  var list = [];
-  for (var index in this.homebridges) {
-    var homebridge = this.homebridges[index];
-    // list.push(homebridge.toList());
-    list = list.concat(homebridge.toList(opt));
-  }
-
-  list.sort((a, b) => (a.sortName > b.sortName) ? 1 : ((b.sortName > a.sortName) ? -1 : 0));
-  // debug("opt",opt,list.length);
-  return (list);
-};
-
-/* {
-  "characteristics": [{
-    "aid": endpoint.aid,
-    "iid": endpoint.iid,
-    "ev": true
-  }]
-};
-*/
-
-Homebridges.prototype.findDevice = function(node, opt) {
-  var list = [];
-  for (var index in this.homebridges) {
-    var homebridge = this.homebridges[index];
-    // list.push(homebridge.toList());
-    list = list.concat(homebridge.toList(opt));
-  }
-  return (list.find(x => x.uniqueId === node));
-};
-
-Homebridges.prototype.findDeviceByName = function(name, opt) {
-  var list = [];
-  for (var index in this.homebridges) {
-    var homebridge = this.homebridges[index];
-    // list.push(homebridge.toList());
-    list = list.concat(homebridge.toList(opt));
-  }
-  return (list.find(x => x.name === name));
-};

package/src/lib/Service.js

@@ -1,307 +0,0 @@
-var debug = require('debug')('Service');
-var Characteristic = require('./Characteristic.js').Characteristic;
-
-module.exports = {
-  Service: Service
-};
-
-/*
- * Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
- */
-
-/*
-
-This is a typical Service
-
-{
-  "iid": 8,
-  "type": "0000008A-0000-1000-8000-0026BB765291",
-  "characteristics": [{
-    "iid": 9,
-    "type": "00000023-0000-1000-8000-0026BB765291",
-    "perms": ["pr"],
-    "format": "string",
-    "value": "Cold Cellar",
-    "description": "Name"
-  }, {
-    "iid": 10,
-    "type": "00000011-0000-1000-8000-0026BB765291",
-    "perms": ["pr", "ev"],
-    "format": "float",
-    "value": 4.9,
-    "description": "Current Temperature",
-    "unit": "celsius",
-    "maxValue": 100,
-    "minValue": -100,
-    "minStep": 0.1
-  }, {
-    "iid": 11,
-    "type": "00000010-0000-1000-8000-0026BB765291",
-    "perms": ["pr", "ev"],
-    "format": "float",
-    "value": 51,
-    "description": "Current Relative Humidity",
-    "unit": "percentage",
-    "maxValue": 100,
-    "minValue": 0,
-    "minStep": 1
-  }, {
-    "iid": 12,
-    "type": "E863F10F-079E-48FF-8F27-9C2605A29F52",
-    "perms": ["pr", "ev"],
-    "format": "uint8",
-    "value": 1011,
-    "description": "Air Pressure",
-    "unit": "mbar",
-    "maxValue": 1200,
-    "minValue": 800,
-    "minStep": 1
-  }],
-  "primary": false,
-  "hidden": false
-}
-*/
-
-function Service(devices, context) {
-  // debug("Service", JSON.stringify(devices));
-  this.iid = devices.iid;
-  this.type = devices.type.substring(0, 8);
-  this.service = _normalizeName(this.type);
-  this.aid = context.aid;
-  this.host = context.host;
-  this.port = context.port;
-  this.homebridge = context.homebridge;
-  this.id = context.id;
-  this.characteristics = [];
-  // Fix for homebridge 1.3.0
-  devices.characteristics.forEach(function (element) {
-    // var service = new Characteristic(element, this);
-    if (element.type.substring(0, 8) === '00000023' && element.description === "Name") {
-      this.name = element.value;
-    } else if (element.type.substring(0, 8) === '000000E3' && element.description === "Configured Name") {
-      this.configuredName = element.value;
-    } else {
-      // this.characteristics.push(service);
-    }
-  }.bind(this));
-  devices.characteristics.forEach(function (element) {
-    var service = new Characteristic(element, this);
-    if (element.type.substring(0, 8) === '00000023' && element.description === "Name") {
-      this.name = element.value;
-    } else if (element.type.substring(0, 8) === '000000E3' && element.description === "Configured Name") {
-      this.configuredName = element.value;
-    } else {
-      this.characteristics.push(service);
-    }
-  }.bind(this));
-  if (this.configuredName) {
-    this.name = this.configuredName;
-  }
-  // Uncomment to display services not defined
-  //  if (!this.service) {
-  //    console.log('Missing', devices);
-  //  }
-}
-
-Service.prototype.toList = function (context) {
-  var descriptions;
-  var getCharacteristics;
-  var putCharacteristics = [];
-  var eventRegisters = [];
-  var characteristics = {};
-  var fullName = context.name;
-
-  if (this.name) {
-    // Fix for #30
-    if (context.manufacturer === "Nest" && (this.name === "Fan" || this.name === "Eco Mode")) {
-      fullName = context.name + " - " + this.name;
-    } else if (context.manufacturer === "Mitsubishi" && !fullName.includes(this.name)) {
-      fullName = context.name + " - " + this.name;
-    } else if (context.manufacturer === "Allterco") {
-      fullName = context.name + " - " + this.name;
-    } else {
-      context.name = this.name;
-      fullName = context.name;
-    }
-  }
-
-  for (var index in this.characteristics) {
-    var characteristic = this.characteristics[index];
-    // debug("characteristic", characteristic)
-    // debug("perms", context.opt);
-    // debug("perms", (context.opt ? "perms" + context.opt.perms + characteristic.perms.includes(context.opt.perms) : "noperms"));
-    if (characteristic.type !== '00000023' && characteristic.perms && (context.opt ? characteristic.perms.includes(context.opt.perms) : true)) {
-      // debug("Yes", context.name, characteristic.description, characteristic.perms);
-      descriptions = (descriptions ? descriptions + ', ' : '') + characteristic.description.replace(/ /g, "").replace(/\./g, "_");
-      getCharacteristics = (getCharacteristics ? getCharacteristics + ',' : '') + characteristic.getCharacteristic;
-      // characteristics = (characteristics ? characteristics + ',' : '') + characteristic.characteristic;
-      characteristics = Object.assign(characteristics, characteristic.characteristic);
-      putCharacteristics = putCharacteristics.concat(characteristic.putCharacteristic);
-      eventRegisters = eventRegisters.concat(characteristic.eventRegister);
-    } else {
-      // debug("No", context.name, characteristic.description, characteristic.perms);
-    }
-  }
-  if (this.service && descriptions) {
-    return ({
-      homebridge: context.homebridge,
-      host: context.host,
-      port: context.port,
-      id: context.id,
-      manufacturer: context.manufacturer,
-      aid: this.aid,
-      type: this.type,
-      name: fullName,
-      service: this.service,
-      fullName: fullName + ' - ' + this.service,
-      sortName: fullName + ':' + this.service,
-      uniqueId: context.homebridge + this.id + context.manufacturer + fullName + this.type,
-      descriptions: descriptions,
-      characteristics: characteristics,
-      getCharacteristics: getCharacteristics,
-      eventRegisters: eventRegisters
-    });
-  }
-};
-
-function _normalizeName(id) {
-  switch (id) {
-    case "00000111":
-      return ("Camera Control");
-    case "00000088":
-      return ("Stateful Programmable Switch");
-    case "000000A1":
-      return ("Bridge Configuration");
-    case "00000062":
-      return ("Bridging State");
-    case "00000055":
-      return ("Pairing");
-    case "000000A2":
-      return ("Protocol Information");
-    case "0000005A":
-      return ("Relay");
-    case "00000099":
-      return ("Time Information");
-    case "00000056":
-      return ("Tunneled BTLEAccessory Service");
-    case "00000129":
-      return ("Data Stream Transport Management");
-    case "00000122":
-      return ("Target Control Management");
-    case "00000125":
-      return ("Target Control");
-    case "00000127":
-      return ("Audio Stream Management");
-    case "00000133":
-      return ("Siri");
-    case "000000D8":
-      return ("Television");
-    case "000000D9":
-      return ("Input Source");
-    case "000000DA":
-      return ("Access Control");
-    case "0000003E":
-      return ("Accessory Information");
-    case "000000BB":
-      return ("Air Purifier");
-    case "0000008D":
-      return ("Air Quality Sensor");
-    case "00000096":
-      return ("Battery Service");
-    case "00000110":
-      return ("Camera RTPStream Management");
-    case "00000097":
-      return ("Carbon Dioxide Sensor");
-    case "0000007F":
-      return ("Carbon Monoxide Sensor");
-    case "00000080":
-      return ("Contact Sensor");
-    case "00000081":
-      return ("Door");
-    case "00000121":
-      return ("Doorbell");
-    case "00000040":
-      return ("Fan");
-    case "000000B7":
-      return ("Fan v2");
-    case "000000BA":
-      return ("Filter Maintenance");
-    case "000000D7":
-      return ("Faucet");
-    case "00000041":
-      return ("Garage Door Opener");
-    case "000000BC":
-      return ("Heater Cooler");
-    case "000000BD":
-      return ("Humidifier Dehumidifier");
-    case "00000082":
-      return ("Humidity Sensor");
-    case "000000CF":
-      return ("Irrigation System");
-    case "00000083":
-      return ("Leak Sensor");
-    case "00000084":
-      return ("Light Sensor");
-    case "00000043":
-      return ("Lightbulb");
-    case "00000044":
-      return ("Lock Management");
-    case "00000045":
-      return ("Lock Mechanism");
-    case "00000112":
-      return ("Microphone");
-    case "00000085":
-      return ("Motion Sensor");
-    case "00000086":
-      return ("Occupancy Sensor");
-    case "00000047":
-      return ("Outlet");
-    case "0000007E":
-      return ("Security System");
-    case "000000CC":
-      return ("Service Label");
-    case "000000B9":
-      return ("Slat");
-    case "00000087":
-      return ("Smoke Sensor");
-    case "00000228":
-      return ("Smart Speaker");
-    case "00000113":
-      return ("Speaker");
-    case "00000089":
-      return ("Stateless Programmable Switch");
-    case "00000049":
-      return ("Switch");
-    case "0000008A":
-      return ("Temperature Sensor");
-    case "0000004A":
-      return ("Thermostat");
-    case "000000D0":
-      return ("Valve");
-    case "0000008B":
-      return ("Window");
-    case "0000008C":
-      return ("Window Covering");
-    case "0000021A":
-      return ("Camera Operating Mode");
-    case "00000204":
-      return ("Camera Event Recording Management");
-    case "0000020A":
-      return ("WiFi Router");
-    case "0000020F":
-      return ("WiFi Satellite");
-    case "00000221":
-      return ("Power Management");
-    case "00000203":
-      return ("Transfer Transport Management");
-    case "00000012":
-      return ("Heartrate");
-    // Eve types
-    case "B77831FD":
-      return ("Air Pressure Service");
-    case "E863F007":
-      return ("History Service");
-    default:
-      debug("Missing HB Type", id);
-  }
-}

package/src/lib/register.js

@@ -1,156 +0,0 @@
-var debug = require('debug')('register');
-
-module.exports = {
-  registerEv: registerEv,
-  registerCt: registerCt
-};
-
-function registerEv(homebridge, devices) {
-  return register(homebridge, devices, 'ev');
-}
-
-function registerCt(homebridge, devices) {
-  return register(homebridge, devices, 'pw');
-}
-
-function register(homebridge, devices, perms) {
-  // debug('Discovered', devices);
-  var events = [];
-  devices.forEach(function(element) {
-    // debug('Device', element);
-    events = events.concat(_instance(element, perms));
-  });
-  return (events);
-}
-
-function _instance(instance, perms) {
-  // debug('Accessories', instance.accessories.accessories);
-  var events = [];
-  instance.accessories.accessories.forEach(function(accessory) {
-    // debug('Accessory', instance.instance.txt);
-    events = events.concat(_service({
-      "host": instance.ipAddress,
-      "port": instance.instance.port,
-      "homebridge": instance.instance.txt.md,
-      "id": instance.instance.txt.id,
-      "aid": accessory.aid
-    }, accessory.services, perms));
-  });
-  return (events);
-}
-
-function _service(context, accessory, perms) {
-  var events = [];
-  accessory.forEach(function(service) {
-    // debug('Service', service);
-    switch (service.type.substring(0, 8)) {
-      case "00000043": // Lightbulb
-      case "00000047": // Outlet
-      case "00000049": // Switch
-      case "00000040": // Fan
-      case "0000008C": // WindowCovering
-      case "0000008A": // TemperatureSensor
-      case "000000B7": // Fan 2 aka Dyson
-      case "00000041": // Garage Door
-      case "000000D0": // Valve aka sprinkler
-        // case "0000003E": // AccessoryInformation
-      case "0000004A": // Thermostat
-      case "00000080": // Contact Sensor
-      case "00000085": // Motion Sensor
-      case "00000111": // Camera
-        // debug('Supported Service', service);
-        events = events.concat(_characteristics(context, service, perms));
-        // debug("Events", events);
-        break;
-      case "0000003E": // AccessoryInformation
-        _name(context, service);
-        // debug("Events", events);
-        break;
-      default:
-    }
-  });
-  return (events);
-}
-
-function _characteristics(context, service, perms) {
-  // debug("Char", service, Array.isArray(service));
-
-  var events = [];
-  service.characteristics.forEach(function(characteristic) {
-    switch (characteristic.type.substring(0, 8)) {
-      case "00000020": // manufacturer
-        context.manufacturer = characteristic.value;
-        break;
-      case "00000023": // name
-        context.name = characteristic.value;
-        break;
-    }
-
-    if (characteristic.perms.includes(perms)) {
-      context.iid = characteristic.iid;
-      context.function = characteristic.description;
-      context.service = service.type.substring(0, 8);
-      context.characteristic = characteristic.type.substring(0, 8);
-      context.deviceType = _normalizeName(context.service);
-      // debug("Register", context);
-      context.fullName = context.name + ' - ' + _normalizeName(context.service) + ' - ' + context.function;
-      context.sortName = context.name + ':' + _normalizeName(context.service) + ':' + context.function;
-      context.uniqueId = context.homebridge + context.id + context.manufacturer + context.name + context.service + context.characteristic;
-      // debug("Perms ", context.fullName, characteristic.perms);
-      events.push(JSON.parse(JSON.stringify(context)));
-    }
-  });
-  // debug("Char Events", events);
-  return (events);
-}
-
-function _name(context, service) {
-  // debug("Char", service, Array.isArray(service));
-
-  var manufacturer, name;
-  service.characteristics.forEach(function(characteristic) {
-    switch (characteristic.type.substring(0, 8)) {
-      case "00000020": // manufacturer
-        context.manufacturer = characteristic.value;
-        break;
-      case "00000023": // name
-        context.name = characteristic.value;
-        break;
-    }
-  });
-  // debug("Char Events", events);
-  // return ({ "manufacturer": manufacturer, "name": name});
-}
-
-function _normalizeName(id) {
-  switch (id) {
-    case "00000043": // Lightbulb
-      return ("Lightbulb");
-    case "00000047": // Outlet
-      return ("Outlet");
-    case "00000049": // Switch
-      return ("Switch");
-    case "000000B7": // Fan 2 aka Dyson
-    case "00000040": // Fan
-      return ("Fan");
-    case "0000008C": // WindowCovering
-      return ("Blinds");
-    case "0000008A": // TemperatureSensor
-      return ("Temperature");
-    case "00000041": // Garage Door
-      return ("Garage Door");
-    case "000000D0": // Valve aka sprinkler
-      return ("Sprinkler");
-      // case "0000003E": // AccessoryInformation
-    case "0000004A": // Thermostat
-      return ("Thermostat");
-    case "00000080": // Contact Sensor
-      return ("Contact");
-    case "00000085": // Motion Sensor
-      return ("Motion");
-    case "00000111": // Camera
-      return ("Camera");
-    default:
-      debug("Missing HB Type", id);
-  }
-}