homebridge-nature-remo-air-purifier 1.0.0 → 1.0.1

package/index.js

@@ -4,8 +4,12 @@ let exec = require("child_process").exec;
 module.exports = function(homebridge) {
   Service = homebridge.hap.Service;
   Characteristic = homebridge.hap.Characteristic;
-  homebridge.registerAccessory("homebridge-nature-remo-air-purifier", "NatureRemoAirPurifier", AirPurifier);
-}
+  homebridge.registerAccessory(
+    "homebridge-nature-remo-air-purifier",
+    "NatureRemoAirPurifier",
+    AirPurifier
+  );
+};
 
 function AirPurifier(log, config) {
   this.log = log;
@@ -17,45 +21,69 @@ function AirPurifier(log, config) {
 
   this.state = { power: false };
 
-  this.informationService = new Service.AccessoryInformation();
-  this.informationService
+  this.informationService = new Service.AccessoryInformation()
     .setCharacteristic(Characteristic.Manufacturer, "Homebridge")
     .setCharacteristic(Characteristic.Model, "NatureRemoAirPurifier")
     .setCharacteristic(Characteristic.SerialNumber, "NRAP-" + this.name);
 
   this.airPurifierService = new Service.AirPurifier(this.name);
-  this.airPurifierService.getCharacteristic(Characteristic.Active)
-    .on('set', this.setPower.bind(this));
+
+  // Active (ON / OFF)
+  this.airPurifierService
+    .getCharacteristic(Characteristic.Active)
+    .on("set", this.setPower.bind(this));
+
+  // 初期状態
+  this.airPurifierService
+    .setCharacteristic(
+      Characteristic.CurrentAirPurifierState,
+      Characteristic.CurrentAirPurifierState.INACTIVE
+    );
 }
 
 AirPurifier.prototype.getServices = function() {
   return [this.informationService, this.airPurifierService];
-}
+};
 
 AirPurifier.prototype.setPower = function(value, callback) {
-  if (this.state.power != value) {
-    this.state.power = value;
-    this.log('Setting air purifier power to ' + value);
-
-    const signalID = value ? this.signal_ID_on : this.signal_ID_off;
-
-    this.cmdRequest(signalID, function(error, stdout, stderr) {
-      if (error) {
-        this.log('Failed to set power: ' + error);
-        callback(error);
-      } else {
-        callback();
-      }
-    }.bind(this));
-  } else {
+  if (this.state.power === value) {
     callback();
+    return;
   }
-}
+
+  this.state.power = value;
+  this.log("Setting air purifier power to " + value);
+
+  const signalID = value ? this.signal_ID_on : this.signal_ID_off;
+
+  this.cmdRequest(signalID, (error) => {
+    if (error) {
+      this.log("Failed to set power: " + error);
+      callback(error);
+      return;
+    }
+
+    // ★ HomeKitに「状態確定」を通知するのが重要
+    this.airPurifierService.setCharacteristic(
+      Characteristic.CurrentAirPurifierState,
+      value
+        ? Characteristic.CurrentAirPurifierState.PURIFYING
+        : Characteristic.CurrentAirPurifierState.INACTIVE
+    );
+
+    callback();
+  });
+};
 
 AirPurifier.prototype.cmdRequest = function(signalID, callback) {
-  let cmd = 'curl -X POST ' +
-            '"https://api.nature.global/1/signals/' + signalID + '/send" ' +
-            '-H "accept":"application/json" ' +
-            '-k --header "Authorization":"Bearer ' + this.access_token + '"';
-  exec(cmd, function(error, stdout, stderr) { callback(error, stdout, stderr); });
-}
+  const cmd =
+    'curl -X POST "https://api.nature.global/1/signals/' +
+    signalID +
+    '/send" ' +
+    '-H "accept: application/json" ' +
+    '-H "Authorization: Bearer ' +
+    this.access_token +
+    '"';
+
+  exec(cmd, (error) => callback(error));
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-nature-remo-air-purifier",
   "displayName": "Homebridge Nature Remo Air Purifier",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Homebridge Plugin to send power on and off to an air purifier using Nature Remo",
   "author": "Sasuki Sho",
   "license": "MIT",