frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2025-03-01 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix slight wrinkle in new Wemo node

Browse Source
This commit is contained in:
Dave Conway-Jones 2016-04-09 18:06:29 +01:00
parent 48bcd3c7df
commit c54a019899
2 changed files with 349 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/wemo/WeMoNG.html
View File

@ -165,12 +165,12 @@
},
oneditprepare: function() {
var devices;
$.getJSON('wemoNG/devices', function(data){
$.getJSON('wemoNG/devices', function(data) {
devices = data;
var devs = Object.keys(data);
if (devs.length !== 0) {
for (var d in devs) {
if (dev.hasOwnProperty(d)) {
if (devs.hasOwnProperty(d)) {
$('<option/>',{
'value': devs[d],
'text': data[devs[d]].name
@ -181,7 +181,7 @@
}
});
$('#node-config-input-device').change(function(){
$('#node-config-input-device').change(function() {
var id = $( "#node-config-input-device option:selected" ).first().val();
if (devices) {
$('#node-config-input-type').val(devices[id].type);

95
hardware/wemo/WeMoNG.js
View File

@ -23,7 +23,7 @@ var interval = setInterval(wemo.start.bind(wemo), 60000);
wemo.start();
module.exports = function(RED) {
"use strict";
'use strict';
var util = require('util');
var ip = require('ip');
var bodyParser = require('body-parser');
@ -45,7 +45,7 @@ module.exports = function(RED) {
var reSubOptions = {
host: dev.ip,
port: dev.port,
path: dev.device.UDN.indexOf('Bridge-1_0') < 0 ? '/upnp/event/basicevent1': '/upnp/event/bridge1',
path: dev.device.UDN.indexOf('Bridge-1_0') < 0 ? '/upnp/event/basicevent1' : '/upnp/event/bridge1',
method: 'SUBSCRIBE',
headers: {
'SID': sub.sid,
@ -56,9 +56,9 @@ module.exports = function(RED) {
var resub_request = http.request(reSubOptions, function(res) {
//shoudl raise an error if needed
if (res.statusCode != 200) {
console.log("problem with resubscription %s - %s", res.statusCode, res.statusMessage);
console.log("opts - %s", util.inspect(reSubOptions));
console.log("dev - %s", util.inspect(dev));
console.log('problem with resubscription %s - %s', res.statusCode, res.statusMessage);
console.log('opts - %s', util.inspect(reSubOptions));
console.log('dev - %s', util.inspect(dev));
delete subscriptions[dev];
delete sub2dev[sub.sid];
subscribe({dev: subs[s]});
@ -68,7 +68,7 @@ module.exports = function(RED) {
}
});
resub_request.on('error', function(){
resub_request.on('error', function() {
//console.log("failed to resubscribe to %s", dev.name );
//need to find a way to resubsribe
delete subscriptions[dev];
@ -81,14 +81,14 @@ module.exports = function(RED) {
}
}
}
};
setInterval(resubscribe, 200000);
var subscribe = function(node) {
var dev = node.dev;
var device = wemo.get(dev);
if (device){
if (device) {
if (subscriptions[dev]) {
//exists
subscriptions[dev].count++;
@ -103,7 +103,7 @@ module.exports = function(RED) {
if (interfaceNames.hasOwnProperty(name)) {
var addrs = interfaces[interfaceNames[name]];
for (var add in addrs) {
if (addrs[add].netmask){
if (addrs[add].netmask) {
//node 0.12 or better
if (!addrs[add].internal && addrs[add].family == 'IPv4') {
if (ip.isEqual(ip.mask(addrs[add].address,addrs[add].netmask),ip.mask(device.ip,addrs[add].netmask))) {
@ -126,22 +126,22 @@ module.exports = function(RED) {
}
var callback_url = 'http://' + ipAddr + ':' + settings.uiPort;
if(settings.httpAdminRoot) {
if (settings.httpAdminRoot) {
callback_url += settings.httpAdminRoot;
}
if (callback_url.lastIndexOf('/') != (callback_url.length -1)) {
if (callback_url.lastIndexOf('/') != (callback_url.length - 1)) {
callback_url += '/';
}
callback_url += 'wemoNG/notification';
console.log("Callback URL = %s",callback_url);
console.log('Callback URL = %s',callback_url);
var subscribeOptions = {
host: device.ip,
port: device.port,
path: device.device.UDN.indexOf('Bridge-1_0') < 0 ? '/upnp/event/basicevent1': '/upnp/event/bridge1',
path: device.device.UDN.indexOf('Bridge-1_0') < 0 ? '/upnp/event/basicevent1' : '/upnp/event/bridge1',
method: 'SUBSCRIBE',
headers: {
'CALLBACK': '<' + callback_url + '>',
@ -158,14 +158,14 @@ module.exports = function(RED) {
subscriptions[dev] = {'count': 1, 'sid': res.headers.sid};
sub2dev[res.headers.sid] = dev;
} else {
console.log("failed to subsrcibe");
console.log('failed to subsrcibe');
}
});
sub_request.end();
}
}
}
};
function unsubscribe(node) {
var dev = node.dev;
@ -178,7 +178,7 @@ module.exports = function(RED) {
var unSubOpts = {
host: device.ip,
port: device.port,
path: device.device.UDN.indexOf('Bridge-1_0') < 0 ? '/upnp/event/basicevent1': '/upnp/event/bridge1',
path: device.device.UDN.indexOf('Bridge-1_0') < 0 ? '/upnp/event/basicevent1' : '/upnp/event/bridge1',
method: 'UNSUBSCRIBE',
headers: {
'SID': sid
@ -187,7 +187,7 @@ module.exports = function(RED) {
//console.log(util.inspect(unSubOpts));
var unSubreq = http.request(unSubOpts, function(res){
var unSubreq = http.request(unSubOpts, function(res) {
//console.log("unsubscribe: %s \n %s", device.name, res.statusCode);
delete subscriptions[dev];
delete sub2dev[sid];
@ -206,8 +206,8 @@ module.exports = function(RED) {
var wemoNGConfig = function(n) {
RED.nodes.createNode(this,n);
this.device = n.device;
}
RED.nodes.registerType("wemo-dev", wemoNGConfig);
};
RED.nodes.registerType('wemo-dev', wemoNGConfig);
var wemoNGNode = function(n) {
RED.nodes.createNode(this,n);
@ -215,25 +215,25 @@ module.exports = function(RED) {
node.device = n.device;
node.name = n.name;
node.dev = RED.nodes.getNode(node.device).device;
node.status({fill:"red",shape:"dot",text:"searching"});
node.status({fill: 'red',shape: 'dot',text: 'searching'});
//console.log("Control - %j" ,this.dev);
if (!wemo.get(node.dev)){
wemo.on('discovered', function(d){
if (!wemo.get(node.dev)) {
wemo.on('discovered', function(d) {
if (node.dev === d) {
node.status({fill:"green",shape:"dot",text:"found"});
node.status({fill: 'green',shape: 'dot',text: 'found'});
}
});
} else {
node.status({fill:"green",shape:"dot",text:"found"});
node.status({fill: 'green',shape: 'dot',text: 'found'});
}
node.on('input', function(msg){
node.on('input', function(msg) {
var dev = wemo.get(node.dev);
if (!dev) {
//need to show that dev not currently found
console.log("no device found");
console.log('no device found');
return;
}
@ -253,7 +253,7 @@ module.exports = function(RED) {
if (msg.payload.state && typeof msg.payload.state === 'number') {
if (dev.type === 'socket') {
if (msg.payload >= 0 && msg.payload < 2) {
on = msg.payload.state
on = msg.payload.state;
}
} else if (dev.type === 'light' || dev.type === 'group') {
if (msg.payload >= 0 && msg.payload < 3) {
@ -272,14 +272,14 @@ module.exports = function(RED) {
wemo.toggleSocket(dev, on);
} else if (dev.type === 'light`') {
//console.log("light");
wemo.setStatus(dev,"10006", on);
wemo.setStatus(dev,'10006', on);
} else {
console.log("group");
wemo.setStatus(dev, "10006", on);
console.log('group');
wemo.setStatus(dev, '10006', on);
}
});
}
RED.nodes.registerType("wemo out", wemoNGNode);
};
RED.nodes.registerType('wemo out', wemoNGNode);
var wemoNGEvent = function(n) {
RED.nodes.createNode(this,n);
@ -290,9 +290,9 @@ module.exports = function(RED) {
node.topic = n.topic;
node.dev = RED.nodes.getNode(node.device).device;
node.status({fill:"red",shape:"dot",text:"searching"});
node.status({fill: 'red',shape: 'dot',text: 'searching'});
var onEvent = function(notification){
var onEvent = function(notification) {
var d = sub2dev[notification.sid];
if (d == node.dev) {
var dd = wemo.get(node.dev);
@ -328,12 +328,12 @@ module.exports = function(RED) {
if (node.dev) {
//subscribe to events
if (wemo.get(node.dev)) {
node.status({fill:"green",shape:"dot",text:"found"});
node.status({fill: 'green',shape: 'dot',text: 'found'});
subscribe(node);
} else {
wemo.on('discovered', function(d){
wemo.on('discovered', function(d) {
if (node.dev === d) {
node.status({fill:"green",shape:"dot",text:"found"});
node.status({fill: 'green',shape: 'dot',text: 'found'});
subscribe(node);
}
});
@ -346,7 +346,7 @@ module.exports = function(RED) {
var device = devices[d];
if (device.ip === node.ipaddr) {
node.dev = device.id;
node.status({fill:"green",shape:"circle",text:"reconfigure"});
node.status({fill: 'green',shape: 'circle',text: 'reconfigure'});
subscribe(node);
break;
}
@ -354,33 +354,30 @@ module.exports = function(RED) {
}
}
node.on('close', function(done){
node.on('close', function(done) {
//should un subscribe from events
wemo.removeListener('event', onEvent);
unsubscribe(node);
done();
});
}
RED.nodes.registerType("wemo in", wemoNGEvent)
};
RED.nodes.registerType('wemo in', wemoNGEvent);
RED.httpAdmin.get('/wemoNG/devices', function(req,res){
RED.httpAdmin.get('/wemoNG/devices', function(req, res) {
res.json(wemo.devices);
});
RED.httpAdmin.use('/wemoNG/notification',bodyParser.raw({type: 'text/xml'}));
RED.httpAdmin.notify('/wemoNG/notification', function(req, res){
RED.httpAdmin.notify('/wemoNG/notification', function(req, res) {
var notification = {
'sid': req.headers.sid
};
//console.log("Incoming Event %s", req.body.toString());
wemo.parseEvent(req.body.toString()).then(function(evt){
wemo.parseEvent(req.body.toString()).then(function(evt) {
evt.sid = notification.sid;
wemo.emit('event',evt);
});
res.send("");
res.send('');
});
}
};