Add LiftMaster accessory shim

Refactoring

accessories/Carwings.js

@@ -3,7 +3,7 @@ var carwings = require("carwingsjs");
 
 function CarwingsAccessory(log, config) {
   this.log = log;
-  this.siriName = config["siri_name"];
+  this.name = config["name"];
   this.username = config["username"];
   this.password = config["password"];
 }
@@ -41,87 +41,85 @@ CarwingsAccessory.prototype = {
     });
   },
 
-  accessoryData: function() {
+  getServices: function() {
     var that = this;
-    return {
-      services: [{
-        sType: types.ACCESSORY_INFORMATION_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of the accessory",
-          designedMaxLength: 255
-        },{
-          cType: types.MANUFACTURER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Nissan",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Manufacturer",
-          designedMaxLength: 255
-        },{
-          cType: types.MODEL_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Rev-1",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Model",
-          designedMaxLength: 255
-        },{
-          cType: types.SERIAL_NUMBER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "A1S2NASF88EW",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "SN",
-          designedMaxLength: 255
-        },{
-          cType: types.IDENTIFY_CTYPE,
-          onUpdate: null,
-          perms: ["pw"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Identify Accessory",
-          designedMaxLength: 1
-        }]
+    return [{
+      sType: types.ACCESSORY_INFORMATION_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of the accessory",
+        designedMaxLength: 255
       },{
-        sType: types.SWITCH_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of service",
-          designedMaxLength: 255
-        },{
-          cType: types.POWER_STATE_CTYPE,
-          onUpdate: function(value) { that.setPowerState(value); },
-          perms: ["pw","pr","ev"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Change the power state of the car",
-          designedMaxLength: 1
-        }]
+        cType: types.MANUFACTURER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Nissan",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Manufacturer",
+        designedMaxLength: 255
+      },{
+        cType: types.MODEL_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Rev-1",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Model",
+        designedMaxLength: 255
+      },{
+        cType: types.SERIAL_NUMBER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "A1S2NASF88EW",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "SN",
+        designedMaxLength: 255
+      },{
+        cType: types.IDENTIFY_CTYPE,
+        onUpdate: null,
+        perms: ["pw"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Identify Accessory",
+        designedMaxLength: 1
       }]
-    }
+    },{
+      sType: types.SWITCH_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of service",
+        designedMaxLength: 255
+      },{
+        cType: types.POWER_STATE_CTYPE,
+        onUpdate: function(value) { that.setPowerState(value); },
+        perms: ["pw","pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Change the power state of the car",
+        designedMaxLength: 1
+      }]
+    }];
   }
 };
 

accessories/LiftMaster.js

@@ -0,0 +1,262 @@
+var types = require("../lib/HAP-NodeJS/accessories/types.js");
+var request = require("request");
+
+// This seems to be the "id" of the official LiftMaster iOS app
+var APP_ID = "JVM/G9Nwih5BwKgNCjLxiFUQxQijAebyyg8QUHr7JOrP+tuPb8iHfRHKwTmDzHOu"
+
+function LiftMasterAccessory(log, config) {
+  this.log = log;
+  this.name = config["name"];
+  this.username = config["username"];
+  this.password = config["password"];
+}
+
+LiftMasterAccessory.prototype = {
+
+  setState: function(state) {
+    this.targetState = state;
+    this.login();
+  },
+
+  login: function() {
+    var that = this;
+
+    // reset our logged-in state hint until we're logged in
+    this.deviceId = null;
+
+    // querystring params
+    var query = {
+      appId: APP_ID,
+      username: this.username,
+      password: this.password,
+      culture: "en"
+    };
+
+    // login to liftmaster
+    request.get({
+      url: "https://myqexternal.myqdevice.com/api/user/validatewithculture",
+      qs: query
+    }, function(err, response, body) {
+
+      if (!err && response.statusCode == 200) {
+
+        // parse and interpret the response
+        var json = JSON.parse(body);
+        that.userId = json["UserId"];
+        that.securityToken = json["SecurityToken"];
+        that.log("Logged in with user ID " + that.userId);
+        that.getDevice();
+      }
+      else {
+        that.log("Error '"+err+"' logging in: " + body);
+      }
+    });
+  },
+
+  // find your garage door ID
+  getDevice: function() {
+    var that = this;
+
+    // querystring params
+    var query = {
+      appId: APP_ID,
+      SecurityToken: this.securityToken,
+      filterOn: "true"
+    };
+
+    // some necessary duplicated info in the headers
+    var headers = {
+      MyQApplicationId: APP_ID,
+      SecurityToken: this.securityToken
+    };
+
+    // request details of all your devices
+    request.get({
+      url: "https://myqexternal.myqdevice.com/api/v4/userdevicedetails/get",
+      qs: query,
+      headers: headers
+    }, function(err, response, body) {
+
+      if (!err && response.statusCode == 200) {
+
+        // parse and interpret the response
+        var json = JSON.parse(body);
+        var devices = json["Devices"];
+
+        // look through the array of devices for an opener
+        for (var i=0; i<devices.length; i++) {
+          var device = devices[i];
+          if (device["MyQDeviceTypeName"] == "GarageDoorOpener") {
+            that.deviceId = device.MyQDeviceId;
+            break;
+          }
+        }
+
+        if (that.deviceId) {
+          that.log("Found an opener with ID " + that.deviceId +". Ready to open.");
+          that.setTargetState();
+        }
+      }
+      else {
+        that.log("Error '"+err+"' getting devices: " + body);
+      }
+    });
+  },
+
+  setTargetState: function() {
+
+    var that = this;
+    var liftmasterState = (this.targetState + "") == "1" ? "0" : "1";
+
+    // querystring params
+    var query = {
+      appId: APP_ID,
+      SecurityToken: this.securityToken,
+      filterOn: "true"
+    };
+
+    // some necessary duplicated info in the headers
+    var headers = {
+      MyQApplicationId: APP_ID,
+      SecurityToken: this.securityToken
+    };
+
+    // PUT request body
+    var body = {
+      AttributeName: "desireddoorstate",
+      AttributeValue: liftmasterState,
+      ApplicationId: APP_ID,
+      SecurityToken: this.securityToken,
+      MyQDeviceId: this.deviceId
+    };
+
+    // send the state request to liftmaster
+    request.put({
+      url: "https://myqexternal.myqdevice.com/api/v4/DeviceAttribute/PutDeviceAttribute",
+      qs: query,
+      headers: headers,
+      body: body,
+      json: true
+    }, function(err, response, json) {
+
+      if (!err && response.statusCode == 200) {
+
+        if (json["ReturnCode"] == "0")
+          that.log("State was successfully set.");
+        else
+          that.log("Bad return code: " + json["ReturnCode"]);
+      }
+      else {
+        that.log("Error '"+err+"' setting door state: " + JSON.stringify(json));
+      }
+    });
+  },
+
+  getServices: function() {
+    var that = this;
+    return [{
+      sType: types.ACCESSORY_INFORMATION_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of the accessory",
+        designedMaxLength: 255
+      },{
+        cType: types.MANUFACTURER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "LiftMaster",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Manufacturer",
+        designedMaxLength: 255
+      },{
+        cType: types.MODEL_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Rev-1",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Model",
+        designedMaxLength: 255
+      },{
+        cType: types.SERIAL_NUMBER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "A1S2NASF88EW",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "SN",
+        designedMaxLength: 255
+      },{
+        cType: types.IDENTIFY_CTYPE,
+        onUpdate: null,
+        perms: ["pw"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Identify Accessory",
+        designedMaxLength: 1
+      }]
+    },{
+      sType: types.GARAGE_DOOR_OPENER_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Garage Door Opener Control",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of service",
+        designedMaxLength: 255
+      },{
+        cType: types.CURRENT_DOOR_STATE_CTYPE,
+        onUpdate: function(value) { that.log("Update current state to " + value); },
+        perms: ["pr","ev"],
+        format: "int",
+        initialValue: 0,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla",
+        designedMinValue: 0,
+        designedMaxValue: 4,
+        designedMinStep: 1,
+        designedMaxLength: 1
+      },{
+        cType: types.TARGET_DOORSTATE_CTYPE,
+        onUpdate: function(value) { that.setState(value); },
+        perms: ["pr","pw","ev"],
+        format: "int",
+        initialValue: 0,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla",
+        designedMinValue: 0,
+        designedMaxValue: 1,
+        designedMinStep: 1,
+        designedMaxLength: 1
+      },{
+        cType: types.OBSTRUCTION_DETECTED_CTYPE,
+        onUpdate: function(value) { that.log("Obstruction detected: " + value); },
+        perms: ["pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla"
+      }]
+    }];
+  }
+};
+
+module.exports.accessory = LiftMasterAccessory;

accessories/Lockitron.js

@@ -3,7 +3,7 @@ var request = require("request");
 
 function LockitronAccessory(log, config) {
   this.log = log;
-  this.siriName = config["siri_name"];
+  this.name = config["name"];
   this.lockID = config["lock_id"];
   this.accessToken = config["api_token"];
 }
@@ -34,136 +34,134 @@ LockitronAccessory.prototype = {
     });
   },
 
-  accessoryData: function() {
+  getServices: function() {
     var that = this;
-    return {
-      services: [{
-        sType: types.ACCESSORY_INFORMATION_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of the accessory",
-          designedMaxLength: 255
-        },{
-          cType: types.MANUFACTURER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Apigee",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Manufacturer",
-          designedMaxLength: 255
-        },{
-          cType: types.MODEL_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Rev-2",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Model",
-          designedMaxLength: 255
-        },{
-          cType: types.SERIAL_NUMBER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "A1S2NASF88EW",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "SN",
-          designedMaxLength: 255
-        },{
-          cType: types.IDENTIFY_CTYPE,
-          onUpdate: null,
-          perms: ["pw"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Identify Accessory",
-          designedMaxLength: 1
-        }]
+    return [{
+      sType: types.ACCESSORY_INFORMATION_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of the accessory",
+        designedMaxLength: 255
       },{
-        sType: types.LOCK_MECHANISM_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Lock Mechanism",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of service",
-          designedMaxLength: 255
-        },{
-          cType: types.CURRENT_LOCK_MECHANISM_STATE_CTYPE,
-          onUpdate: function(value) { that.log("Update current state to " + value); },
-          perms: ["pr","ev"],
-          format: "int",
-          initialValue: 0,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "BlaBla",
-          designedMinValue: 0,
-          designedMaxValue: 3,
-          designedMinStep: 1,
-          designedMaxLength: 1
-        },{
-          cType: types.TARGET_LOCK_MECHANISM_STATE_CTYPE,
-          onUpdate: function(value) { that.setState(value); },
-          perms: ["pr","pw","ev"],
-          format: "int",
-          initialValue: 0,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "BlaBla",
-          designedMinValue: 0,
-          designedMaxValue: 1,
-          designedMinStep: 1,
-          designedMaxLength: 1
-        }]
+        cType: types.MANUFACTURER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Apigee",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Manufacturer",
+        designedMaxLength: 255
       },{
-        sType: types.LOCK_MANAGEMENT_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Lock Management",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of service",
-          designedMaxLength: 255
-        },{
-          cType: types.LOCK_MANAGEMENT_CONTROL_POINT_CTYPE,
-          onUpdate: function(value) { that.log("Update control point to " + value); },
-          perms: ["pw"],
-          format: "data",
-          initialValue: 0,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "BlaBla",
-          designedMaxLength: 255
-        },{
-          cType: types.VERSION_CTYPE,
-          onUpdate: function(value) { that.log("Update version to " + value); },
-          perms: ["pr"],
-          format: "string",
-          initialValue: "1.0",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "BlaBla",
-          designedMaxLength: 255
-        }]
+        cType: types.MODEL_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Rev-2",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Model",
+        designedMaxLength: 255
+      },{
+        cType: types.SERIAL_NUMBER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "A1S2NASF88EW",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "SN",
+        designedMaxLength: 255
+      },{
+        cType: types.IDENTIFY_CTYPE,
+        onUpdate: null,
+        perms: ["pw"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Identify Accessory",
+        designedMaxLength: 1
       }]
-    };
+    },{
+      sType: types.LOCK_MECHANISM_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Lock Mechanism",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of service",
+        designedMaxLength: 255
+      },{
+        cType: types.CURRENT_LOCK_MECHANISM_STATE_CTYPE,
+        onUpdate: function(value) { that.log("Update current state to " + value); },
+        perms: ["pr","ev"],
+        format: "int",
+        initialValue: 0,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla",
+        designedMinValue: 0,
+        designedMaxValue: 3,
+        designedMinStep: 1,
+        designedMaxLength: 1
+      },{
+        cType: types.TARGET_LOCK_MECHANISM_STATE_CTYPE,
+        onUpdate: function(value) { that.setState(value); },
+        perms: ["pr","pw","ev"],
+        format: "int",
+        initialValue: 0,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla",
+        designedMinValue: 0,
+        designedMaxValue: 1,
+        designedMinStep: 1,
+        designedMaxLength: 1
+      }]
+    },{
+      sType: types.LOCK_MANAGEMENT_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Lock Management",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of service",
+        designedMaxLength: 255
+      },{
+        cType: types.LOCK_MANAGEMENT_CONTROL_POINT_CTYPE,
+        onUpdate: function(value) { that.log("Update control point to " + value); },
+        perms: ["pw"],
+        format: "data",
+        initialValue: 0,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla",
+        designedMaxLength: 255
+      },{
+        cType: types.VERSION_CTYPE,
+        onUpdate: function(value) { that.log("Update version to " + value); },
+        perms: ["pr"],
+        format: "string",
+        initialValue: "1.0",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "BlaBla",
+        designedMaxLength: 255
+      }]
+    }];
   }
 };
 

accessories/Sonos.js

@@ -3,7 +3,7 @@ var sonos = require('sonos');
 
 function SonosAccessory(log, config) {
   this.log = log;
-  this.siriName = config["siri_name"];
+  this.name = config["name"];
   this.playVolume = config["play_volume"];
   this.device = null;
   this.search();
@@ -61,87 +61,85 @@ SonosAccessory.prototype = {
     }
   },
 
-  accessoryData: function() {
+  getServices: function() {
     var that = this;
-    return {
-      services: [{
-        sType: types.ACCESSORY_INFORMATION_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of the accessory",
-          designedMaxLength: 255
-        },{
-          cType: types.MANUFACTURER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Sonos",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Manufacturer",
-          designedMaxLength: 255
-        },{
-          cType: types.MODEL_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Rev-1",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Model",
-          designedMaxLength: 255
-        },{
-          cType: types.SERIAL_NUMBER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "A1S2NASF88EW",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "SN",
-          designedMaxLength: 255
-        },{
-          cType: types.IDENTIFY_CTYPE,
-          onUpdate: null,
-          perms: ["pw"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Identify Accessory",
-          designedMaxLength: 1
-        }]
+    return [{
+      sType: types.ACCESSORY_INFORMATION_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of the accessory",
+        designedMaxLength: 255
       },{
-        sType: types.SWITCH_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Speakers",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of service",
-          designedMaxLength: 255
-        },{
-          cType: types.POWER_STATE_CTYPE,
-          onUpdate: function(value) { that.setPlaying(value); },
-          perms: ["pw","pr","ev"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Change the playback state of the sonos",
-          designedMaxLength: 1
-        }]
+        cType: types.MANUFACTURER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Sonos",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Manufacturer",
+        designedMaxLength: 255
+      },{
+        cType: types.MODEL_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Rev-1",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Model",
+        designedMaxLength: 255
+      },{
+        cType: types.SERIAL_NUMBER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "A1S2NASF88EW",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "SN",
+        designedMaxLength: 255
+      },{
+        cType: types.IDENTIFY_CTYPE,
+        onUpdate: null,
+        perms: ["pw"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Identify Accessory",
+        designedMaxLength: 1
       }]
-    }
+    },{
+      sType: types.SWITCH_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Speakers",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of service",
+        designedMaxLength: 255
+      },{
+        cType: types.POWER_STATE_CTYPE,
+        onUpdate: function(value) { that.setPlaying(value); },
+        perms: ["pw","pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Change the playback state of the sonos",
+        designedMaxLength: 1
+      }]
+    }];
   }
 };
 

accessories/WeMo.js

@@ -3,7 +3,7 @@ var wemo = require('wemo');
 
 function WeMoAccessory(log, config) {
   this.log = log;
-  this.siriName = config["siri_name"];
+  this.name = config["name"];
   this.wemoName = config["wemo_name"];
   this.device = null;
   this.log("Searching for WeMo device with exact name '" + this.wemoName + "'...");
@@ -16,8 +16,13 @@ WeMoAccessory.prototype = {
     var that = this;
 
     wemo.Search(this.wemoName, function(err, device) {
-      that.log("Found '"+that.wemoName+"' device at " + device.ip);
-      that.device = new wemo(device.ip, device.port);
+      if (!err && device) {
+        that.log("Found '"+that.wemoName+"' device at " + device.ip);
+        that.device = new wemo(device.ip, device.port);
+      }
+      else {
+        that.log("Error finding device '" + that.wemoName + "': " + err);
+      }
     });
   },
 
@@ -43,87 +48,85 @@ WeMoAccessory.prototype = {
     });
   },
 
-  accessoryData: function() {
+  getServices: function() {
     var that = this;
-    return {
-      services: [{
-        sType: types.ACCESSORY_INFORMATION_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of the accessory",
-          designedMaxLength: 255
-        },{
-          cType: types.MANUFACTURER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "WeMo",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Manufacturer",
-          designedMaxLength: 255
-        },{
-          cType: types.MODEL_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Rev-1",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Model",
-          designedMaxLength: 255
-        },{
-          cType: types.SERIAL_NUMBER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "A1S2NASF88EW",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "SN",
-          designedMaxLength: 255
-        },{
-          cType: types.IDENTIFY_CTYPE,
-          onUpdate: null,
-          perms: ["pw"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Identify Accessory",
-          designedMaxLength: 1
-        }]
+    return [{
+      sType: types.ACCESSORY_INFORMATION_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of the accessory",
+        designedMaxLength: 255
       },{
-        sType: types.SWITCH_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of service",
-          designedMaxLength: 255
-        },{
-          cType: types.POWER_STATE_CTYPE,
-          onUpdate: function(value) { that.setPowerState(value); },
-          perms: ["pw","pr","ev"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Change the power state of the WeMo",
-          designedMaxLength: 1
-        }]
+        cType: types.MANUFACTURER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "WeMo",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Manufacturer",
+        designedMaxLength: 255
+      },{
+        cType: types.MODEL_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Rev-1",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Model",
+        designedMaxLength: 255
+      },{
+        cType: types.SERIAL_NUMBER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "A1S2NASF88EW",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "SN",
+        designedMaxLength: 255
+      },{
+        cType: types.IDENTIFY_CTYPE,
+        onUpdate: null,
+        perms: ["pw"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Identify Accessory",
+        designedMaxLength: 1
       }]
-    }
+    },{
+      sType: types.SWITCH_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of service",
+        designedMaxLength: 255
+      },{
+        cType: types.POWER_STATE_CTYPE,
+        onUpdate: function(value) { that.setPowerState(value); },
+        perms: ["pw","pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Change the power state of the WeMo",
+        designedMaxLength: 1
+      }]
+    }];
   }
 };
 

accessories/XfinityHome.js

@@ -4,7 +4,7 @@ var xmldoc = require("xmldoc");
 
 function XfinityHomeAccessory(log, config) {
   this.log = log;
-  this.siriName = config["siri_name"];
+  this.name = config["name"];
   this.email = config["email"];
   this.password = config["password"];
   this.dsig = config["dsig"];
@@ -144,133 +144,131 @@ XfinityHomeAccessory.prototype = {
     });
   },
 
-  accessoryData: function() {
+  getServices: function() {
     var that = this;
-    return {
-      services: [{
-        sType: types.ACCESSORY_INFORMATION_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: this.siriName,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Name of the accessory",
-          designedMaxLength: 255
-        },{
-          cType: types.MANUFACTURER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Comcast",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Manufacturer",
-          designedMaxLength: 255
-        },{
-          cType: types.MODEL_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Rev-1",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Model",
-          designedMaxLength: 255
-        },{
-          cType: types.SERIAL_NUMBER_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "A1S2NASF88EW",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "SN",
-          designedMaxLength: 255
-        },{
-          cType: types.IDENTIFY_CTYPE,
-          onUpdate: null,
-          perms: ["pw"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Identify Accessory",
-          designedMaxLength: 1
-        }]
+    return [{
+      sType: types.ACCESSORY_INFORMATION_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: this.name,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Name of the accessory",
+        designedMaxLength: 255
       },{
-        sType: types.SWITCH_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Away Mode",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Away Mode service",
-          designedMaxLength: 255
-        },{
-          cType: types.POWER_STATE_CTYPE,
-          onUpdate: function(value) { that.armWithType(value, "away"); },
-          perms: ["pw","pr","ev"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Turn on the Away alarm",
-          designedMaxLength: 1
-        }]
+        cType: types.MANUFACTURER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Comcast",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Manufacturer",
+        designedMaxLength: 255
       },{
-        sType: types.SWITCH_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Night Mode",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Night Mode service",
-          designedMaxLength: 255
-        },{
-          cType: types.POWER_STATE_CTYPE,
-          onUpdate: function(value) { that.armWithType(value, "night"); },
-          perms: ["pw","pr","ev"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Turn on the Night alarm",
-          designedMaxLength: 1
-        }]
+        cType: types.MODEL_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Rev-1",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Model",
+        designedMaxLength: 255
       },{
-        sType: types.SWITCH_STYPE,
-        characteristics: [{
-          cType: types.NAME_CTYPE,
-          onUpdate: null,
-          perms: ["pr"],
-          format: "string",
-          initialValue: "Stay Mode",
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Stay Mode service",
-          designedMaxLength: 255
-        },{
-          cType: types.POWER_STATE_CTYPE,
-          onUpdate: function(value) { that.armWithType(value, "stay"); },
-          perms: ["pw","pr","ev"],
-          format: "bool",
-          initialValue: false,
-          supportEvents: false,
-          supportBonjour: false,
-          manfDescription: "Turn on the Stay alarm",
-          designedMaxLength: 1
-        }]
+        cType: types.SERIAL_NUMBER_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "A1S2NASF88EW",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "SN",
+        designedMaxLength: 255
+      },{
+        cType: types.IDENTIFY_CTYPE,
+        onUpdate: null,
+        perms: ["pw"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Identify Accessory",
+        designedMaxLength: 1
       }]
-    }
+    },{
+      sType: types.SWITCH_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Away Mode",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Away Mode service",
+        designedMaxLength: 255
+      },{
+        cType: types.POWER_STATE_CTYPE,
+        onUpdate: function(value) { that.armWithType(value, "away"); },
+        perms: ["pw","pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Turn on the Away alarm",
+        designedMaxLength: 1
+      }]
+    },{
+      sType: types.SWITCH_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Night Mode",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Night Mode service",
+        designedMaxLength: 255
+      },{
+        cType: types.POWER_STATE_CTYPE,
+        onUpdate: function(value) { that.armWithType(value, "night"); },
+        perms: ["pw","pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Turn on the Night alarm",
+        designedMaxLength: 1
+      }]
+    },{
+      sType: types.SWITCH_STYPE,
+      characteristics: [{
+        cType: types.NAME_CTYPE,
+        onUpdate: null,
+        perms: ["pr"],
+        format: "string",
+        initialValue: "Stay Mode",
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Stay Mode service",
+        designedMaxLength: 255
+      },{
+        cType: types.POWER_STATE_CTYPE,
+        onUpdate: function(value) { that.armWithType(value, "stay"); },
+        perms: ["pw","pr","ev"],
+        format: "bool",
+        initialValue: false,
+        supportEvents: false,
+        supportBonjour: false,
+        manfDescription: "Turn on the Stay alarm",
+        designedMaxLength: 1
+      }]
+    }];
   }
 };