From 4a831422eb3c565bb33c965992196f982f88a1fa Mon Sep 17 00:00:00 2001
From: "stevetrease@gmail.com" <stevetrease@gmail.com>
Date: Sat, 10 Oct 2015 14:41:00 +0100
Subject: [PATCH] Added two new accessories for a readonly thermometer and
 hygrometer (humidity meter) based on HttpAccessory.

---
 accessories/HttpHygrometer.js  | 71 ++++++++++++++++++++++++++++++
 accessories/HttpThermometer.js | 79 ++++++++++++++++++++++++++++++++++
 config-sample.json             | 15 ++++++-
 3 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 accessories/HttpHygrometer.js
 create mode 100644 accessories/HttpThermometer.js

diff --git a/accessories/HttpHygrometer.js b/accessories/HttpHygrometer.js
new file mode 100644
index 0000000..61ad3b9
--- /dev/null
+++ b/accessories/HttpHygrometer.js
@@ -0,0 +1,71 @@
+var Service = require("HAP-NodeJS").Service;
+var Characteristic = require("HAP-NodeJS").Characteristic;
+var request = require("request");
+
+module.exports = {
+  accessory: HygrometerAccessory
+}
+
+function HygrometerAccessory(log, config) {
+  this.log = log;
+
+  // url info
+  this.url = config["url"];
+  this.http_method = config["http_method"];
+}
+
+
+HygrometerAccessory.prototype = {
+
+  httpRequest: function(url, method, callback) {
+    request({
+      url: url,
+      method: method
+    },
+    function (error, response, body) {
+      callback(error, response, body)
+    })
+  },
+
+
+  identify: function(callback) {
+    this.log("Identify requested!");
+    callback(); // success
+  },
+
+  getCurrentRelativeHumidity: function (callback) {
+    var that = this;
+    that.log ("getting CurrentCurrentRelativeHumidity");
+
+    this.httpRequest(this.url, this.http_method, function(error, response, body) {
+      if (error) {
+        this.log('HTTP function failed: %s', error);
+        callback(error);
+      }
+      else {
+        this.log('HTTP function succeeded - %s', body);
+        callback(null, Number(body));
+      }
+    }.bind(this));
+  },  
+
+  getServices: function() {
+
+    // you can OPTIONALLY create an information service if you wish to override
+    // the default values for things like serial number, model, etc.
+    var informationService = new Service.AccessoryInformation();
+    
+    informationService
+      .setCharacteristic(Characteristic.Manufacturer, "HTTP Manufacturer")
+      .setCharacteristic(Characteristic.Model, "HTTP Hygrometer")
+      .setCharacteristic(Characteristic.SerialNumber, "HTTP Serial Number");
+    
+    var humidityService = new Service.HumiditySensor();
+
+    humidityService
+	.getCharacteristic(Characteristic.CurrentRelativeHumidity)
+	.on('get', this.getCurrentRelativeHumidity.bind(this));
+    
+    return [informationService, humidityService];
+  }
+};
diff --git a/accessories/HttpThermometer.js b/accessories/HttpThermometer.js
new file mode 100644
index 0000000..ac9bdc2
--- /dev/null
+++ b/accessories/HttpThermometer.js
@@ -0,0 +1,79 @@
+var Service = require("HAP-NodeJS").Service;
+var Characteristic = require("HAP-NodeJS").Characteristic;
+var request = require("request");
+
+module.exports = {
+  accessory: ThermometerAccessory
+}
+
+function ThermometerAccessory(log, config) {
+  this.log = log;
+
+  // url info
+  this.url = config["url"];
+  this.http_method = config["http_method"];
+}
+
+
+ThermometerAccessory.prototype = {
+
+  httpRequest: function(url, method, callback) {
+    request({
+      url: url,
+      method: method
+    },
+    function (error, response, body) {
+      callback(error, response, body)
+    })
+  },
+
+
+  identify: function(callback) {
+    this.log("Identify requested!");
+    callback(); // success
+  },
+
+  getCurrentTemperature: function (callback) {
+    var that = this;
+    that.log ("getting CurrentTemperature");
+
+
+    this.httpRequest(this.url, this.http_method, function(error, response, body) {
+      if (error) {
+        this.log('HTTP function failed: %s', error);
+        callback(error);
+      }
+      else {
+        this.log('HTTP function succeeded - %s', body);
+        callback(null, Number(body));
+      }
+    }.bind(this));
+  },  
+
+  getTemperatureUnits: function (callback) {
+    var that = this;
+    that.log ("getTemperature Units");
+    // 1 = F and 0 = C
+    callback (null, 0);
+  },  
+
+  getServices: function() {
+
+    // you can OPTIONALLY create an information service if you wish to override
+    // the default values for things like serial number, model, etc.
+    var informationService = new Service.AccessoryInformation();
+    
+    informationService
+      .setCharacteristic(Characteristic.Manufacturer, "HTTP Manufacturer")
+      .setCharacteristic(Characteristic.Model, "HTTP Thermometer")
+      .setCharacteristic(Characteristic.SerialNumber, "HTTP Serial Number");
+    
+    var temperatureService = new Service.TemperatureSensor();
+
+    temperatureService
+	.getCharacteristic(Characteristic.CurrentTemperature)
+	.on('get', this.getCurrentTemperature.bind(this));
+    
+    return [informationService, temperatureService];
+  }
+};
diff --git a/config-sample.json b/config-sample.json
index 7af74db..85fd6e3 100644
--- a/config-sample.json
+++ b/config-sample.json
@@ -164,7 +164,20 @@
             "off_url": "https://192.168.1.22:3030/devices/23222/off",
             "brightness_url": "https://192.168.1.22:3030/devices/23222/brightness/%b",
             "http_method": "POST"
-        },{
+        },
+	{
+            "accessory": "HttpHygrometer",
+            "name": "Kitchen",
+            "url": "http://host/URL",
+            "http_method": "GET"
+        },
+	{
+            "accessory": "HttpThermometer",
+            "name": "Garage",
+            "url": "http://home/URL",
+            "http_method": "GET"
+        },
+	{
             "accessory": "ELKM1",
             "name": "Security System",
             "description": "Allows basic control of Elk M1 security system. You can use 1 of 3 arm modes: Away, Stay, Night. If you need to access all 3, create 3 accessories with different names.",