From 0d0c88d19e388bf6e03c640a21a3df287e0ba15a Mon Sep 17 00:00:00 2001
From: bartbutenaers <bart.butenaers@gmail.com>
Date: Fri, 29 Jan 2021 17:28:04 +0100
Subject: [PATCH 1/3] Wemo insight power parameters (#739)

* Insight power parameters

* Insight power parameters

* Insight power parameters

* Insight power parameters

* Insight power parameters

* Bump version 0.2.0
---
 hardware/wemo/README.md    |  27 +++++++-
 hardware/wemo/WeMoNG.html  |  41 ++++++++++--
 hardware/wemo/WeMoNG.js    |  21 +++++--
 hardware/wemo/lib/wemo.js  | 125 +++++++++++++++++++++++++++++++++++--
 hardware/wemo/package.json |   2 +-
 5 files changed, 201 insertions(+), 15 deletions(-)

diff --git a/hardware/wemo/README.md b/hardware/wemo/README.md
index 7adf65ad..d5a6dbd7 100644
--- a/hardware/wemo/README.md
+++ b/hardware/wemo/README.md
@@ -73,16 +73,39 @@ And a lightbulb can look like this:
    }
 ```
 
-Insight
+An Insight socket output can look like this:
 
 ```
   {
     "raw": "<e:propertyset xmlns:e=\"urn:schemas-upnp-org:event-1-0\">\n<e:property>\n<BinaryState>8|1454271649|301|834|56717|1209600|8|1010|638602|12104165</BinaryState>\n</e:property>\n</e:propertyset>\n\n\r",
     "state": "8",
-    "power": 1.01,
+    "onSince": 1611179325,
+    "onFor": 2545,
+    "onToday": 17432,
+    "onTotal": 47939,
+    "averagePower": 13,
+    "power": 3.205,
+    "energyToday": 3596536,
+    "energyTotal": 9966151
     "sid": "uuid:ea808ecc-1dd1-11b2-9579-8e5c117d479e",
     "type": "socket",
     "name": "WeMo Insight",
     "id": "221450K1200F5C"
   }
 ```
+Some information about those power parameters:
++ `state`: Whether the device is currently ON or OFF (1 or 0).
++ `onSince`: The date and time when the device was last turned on or off (as a Unix timestamp).
++ `onFor`: How long the device was last ON for (seconds).
++ `onToday`: How long the device has been ON today (seconds).
++ `onTotal`: How long the device has been ON total (seconds).
++ `timespan`: Timespan over which onTotal is relevant (seconds). Typically 2 weeks except when first started up.
++ `averagePower`: Average power consumption (Watts).
++ `power`: Current power consumption (Watts).
++ `energyToday`: Energy used today (Watt-hours, or Wh).
++ `energyTotal`: Energy used in total (Wh).
++ `standbyLimit`: Minimum energy usage to register the insight as switched on ( milliwats, default 8000mW, configurable via WeMo App).
+
+## Lookup Node
+
+This node queries the current state of a device, when an input message is injected.  The output is very similar to that of the Input node.
diff --git a/hardware/wemo/WeMoNG.html b/hardware/wemo/WeMoNG.html
index b9cec3ab..96fb6d41 100644
--- a/hardware/wemo/WeMoNG.html
+++ b/hardware/wemo/WeMoNG.html
@@ -29,9 +29,26 @@
     <li>Light Groups</li>
     <li>Motion Detector</li>
   </ul>
-  <p>Sockets will generate msg.payload with values of 0/1/8 for off or on 
-  (8 is on but at standby load for insight sockets), lightswill return an
-  object like this:</p>
+  <p>Sockets will generate msg.payload with values of 0 or 1 (for off or on).</p> 
+  <p>Insight sockets will return an object like this (where state can also be 8 at standby):</p>
+  <pre>
+  {
+    state: "1"
+    onSince: 1611180205
+    onFor: 853
+    onToday: 18284
+    onTotal: 48785
+    averagePower: 12
+    power: 0
+    energyToday: 3772853
+    energyTotal: 10142468
+    sid: "uuid:adebe0c4-1dd1-11b2-8779-d6b6d5a8a932"
+    type: "socket"
+    name: "WeMo Insight"
+    id: "221536K12000B4"
+  }
+  </pre>
+  <p>Lights will return an object like this:</p>
   <pre>
   {
     name: 'Bedroom light',
@@ -164,7 +181,23 @@
 
 <script type="text/x-red" data-help-name="wemo lookup">
     <p>This node queries the current state of a device</p>
-    <p>For lights it return a msg.payload that looks like this:</p>
+    <p>For sockets it returns a msg.payload that looks like this:</p>
+<pre>{
+  state: 0
+}</pre>
+    <p>For insight sockets it returns a msg.payload that contains extra power parameters:</p>
+<pre>{
+  state: 0,
+  onSince: 1611179325,
+  onFor: 2545,
+  onToday: 17432,
+  onTotal: 47939,
+  averagePower: 13,
+  power: 3.205,
+  energyToday: 3596536,
+  energyTotal: 9966151
+}</pre>
+    <p>For lights it returns a msg.payload that looks like this:</p>
 <pre>{
   available: true,
   state: 0,
diff --git a/hardware/wemo/WeMoNG.js b/hardware/wemo/WeMoNG.js
index 1676fb94..3adf9985 100644
--- a/hardware/wemo/WeMoNG.js
+++ b/hardware/wemo/WeMoNG.js
@@ -246,7 +246,7 @@ module.exports = function(RED) {
             } else if (typeof msg.payload === 'object') {
                 //object need to get complicated here
                 if (msg.payload.hasOwnProperty('state') && typeof msg.payload.state === 'number') {
-                    if (dev.type === 'socket') {
+                    if (dev.type === 'socket' || dev.type === 'socket_insight') {
                         if (msg.payload.state >= 0 && msg.payload.state < 2) {
                             on = msg.payload.state;
                         }
@@ -278,7 +278,7 @@ module.exports = function(RED) {
                 }
             }
 
-            if (dev.type == 'socket') {
+            if (dev.type == 'socket' || dev.type == 'socket_insight') {
                 //console.log("socket");
                 wemo.toggleSocket(dev, on);
             } else if (dev.type === 'light') {
@@ -325,7 +325,10 @@ module.exports = function(RED) {
                         }
                         break;
                     }
-                    case 'socket': {
+                    case 'socket':
+                    case 'socket_insight': {
+                        // For backwards compatibility, always send type 'socket'
+                        notification.type = 'socket';
                         node.send(msg);
                         break;
                     }
@@ -426,9 +429,19 @@ module.exports = function(RED) {
                     msg.payload = status;
                     node.send(msg);
                 });
+            } else if (dev.type === 'socket_insight') {
+                console.log("socket_insight");
+                // insight socket: ask both current switch status AND power measurements
+                wemo.getInsightParams(dev)
+                .then(function(insightParameters) {
+                    msg.payload = insightParameters;
+                    // 'state' should be a number for backwards compatibility
+                    msg.payload.state = parseInt(msg.payload.state);
+                    node.send(msg);
+                });            
             } else {
                 console.log("socket");
-                //socket
+                // classic socket: no power measurement, so only request current switch status
                 wemo.getSocketStatus(dev)
                 .then(function(status) {
                     msg.payload = {
diff --git a/hardware/wemo/lib/wemo.js b/hardware/wemo/lib/wemo.js
index ea168821..1012e159 100644
--- a/hardware/wemo/lib/wemo.js
+++ b/hardware/wemo/lib/wemo.js
@@ -69,6 +69,17 @@ var getSocketState = {
   ].join('\n')
 }
 
+var getInsightParameters = {
+  method: 'POST',
+  path: '/upnp/control/insight1',
+  action: '"urn:Belkin:service:insight:1#GetInsightParams"',
+  body: [
+    postbodyheader,
+    '<u:GetInsightParams xmlns:u="urn:Belkin:service:insight:1">',
+    '</u:GetInsightParams>',
+    postbodyfooter
+  ].join('\n')
+}    
 
 var setdevstatus = {};
 setdevstatus.path = '/upnp/control/bridge1';
@@ -109,6 +120,47 @@ var WeMoNG = function () {
 
 }
 
+function addInsightParams(insightParms, msg) {
+  var params = insightParms.split("|");
+
+  // Whether the device is ON or OFF (1 or 0)
+  msg.state = params[0];
+  
+  // The date and time when the device was last turned on or off (as a Unix timestamp)
+  msg.onSince = parseInt(params[1]);
+  
+  // How long the device was last ON for (seconds)
+  msg.onFor = parseInt(params[2]);
+
+  // How long the device has been ON today (seconds)
+  msg.onToday = parseInt(params[3]);
+  
+  // How long the device has been ON total (seconds)
+  msg.onTotal = parseInt(params[4]);
+  
+  // Timespan over which onTotal is relevant (seconds). Typically 2 weeks except when first started up.
+  //msg.timespan = parseInt(params[5]);
+  
+  // Average power consumption (Watts)
+  msg.averagePower = parseInt(params[6]);
+  
+  // Current power consumption (Watts).  Conversion required because the value is delivered in milliWatts.
+  // It is called 'power' (instead of currentPower) for backwards compatibility ...
+  msg.power = params[7]/1000;
+  
+  // Energy used today (Watt-hours, or Wh)
+  msg.energyToday = parseInt(params[8]);
+  
+  // Energy used in total (Wh)
+  msg.energyTotal = parseFloat(params[9]);
+  
+  // The 10-th parameter is not always available
+  if (params[10]) {
+    // Minimum energy usage to register the insight as switched on ( milliwats, default 8000mW, configurable via WeMo App)
+    msg.standbyLimit = parseInt(params[10]);
+  }
+}
+
 util.inherits(WeMoNG, events.EventEmitter);
 
 WeMoNG.prototype.start = function start() {
@@ -222,8 +274,23 @@ WeMoNG.prototype.start = function start() {
               post_request.write(util.format(getenddevs.body, udn));
               post_request.end();
 
+            } else if (device.deviceType.indexOf('urn:Belkin:device:insight') != -1) {
+              // Insight socket (with power measurement)
+              var socket = {
+                "ip": location.hostname,
+                "port": location.port,
+                "name": device.friendlyName,
+                "type": "socket_insight",
+                "device": device
+              };
+              if (!_wemo.devices[device.serialNumber]) {
+                _wemo.devices[device.serialNumber] = socket;
+                _wemo.emit('discovered',device.serialNumber);
+              } else {
+                _wemo.devices[device.serialNumber] = socket;
+              }
             } else if (device.deviceType.indexOf('urn:Belkin:device') != -1) {
-              //socket
+              // classic socket (without power measurement)
               var socket = {
                 "ip": location.hostname,
                 "port": location.port,
@@ -364,6 +431,57 @@ WeMoNG.prototype.getSocketStatus = function getSocketStatus(socket) {
   return def.promise;
 };
 
+WeMoNG.prototype.getInsightParams = function getInsightParams(socket) {
+  var postoptions = {
+    host: socket.ip,
+    port: socket.port,
+    path: getInsightParameters.path,
+    method: getInsightParameters.method,
+    headers: {
+      'SOAPACTION': getInsightParameters.action,
+      'Content-Type': 'text/xml; charset="utf-8"',
+      'Accept': ''
+    }
+  }
+
+  var def = Q.defer();
+
+  var post_request = http.request(postoptions, function(res){
+    var data = "";
+    res.setEncoding('utf8');
+    res.on('data', function(chunk){
+      data += chunk;
+    });
+
+    res.on('end', function(){
+      xml2js.parseString(data, function(err, result){
+        if (!err) {
+          var params = result["s:Envelope"]["s:Body"][0]["u:GetInsightParamsResponse"][0].InsightParams[0];
+          var msg = {};
+          addInsightParams(params, msg);
+          def.resolve(msg);
+        }
+      });
+    });
+  });
+
+  post_request.on('error', function (e) {
+    console.log(e);
+    console.log("%j", postoptions);
+    def.reject();
+  });
+
+  post_request.on('timeout', function(){
+    post_request.abort();
+    def.reject();
+  });
+
+  post_request.write(getInsightParameters.body);
+  post_request.end();
+
+  return def.promise;
+};
+
 WeMoNG.prototype.getLightStatus = function getLightStatus(light) {
   var postoptions = {
     host: light.ip,
@@ -500,9 +618,8 @@ WeMoNG.prototype.parseEvent = function parseEvent(evt) {
       } else if (prop.hasOwnProperty('BinaryState')) {
         msg.state = prop['BinaryState'][0];
         if (msg.state.length > 1) {
-          var parts = msg.state.split('|');
-          msg.state = parts[0];
-          msg.power = parts[7]/1000;
+          // Add all the insight params to the msg
+          addInsightParams(msg.state, msg);
         }
 
         def.resolve(msg);
diff --git a/hardware/wemo/package.json b/hardware/wemo/package.json
index f001b755..c191abab 100644
--- a/hardware/wemo/package.json
+++ b/hardware/wemo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-wemo",
-  "version": "0.1.18",
+  "version": "0.2.0",
   "description": "Input and Output nodes for Belkin WeMo devices",
   "repository": "https://github.com/node-red/node-red-nodes/tree/master/hardware",
   "main": "WeMoNG.js",

From fc2f6ed3c7dbbd689084c3f23608390db6678bc9 Mon Sep 17 00:00:00 2001
From: Andreas Martens <amartens@uk.ibm.com>
Date: Fri, 29 Jan 2021 16:46:15 +0000
Subject: [PATCH 2/3] join a MUC if we're already connected to server and
 refactor error handling (#749)

---
 social/xmpp/92-xmpp.js | 195 +++++++++++++++++++++--------------------
 1 file changed, 100 insertions(+), 95 deletions(-)

diff --git a/social/xmpp/92-xmpp.js b/social/xmpp/92-xmpp.js
index 59e0ac36..69a0cd13 100644
--- a/social/xmpp/92-xmpp.js
+++ b/social/xmpp/92-xmpp.js
@@ -57,7 +57,7 @@ module.exports = function(RED) {
         this.register = function(xmppThat) {
             if (RED.settings.verbose || LOGITALL) {that.log("registering "+xmppThat.id); }
             that.users[xmppThat.id] = xmppThat;
-            // So we could start the connection here, but we already have the logic in the thats.
+            // So we could start the connection here, but we already have the logic in the nodes that takes care of that.
             // if (Object.keys(that.users).length === 1) {
             //   this.client.start();
             // }
@@ -211,6 +211,66 @@ module.exports = function(RED) {
         }
     });
 
+    function joinMUC(node, xmpp, name) {
+        // the presence with the muc x element signifies we want to join the muc
+        // if we want to support passwords, we need to add that as a child of the x element
+        // (third argument to the x/muc/children )
+        // We also turn off chat history (maxstanzas 0) because that's not what this node is about.
+        var stanza = xml('presence',
+                         {"to": name},
+                         xml("x",'http://jabber.org/protocol/muc'),
+                         { maxstanzas:0, seconds:1 }
+                        );
+        node.serverConfig.used(node);
+        xmpp.send(stanza);
+
+    }
+
+    // separated out since we want the same functionality from both in and out nodes
+    function errorHandler(node, err){
+        if (!node.quiet) {
+            node.quiet = true;
+            // if the error has a "stanza" then we've probably done something wrong and the
+            // server is unhappy with us
+            if (err.hasOwnProperty("stanza")) {
+                if (err.stanza.name === 'stream:error') { node.error("stream:error - bad login id/pwd ?",err); }
+                else { node.error(err.stanza.name,err); }
+                node.status({fill:"red",shape:"ring",text:"bad login"});
+            }
+            // The error might be a string
+            else if (err == "TimeoutError") {
+                // OK, this happens with OpenFire, suppress it.
+                node.status({fill:"grey",shape:"dot",text:"opening"});
+                node.log("Timed out! ",err);
+                //                    node.status({fill:"red",shape:"ring",text:"XMPP timeout"});
+            }
+            else if (err === "XMPP authentication failure") {
+                node.error(err,err);
+                node.status({fill:"red",shape:"ring",text:"XMPP authentication failure"});
+            }
+            // or it might have a name that tells us what's wrong
+            else if (err.name === "SASLError") {
+                node.error("Authorization error! "+err.condition,err);
+                node.status({fill:"red",shape:"ring",text:"XMPP authorization failure"});
+            }
+            
+            // or it might have the errno set.
+            else if (err.errno === "ETIMEDOUT") {
+                node.error("Timeout connecting to server",err);
+                node.status({fill:"red",shape:"ring",text:"timeout"});
+            }
+            else if (err.errno === "ENOTFOUND") {
+                node.error("Server doesn't exist "+xmpp.options.service,err);
+                node.status({fill:"red",shape:"ring",text:"bad address"});
+            }
+            // nothing we've seen before!
+            else {
+                node.error("Unknown error: "+err,err);
+                node.status({fill:"red",shape:"ring",text:"node-red:common.status.error"});
+            }
+        }
+    }
+    
     function XmppInNode(n) {
         RED.nodes.createNode(this,n);
         this.server = n.server;
@@ -220,6 +280,9 @@ module.exports = function(RED) {
         this.sendAll = n.sendObject;
         // Yes, it's called "from", don't ask me why; I don't know why
         this.from = n.to || "";
+        this.quiet = false;
+        // MUC == Multi-User-Chat == chatroom
+        this.muc = this.join && (this.from !== "")
         var node = this;
 
         var xmpp = this.serverConfig.client;
@@ -237,26 +300,27 @@ module.exports = function(RED) {
            disconnect: Socket is disconnected
         */
 
-        xmpp.on('online', async address => {
+        // if we're already connected, then do the actions now, otherwise register a callback
+        if(xmpp.status === "online") {
             node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
-            if ((node.join) && (node.from !== "")) {
-                var to = node.from+'/'+node.nick;
-                // the presence with the muc x element signifies we want to join the muc
-                // if we want to support passwords, we need to add that as a child of the x element
-                // (third argument to the x/muc/children )
-                // We also turn off chat history (maxstanzas 0) because that's not what this node is about.
-                var stanza = xml('presence',
-                    {"to": to},
-                    xml("x",'http://jabber.org/protocol/muc'),
-                    { maxstanzas:0, seconds:1 }
-                );
-                node.serverConfig.used(node);
-                xmpp.send(stanza).catch(error => {node.warn("Got error when sending presence: "+error)});
+            if(node.muc) {
+                joinMUC(node, xmpp, node.from+'/'+node.nick);
+            }
+        }
+        // sod it, register it anyway, that way things will work better on a reconnect:
+        xmpp.on('online', async address => {
+            node.quiet = false;
+            node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
+            if (node.muc) {
+                // if we want to use a chatroom, we need to tell the server we want to join it
+                joinMUC(node, xmpp, node.from+'/'+node.nick);
             }
         });
 
         xmpp.on('connecting', async address => {
-            node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
+            if(!node.quiet) {
+                node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
+            }
         });
         xmpp.on('connect', async address => {
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connected"});
@@ -281,39 +345,7 @@ module.exports = function(RED) {
         // Should we listen on other's status (chatstate) or a chatroom state (groupbuddy)?
         xmpp.on('error', err => {
             if (RED.settings.verbose || LOGITALL) { node.log("XMPP Error: "+err); }
-            if (err.hasOwnProperty("stanza")) {
-                if (err.stanza.name === 'stream:error') { node.error("stream:error - bad login id/pwd ?",err); }
-                else { node.error(err.stanza.name,err); }
-                node.status({fill:"red",shape:"ring",text:"bad login"});
-            }
-            else {
-                if (err.errno === "ETIMEDOUT") {
-                    node.error("Timeout connecting to server",err);
-                    node.status({fill:"red",shape:"ring",text:"timeout"});
-                }
-                if (err.errno === "ENOTFOUND") {
-                    node.error("Server doesn't exist "+xmpp.options.service,err);
-                    node.status({fill:"red",shape:"ring",text:"bad address"});
-                }
-                else if (err === "XMPP authentication failure") {
-                    node.error("Authentication failure! "+err,err);
-                    node.status({fill:"red",shape:"ring",text:"XMPP authentication failure"});
-                }
-                else if (err.name === "SASLError") {
-                    node.error("Authorization error! "+err.condition,err);
-                    node.status({fill:"red",shape:"ring",text:"XMPP authorization failure"});
-                }
-                else if (err == "TimeoutError") {
-                    // Suppress it!
-                    node.warn("Timed out! ");
-                    node.status({fill:"grey",shape:"dot",text:"opening"});
-                    //node.status({fill:"red",shape:"ring",text:"XMPP timeout"});
-                }
-                else {
-                    node.error(err,err);
-                    node.status({fill:"red",shape:"ring",text:"node-red:common.status.error"});
-                }
-            }
+            errorHandler(node, err);
         });
 
         // Meat of it, a stanza object contains chat messages (and other things)
@@ -408,7 +440,6 @@ module.exports = function(RED) {
         }
         catch(e) {
             node.error("Bad xmpp configuration; service: "+xmpp.options.service+" jid: "+node.serverConfig.jid);
-            node.warn(e);
             node.warn(e.stack);
             node.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"});
         }
@@ -429,6 +460,9 @@ module.exports = function(RED) {
         this.join = n.join || false;
         this.sendAll = n.sendObject;
         this.to = n.to || "";
+        this.quiet = false;
+        // MUC == Multi-User-Chat == chatroom
+        this.muc = this.join && (this.to !== "")
         var node = this;
 
         var xmpp = this.serverConfig.client;
@@ -446,27 +480,26 @@ module.exports = function(RED) {
            disconnect: Socket is disconnected
         */
 
-        xmpp.on('online', function(data) {
+        // if we're already connected, then do the actions now, otherwise register a callback
+        if(xmpp.status === "online") {
             node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
-            if ((node.join) && (node.to !== "")) {
-                // disable chat history
-                var to = node.to+'/'+node.nick;
-                // the presence with the muc x element signifies we want to join the muc
-                // if we want to support passwords, we need to add that as a child of the x element
-                // (third argument to the x/muc/children )
-                // We also turn off chat history (maxstanzas 0) because that's not what this node is about.
-                var stanza = xml('presence',
-                    {"to": to},
-                    xml("x",'http://jabber.org/protocol/muc'),
-                    { maxstanzas:0, seconds:1 }
-                );
-                node.serverConfig.used(node);
-                xmpp.send(stanza);
+            if(node.muc){
+                joinMUC(node, xmpp, node.to+'/'+node.nick);
+            }
+        }
+        // sod it, register it anyway, that way things will work better on a reconnect:
+        xmpp.on('online', function(data) {
+            node.quiet = false;
+            node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
+            if (node.muc) {
+                joinMUC(node, xmpp,node.to+"/"+node.nick);
             }
         });
 
         xmpp.on('connecting', async address => {
-            node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
+            if(!node.quiet) {
+                node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
+            }
         });
         xmpp.on('connect', async address => {
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connected"});
@@ -490,35 +523,7 @@ module.exports = function(RED) {
 
         xmpp.on('error', function(err) {
             if (RED.settings.verbose || LOGITALL) { node.log(err); }
-            if (err.hasOwnProperty("stanza")) {
-                if (err.stanza.name === 'stream:error') { node.error("stream:error - bad login id/pwd ?",err); }
-                else { node.error(err.stanza.name,err); }
-                node.status({fill:"red",shape:"ring",text:"bad login"});
-            }
-            else {
-                if (err.errno === "ETIMEDOUT") {
-                    node.error("Timeout connecting to server",err);
-                    node.status({fill:"red",shape:"ring",text:"timeout"});
-                }
-                else if (err.errno === "ENOTFOUND") {
-                    node.error("Server doesn't exist "+xmpp.options.service,err);
-                    node.status({fill:"red",shape:"ring",text:"bad address"});
-                }
-                else if (err === "XMPP authentication failure") {
-                    node.error(err,err);
-                    node.status({fill:"red",shape:"ring",text:"XMPP authentication failure"});
-                }
-                else if (err == "TimeoutError") {
-                    // OK, this happens with OpenFire, suppress it.
-                    node.status({fill:"grey",shape:"dot",text:"opening"});
-                    node.log("Timed out! ",err);
-                    //                    node.status({fill:"red",shape:"ring",text:"XMPP timeout"});
-                }
-                else {
-                    node.error("Unknown error: "+err,err);
-                    node.status({fill:"red",shape:"ring",text:"node-red:common.status.error"});
-                }
-            }
+            errorHandler(node, err)
         });
 
         //register with config

From 77fac0331980e8d20a73fa1b8a11ffe4d3d89fd8 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 29 Jan 2021 16:48:54 +0000
Subject: [PATCH 3/3] bump xmpp

---
 social/xmpp/package.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/social/xmpp/package.json b/social/xmpp/package.json
index 44381f89..09ed319b 100644
--- a/social/xmpp/package.json
+++ b/social/xmpp/package.json
@@ -1,10 +1,13 @@
 {
     "name": "node-red-node-xmpp",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "A Node-RED node to talk to an XMPP server",
     "dependencies": {
-        "@xmpp/client": "^0.11.1"
+        "@xmpp/client": "^0.12.0"
     },
+    "bundledDependencies": [
+        "@xmpp/client"
+    ],
     "repository": {
         "type": "git",
         "url": "https://github.com/node-red/node-red-nodes/tree/master/social/xmpp"