node-red-contrib-remote 2.0.1 → 2.0.3

package/README.md

@@ -36,6 +36,12 @@ You will find more information on [www.remote-red-com](https://www.remote-red.co
 
 ## Version History
 
+Version 2.0.3
+-  More stable handling of connection losses
+
+Version 2.0.2
+- Crash on Node-RED startup fixed, extended error reporting
+
 Version 2.0.1
 - Possible bug on network connection fixed
 

package/nodes/remote-access.js

@@ -12,12 +12,7 @@ module.exports = function(RED) {
       // Is there a old node.sshprocess object?
       if (node.sshprocess !== undefined) {
         node.log(`ssh process with pid ${node.sshprocess.pid} already existing`);
-        node.sshprocess.removeAllListeners('close');
-        node.sshprocess.removeAllListeners('exit');
-        node.sshprocess.removeAllListeners('error');
-        node.sshprocess.stdout.removeAllListeners('data');
-        node.sshprocess.stderr.removeAllListeners('data');
-        node.sshprocess = undefined;
+        killSSHProcess(node);
       }
 
       // Reset heartbeat status
@@ -102,7 +97,8 @@ module.exports = function(RED) {
     return new Promise((resolve, reject) => {
       // Is this instance banned?
       if ( node.instanceIsBanned ) {
-        reject();
+        reject(new Error('Instance banned'));
+        return;
       }
 
       // Create object with config values to send to server
@@ -120,7 +116,7 @@ module.exports = function(RED) {
       const configString = JSON.stringify(config);
       const configStringBuffer = Buffer.from(configString);
       const configStringBase64 = configStringBuffer.toString('base64');
-      node.log(`Sending config to server: ${configString}`);
+      // node.log(`Sending config to server: ${configString}`);
 
       // Call API to retrive server and port.
       const axiosInstance = commons.createAxiosInstance();
@@ -141,29 +137,39 @@ module.exports = function(RED) {
       })
       .catch((error) => {
         // Log error
-        node.error('requestInstanceSlot: ' + commons.getNetworkErrorString(error))
+        node.error('requestInstanceSlot: ' + commons.getNetworkErrorString(error));
+        node.error(error);
         if ( commons.getNetworkErrorCustomString(error) !== undefined) {
           node.error(commons.getNetworkErrorCustomString(error));
         }
+        commons.reportError(error, node, 'requestInstanceSlot');
 
         // Wenn gebannt -> Merken
         if ( error.response && error.response.status ) {
           if ( error.response.status === 403 ) {
             setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.banned"});
             node.instanceIsBanned = true;
+            reject(new Error('Instance banned'));
+            return;
           }
         }
 
         // Set status
         if (!node.instanceIsBanned) setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.commerror"});
-        reject();
+
+        // Resolve as error is handled
+        resolve();
       });
     });
   }
 
   async function tryConnect(node) {
     // Request new instance slot and connect ssh
-    await requestInstanceSlot(node)
+    try {
+      await requestInstanceSlot(node)
+    } catch (error) {
+      commons.reportError(error, node, 'tryConnect');
+    }
 
     // Create timer to check if ssh process still serving in 10 seconds
     node.checkservingtimeout = setTimeout(checkServing, 1000*10, node);
@@ -210,8 +216,11 @@ module.exports = function(RED) {
         }
         node.lastHeartbeatStatus = response.data.status
 
-        // If the communication is not ok...
-        if ( node.lastHeartbeatStatus === 'NOTFOUND' ) {
+        // Based on the status...
+        if ( node.lastHeartbeatStatus === 'OK' ) {
+          node.initialHeartbeatStatus = node.lastHeartbeatStatus; // Wenn es jetzt OK ist, zählt es auch wie initial OK
+          setStatus(node, {fill:"green",shape:"dot",text:"remote-access.status.serving"});
+        } else if ( node.lastHeartbeatStatus === 'NOTFOUND' ) {
           // The local endpoint responed a 404...
           setStatus(node, {fill:"yellow",shape:"dot",text:"remote-access.status.heartbeaterrornotfound"});
           node.log(`Heartbeat detected no valid endpoint, got a 404 response. Please check the base URL in the connection settings.`);
@@ -219,8 +228,8 @@ module.exports = function(RED) {
           if ( node.initialHeartbeatStatus === 'OK' ) {
             // If the status before was ok > Restart communication
             setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.heartbeaterror"});
-            killSSHProcess(node)
             node.log(`Heartbeat error. Reconnecting soon.`);
+            killSSHProcess(node)
           } else {
             // If the status before had also an error > Just change the label.
             setStatus(node, {fill:"yellow",shape:"dot",text:"remote-access.status.heartbeaterroractive"});
@@ -230,7 +239,7 @@ module.exports = function(RED) {
       })
       .catch((error) => {
         // Error on api call > Log error
-        node.error('heartbeat: ' + commons.getNetworkErrorString(error))
+        commons.reportError(error, node, 'heartbeat');
         if ( commons.getNetworkErrorCustomString(error) !== undefined) {
           node.error(commons.getNetworkErrorCustomString(error));
         }
@@ -243,7 +252,13 @@ module.exports = function(RED) {
     try {
       if (node.sshprocess !== undefined) {
         node.log(`Killing process ${node.sshprocess.pid}`);
+        node.sshprocess.removeAllListeners('close');
+        node.sshprocess.removeAllListeners('exit');
+        node.sshprocess.removeAllListeners('error');
+        node.sshprocess.stdout.removeAllListeners('data');
+        node.sshprocess.stderr.removeAllListeners('data');
         node.sshprocess.kill();
+        node.sshprocess = undefined;
       }
       node.serving = false
     } catch (error) {

package/nodes/remote-commons.js

@@ -80,6 +80,19 @@ module.exports = {
       errorString = `Error during DNS queries. Please check Internet connection on your Node-RED server. Please check if a firewall blocks your DNS queries.`;
     }
     return errorString;
+  },
+
+  reportError: function(error, node, caller) {
+    if (error instanceof AggregateError) {
+      error.errors.forEach(errorElem => {
+        this.reportError(errorElem, node, caller);
+      });
+    } else {
+      node.error(`${caller}: ${error.code}: ${error.message}`);
+      if ( error.stack !== undefined ) {
+        node.debug(error.stack);
+      }
+    }
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-remote",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Remote-RED is an ecosystem to bring remote access, push notification and geofencing to Node-RED. There are also additional functions like directly answer on a notification and homescreen widgets.",
   "author": "Thorsten Heilmann",
   "license": "GPL-3.0",
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "axios": "^1.7.2",
+    "axios": "^1.8.1",
     "internal-ip": "^6.1.0",
     "limiter": "^1.1.5",
     "path": "^0.12.7",