From 8acc5064d0503441c0b45330af1da1d319a50ff6 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 10 Sep 2018 11:37:20 -0400
Subject: [PATCH] update notify package to use a more cross platform library

---
 social/notify/57-notify.html |  15 ++++++++-------
 social/notify/57-notify.js   |  25 +++++++++++++++++--------
 social/notify/node-red.png   | Bin 0 -> 1019 bytes
 social/notify/package.json   |   8 ++++----
 4 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 social/notify/node-red.png

diff --git a/social/notify/57-notify.html b/social/notify/57-notify.html
index d0fc85d4..fe3244a2 100644
--- a/social/notify/57-notify.html
+++ b/social/notify/57-notify.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="notify">
+<script type="text/x-red" data-template-name="nnotify">
     <div class="form-row">
         <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
@@ -10,15 +10,15 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="notify">
-    <p>Uses Growl to provide a desktop popup containing the <code>msg.payload</code>. Only useful on the local machine.</p>
-    <p>Optionally uses <code>msg.topic</code> as the title.</p>
-    <p>Uses Growl so should work cross platform but will need pre-reqs installed... see <i><a href="https://npmjs.org/package/growl" target="_new">this link.</a></i></p>
-    <p>If installing on Windows you MUST read the install instructions ... especially the bit about adding growlnotify to your path... or it WILL NOT work.</p>
+<script type="text/x-red" data-help-name="nnotify">
+    <p>Uses node-notifier to provide a desktop popup containing the <code>msg.payload</code>. Only useful on the local machine.</p>
+    <p>Optionally uses <code>msg.topic</code> as the title, and <code>msg.icon</code> as the full path to an icon file to display.</p>
+    <p>Uses node-notifier so should work cross platform but may need to intall pre-reqs... see <i><a href="https://www.npmjs.com/package/node-notifier" target="_new">this link.</a></i></p>
+    <p>If installing on Windows you MUST read the install instructions...  or it WILL NOT work.</p>
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('notify',{
+    RED.nodes.registerType('nnotify',{
         category: 'output',
         defaults: {
             title: {value:""},
@@ -29,6 +29,7 @@
         outputs:0,
         icon: "alert.png",
         align: "right",
+        paletteLabel: "notify",
         label: function() {
             return this.name||this.title||"notify";
         },
diff --git a/social/notify/57-notify.js b/social/notify/57-notify.js
index 0b317d73..873ef466 100644
--- a/social/notify/57-notify.js
+++ b/social/notify/57-notify.js
@@ -1,26 +1,35 @@
 
 module.exports = function(RED) {
     "use strict";
-    var growl = require('growl');
-    var imagefile = process.env.NODE_RED_HOME+"/public/node-red.png";
+    var notifier = require('node-notifier');
+    var path = require('path');
+    var fs = require('fs');
+    var image = path.join(__dirname, "/node-red.png");
 
     function NotifyNode(n) {
         RED.nodes.createNode(this,n);
         this.title = n.title;
         var node = this;
+        
         node.on("input",function(msg) {
-            var titl = node.title || msg.topic;
-            if (typeof(msg.payload) == 'object') {
+            var title = node.title || msg.topic;
+            if (typeof msg.payload === 'object') {
                 msg.payload = JSON.stringify(msg.payload);
             }
-            if (typeof(titl) != 'undefined') {
-                growl(msg.payload, { title: titl, image: imagefile });
+            var icon = image;
+            if (msg.icon) {
+                if (fs.existsSync(msg.icon)) { icon = msg.icon; }
+                else { node.error("Bad Icon file: "+msg.icon,msg); }
+            }
+            var icon = msg.icon || image;
+            if (typeof(title) !== 'undefined') {
+                notifier.notify({ message:msg.payload, title:title, icon:icon });
             }
             else {
-                growl(msg.payload, { image: imagefile });
+                notifier.notify({ message:msg.payload, icon:imagefile });
             }
         });
     }
 
-    RED.nodes.registerType("notify",NotifyNode);
+    RED.nodes.registerType("nnotify",NotifyNode);
 }
diff --git a/social/notify/node-red.png b/social/notify/node-red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a60c26729469de139f9bab6f64909e3e677f42b0
GIT binary patch
literal 1019
zcmV<X0|fkuP)<h;3K|Lk000e1NJLTq001rk000sQ1^@s6BmwN<00004b3#c}2nYxW
zd<bNS00009a7bBm000ek000ek0Vj0Sn*aa+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H119(Y9K~zYIy_R2S6jv0+zjNpAPA2ZS4S}|lK2)j?l_InuG>H+m
z*=&%OQj4bekQS=6f@!6%#cEin@zFxD3R1Bzt++3x0k_?~2@8^qF<DC*6pRFXsRnhi
zk^Pg|ote`IH=4HYY*I4);J(a!bMEgBXTCYa%<xmWTrP0`&YcsQl=~p1(a7(VN^`<6
zK8wX-DK8)S4X%{hUA=w#`+H~4Zg3tx^fnX0*t!+1d-vwE)6>rm4Gp>Vta80Umk~0V
zOe-@#$CmX@VQQ)|GypK8eC-;zQqjA*x?Towvz~Qb!PDvVdqRj0n7I$Y1^^%_C*U}1
zs^hvY3uevB^B6ptOzMVVkeAssO{cA`ty%~AC=tb(`6dyaX6AV!y2rM?3!2us7H}a1
z5s~L<rBbTHDVNVlUEge1DxMAhAfM;d$jC22)BG?JiTt^IT`Bby5glgc@3PtKCo6kX
zDaE1o_Fd)K*;V&A1%p;Lo1KrvV)d=Rj*QGMUcC5f;qqngq5vomK<mJO)x2d(Ji2q|
z@fz5>0Db~+s<*dy5WwFKpUdR}4;B`_W-0fRrs<9LaF>?mN!JfHN)<`L;46hIR~kYC
z09UIhPEP9jrcLiFrI?vtBBB8Rm!y=3{s|2LwbmM}t#y+C0JwEi=U-yS0W|G-0LO{w
z0Dxuyn;pkFGdeoDCy_`5*AuXw9)Sz7>IX>EK(6}-5e*X2rvQ!sNHg=>%$#UxX_;0^
zz2*<@6G^tL8FR;u*9#L94d1+IZboSP_9X;^KSZO^Z&%)n$K#^AySop-DQ2EjN*$9@
z9*aaGwjbc6l-gz&izl_FrZ*Vyj6*n11-AWTz%)OPL?VT!S;oi5%~Gj!f{6AL(F}l(
zqtWP8y^_gfa-+2EGtl+jB!p*n1AtpD&j`c#$hTj9I-P!th)x4|0l+s>$|FxZtV*R0
zFU`$;nLmHN$t{(<iwc2IXD2rH_5J4StdhxOLbh!W<58ki0ZcISB_YHDfJFd{Zn1bY
zf8j!V`TF(M6%_(64i7ti%_;zZ+8aJJHa2$7ahyFw^d=E~!OV~MB`I(4T1JA}cjznl
zvU+-Yt^&9U0Et8*7!HS@A)+vVFjuQ5No&~JPgG05{{?)d`uqDU0PfZnR4VmzsH0<>
pb?erud)&3G-+iCQ8|lBM%3tG4gA;!2q&@%u002ovPDHLkV1jZ<)mZ=l

literal 0
HcmV?d00001

diff --git a/social/notify/package.json b/social/notify/package.json
index 77987131..cdd904ac 100644
--- a/social/notify/package.json
+++ b/social/notify/package.json
@@ -1,17 +1,17 @@
 {
     "name"          : "node-red-node-notify",
-    "version"       : "0.0.5",
+    "version"       : "0.1.1",
     "description"   : "A Node-RED node to send local popup Notify alerts",
     "dependencies"  : {
-        "growl"   : "1.8.1"
+        "node-notifier" : "5.2.1"
     },
     "repository" : {
         "type":"git",
         "url":"https://github.com/node-red/node-red-nodes.git",
-        "path":"/tree/master/social/growl"
+        "path":"/tree/master/social/notify"
     },
     "license": "Apache-2.0",
-    "keywords": [ "node-red", "growl", "notify"],
+    "keywords": [ "node-red", "notify", "growl"],
     "node-red"      : {
         "nodes"     : {
             "notify": "57-notify.js"