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

fix network scan and logging

Browse Source
This commit is contained in:
madmod
2015-06-27 20:23:32 -06:00
parent 479dfb6329
commit 8b71a1c44f
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
platforms/PhilipsHue.js
View File

@@ -98,32 +98,36 @@ var locateBridge = function (callback) {
} }
that.log( that.log(
"Philips Hue bridges found:", "Philips Hue bridges found:\n" +
bridges.map(function (bridge) { (bridges.map(function (bridge) {
// Bridge name is only returned from meethue.com so use id instead if it isn't there // Bridge name is only returned from meethue.com so use id instead if it isn't there
return '\t' + (bridge.name || bridge.id) + bridge.ipaddress + '\n'; return "\t" + bridge.ipaddress + ' - ' + (bridge.name || bridge.id);
}) })).join("\n")
); );
callback(null, bridges[0].ipaddress); callback(null, bridges[0].ipaddress);
}; };
// Try to discover the bridge ip using meethue.com // Try to discover the bridge ip using meethue.com
that.log("Attempting to discover Philips Hue bridge with network scan."); that.log("Attempting to discover Philips Hue bridge with meethue.com...");
hue.nupnpSearch(function (locateError, bridges) { hue.nupnpSearch(function (locateError, bridges) {
if (locateError) { if (locateError) {
that.log("Philips Hue bridge discovery with meethue.com failed. Register your bridge with the meethue.com for more reiable discovery."); that.log("Philips Hue bridge discovery with meethue.com failed. Register your bridge with the meethue.com for more reiable discovery.");
that.log("Attempting to discover Philips Hue bridge with network scan."); that.log("Attempting to discover Philips Hue bridge with network scan...");
// Timeout after one minute
hue.upnpSearch(60000)
.then(function (bridges) {
that.log("Scan complete")
hue.upnpSearch(function (searchError, bridges) {
if (err) {
that.log("Philips Hue bridge discovery with network scan failed. Check your network connection or set ip_address manually in configuration.");
getIp(new Error("Scan failed"));
} else {
getIp(null, bridges); getIp(null, bridges);
} })
}); .fail(function (scanError) {
that.log("Philips Hue bridge discovery with network scan failed. Check your network connection or set ip_address manually in configuration.");
getIp(new Error("Scan failed: " + scanError.message));
}).done();
} else { } else {
getIp(null, bridges); getIp(null, bridges);
} }
@@ -155,6 +159,8 @@ PhilipsHuePlatform.prototype = {
// Discover the bridge if needed // Discover the bridge if needed
if (!this.ip_address) { if (!this.ip_address) {
locateBridge.call(this, function (err, ip_address) { locateBridge.call(this, function (err, ip_address) {
if (err) throw err;
// TODO: Find a way to persist this // TODO: Find a way to persist this
that.ip_address = ip_address; that.ip_address = ip_address;
that.log("Save the Philips Hue bridge ip address "+ ip_address +" to your config to skip discovery."); that.log("Save the Philips Hue bridge ip address "+ ip_address +" to your config to skip discovery.");