node-red-contrib-remote 2.0.2 → 2.0.4

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.4
+-  Fix for 'No endpoint detected' message
+
+Version 2.0.3
+-  More stable handling of connection losses
+
 Version 2.0.2
 - Crash on Node-RED startup fixed, extended error reporting
 

package/nodes/remote-access.js

@@ -5,19 +5,14 @@ module.exports = function(RED) {
   const internalIp = require('internal-ip');
   const instancehashToAccessNode = {};
 
-  function startSSH(node, server, port) {
+  async function startSSH(node, server, port) {
     try {
       node.log("starting ssh process");
 
       // 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;
+        node.log(`checking old ssh process with pid ${node.sshprocess.pid}`);
+        await killSSHProcess(node);
       }
 
       // Reset heartbeat status
@@ -35,7 +30,8 @@ module.exports = function(RED) {
         sshparameters.push('-v');
       }
       node.sshprocess = child_process.spawn("ssh", sshparameters);
-      node.log(`ssh process with pid ${node.sshprocess.pid} started`);
+      const currentPid = node.sshprocess.pid;
+      node.log(`ssh process with pid ${currentPid} started`);
 
       // Set serving.. if not working, the process will exit or close
       setStatus(node, {fill:"green",shape:"dot",text:"remote-access.status.serving"});
@@ -54,23 +50,29 @@ module.exports = function(RED) {
       });
 
       node.sshprocess.on('close', (code, signal) => {
-        if ( node.statustext !== "remote-access.status.heartbeaterror" ) {
-          setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopped"});
+        node.log(`ssh process close (pid: ${currentPid} code: ${code} signal: ${signal})`);
+        // Only update status if this is still the current process
+        if (node.sshprocess && node.sshprocess.pid === currentPid) {
+          if ( node.statustext !== "remote-access.status.heartbeaterror" ) {
+            setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopped"});
+          }
+          node.serving = false
         }
-        node.serving = false
-        node.log(`ssh process close (pid: ${node.sshprocess.pid} code: ${code} signal: ${signal})`);
       });
 
       node.sshprocess.on('exit', (code, signal) => {
-        if ( node.statustext !== "remote-access.status.heartbeaterror" ) {
-          setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopped"});
+        node.log(`ssh process exit (pid: ${currentPid} code: ${code} signal: ${signal})`);
+        // Only update status if this is still the current process
+        if (node.sshprocess && node.sshprocess.pid === currentPid) {
+          if ( node.statustext !== "remote-access.status.heartbeaterror" ) {
+            setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopped"});
+          }
+          node.serving = false
         }
-        node.serving = false
-        node.log(`ssh process exit (pid: ${node.sshprocess.pid} code: ${code} signal: ${signal})`);
       });
 
       node.sshprocess.on('error', (err) => {
-        node.log(`ssh process error (pid: ${node.sshprocess.pid}): ${err.name} : ${err.message}`);
+        node.log(`ssh process error (pid: ${currentPid}): ${err.name} : ${err.message}`);
       });
     } catch (e) {
       // TODO: Error: socket hang up
@@ -103,6 +105,7 @@ module.exports = function(RED) {
       // Is this instance banned?
       if ( node.instanceIsBanned ) {
         reject(new Error('Instance banned'));
+        return;
       }
 
       // Create object with config values to send to server
@@ -120,7 +123,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();
@@ -153,6 +156,8 @@ module.exports = function(RED) {
           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;
           }
         }
 
@@ -218,8 +223,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.`);
@@ -227,8 +235,9 @@ 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.`);
+            // Set serving to false, checkServing will trigger reconnect and startSSH will kill old process
+            node.serving = false;
           } else {
             // If the status before had also an error > Just change the label.
             setStatus(node, {fill:"yellow",shape:"dot",text:"remote-access.status.heartbeaterroractive"});
@@ -238,7 +247,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));
         }
@@ -247,16 +256,62 @@ module.exports = function(RED) {
   }
 
   function killSSHProcess(node) {
-    // Kill process
-    try {
-      if (node.sshprocess !== undefined) {
-        node.log(`Killing process ${node.sshprocess.pid}`);
-        node.sshprocess.kill();
+    // Returns a promise that kills the current process. Resolves when process is dead or after 2 seconds.
+    return new Promise((resolve) => {
+      try {
+        if (node.sshprocess !== undefined) {
+          const pidToKill = node.sshprocess.pid;
+          const processToKill = node.sshprocess;
+
+          // Remove existing listeners
+          processToKill.removeAllListeners('close');
+          processToKill.removeAllListeners('exit');
+          processToKill.removeAllListeners('error');
+          processToKill.stdout.removeAllListeners('data');
+          processToKill.stderr.removeAllListeners('data');
+
+          // Check if process is already dead (exitCode is set when process has exited)
+          if (processToKill.exitCode !== null || processToKill.killed) {
+            node.log(`Process ${pidToKill} already dead (exitCode: ${processToKill.exitCode}, killed: ${processToKill.killed})`);
+            node.sshprocess = undefined;
+            node.serving = false;
+            resolve();
+            return;
+          }
+
+          node.log(`Killing process ${pidToKill}`);
+
+          // Safety timeout: resolve after 2 seconds even if exit event doesn't fire
+          const safetyTimeout = setTimeout(() => {
+            node.log(`Process ${pidToKill} kill timeout after 2 seconds`);
+            node.serving = false;
+            resolve();
+          }, 2000);
+
+          // Set up one-time exit handler to know when process is really dead
+          const exitHandler = () => {
+            clearTimeout(safetyTimeout);
+            node.log(`Process ${pidToKill} confirmed killed`);
+            node.serving = false;
+            resolve();
+          };
+
+          // Add one-time exit handler
+          processToKill.once('exit', exitHandler);
+
+          // Send kill signal
+          processToKill.kill();
+          node.sshprocess = undefined;
+        } else {
+          node.serving = false;
+          resolve();
+        }
+      } catch (error) {
+        node.error(`Error in killSSHProcess: ${error}`);
+        node.serving = false;
+        resolve();
       }
-      node.serving = false
-    } catch (error) {
-      node.error(`Error in killSSHProcess: ${error}`);
-    }
+    });
   }
 
   function RemoteAccessNode(config) {
@@ -369,8 +424,8 @@ module.exports = function(RED) {
       // Set status
       setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopping"});
 
-      // Kill process
-      killSSHProcess(node)
+      // Kill process (don't wait as Node-RED has a timeout for close handlers)
+      killSSHProcess(node).catch(err => node.error(`Error killing SSH process on close: ${err}`))
 
       // Cancel timeouts
       try {

package/nodes/remote-commons.js

@@ -88,7 +88,10 @@ module.exports = {
         this.reportError(errorElem, node, caller);
       });
     } else {
-      node.error(`${caller}: ${error.code}: ${(error.stack !== undefined) ? error.stack : error.message}`);
+      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.2",
+  "version": "2.0.4",
   "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",