Skip to content

Commit

Permalink
Implemented pushover attachment feature
Browse files Browse the repository at this point in the history
  • Loading branch information
damoclark committed Dec 12, 2018
1 parent 779c692 commit 5c5db9a
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 8 deletions.
1 change: 1 addition & 0 deletions social/pushover/57-pushover.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<p><code>msg.topic</code>: set the title</p>
<p><code>msg.device</code>: set the device</p>
<p><code>msg.priority</code>: set the priority</p>
<p><code>msg.attachment</code>: attach an image (Buffer or file path)</p>
<p><code>msg.url</code>: to add a web address</p>
<p><code>msg.url_title</code>: to add a url title if not already set in the properties</p>
<p><code>msg.sound</code>: set the notification sound, <i><a href="https://pushover.net/api#sounds" target="_new">see the available options</a></i></p>
Expand Down
46 changes: 41 additions & 5 deletions social/pushover/57-pushover.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = function(RED) {
"use strict";
var PushOver = require('pushover-notifications');
var util = require('util');
var fs = require('fs');

function PushoverNode(n) {
RED.nodes.createNode(this,n);
Expand Down Expand Up @@ -37,6 +38,7 @@ module.exports = function(RED) {
var url = node.url || msg.url || null;
var url_title = node.url_title || msg.url_title || null;
var html = node.html || false;
var attachment = msg.attachment || null;
if (isNaN(pri)) {pri=0;}
if (pri > 2) {pri = 2;}
if (pri < -2) {pri = -2;}
Expand All @@ -58,16 +60,50 @@ module.exports = function(RED) {
if (typeof(url) === 'string') { pushmsg.url = url; }
if (typeof(url_title) === 'string') { pushmsg.url_title = url_title; }
if (html) { pushmsg.html = 1; }
//node.log("Sending "+JSON.stringify(pushmsg));
pusher.send( pushmsg, function(err, response) {
if (err) { node.error("Pushover Error: "+err); }
//console.log(response);
});
if (typeof(attachment) === 'string') {
// Treat attachment as a path
fs.readFile(attachment,function(err, data) {
if (err) {
node.error("[57-pushover.js] Error: File Read Error: "+err);
return;
}
pushmsg.file = { data: data };
pushMessage(pushmsg);
});
return;
}
else if (attachment instanceof Buffer) {
// Is it base64 encoded or binary?
var attachmentString = attachment.toString();
var attachmentBuffer = Buffer.from(attachmentString,'base64');
if(attachmentString === attachmentBuffer.toString('base64')) {
// If converts back to same, then it was base64 so set to binary
// https://stackoverflow.com/a/48770228
attachment = attachmentBuffer;
}
// Unset these temporary values
attachmentBuffer = attachmentString = undefined;
// attach the buffer
pushmsg.file = { data: attachment };
}
else if (attachment) {
node.error("[57-pushover.js] Error: attachment property must be a path to a local file or a Buffer containing an image");
return;
}
pushMessage(pushmsg);
}
else {
node.warn("Pushover credentials not set.");
}
});

function pushMessage(pushmsg) {
pusher.send( pushmsg, function(err, response) {
if (err) { node.error("[57-pushover.js] Error: "+err); }
response = JSON.parse(response);
if (response.status !== 1) { node.error("[57-pushover.js] Error: "+response); }
});
}
}
RED.nodes.registerType("pushover",PushoverNode,{
credentials: {
Expand Down
1 change: 1 addition & 0 deletions social/pushover/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Optionally uses `msg.topic` to set the configuration, if not already set in the
- `msg.device`: to set the device
- `msg.priority`: to set the priority
- `msg.topic`: to set the title
- `msg.attachment`: to specify an image to attach to message (path as a string or Buffer containing image)
- `msg.url`: to add a web address
- `msg.url_title`: to add a url title
- `msg.sound`: to set the alert sound, see the [available options](https://pushover.net/api#sounds)
Expand Down
13 changes: 10 additions & 3 deletions social/pushover/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name" : "node-red-node-pushover",
"version" : "0.0.13",
"version" : "0.0.14",
"description" : "A Node-RED node to send alerts via Pushover",
"dependencies" : {
"pushover-notifications" : "~0.2.4"
"pushover-notifications" : "^1.2.0"
},
"repository" : {
"type":"git",
Expand All @@ -20,5 +20,12 @@
"name": "Dave Conway-Jones",
"email": "ceejay@vnet.ibm.com",
"url": "http://nodered.org"
}
},
"contributors": [
{
"name": "Damien Clark",
"email": "damo.clarky@gmail.com",
"url": "https://damos.world"
}
]
}

0 comments on commit 5c5db9a

Please sign in to comment.