Update to modern API and return error messages on failed connections

accessories/GenericRS232Device.js

@@ -1,4 +1,5 @@
-var types = require("HAP-NodeJS/accessories/types.js");
+var Service = require("HAP-NodeJS").Service;
+var Characteristic = require("HAP-NodeJS").Characteristic;
 var SerialPort = require("serialport").SerialPort;
 
 module.exports = {
@@ -18,108 +19,39 @@ function GenericRS232DeviceAccessory(log, config) {
 }
 
 GenericRS232DeviceAccessory.prototype = {
-  getServices: function() {
+  setPowerState: function(powerOn, callback) {
     var that        = this;
-    return [
+    var command     = powerOn ? that.on_command : that.off_command;
-      {
+    var serialPort  = new SerialPort(that.device, { baudrate: that.baudrate }, false);
-        sType: types.ACCESSORY_INFORMATION_STYPE,
+    serialPort.open(function (error) {
-        characteristics: [
-          {
-            cType: types.NAME_CTYPE,
-            onUpdate: null,
-            perms: ["pr"],
-            format: "string",
-            initialValue: that.name,
-            supportEvents: false,
-            supportBonjour: false,
-            manfDescription: "Name of the accessory",
-            designedMaxLength: 255
-          },
-          {
-            cType: types.MANUFACTURER_CTYPE,
-            onUpdate: null,
-            perms: ["pr"],
-            format: "string",
-            initialValue: that.manufacturer,
-            supportEvents: false,
-            supportBonjour: false,
-            manfDescription: "Manufacturer",
-            designedMaxLength: 255
-          },
-          {
-            cType: types.MODEL_CTYPE,
-            onUpdate: null,
-            perms: ["pr"],
-            format: "string",
-            initialValue: that.model_name,
-            supportEvents: false,
-            supportBonjour: false,
-            manfDescription: "Model",
-            designedMaxLength: 255
-          },
-          {
-            cType: types.SERIAL_NUMBER_CTYPE,
-            onUpdate: null,
-            perms: ["pr"],
-            format: "string",
-            initialValue: that.id,
-            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.serviceName,
-            supportEvents: false,
-            supportBonjour: false,
-            manfDescription: "Name of service",
-            designedMaxLength: 255
-          },
-          {
-            cType: types.POWER_STATE_CTYPE,
-            onUpdate: function(value) {
-              var command = (value == 1 ? that.on_command : that.off_command);
-              var serialPort = new SerialPort(that.device, { baudrate: that.baudrate });
-              serialPort.on("open", function () {
-                serialPort.write(command, function(error, results) {
       if (error) {
-                    console.log('Errors ' + err);
+        callback(new Error('Can not communicate with ' + that.name + " (" + error + ")"))
+      } else {
+        serialPort.write(command, function(err, results) {
+          if (error) {
+            callback(new Error('Can not send power command to ' + that.name + " (" + err + ")"))
+          } else {
+            callback()
           }
         });
+      }
     });
-              
   },
-            perms: ["pw","pr","ev"],
+  
-            format: "bool",
+  getServices: function() {
-            initialValue: false,
+    var switchService = new Service.Switch();
-            supportEvents: false,
+    var informationService = new Service.AccessoryInformation();
-            supportBonjour: false,
+
-            manfDescription: "Set the Power state",
+    informationService
-            designedMaxLength: 1
+      .setCharacteristic(Characteristic.Manufacturer, this.manufacturer)
-          }
+      .setCharacteristic(Characteristic.Model, this.model_name)
-        ]
+      .setCharacteristic(Characteristic.SerialNumber, this.id);
-      }
+
-    ]
+    switchService
+      .getCharacteristic(Characteristic.On)
+      .on('set', this.setPowerState.bind(this));
+
+    return [informationService, switchService];
   }
 }