mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-03-08 05:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #287 from webdeck/indigo

Browse Source 
Graceful handling of JSON parse errors from Indigo responses.
This commit is contained in:
Nick Farina
2015-10-18 14:16:16 -07:00
parent 5066b108d2 ad62bd4b15
commit 74a72c1096
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
platforms/Indigo.js
View File

@@ -68,7 +68,7 @@ IndigoPlatform.prototype = {
}
var json = JSON.parse(body);
async.each(json, function(item, asyncCallback) {
async.eachSeries(json, function(item, asyncCallback) {
var deviceURL = that.baseURL + item.restURL;
var deviceOptions = {
url: deviceURL,
@@ -81,15 +81,19 @@ IndigoPlatform.prototype = {
request(deviceOptions, function(deviceError, deviceResponse, deviceBody) {
if (deviceError) {
console.trace("Requesting Indigo device info: " + deviceURL + "\nError: " + deviceError + "\nResponse: " + deviceBody);
asyncCallback(deviceError)
}
else {
var deviceJson = JSON.parse(deviceBody);
that.log("Discovered " + deviceJson.type + ": " + deviceJson.name);
that.foundAccessories.push(
new IndigoAccessory(that.log, that.auth, deviceURL, deviceJson));
asyncCallback();
try {
var deviceJson = JSON.parse(deviceBody);
that.log("Discovered " + deviceJson.type + ": " + deviceJson.name);
that.foundAccessories.push(
new IndigoAccessory(that.log, that.auth, deviceURL, deviceJson));
}
catch (e) {
that.log("Error parsing Indigo device info: " + deviceURL + "\nException: " + e + "\nResponse: " + deviceBody);
}
}
asyncCallback();
});
}, function(asyncError) {
// This will be called after all the requests complete
@@ -135,11 +139,18 @@ IndigoAccessory.prototype = {
if (error) {
console.trace("Requesting Device Status.");
that.log(error);
return error;
}
that.log("getStatus of " + that.name + ": " + body);
callback(JSON.parse(body));
else {
that.log("getStatus of " + that.name + ": " + body);
try {
var json = JSON.parse(body);
callback(json);
}
catch (e) {
console.trace("Requesting Device Status.");
that.log("Exception: " + e + "\nResponse: " + body);
}
}
});
},