Skip to content

Commit

Permalink
Update to v1.9.0
Browse files Browse the repository at this point in the history 
* New "Hue Bridge" node (check node docs)
* New event-based algorithm improves the stability of all nodes
* New option to specify your own, alternative Hue Bridge port has been added (check node docs)
* Fixed Hue Bridge API limit errors for bridges with a large number of devices
* Other improvements
* Dependency updates
  • Loading branch information
Foddy committed Nov 2, 2018
1 parent bd33855 commit 1a46b97
Show file tree
Hide file tree
Showing 17 changed files with 1,209 additions and 661 deletions.
361 changes: 220 additions & 141 deletions README.md
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
@@ -1,6 +1,6 @@
{
"name": "node-red-contrib-huemagic",
"version": "1.7.0",
"version": "1.9.0",
"description": "Philips Hue node to control lights, groups, scenes, taps, switches, motion sensors, temperature sensors and Lux sensors using Node-RED.",
"author": "foddy",
"homepage": "https://github.com/Foddy/node-red-contrib-huemagic",
Expand All @@ -26,7 +26,8 @@
],
"node-red": {
"nodes": {
"hue-bridge": "red/hue-bridge.js",
"hue-bridge": "red/hue-bridge-config.js",
"hue-bridge-node": "red/hue-bridge.js",
"hue-light": "red/hue-light.js",
"hue-group": "red/hue-group.js",
"hue-scene": "red/hue-scene.js",
Expand Down
176 changes: 176 additions & 0 deletions red/hue-bridge-config.html
View file
@@ -0,0 +1,176 @@
<script type="text/x-red" data-template-name="hue-bridge">
<div class="form-row">
<label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-config-input-name">
</div>
<div class="form-row">
<label for="node-config-input-bridge"><i class="fa fa-server"></i> Bridge IP</label>
<div style="display: inline-block; position: relative; width: 70%; height: 20px;">
<div style="position: absolute; left: 0px; right: 40px;">
<input type="text" id="node-config-input-bridge" placeholder="X.X.X.X[:PORT]" style="width: 100%"/>
</div>
<a id="node-config-input-scan" class="editor-button" style="position: absolute; right: 0px; top: 0px;">
<i class="fa fa-search"></i>
</a>
</div>
</div>
<div class="form-row">
<label for="node-config-input-key"><i class="fa fa-key"></i> API Key</label>
<div style="display: inline-block; position: relative; width: 70%; height: 20px;">
<div style="position: absolute; left: 0px; right: 40px;">
<input type="text" id="node-config-input-key" style="width: 100%"/>
</div>
<a id="node-config-input-register" class="editor-button" style="position: absolute; right: 0px; top: 0px;">
<i class="fa fa-user-circle-o"></i>
</a>
</div>
</div>
<div class="form-row">
<label for="node-config-input-interval"><i class="fa fa-clock-o"></i> Poll interval</label>
<input type="text" placeholder="3000" id="node-config-input-interval">
</div>
</script>

<script type="text/x-red" data-help-name="hue-bridge">
<p>Philips Hue Bridge configuration with the following parameters:</p>

<h3>Name</h3>
<p>Type in the name of the Hue Bridge manually or keep the default device name</p>

<h3>Bridge IP & Port</h3>
<p>Type in the Hue Bridge IP address manually or press the button to retreive all locally available bridges (static IP configuration on the Hue Bridge recommended). Optionally, you can define an alternate port to the bridge instead of the default port (80) by appending it with a colon</p>

<h3>API Key</h3>
<p>Type in the Hue Bridge authorization key manually or press the button to retreive key from bridge</p>

<h3>Poll interval</h3>
<p>Interval that is used to poll active nodes for changes (min 500ms / recommended between 1000ms and 5000ms)</p>
</script>

<script type="text/javascript">
RED.nodes.registerType("hue-bridge", {
category: "config",
color: '#c7d8d8',
defaults: {
name: {value:"Hue Bridge", required: true},
bridge: {value:"", required: true},
key: {value:"", required: true},
interval: {
value: 3000,
required: true,
validate: function(v) {
return (/^[0-9]+/.test(v) && parseInt(v,10) >= 500);
}
}
},
paletteLabel: "Hue Bridge",
label: function() {
return this.name;
},
oneditprepare: function()
{
function manualBridgeIP()
{
var current = $('#node-config-input-bridge').val();
$('#node-config-input-bridge').replaceWith('<input type="text" id="node-config-input-bridge" style="width: 100%"/>');
$('#node-config-input-bridge').val(current);
}

function searchAndSelectBridge()
{
var current = $('#node-config-input-bridge').val();
$('#node-config-input-bridge').replaceWith('<select id="node-config-input-bridge" style="width: 100%"></select>');
$('#node-config-input-bridge').append('<option selected="selected" value="null">searching…</option>');

$.get('hue/bridges')
.done( function(data) {
var bridges = JSON.parse(data);

if(bridges.length <= 0)
{
RED.notify("No Hue Bridge found.", "error");
}

// RESET OPTIONS
$('#node-config-input-bridge').empty();

// SET BRIDGES AS OPTIONS
bridges.forEach(function(bridge)
{
$('#node-config-input-bridge').append('<option value="' + bridge.ip + '">' + bridge.ip + '</option>');
});

// SELECT CURRENT VALUE
$('#node-config-input-bridge').val(current);
})
.fail(function()
{
RED.notify("Something went wrong. Please retry.", "error");
});
}

$(document).on('change', '#node-config-input-bridge', function()
{
var currentBridgeIP = $('#node-config-input-bridge').val();
if(currentBridgeIP.length > 6)
{
$.get('hue/name', { ip: currentBridgeIP } )
.done( function(data)
{
$('#node-config-input-name').val(data);
})
.fail(function(err)
{
RED.notify("Sorry. Your selected Hue Bridge is invalid!", "error");
});
}
});

$('#node-config-input-scan').click(function()
{
if($('#node-config-input-bridge').prop("tagName") === "INPUT")
{
searchAndSelectBridge();
} else {
manualBridgeIP();
}
});

$('#node-config-input-register').click(function()
{
if(!$('#node-config-input-bridge').val())
{
RED.notify("Please select your Hue Bridge before trying to create a new user!", "error");
}
else
{
$('#node-config-input-key').val("");
$('#node-config-input-key').attr("placeholder", "waiting 20 seconds…");
RED.notify("Please press your Hue Bridge button within the next 20 seconds to create a new user!");

setTimeout(function()
{
$.get('hue/register', { ip: $('#node-config-input-bridge').val() } )
.done( function(data)
{
if(data == "error")
{
RED.notify("Please retry within 20 seconds…", "error");
$('#node-config-input-key').attr("placeholder", "");
}
else
{
var userdata = JSON.parse(data);
$('#node-config-input-key').val(userdata[0].success.username);
RED.notify("User created successfully!");
}
}).fail(function(err)
{
RED.notify(err.responseText, "error");
});
}, 20000);
}
});
}
});
</script>

0 comments on commit 1a46b97

Please sign in to comment.