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

Fix for Domoticz platform async callbacks
This commit is contained in:
Nick Farina
2015-08-24 22:12:24 -07:00

View File

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