mirror of
https://github.com/node-red/node-red-nodes.git
synced 2023-10-10 13:36:58 +02:00
Apply consistent style to node-red-nodes
(not updating npm for this yet - just whitespace)
This commit is contained in:
parent
84f61a0466
commit
f497b57b7d
@ -54,7 +54,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Node constructor for bbb-analogue-in
|
// Node constructor for bbb-analogue-in
|
||||||
function AnalogueInputNode(n) {
|
function AnalogueInputNode(n) {
|
||||||
RED.nodes.createNode(this, n);
|
RED.nodes.createNode(this, n);
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -110,7 +110,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Node constructor for bbb-discrete-in
|
// Node constructor for bbb-discrete-in
|
||||||
function DiscreteInputNode(n) {
|
function DiscreteInputNode(n) {
|
||||||
RED.nodes.createNode(this, n);
|
RED.nodes.createNode(this, n);
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -285,7 +285,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Node constructor for bbb-pulse-in
|
// Node constructor for bbb-pulse-in
|
||||||
function PulseInputNode(n) {
|
function PulseInputNode(n) {
|
||||||
RED.nodes.createNode(this, n);
|
RED.nodes.createNode(this, n);
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -383,7 +383,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Node constructor for bbb-discrete-out
|
// Node constructor for bbb-discrete-out
|
||||||
function DiscreteOutputNode(n) {
|
function DiscreteOutputNode(n) {
|
||||||
RED.nodes.createNode(this, n);
|
RED.nodes.createNode(this, n);
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -443,7 +443,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Node constructor for bbb-pulse-out
|
// Node constructor for bbb-pulse-out
|
||||||
function PulseOutputNode(n) {
|
function PulseOutputNode(n) {
|
||||||
RED.nodes.createNode(this, n);
|
RED.nodes.createNode(this, n);
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -519,14 +519,14 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Register the nodes by name. This must be called before overriding any of the Node functions.
|
// Register the nodes by name. This must be called before overriding any of the Node functions.
|
||||||
RED.nodes.registerType("bbb-analogue-in", AnalogueInputNode);
|
RED.nodes.registerType("bbb-analogue-in", AnalogueInputNode);
|
||||||
RED.nodes.registerType("bbb-discrete-in", DiscreteInputNode);
|
RED.nodes.registerType("bbb-discrete-in", DiscreteInputNode);
|
||||||
RED.nodes.registerType("bbb-pulse-in", PulseInputNode);
|
RED.nodes.registerType("bbb-pulse-in", PulseInputNode);
|
||||||
RED.nodes.registerType("bbb-discrete-out", DiscreteOutputNode);
|
RED.nodes.registerType("bbb-discrete-out", DiscreteOutputNode);
|
||||||
RED.nodes.registerType("bbb-pulse-out", PulseOutputNode);
|
RED.nodes.registerType("bbb-pulse-out", PulseOutputNode);
|
||||||
|
|
||||||
// On close, detach the interrupt (if we attached one) and clear any active timers
|
// On close, detach the interrupt (if we attached one) and clear any active timers
|
||||||
DiscreteInputNode.prototype.close = function () {
|
DiscreteInputNode.prototype.close = function () {
|
||||||
if (this.interruptAttached) {
|
if (this.interruptAttached) {
|
||||||
bonescript.detachInterrupt(this._pin);
|
bonescript.detachInterrupt(this._pin);
|
||||||
@ -539,7 +539,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// On close, detach the interrupt (if we attached one) and clear the interval (if we set one)
|
// On close, detach the interrupt (if we attached one) and clear the interval (if we set one)
|
||||||
PulseInputNode.prototype.close = function () {
|
PulseInputNode.prototype.close = function () {
|
||||||
if (this.interruptAttached) {
|
if (this.interruptAttached) {
|
||||||
bonescript.detachInterrupt(this._pin);
|
bonescript.detachInterrupt(this._pin);
|
||||||
@ -549,7 +549,7 @@ module.exports = function (RED) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// On close, clear an active pulse timer
|
// On close, clear an active pulse timer
|
||||||
PulseOutputNode.prototype.close = function () {
|
PulseOutputNode.prototype.close = function () {
|
||||||
if (this.pulseTimer !== null) {
|
if (this.pulseTimer !== null) {
|
||||||
clearTimeout(this.pulseTimer);
|
clearTimeout(this.pulseTimer);
|
||||||
|
@ -148,8 +148,8 @@ module.exports = function(RED) {
|
|||||||
for (var key in message.payload) {
|
for (var key in message.payload) {
|
||||||
if (message.payload.hasOwnProperty(key)) {
|
if (message.payload.hasOwnProperty(key)) {
|
||||||
// Ensure our valid keys contain valid values
|
// Ensure our valid keys contain valid values
|
||||||
switch(key) {
|
switch (key) {
|
||||||
case "runmode" :
|
case "runmode" : {
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
hminnode.log("Hit the runmode case");
|
hminnode.log("Hit the runmode case");
|
||||||
}
|
}
|
||||||
@ -158,8 +158,9 @@ module.exports = function(RED) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
//case "holiday" :
|
//case "holiday" : {
|
||||||
//if (DEBUG) {
|
//if (DEBUG) {
|
||||||
//hminnode.log("Hit the holiday case");
|
//hminnode.log("Hit the holiday case");
|
||||||
//}
|
//}
|
||||||
@ -183,8 +184,9 @@ module.exports = function(RED) {
|
|||||||
//message.payload.away_mode = 0;
|
//message.payload.away_mode = 0;
|
||||||
//}
|
//}
|
||||||
//break;
|
//break;
|
||||||
|
// }
|
||||||
|
|
||||||
//case "hotwater" :
|
//case "hotwater" : {
|
||||||
//if (DEBUG) {
|
//if (DEBUG) {
|
||||||
//hminnode.log("Hit the hotwater case");
|
//hminnode.log("Hit the hotwater case");
|
||||||
//}
|
//}
|
||||||
@ -193,8 +195,9 @@ module.exports = function(RED) {
|
|||||||
//return;
|
//return;
|
||||||
//}
|
//}
|
||||||
//break;
|
//break;
|
||||||
|
// }
|
||||||
|
|
||||||
case "heating" :
|
case "heating" : {
|
||||||
// Ensure heating stays last! It's got a multi write scenario
|
// Ensure heating stays last! It's got a multi write scenario
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
hminnode.log("Hit the heating case");
|
hminnode.log("Hit the heating case");
|
||||||
@ -226,10 +229,12 @@ module.exports = function(RED) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default :
|
default : {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Valid set of key messages, construct DCB and write
|
// Valid set of key messages, construct DCB and write
|
||||||
var dcb = message.payload;
|
var dcb = message.payload;
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
|
@ -55,7 +55,7 @@ function BleScan(n) {
|
|||||||
msg.payload = "not found";
|
msg.payload = "not found";
|
||||||
|
|
||||||
//check for the device name and the UUID (first one from the UUID list)
|
//check for the device name and the UUID (first one from the UUID list)
|
||||||
if(peripheral.advertisement.localName==node.ble_name && peripheral.advertisement.serviceUuids[0]==node.ble_uuid) {
|
if (peripheral.advertisement.localName==node.ble_name && peripheral.advertisement.serviceUuids[0]==node.ble_uuid) {
|
||||||
msg.payload=peripheral.advertisement.localName;
|
msg.payload=peripheral.advertisement.localName;
|
||||||
noble.stopScanning();
|
noble.stopScanning();
|
||||||
}
|
}
|
||||||
|
@ -43,17 +43,17 @@ module.exports = function(RED) {
|
|||||||
else { http = require("http"); }
|
else { http = require("http"); }
|
||||||
this.on("input", function(msg) {
|
this.on("input", function(msg) {
|
||||||
this.url = this.baseurl + '/input/post.json?';
|
this.url = this.baseurl + '/input/post.json?';
|
||||||
if(msg.payload.indexOf(':') > -1){
|
if (msg.payload.indexOf(':') > -1){
|
||||||
this.url += 'json={' + msg.payload + '}';
|
this.url += 'json={' + msg.payload + '}';
|
||||||
} else {
|
} else {
|
||||||
this.url += 'csv='+msg.payload;
|
this.url += 'csv='+msg.payload;
|
||||||
}
|
}
|
||||||
this.url += '&apikey='+this.apikey;
|
this.url += '&apikey='+this.apikey;
|
||||||
var nodegroup = this.nodegroup || msg.nodegroup;
|
var nodegroup = this.nodegroup || msg.nodegroup;
|
||||||
if(nodegroup !== ""){
|
if (nodegroup !== ""){
|
||||||
this.url += '&node=' + nodegroup;
|
this.url += '&node=' + nodegroup;
|
||||||
}
|
}
|
||||||
if(typeof msg.time !== 'undefined'){
|
if (typeof msg.time !== 'undefined'){
|
||||||
this.url += '&time=' + msg.time;
|
this.url += '&time=' + msg.time;
|
||||||
}
|
}
|
||||||
node.log("[emoncms] "+this.url);
|
node.log("[emoncms] "+this.url);
|
||||||
|
@ -24,9 +24,9 @@ module.exports = function(RED) {
|
|||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
|
|
||||||
function onError(err, node) {
|
function onError(err, node) {
|
||||||
if(err && node) {
|
if (err && node) {
|
||||||
if(node.emitter) {
|
if (node.emitter) {
|
||||||
if(!node.emitter.emit('error', err)) {
|
if (!node.emitter.emit('error', err)) {
|
||||||
node.error(err);
|
node.error(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -61,11 +61,11 @@ module.exports = function(RED) {
|
|||||||
|
|
||||||
// sort migration from old node
|
// sort migration from old node
|
||||||
var apikey;
|
var apikey;
|
||||||
if(this.n._migrate) {
|
if (this.n._migrate) {
|
||||||
apikey = this.n._apikey;
|
apikey = this.n._apikey;
|
||||||
this.credentials = {apikey:apikey};
|
this.credentials = {apikey:apikey};
|
||||||
}
|
}
|
||||||
else if(this.credentials) {
|
else if (this.credentials) {
|
||||||
apikey = this.credentials.apikey;
|
apikey = this.credentials.apikey;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,7 +75,7 @@ module.exports = function(RED) {
|
|||||||
// get 'me' info
|
// get 'me' info
|
||||||
this.me = when.promise(function(resolve, reject) {
|
this.me = when.promise(function(resolve, reject) {
|
||||||
pusher.me(function(err, me) {
|
pusher.me(function(err, me) {
|
||||||
if(err) {
|
if (err) {
|
||||||
reject(err);
|
reject(err);
|
||||||
} else {
|
} else {
|
||||||
resolve(me);
|
resolve(me);
|
||||||
@ -87,7 +87,7 @@ module.exports = function(RED) {
|
|||||||
// get latest timestamp
|
// get latest timestamp
|
||||||
this.last = when.promise(function(resolve) {
|
this.last = when.promise(function(resolve) {
|
||||||
pusher.history({limit:1}, function(err, res) {
|
pusher.history({limit:1}, function(err, res) {
|
||||||
if(err) {
|
if (err) {
|
||||||
resolve(0);
|
resolve(0);
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@ -121,13 +121,13 @@ module.exports = function(RED) {
|
|||||||
|
|
||||||
PushbulletConfig.prototype.setupStream = function() {
|
PushbulletConfig.prototype.setupStream = function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
if(this.pusher) {
|
if (this.pusher) {
|
||||||
var stream = this.pusher.stream();
|
var stream = this.pusher.stream();
|
||||||
stream.on('message', function(res) {
|
stream.on('message', function(res) {
|
||||||
if(res.type === 'tickle') {
|
if (res.type === 'tickle') {
|
||||||
self.handleTickle(res);
|
self.handleTickle(res);
|
||||||
}
|
}
|
||||||
else if(res.type === 'push') {
|
else if (res.type === 'push') {
|
||||||
self.pushMsg(res.push);
|
self.pushMsg(res.push);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -156,16 +156,16 @@ module.exports = function(RED) {
|
|||||||
|
|
||||||
PushbulletConfig.prototype.handleTickle = function(ticklemsg) {
|
PushbulletConfig.prototype.handleTickle = function(ticklemsg) {
|
||||||
var self = this;
|
var self = this;
|
||||||
if(this.pusher && ticklemsg.subtype === "push") {
|
if (this.pusher && ticklemsg.subtype === "push") {
|
||||||
var lastprom = this.last;
|
var lastprom = this.last;
|
||||||
this.last = when.promise(function(resolve) {
|
this.last = when.promise(function(resolve) {
|
||||||
when(lastprom).then(function(last) {
|
when(lastprom).then(function(last) {
|
||||||
self.pusher.history({modified_after: last}, function(err, res) {
|
self.pusher.history({modified_after: last}, function(err, res) {
|
||||||
if(err) {
|
if (err) {
|
||||||
resolve(last);
|
resolve(last);
|
||||||
return onError(err);
|
return onError(err);
|
||||||
}
|
}
|
||||||
for(var i=0;i<res.pushes.length; i++) {
|
for (var i=0;i<res.pushes.length; i++) {
|
||||||
self.pushMsg(res.pushes[i]);
|
self.pushMsg(res.pushes[i]);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -180,7 +180,7 @@ module.exports = function(RED) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
PushbulletConfig.prototype.pushMsg = function(incoming) {
|
PushbulletConfig.prototype.pushMsg = function(incoming) {
|
||||||
if(this._inputNodes.length === 0) {
|
if (this._inputNodes.length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -189,48 +189,48 @@ module.exports = function(RED) {
|
|||||||
data: incoming
|
data: incoming
|
||||||
}
|
}
|
||||||
|
|
||||||
if(incoming.dismissed === true) {
|
if (incoming.dismissed === true) {
|
||||||
msg.pushtype = 'dismissal';
|
msg.pushtype = 'dismissal';
|
||||||
msg.topic = 'Push dismissed';
|
msg.topic = 'Push dismissed';
|
||||||
msg.payload = incoming.iden;
|
msg.payload = incoming.iden;
|
||||||
}
|
}
|
||||||
else if(incoming.active === false && incoming.type === undefined) {
|
else if (incoming.active === false && incoming.type === undefined) {
|
||||||
msg.pushtype = 'delete';
|
msg.pushtype = 'delete';
|
||||||
msg.topic = 'Push deleted';
|
msg.topic = 'Push deleted';
|
||||||
msg.payload = incoming.iden;
|
msg.payload = incoming.iden;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'clip') {
|
else if (incoming.type === 'clip') {
|
||||||
msg.topic = 'Clipboard content';
|
msg.topic = 'Clipboard content';
|
||||||
msg.payload = incoming.body;
|
msg.payload = incoming.body;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'note') {
|
else if (incoming.type === 'note') {
|
||||||
msg.topic = incoming.title;
|
msg.topic = incoming.title;
|
||||||
msg.payload = incoming.body;
|
msg.payload = incoming.body;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'link') {
|
else if (incoming.type === 'link') {
|
||||||
msg.topic = incoming.title;
|
msg.topic = incoming.title;
|
||||||
msg.payload = incoming.url;
|
msg.payload = incoming.url;
|
||||||
msg.message = incoming.body;
|
msg.message = incoming.body;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'address') {
|
else if (incoming.type === 'address') {
|
||||||
msg.topic = incoming.name;
|
msg.topic = incoming.name;
|
||||||
msg.payload = incoming.address;
|
msg.payload = incoming.address;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'list') {
|
else if (incoming.type === 'list') {
|
||||||
msg.topic = incoming.title;
|
msg.topic = incoming.title;
|
||||||
msg.payload = incoming.items;
|
msg.payload = incoming.items;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'file') {
|
else if (incoming.type === 'file') {
|
||||||
msg.topic = incoming.file_name;
|
msg.topic = incoming.file_name;
|
||||||
msg.payload = incoming.file_url;
|
msg.payload = incoming.file_url;
|
||||||
msg.message = incoming.body;
|
msg.message = incoming.body;
|
||||||
}
|
}
|
||||||
// Android specific, untested
|
// Android specific, untested
|
||||||
else if(incoming.type === 'mirror') {
|
else if (incoming.type === 'mirror') {
|
||||||
msg.topic = incoming.title;
|
msg.topic = incoming.title;
|
||||||
msg.payload = incoming.body;
|
msg.payload = incoming.body;
|
||||||
}
|
}
|
||||||
else if(incoming.type === 'dismissal') {
|
else if (incoming.type === 'dismissal') {
|
||||||
msg.topic = "dismissal";
|
msg.topic = "dismissal";
|
||||||
msg.topic = "Push dismissed";
|
msg.topic = "Push dismissed";
|
||||||
msg.payload = incoming.iden;
|
msg.payload = incoming.iden;
|
||||||
@ -246,14 +246,14 @@ module.exports = function(RED) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
PushbulletConfig.prototype.registerInputNode = function(/*Node*/handler) {
|
PushbulletConfig.prototype.registerInputNode = function(/*Node*/handler) {
|
||||||
if(!this.stream) {
|
if (!this.stream) {
|
||||||
this.setupStream();
|
this.setupStream();
|
||||||
}
|
}
|
||||||
this._inputNodes.push(handler);
|
this._inputNodes.push(handler);
|
||||||
};
|
};
|
||||||
|
|
||||||
function migrateOldSettings(n) {
|
function migrateOldSettings(n) {
|
||||||
if(n.config === undefined) {
|
if (n.config === undefined) {
|
||||||
var newid, config, apikey, deviceid, pushkeys;
|
var newid, config, apikey, deviceid, pushkeys;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -264,10 +264,10 @@ module.exports = function(RED) {
|
|||||||
|
|
||||||
var cred = RED.nodes.getCredentials(n.id);
|
var cred = RED.nodes.getCredentials(n.id);
|
||||||
// get old apikey
|
// get old apikey
|
||||||
if(cred && cred.hasOwnProperty("pushkey")) {
|
if (cred && cred.hasOwnProperty("pushkey")) {
|
||||||
apikey = cred.pushkey;
|
apikey = cred.pushkey;
|
||||||
}
|
}
|
||||||
else if(pushkeys) {
|
else if (pushkeys) {
|
||||||
apikey = pushkeys.pushbullet;
|
apikey = pushkeys.pushbullet;
|
||||||
}
|
}
|
||||||
// get old device
|
// get old device
|
||||||
@ -278,7 +278,7 @@ module.exports = function(RED) {
|
|||||||
deviceid = pushkeys.deviceid;
|
deviceid = pushkeys.deviceid;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(apikey) {
|
if (apikey) {
|
||||||
newid = (1+Math.random()*4294967295).toString(16);
|
newid = (1+Math.random()*4294967295).toString(16);
|
||||||
config = new PushbulletConfig({
|
config = new PushbulletConfig({
|
||||||
id: newid,
|
id: newid,
|
||||||
@ -289,7 +289,7 @@ module.exports = function(RED) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!(apikey || deviceid)) {
|
if (!(apikey || deviceid)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -317,7 +317,7 @@ module.exports = function(RED) {
|
|||||||
this.pusher = null;
|
this.pusher = null;
|
||||||
|
|
||||||
var configNode;
|
var configNode;
|
||||||
if(this.migrated) {
|
if (this.migrated) {
|
||||||
this.warn('Settings migrated from previous version of Pushbullet Node, please edit node to update settings.');
|
this.warn('Settings migrated from previous version of Pushbullet Node, please edit node to update settings.');
|
||||||
this.status({fill: 'yellow', shape: 'ring', text: 'Node migrated'});
|
this.status({fill: 'yellow', shape: 'ring', text: 'Node migrated'});
|
||||||
this.deviceid = this.migrated.deviceid;
|
this.deviceid = this.migrated.deviceid;
|
||||||
@ -332,7 +332,7 @@ module.exports = function(RED) {
|
|||||||
catch(err){}
|
catch(err){}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(configNode) {
|
if (configNode) {
|
||||||
configNode.initialise();
|
configNode.initialise();
|
||||||
this.pusher = configNode.pusher;
|
this.pusher = configNode.pusher;
|
||||||
configNode.onConfig('error', function(err) {
|
configNode.onConfig('error', function(err) {
|
||||||
@ -349,15 +349,15 @@ module.exports = function(RED) {
|
|||||||
if (typeof(msg.payload) === 'object') {
|
if (typeof(msg.payload) === 'object') {
|
||||||
msg.payload = JSON.stringify(msg.payload);
|
msg.payload = JSON.stringify(msg.payload);
|
||||||
}
|
}
|
||||||
else if(msg.payload) {
|
else if (msg.payload) {
|
||||||
msg.payload = msg.payload.toString();
|
msg.payload = msg.payload.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(['delete', 'dismissal', 'updatelist', '_rawupdate_'].indexOf(pushtype) === -1) {
|
if (['delete', 'dismissal', 'updatelist', '_rawupdate_'].indexOf(pushtype) === -1) {
|
||||||
if (channel) {
|
if (channel) {
|
||||||
deviceid = { channel_tag : channel };
|
deviceid = { channel_tag : channel };
|
||||||
}
|
}
|
||||||
else if(deviceid === "") {
|
else if (deviceid === "") {
|
||||||
try {
|
try {
|
||||||
when(configNode.me).then(function(me) {
|
when(configNode.me).then(function(me) {
|
||||||
if (me) {
|
if (me) {
|
||||||
@ -392,24 +392,24 @@ module.exports = function(RED) {
|
|||||||
if (this.pusher) {
|
if (this.pusher) {
|
||||||
var handleErr = function(msg){
|
var handleErr = function(msg){
|
||||||
return function(err) {
|
return function(err) {
|
||||||
if(err) {
|
if (err) {
|
||||||
self.error(msg);
|
self.error(msg);
|
||||||
onError(err, self);
|
onError(err, self);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(deviceid) {
|
if (deviceid) {
|
||||||
if(pushtype === 'note') {
|
if (pushtype === 'note') {
|
||||||
this.pusher.note(deviceid, title, msg.payload, handleErr('Unable to push note'));
|
this.pusher.note(deviceid, title, msg.payload, handleErr('Unable to push note'));
|
||||||
}
|
}
|
||||||
else if(pushtype === 'address') {
|
else if (pushtype === 'address') {
|
||||||
this.pusher.address(deviceid, title, msg.payload, handleErr('Unable to push address'));
|
this.pusher.address(deviceid, title, msg.payload, handleErr('Unable to push address'));
|
||||||
}
|
}
|
||||||
else if(pushtype === 'list') {
|
else if (pushtype === 'list') {
|
||||||
this.pusher.list(deviceid, title, JSON.parse(msg.payload), handleErr('Unable to push list'));
|
this.pusher.list(deviceid, title, JSON.parse(msg.payload), handleErr('Unable to push list'));
|
||||||
}
|
}
|
||||||
else if(pushtype === 'link') {
|
else if (pushtype === 'link') {
|
||||||
this.pusher.push(deviceid, {
|
this.pusher.push(deviceid, {
|
||||||
type: 'link',
|
type: 'link',
|
||||||
title: title,
|
title: title,
|
||||||
@ -417,31 +417,31 @@ module.exports = function(RED) {
|
|||||||
url: msg.payload
|
url: msg.payload
|
||||||
}, handleErr('Unable to push link'));
|
}, handleErr('Unable to push link'));
|
||||||
}
|
}
|
||||||
else if(pushtype === 'file') {
|
else if (pushtype === 'file') {
|
||||||
// Workaround for Pushbullet dep not handling error on file open
|
// Workaround for Pushbullet dep not handling error on file open
|
||||||
if(fs.existsSync(msg.payload)) {
|
if (fs.existsSync(msg.payload)) {
|
||||||
this.pusher.file(deviceid, msg.payload, title, handleErr('Unable to push file'));
|
this.pusher.file(deviceid, msg.payload, title, handleErr('Unable to push file'));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.error('File does not exist!');
|
this.error('File does not exist!');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(pushtype === '_raw_') {
|
else if (pushtype === '_raw_') {
|
||||||
this.pusher.push(deviceid, msg.raw, handleErr('Unable to push raw data'));
|
this.pusher.push(deviceid, msg.raw, handleErr('Unable to push raw data'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(msg.data && msg.data.iden) {
|
if (msg.data && msg.data.iden) {
|
||||||
if(pushtype === 'delete') {
|
if (pushtype === 'delete') {
|
||||||
this.pusher.deletePush(msg.data.iden, handleErr('Unable to delete push'));
|
this.pusher.deletePush(msg.data.iden, handleErr('Unable to delete push'));
|
||||||
}
|
}
|
||||||
else if(pushtype === 'dismissal') {
|
else if (pushtype === 'dismissal') {
|
||||||
this.pusher.updatePush(msg.data.iden, {dismissed: true}, handleErr('Unable to dismiss push'));
|
this.pusher.updatePush(msg.data.iden, {dismissed: true}, handleErr('Unable to dismiss push'));
|
||||||
}
|
}
|
||||||
else if(pushtype === 'updatelist') {
|
else if (pushtype === 'updatelist') {
|
||||||
try {
|
try {
|
||||||
var data = JSON.parse(msg.payload);
|
var data = JSON.parse(msg.payload);
|
||||||
if(msg.data.type && msg.data.type !== 'list') {
|
if (msg.data.type && msg.data.type !== 'list') {
|
||||||
this.warn('Trying to update list items in non list push');
|
this.warn('Trying to update list items in non list push');
|
||||||
}
|
}
|
||||||
this.pusher.updatePush(msg.data.iden, {items: data}, handleErr('Unable to update list'));
|
this.pusher.updatePush(msg.data.iden, {items: data}, handleErr('Unable to update list'));
|
||||||
@ -450,7 +450,7 @@ module.exports = function(RED) {
|
|||||||
this.warn("Invalid list");
|
this.warn("Invalid list");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(pushtype === '_rawupdate_') {
|
else if (pushtype === '_rawupdate_') {
|
||||||
this.pusher.updatePush(msg.data.iden, msg.raw, handleErr('Unable to update raw data'));
|
this.pusher.updatePush(msg.data.iden, msg.raw, handleErr('Unable to update raw data'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -462,13 +462,13 @@ module.exports = function(RED) {
|
|||||||
|
|
||||||
RED.httpAdmin.get('/pushbullet/:id/migrate', function(req, res) {
|
RED.httpAdmin.get('/pushbullet/:id/migrate', function(req, res) {
|
||||||
var node = RED.nodes.getNode(req.params.id);
|
var node = RED.nodes.getNode(req.params.id);
|
||||||
if(node && node.migrated) {
|
if (node && node.migrated) {
|
||||||
if(req.query.save) {
|
if (req.query.save) {
|
||||||
var promise;
|
var promise;
|
||||||
if(node.migrated.apikey) {
|
if (node.migrated.apikey) {
|
||||||
promise = RED.nodes.addCredentials(node.migrated.id, {apikey: node.migrated.apikey});
|
promise = RED.nodes.addCredentials(node.migrated.id, {apikey: node.migrated.apikey});
|
||||||
}
|
}
|
||||||
if(node.migrated.deviceid) {
|
if (node.migrated.deviceid) {
|
||||||
when(promise).then(function() {
|
when(promise).then(function() {
|
||||||
RED.nodes.addCredentials(req.params.id, {deviceid: node.migrated.deviceid});
|
RED.nodes.addCredentials(req.params.id, {deviceid: node.migrated.deviceid});
|
||||||
});
|
});
|
||||||
@ -486,29 +486,29 @@ module.exports = function(RED) {
|
|||||||
var cred = RED.nodes.getCredentials(req.params.id);
|
var cred = RED.nodes.getCredentials(req.params.id);
|
||||||
var pb;
|
var pb;
|
||||||
|
|
||||||
if(config && config.pusher) {
|
if (config && config.pusher) {
|
||||||
config.pusher.devices(function(err, chans) {
|
config.pusher.devices(function(err, chans) {
|
||||||
if(err) {
|
if (err) {
|
||||||
res.send("[]");
|
res.send("[]");
|
||||||
return onError(err, config);
|
return onError(err, config);
|
||||||
}
|
}
|
||||||
res.send(JSON.stringify(chans.devices));
|
res.send(JSON.stringify(chans.devices));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(cred && cred.apikey) {
|
else if (cred && cred.apikey) {
|
||||||
pb = new PushBullet(cred.apikey);
|
pb = new PushBullet(cred.apikey);
|
||||||
pb.devices(function(err, chans) {
|
pb.devices(function(err, chans) {
|
||||||
if(err) {
|
if (err) {
|
||||||
res.send("[]");
|
res.send("[]");
|
||||||
return onError(err, config);
|
return onError(err, config);
|
||||||
}
|
}
|
||||||
res.send(JSON.stringify(chans.devices));
|
res.send(JSON.stringify(chans.devices));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(req.query.apikey) {
|
else if (req.query.apikey) {
|
||||||
pb = new PushBullet(req.query.apikey);
|
pb = new PushBullet(req.query.apikey);
|
||||||
pb.devices(function(err, chans) {
|
pb.devices(function(err, chans) {
|
||||||
if(err) {
|
if (err) {
|
||||||
res.send("[]");
|
res.send("[]");
|
||||||
return onError(err, config);
|
return onError(err, config);
|
||||||
}
|
}
|
||||||
@ -524,7 +524,7 @@ module.exports = function(RED) {
|
|||||||
RED.nodes.createNode(this, n);
|
RED.nodes.createNode(this, n);
|
||||||
var self = this;
|
var self = this;
|
||||||
var config = RED.nodes.getNode(n.config);
|
var config = RED.nodes.getNode(n.config);
|
||||||
if(config) {
|
if (config) {
|
||||||
config.initialise();
|
config.initialise();
|
||||||
config.registerInputNode(this);
|
config.registerInputNode(this);
|
||||||
config.onConfig('error', function(err) {
|
config.onConfig('error', function(err) {
|
||||||
@ -550,8 +550,8 @@ module.exports = function(RED) {
|
|||||||
|
|
||||||
PushbulletIn.prototype.emitPush = function(msg) {
|
PushbulletIn.prototype.emitPush = function(msg) {
|
||||||
try {
|
try {
|
||||||
if(this.credentials.filters.length > 0) {
|
if (this.credentials.filters.length > 0) {
|
||||||
if( (this.credentials.filters.indexOf(msg.data.source_device_iden) > -1) ||
|
if ( (this.credentials.filters.indexOf(msg.data.source_device_iden) > -1) ||
|
||||||
(this.credentials.filters.indexOf(msg.data.target_device_iden) > -1) ||
|
(this.credentials.filters.indexOf(msg.data.target_device_iden) > -1) ||
|
||||||
(!msg.data.target_device_iden && !msg.data.source_device_iden)) { /* All */
|
(!msg.data.target_device_iden && !msg.data.source_device_iden)) { /* All */
|
||||||
this.send(msg);
|
this.send(msg);
|
||||||
|
@ -73,7 +73,7 @@ module.exports = function(RED) {
|
|||||||
try {
|
try {
|
||||||
// decide if we are to Send SMS
|
// decide if we are to Send SMS
|
||||||
var tonum = node.number || msg.topic;
|
var tonum = node.number || msg.topic;
|
||||||
if( this.twilioType == "call" ) {
|
if ( this.twilioType == "call" ) {
|
||||||
// Make a call
|
// Make a call
|
||||||
var twimlurl = node.url || msg.payload;
|
var twimlurl = node.url || msg.payload;
|
||||||
node.twilioClient.makeCall( {to: tonum, from: node.fromNumber, url: twimlurl}, function(err, response) {
|
node.twilioClient.makeCall( {to: tonum, from: node.fromNumber, url: twimlurl}, function(err, response) {
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
**/
|
**/
|
||||||
|
|
||||||
module.exports = function(RED) {
|
module.exports = function(RED) {
|
||||||
"use strict";
|
"use strict";
|
||||||
var XMPP = require('simple-xmpp');
|
var XMPP = require('simple-xmpp');
|
||||||
|
|
||||||
function XMPPServerNode(n) {
|
function XMPPServerNode(n) {
|
||||||
RED.nodes.createNode(this,n);
|
RED.nodes.createNode(this,n);
|
||||||
this.server = n.server;
|
this.server = n.server;
|
||||||
this.port = n.port;
|
this.port = n.port;
|
||||||
@ -29,7 +29,7 @@ function XMPPServerNode(n) {
|
|||||||
this.password = credentials.password;
|
this.password = credentials.password;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RED.nodes.registerType("xmpp-server",XMPPServerNode,{
|
RED.nodes.registerType("xmpp-server",XMPPServerNode,{
|
||||||
credentials: {
|
credentials: {
|
||||||
user: {type:"text"},
|
user: {type:"text"},
|
||||||
password: {type: "password"}
|
password: {type: "password"}
|
||||||
@ -37,7 +37,7 @@ RED.nodes.registerType("xmpp-server",XMPPServerNode,{
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
function XmppInNode(n) {
|
function XmppInNode(n) {
|
||||||
RED.nodes.createNode(this,n);
|
RED.nodes.createNode(this,n);
|
||||||
this.server = n.server;
|
this.server = n.server;
|
||||||
|
|
||||||
@ -121,9 +121,9 @@ function XmppInNode(n) {
|
|||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
RED.nodes.registerType("xmpp in",XmppInNode);
|
RED.nodes.registerType("xmpp in",XmppInNode);
|
||||||
|
|
||||||
function XmppOutNode(n) {
|
function XmppOutNode(n) {
|
||||||
RED.nodes.createNode(this,n);
|
RED.nodes.createNode(this,n);
|
||||||
this.server = n.server;
|
this.server = n.server;
|
||||||
|
|
||||||
@ -207,6 +207,6 @@ function XmppOutNode(n) {
|
|||||||
xmpp = null;
|
xmpp = null;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
RED.nodes.registerType("xmpp out",XmppOutNode);
|
RED.nodes.registerType("xmpp out",XmppOutNode);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user