mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-04-22 22:05:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125 from nfarina/possible-domoticz-async-fix

Browse Source 
Fix for Domoticz platform async callbacks
This commit is contained in:
Nick Farina
2015-08-24 22:12:24 -07:00
parent 7e84806846 77fbe5b53c
commit b3675f4be3
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platforms/Domoticz.js
View File

@@ -69,8 +69,14 @@ DomoticzPlatform.prototype = {
this.log("Fetching Domoticz lights and switches..."); this.log("Fetching Domoticz lights and switches...");
var that = this; var that = this;
var foundAccessories = []; var foundAccessories = [];
// mechanism to ensure callback is only executed once all requests complete
var asyncCalls = 0;
function callbackLater() { if (--asyncCalls == 0) callback(foundAccessories); }
if (this.roomid == 0) { if (this.roomid == 0) {
//Get Lights //Get Lights
asyncCalls++;
request.get({ request.get({
url: this.urlForQuery("type=devices&filter=light&used=true&order=Name"), url: this.urlForQuery("type=devices&filter=light&used=true&order=Name"),
json: true json: true
@@ -83,7 +89,7 @@ DomoticzPlatform.prototype = {
foundAccessories.push(accessory); foundAccessories.push(accessory);
}) })
} }
callback(foundAccessories); callbackLater();
} else { } else {
that.log("There was a problem connecting to Domoticz. (" + err + ")"); that.log("There was a problem connecting to Domoticz. (" + err + ")");
} }
@@ -91,6 +97,7 @@ DomoticzPlatform.prototype = {
} }
else { else {
//Get all devices specified in the room //Get all devices specified in the room
asyncCalls++;
request.get({ request.get({
url: this.urlForQuery("type=devices&plan=" + this.roomid), url: this.urlForQuery("type=devices&plan=" + this.roomid),
json: true json: true
@@ -106,14 +113,14 @@ DomoticzPlatform.prototype = {
} }
}) })
} }
callback(foundAccessories); callbackLater();
} else { } else {
that.log("There was a problem connecting to Domoticz."); that.log("There was a problem connecting to Domoticz.");
} }
}); });
} }
//Get Scenes //Get Scenes
foundAccessories = []; asyncCalls++;
request.get({ request.get({
url: this.urlForQuery("type=scenes"), url: this.urlForQuery("type=scenes"),
json: true json: true
@@ -126,7 +133,7 @@ DomoticzPlatform.prototype = {
foundAccessories.push(accessory); foundAccessories.push(accessory);
}) })
} }
callback(foundAccessories); callbackLater();
} else { } else {
that.log("There was a problem connecting to Domoticz."); that.log("There was a problem connecting to Domoticz.");
} }