node-red-contrib-remote 1.4.0 → 1.5.1

package/README.md

@@ -1,6 +1,6 @@
 # Remote-RED
 
-Remote-RED is an ecosystem to bring remote access and push notifications to Node-RED. It consists of several parts:
+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. It consists of several parts:
 - node-red-contrib-remote: The Node-RED nodes of Remote-RED. Published in this repro.
 - Remote-RED servers: Several servers used for proxying the remote access traffic and sending push notifications.
 - Remote-RED apps: Apps to access the services published by the Remote-RED remote-access node and receiving the push notifications of the remote-notification node. Available or Android, iOS and iPadOS.
@@ -36,6 +36,17 @@ You will find more information on [www.remote-red-com](https://www.remote-red.co
 
 ## Version History
 
+Version 1.5.1
+- Added support for running Node-RED with a self signed https certificate.
+- Notifications and Questions will automatically convert values to string if a string is needed (e.g. title and body). 
+
+Version 1.5.0
+- Geofencing! You can add geofences in the apps. Entering and leaving them will trigger a message on the new output of the remote access node.
+- Adding server location in Asia.
+- New instances will have the base url '/ui' again.
+- Error with "Multiple requests" after a missing internet connection fixed.
+- iOS App: Links with target '_blank' will be redirected to iOS.
+
 Version 1.4.0
 - In addition to the QR code, a link is now generated to add an instance in the app.
 - Sending notifications and questions is prevented if msg.playload.send === false.

package/nodes/locales/de/remote-access.json

@@ -17,7 +17,8 @@
           "commerror": "Fehler bei der Kommunikation mit dem Server.",
           "noconfig": "Keine Konfiguration gefunden.",
           "incompleteconfig": "Konfiguration unvollständig.",
-          "backupconfig": "Konfiguration aus Backup."
+          "backupconfig": "Konfiguration aus Backup.",
+          "banned": "Die Instanz wurde deaktiviert. Möglicherweise aufgrund einer DDOS-Attacke. Wenn Sie dieses System nicht missbrauchen, erstelle bitte eine neuen Konfig Node, um Remote-RED wieder zu verwenden. Andernfalls suchen Sie nach falschen Weiterleitungen oder Proxy Fehlern. Diese IP wird für 10 Minuten gesperrt."
         },
         "help": {
           "title": "Hilfe",

package/nodes/locales/de/remote-config.json

@@ -12,6 +12,7 @@
           "region": "Standort Server",
           "region_us": "Amerika (USA)",
           "region_de": "Europa (Deutschland)",
+          "region_sg": "Asien (Singapur)",
           "region_dev": "Entwicklung",
           "region_desc": "Der Standort kann nicht mehr geändert werden, sobald eine App registriert wurde.",
           "change_info": "Wenn Du Einstellungen änderst, musst Du die App neu verbinden.",

package/nodes/locales/en-US/remote-access.json

@@ -17,7 +17,8 @@
           "commerror": "Error communicating with server.",
           "noconfig": "No configuration found.",
           "incompleteconfig": "Configuration incomplete.",
-          "backupconfig": "Configuration from backup."
+          "backupconfig": "Configuration from backup.",
+          "banned": "Instance is deactivated. Maybe due DDOS attacks. If you are not missusing this system, please create new config node to use Remote-RED again. Otherwise look for incorrect redirects or such errors. Banning IP for 10 minutes."
         },
         "help": {
           "title": "Help",

package/nodes/locales/en-US/remote-config.json

@@ -12,6 +12,7 @@
           "region": "Server location",
           "region_us": "America (USA)",
           "region_de": "Europe (Germany)",
+          "region_sg": "Asia (Singapur)",
           "region_dev": "Development host",
           "region_desc": "The region can´t be changed after registering an app.",
           "change_info": "If you change settings, you need to reconnect the app.",

package/nodes/remote-access.html

@@ -8,10 +8,8 @@
       verbose: {value:0}
     },
     inputs: 0,
-    outputs: 1,
-    outputLabels: ["action output"],
-    // outputs: 2,
-    // outputLabels: ["action output", "geofence output"],
+    outputs: 2,
+    outputLabels: ["action output", "geofence output"],
     icon: "font-awesome/fa-mobile",
     label: function() {
         return this.name || "remote access";

package/nodes/remote-access.js

@@ -4,6 +4,7 @@ module.exports = function(RED) {
   const os = require("os");
   let sshprocess = undefined
   let statustext = ''
+  let instanceIsBanned = false
 
   function startSSH(node, server, port) {
     try {
@@ -18,7 +19,7 @@ module.exports = function(RED) {
       if ( host === 'localhost' && os.platform() === 'win32' ) {
         host = '127.0.0.1'
       }
-      //node.log('ssh -o StrictHostKeyChecking=no -R ' + port.toString() + ':' + host + ':' + node.confignode.port.toString() + ' forward@proxy-' + server + ' -N');
+      // node.log('ssh -o StrictHostKeyChecking=no -R ' + port.toString() + ':' + host + ':' + node.confignode.port.toString() + ' forward@proxy-' + server + ' -N');
       var sshparameters = ['-o StrictHostKeyChecking=no', '-R', port.toString() + ':' + host + ':' + node.confignode.port.toString(), 'forward@proxy-' + server, '-N'];
       if ( node.verbose ) {
         sshparameters.push('-v');
@@ -36,6 +37,9 @@ module.exports = function(RED) {
 
       sshprocess.stderr.on('data', (data) => {
         logSSHBuffer(node, data, 'ssh process stderr');
+        if ( data.toString().includes('Connection timed out')) {
+          node.error(`SSH connection timeout. Please check if port 22 is open for outgoing connections.`);
+        }
       });
 
       sshprocess.on('close', (code, signal) => {
@@ -89,6 +93,11 @@ module.exports = function(RED) {
   }
 
   function requestInstanceSlot(node) {
+    // Is this instance banned?
+    if ( instanceIsBanned ) {
+      return;
+    }
+
     // Call API to retrive server and port.
     const axiosInstance = commons.createAxiosInstance();
     axiosInstance.post(`https://api-${node.confignode.server}/instanceSlotRequest`, {
@@ -105,10 +114,22 @@ module.exports = function(RED) {
       startSSH(node, node.confignode.server, port);
     })
     .catch((error) => {
-      node.error('requestInstanceSlot: ' + error);
-      if ( error.response && error.response.data && error.response.data.message ) {
-        node.error(`${error.response.data.message}`);
+      // Log error
+      node.error('requestInstanceSlot: ' + commons.getNetworkErrorString(error))
+      if ( commons.getNetworkErrorCustomString(error) !== undefined) {
+        node.error(commons.getNetworkErrorCustomString(error));
       }
+
+      // 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"});
+          instanceIsBanned = true;
+          return;
+        }
+      }
+
+      // Set status
       setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.commerror"});
       return;
     });
@@ -183,10 +204,10 @@ module.exports = function(RED) {
         }
       })
       .catch((error) => {
-        // Error on api call > Just log
-        node.error('heartbeat: ' + error);
-        if ( error.response && error.response.data && error.response.data.message ) {
-          node.error(`${error.response.data.message}`);
+        // Error on api call > Log error
+        node.error('heartbeat: ' + commons.getNetworkErrorString(error))
+        if ( commons.getNetworkErrorCustomString(error) !== undefined) {
+          node.error(commons.getNetworkErrorCustomString(error));
         }
       });
     }

package/nodes/remote-commons.js

@@ -8,6 +8,7 @@ module.exports = {
   createAxiosInstance: function() {
     var filepath = path.join(__dirname, 'resources', 'ca.cer');
     const httpsAgent = new https.Agent({
+      rejectUnauthorized: false,
       ca: fs.readFileSync(filepath),
       checkServerIdentity: function(host, cert) {
         const pubkeyPinned = 'YHGEo54+LKxdpCuSAFt+Zwx/RVSHER96vM/Rh0/zcQ4=';
@@ -17,7 +18,7 @@ module.exports = {
         }
       }
     });
-    return axios.create({ httpsAgent: httpsAgent });
+    return axios.create({ httpsAgent: httpsAgent, timeout: 5000 });
   },
 
   getNodeVersion: function() {
@@ -26,15 +27,40 @@ module.exports = {
     return pjson.version;
   },
 
-  evaluateValue: function(RED, value, type, node, msg) {
+  evaluateValue: function(RED, value, type, node, msg, tostring) {
     // Evaluates the value
     let evalValue = ''
     try {
       evalValue = RED.util.evaluateNodeProperty(value, type, node, msg);
+      if (tostring) {
+        if (evalValue == undefined) evalValue = '';
+        evalValue = String(evalValue);
+      }
     } catch (e) {
       node.error(`Error evaluating value: ${e}`)
     }
     return evalValue;
+  },
+
+  getNetworkErrorString: function(error) {
+    // Trys to get a error message
+    let errorString = `` + error;
+    if ( error.response && error.response.data && error.response.data.message ) {
+      errorString = `${error.response.data.message}`;
+    }
+    return errorString;
+  },
+
+  getNetworkErrorCustomString: function(error) {
+    // Custom error messages for common errors
+    let errorString = undefined;
+    if ( error.code === 'ECONNABORTED' ) {
+      errorString = `Error during https call. Please check Internet connection on your Node-RED server. Please check if a firewall blocks outgoing port 443.`;
+    }
+    if ( error.code === 'EAI_AGAIN' ) {
+      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;
   }
 
 }

package/nodes/remote-config.html

@@ -103,6 +103,9 @@
       } else {
         // Show error
         alert('Error while registering instance: ' + data.error);
+
+        // Enable button again
+        document.getElementById('registerRemoteAppButton').disabled = false;
       }
     });
   }
@@ -214,6 +217,7 @@
     <select id="node-config-input-region">
         <option value="us" data-i18n="remote-config.label.region_us"></option>
         <option value="de" data-i18n="remote-config.label.region_de"></option>
+        <option value="sg" data-i18n="remote-config.label.region_sg"></option>
         <!-- <option value="dev" data-i18n="remote-config.label.region_dev"></option> -->
     </select>
   </div>

package/nodes/remote-config.js

@@ -27,7 +27,7 @@ module.exports = function(RED) {
     // Return the internal IP and the mountpath
     const ipData = {
       'ipv4': internalIp.v4.sync(),
-      'baseurl': RED.httpNode.mountpath + ((RED.settings.ui !== undefined && RED.settings.ui.path !== undefined) ? RED.settings.ui.path : ''),
+      'baseurl': RED.httpNode.mountpath + ((RED.settings.ui !== undefined && RED.settings.ui.path !== undefined) ? RED.settings.ui.path : 'ui'),
       'port': (RED.settings.uiPort !== undefined) ? String(RED.settings.uiPort) : '1880'
     }
     console.log(`${JSON.stringify(ipData)}`);
@@ -48,6 +48,9 @@ module.exports = function(RED) {
       if ( error.response && error.response.data && error.response.data.message ) {
         errorMessage = errorMessage + " / " + error.response.data.message;
       }
+      if ( commons.getNetworkErrorCustomString(error) !== undefined) {
+        errorMessage = commons.getNetworkErrorCustomString(error);
+      }
       res.json({ 'error': errorMessage });
     });
   });
@@ -97,6 +100,9 @@ module.exports = function(RED) {
       if ( error.response && error.response.data && error.response.data.message ) {
         errorMessage = errorMessage + " / " + error.response.data.message;
       }
+      if ( commons.getNetworkErrorCustomString(error) !== undefined) {
+        errorMessage = commons.getNetworkErrorCustomString(error);
+      }
       res.json({ 'error': errorMessage });
     });
   });

package/nodes/remote-notification.js

@@ -18,16 +18,14 @@ module.exports = function(RED) {
     // Act on incomming messages
     node.on('input', function(msg) {
       if (node.confignode != undefined) {
-        if (msg.payload.send === false) {
+        if (msg.payload !== undefined && msg.payload.send === false) {
           node.log(`Notification not send (msg.payload.send = false).`)
           return;
         }
         node.limiter.removeTokens(1, function(err, remainingRequests) {
           if (remainingRequests >= 0) {
-            let title = commons.evaluateValue(RED, config.notificationTitle, config.notificationTitleType, node, msg);
-            let body = commons.evaluateValue(RED, config.notificationBody, config.notificationBodyType, node, msg);
-            if (title == undefined) title = '';
-            if (body == undefined) body = '';
+            let title = commons.evaluateValue(RED, config.notificationTitle, config.notificationTitleType, node, msg, true);
+            let body = commons.evaluateValue(RED, config.notificationBody, config.notificationBodyType, node, msg, true);
             const notificationEmpty = (title == '' && body == '');
             if (!notificationEmpty) {
               // Title and/or body are filled
@@ -40,7 +38,7 @@ module.exports = function(RED) {
                 // Sound configured or computed?
                 let sound = config.notificationSound
                 if (sound === 'computed') {
-                  sound = commons.evaluateValue(RED, config.notificationSoundComputed, config.notificationSoundComputedType, node, msg);
+                  sound = commons.evaluateValue(RED, config.notificationSoundComputed, config.notificationSoundComputedType, node, msg, true);
                 }
 
                 // Call API to send notification
@@ -63,7 +61,11 @@ module.exports = function(RED) {
                   }
                 })
                 .catch((error) => {
-                  node.error("ERROR: " + error);
+                  // Log error
+                  node.error('sendNotification: ' + commons.getNetworkErrorString(error))
+                  if ( commons.getNetworkErrorCustomString(error) !== undefined) {
+                    node.error(commons.getNetworkErrorCustomString(error));
+                  }
 
                   // Output status if configured so
                   if ( config.output == 2 ) {
@@ -73,7 +75,7 @@ module.exports = function(RED) {
                 });
               } else {
                 // To big...
-                node.error("The message exceeded 3600 bytes. Can´t send.");
+                node.error("xxxThe message exceeded 3600 bytes. Can´t send.");
 
                 // Output status if configured so
                 if ( config.output == 2 ) {

package/nodes/remote-question.js

@@ -18,16 +18,14 @@ module.exports = function(RED) {
     // Act on incomming messages
     node.on('input', function(msg) {
       if (node.confignode != undefined) {
-        if (msg.payload.send === false) {
+        if (msg.payload !== undefined && msg.payload.send === false) {
           node.log(`Question not send (msg.payload.send = false).`)
           return;
         }
         node.limiter.removeTokens(1, function(err, remainingRequests) {
           if (remainingRequests >= 0) {
-            let title = commons.evaluateValue(RED, config.questionTitle, config.questionTitleType, node, msg);
-            let body = commons.evaluateValue(RED, config.questionBody, config.questionBodyType, node, msg);
-            if (title == undefined) title = '';
-            if (body == undefined) body = '';
+            let title = commons.evaluateValue(RED, config.questionTitle, config.questionTitleType, node, msg, true);
+            let body = commons.evaluateValue(RED, config.questionBody, config.questionBodyType, node, msg, true);
             const notificationEmpty = (title == '' && body == '');
             if (!notificationEmpty) {
               // Title and/or body are filled, generate question data
@@ -37,19 +35,20 @@ module.exports = function(RED) {
                 "questiontype" : 1,
                 "answers": [
                   {
-                    "text": commons.evaluateValue(RED, config.questionAnswerOne, config.questionAnswerOneType, node, msg),
-                    "value": commons.evaluateValue(RED, config.questionAnswerOneValue, config.questionAnswerOneValueType, node, msg)
+                    "text": commons.evaluateValue(RED, config.questionAnswerOne, config.questionAnswerOneType, node, msg, true),
+                    "value": commons.evaluateValue(RED, config.questionAnswerOneValue, config.questionAnswerOneValueType, node, msg, false)
                   },
                   {
-                    "text": commons.evaluateValue(RED, config.questionAnswerTwo, config.questionAnswerTwoType, node, msg),
-                    "value": commons.evaluateValue(RED, config.questionAnswerTwoValue, config.questionAnswerTwoValueType, node, msg)
+                    "text": commons.evaluateValue(RED, config.questionAnswerTwo, config.questionAnswerTwoType, node, msg, true),
+                    "value": commons.evaluateValue(RED, config.questionAnswerTwoValue, config.questionAnswerTwoValueType, node, msg, false)
                   },
                   {
-                    "text": commons.evaluateValue(RED, config.questionAnswerThree, config.questionAnswerThreeType, node, msg),
-                    "value": commons.evaluateValue(RED, config.questionAnswerThreeValue, config.questionAnswerThreeValueType, node, msg)
+                    "text": commons.evaluateValue(RED, config.questionAnswerThree, config.questionAnswerThreeType, node, msg, true),
+                    "value": commons.evaluateValue(RED, config.questionAnswerThreeValue, config.questionAnswerThreeValueType, node, msg, false)
                   }
                 ]
               };
+              node.log(`questionData: ${JSON.stringify(questionData)}`)
 
               // Content smaller than 3600 bytes? FCM max size (complete payload) is 4000 bytes.
               if (title.length + body.length + JSON.stringify(questionData).length <= 3600) {
@@ -59,7 +58,7 @@ module.exports = function(RED) {
                 // Sound configured or computed?
                 let sound = config.questionSound
                 if (sound === 'computed') {
-                  sound = commons.evaluateValue(RED, config.questionSoundComputed, config.questionSoundComputedType, node, msg);
+                  sound = commons.evaluateValue(RED, config.questionSoundComputed, config.questionSoundComputedType, node, msg, true);
                 }
 
                 // Call API to send notification
@@ -77,7 +76,11 @@ module.exports = function(RED) {
                   node.debug(`Question send successfull`)
                 })
                 .catch((error) => {
-                  node.error("ERROR: " + error);
+                  // Log error
+                  node.error('sendNotification: ' + commons.getNetworkErrorString(error))
+                  if ( commons.getNetworkErrorCustomString(error) !== undefined) {
+                    node.error(commons.getNetworkErrorCustomString(error));
+                  }
 
                   // Output Error
                   const msg = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-red-contrib-remote",
-  "version": "1.4.0",
-  "description": "Remote services for Node-RED including remote access, push notifications and questions through push notifications.",
+  "version": "1.5.1",
+  "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",
   "node-red": {