node-red-contrib-remote 1.6.1 → 2.0.1

package/README.md

@@ -36,6 +36,22 @@ You will find more information on [www.remote-red-com](https://www.remote-red.co
 
 ## Version History
 
+Version 2.0.1
+- Possible bug on network connection fixed
+
+Version 2.0.0
+- Enormously faster access to your Node-RED via the Internet
+- macOS app for Apple Silicon (M-Chips)#
+- Status display whether the instances are connected
+- Changes to the configuration are applied without reconnecting the app
+- Connection loss after switching from Wifi to mobile fixed
+- Notifications with full UTF-8 support 
+- New instances automatically recognize http/https and the use of Dashboard 2
+- Android: Local network is used again if possible
+- Android: Delete an instance by long press and pull to refresh
+- Reconnecting the instance to my server improved
+- Multiple use of a config node in several access nodes is now recognized
+
 Version 1.6.1
 - Adding instances on Android is be possible again.
 

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

@@ -15,8 +15,8 @@
           "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.",
-          "backup_info": "Diese Konfig-Node wurde aus einem Backup wiederhergestellt. Daher sind sicherheitsrelevante Informationen nicht enthalten. Bitte löschen diese Konfig-Node und die Verbindungen in Deinen Remote-RED Apps. Lege eine neue Konfig-Node an, verbinde diese neu mit den Apps und wähle diese neue Konfig-Node in allen davon abhängigen Nodes aus."
+          "change_info": "Damit Änderungen aktiv werden führe einen Redeploy durch. Starte danach die App neu oder aktualisiere die Liste der Instanzen, indem Du die Liste nach unten ziehst.",
+          "backup_info": "Diese Konfig-Node wurde aus einem Backup wiederhergestellt. Daher sind sicherheitsrelevante Informationen nicht enthalten. Bitte löschen diese Konfig-Node (über das Zahnrad Icon rechts oben) und die Verbindungen in Deinen Remote-RED Apps. Lege eine neue Konfig-Node an, verbinde diese neu mit den Apps und wähle diese neue Konfig-Node in allen davon abhängigen Nodes aus."
         },
         "actions" : {
           "register_app": "Remote-RED App verbinden",

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

@@ -15,8 +15,8 @@
           "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.",
-          "backup_info": "This config node was restored from a backup. Therefore security relevant information are not included. Please delete this config-node and the connections in your Remote-RED apps. Create a new config-node, connect it to the apps and select this new config node in all dependent nodes."
+          "change_info": "To apply changes, first carry out a redeploy. Then restart the app or refresh the list of instances by dragging the list down.",
+          "backup_info": "This config node was restored from a backup. Therefore security relevant information are not included. Please delete this config-node (via the gear icon at the top right) and the connections in your Remote-RED apps. Create a new config-node, connect it to the apps and select this new config node in all dependent nodes."
         },
         "actions" : {
           "register_app": "Connect Remote-RED App",

package/nodes/remote-access.js

@@ -2,14 +2,24 @@ module.exports = function(RED) {
   const commons = require('./remote-commons');
   const child_process = require('child_process');
   const os = require("os");
-  let sshprocess = undefined
-  let statustext = ''
-  let instanceIsBanned = false
+  const internalIp = require('internal-ip');
+  const instancehashToAccessNode = {};
 
   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;
+      }
+
       // Reset heartbeat status
       node.initialHeartbeatStatus = ''
       node.lastHeartbeatStatus = ''
@@ -24,48 +34,43 @@ module.exports = function(RED) {
       if ( node.verbose ) {
         sshparameters.push('-v');
       }
-      sshprocess = child_process.spawn("ssh", sshparameters);
+      node.sshprocess = child_process.spawn("ssh", sshparameters);
+      node.log(`ssh process with pid ${node.sshprocess.pid} started`);
 
       // Set serving.. if not working, the process will exit or close
       setStatus(node, {fill:"green",shape:"dot",text:"remote-access.status.serving"});
       node.serving = true
 
       // Attach to process events
-      sshprocess.stdout.on('data', (data) => {
+      node.sshprocess.stdout.on('data', (data) => {
         logSSHBuffer(node, data, 'ssh process stdout');
       });
 
-      sshprocess.stderr.on('data', (data) => {
+      node.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) => {
-        if ( statustext !== "remote-access.status.heartbeaterror" ) {
+      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.serving = false
-        node.log("ssh process stopped (close: " + code + " / " + signal + ")");
+        node.log(`ssh process close (pid: ${node.sshprocess.pid} code: ${code} signal: ${signal})`);
       });
 
-      sshprocess.on('exit', (code, signal) => {
-        if ( statustext !== "remote-access.status.heartbeaterror" ) {
+      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.serving = false
-        node.log("ssh process stopped (exit: " + code + " / " + signal + ")");
-      });
-
-      sshprocess.on('error', (err) => {
-        node.log("ssh process error:" + err.name + ": " + err.message);
+        node.log(`ssh process exit (pid: ${node.sshprocess.pid} code: ${code} signal: ${signal})`);
       });
 
-      node.on('close', function() {
-        setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopping"});
-        node.log("stopping ssh process");
-        sshprocess.kill();
+      node.sshprocess.on('error', (err) => {
+        node.log(`ssh process error (pid: ${node.sshprocess.pid}): ${err.name} : ${err.message}`);
       });
     } catch (e) {
       // TODO: Error: socket hang up
@@ -87,57 +92,78 @@ module.exports = function(RED) {
   function setStatus(node, options) {
     // Set the status, remember text
     if ( options !== undefined && options.text !== undefined ) {
-      statustext = options.text
+      node.statustext = options.text
     }
     node.status(options);
   }
 
   function requestInstanceSlot(node) {
-    // Is this instance banned?
-    if ( instanceIsBanned ) {
-      return;
-    }
+    // Asnyc because https call can take some seconds..
+    return new Promise((resolve, reject) => {
+      // Is this instance banned?
+      if ( node.instanceIsBanned ) {
+        reject();
+      }
 
-    // Call API to retrive server and port.
-    const axiosInstance = commons.createAxiosInstance();
-    axiosInstance.post(`https://api-${node.confignode.server}/instanceSlotRequest`, {
-      'instancehash': node.confignode.instancehash,
-      'instanceauth': node.confignode.instanceauth,
-      'protocol': node.confignode.protocol,
-      'mountpath': RED.httpNode.mountpath,
-      'version': commons.getNodeVersion()
-    })
-    .then(response => {
-      // Start SSH
-      const port = response.data.port;
-      node.log(`Using ${node.confignode.server} on port ${port}`);
-      startSSH(node, node.confignode.server, port);
-    })
-    .catch((error) => {
-      // Log error
-      node.error('requestInstanceSlot: ' + commons.getNetworkErrorString(error))
-      if ( commons.getNetworkErrorCustomString(error) !== undefined) {
-        node.error(commons.getNetworkErrorCustomString(error));
+      // Create object with config values to send to server
+      var localip = node.confignode.host;
+      if (localip.toLowerCase() == 'localhost') localip = internalIp.v4.sync();
+      if (localip === undefined) localip = "";
+      const config = {
+        'name': node.confignode.name,
+        'localip': localip,
+        'localport': node.confignode.port,
+        'localprotocol': node.confignode.protocol,
+        'baseurl': node.confignode.baseurl,
+        'timestamp': Date.now(),
       }
+      const configString = JSON.stringify(config);
+      const configStringBuffer = Buffer.from(configString);
+      const configStringBase64 = configStringBuffer.toString('base64');
+      node.log(`Sending config to server: ${configString}`);
+
+      // Call API to retrive server and port.
+      const axiosInstance = commons.createAxiosInstance();
+      axiosInstance.post(`https://api-${node.confignode.server}/instanceSlotRequest`, {
+        'instancehash': node.confignode.instancehash,
+        'instanceauth': node.confignode.instanceauth,
+        'protocol': node.confignode.protocol,
+        'mountpath': RED.httpNode.mountpath,
+        'config': configStringBase64,
+        'version': commons.getNodeVersion()
+      })
+      .then(response => {
+        // Start SSH
+        const port = response.data.port;
+        node.log(`Using ${node.confignode.server} on port ${port}`);
+        startSSH(node, node.confignode.server, port);
+        resolve();
+      })
+      .catch((error) => {
+        // 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;
+        // 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;
+          }
         }
-      }
 
-      // Set status
-      setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.commerror"});
-      return;
+        // Set status
+        if (!node.instanceIsBanned) setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.commerror"});
+        reject();
+      });
     });
   }
 
-  function tryConnect(node) {
+  async function tryConnect(node) {
     // Request new instance slot and connect ssh
-    requestInstanceSlot(node)
+    await requestInstanceSlot(node)
 
     // Create timer to check if ssh process still serving in 10 seconds
     node.checkservingtimeout = setTimeout(checkServing, 1000*10, node);
@@ -193,8 +219,7 @@ 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"});
-            sshprocess.kill();
-            node.serving = false
+            killSSHProcess(node)
             node.log(`Heartbeat error. Reconnecting soon.`);
           } else {
             // If the status before had also an error > Just change the label.
@@ -213,12 +238,28 @@ module.exports = function(RED) {
     }
   }
 
+  function killSSHProcess(node) {
+    // Kill process
+    try {
+      if (node.sshprocess !== undefined) {
+        node.log(`Killing process ${node.sshprocess.pid}`);
+        node.sshprocess.kill();
+      }
+      node.serving = false
+    } catch (error) {
+      node.error(`Error in killSSHProcess: ${error}`);
+    }
+  }
+
   function RemoteAccessNode(config) {
     RED.nodes.createNode(this,config);
     const node = this;
+    node.sshprocess = undefined;
+    node.statustext = '';
     node.serving = false;
     node.verbose = config.verbose;
     node.errorcounter = 0;
+    node.instanceIsBanned = false;
 
     // Status
     setStatus(node, {fill:"orange",shape:"dot",text:"remote-access.status.starting"});
@@ -238,18 +279,29 @@ module.exports = function(RED) {
       return;
     }
     if ( node.confignode.instancehash !== undefined && node.confignode.instanceauth === undefined ) {
-      node.log("Configuration has no instanceauth. Maybe restored backup!");
+      node.error("Configuration has no instanceauth. Maybe restored backup!");
       setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.backupconfig"});
       return;
     }
 
+    // Check if there are more access nodes for this config node
+    const accessNodeObject = instancehashToAccessNode[node.confignode.instancehash];
+    if (accessNodeObject !== undefined && accessNodeObject['id'] !== node.id) {
+      const errorText = `The config node '${node.confignode.name}' is already used in the access node '${accessNodeObject['name']}'. Use only one access node for a config node.`;
+      node.error(errorText);
+      setStatus(node, {fill:"red",shape:"dot",text:errorText});
+      return;
+    } else {
+      instancehashToAccessNode[node.confignode.instancehash] = { id: node.id, name: node.name }
+    }
+        
     // Init heartbeat
     node.initialHeartbeatStatus = ''
     node.lastHeartbeatStatus = ''
     node.heartbeatinterval = setInterval(heartbeat, 5*60*1000, node);
 
     // Call API for announce the instacehash and authentication, retrive server and port.
-    tryConnect(node);
+    tryConnect(node)
 
     // Post URL for action
     const postUrlAction = `/contrib-remote/action/${node.confignode.instancehash}`;
@@ -305,31 +357,48 @@ module.exports = function(RED) {
     });
 
     // Clean up on close
-    node.on('close', function() {
+    node.on('close', function(removed, done) {
+      // Set status
+      setStatus(node, {fill:"red",shape:"dot",text:"remote-access.status.stopping"});
+
+      // Kill process
+      killSSHProcess(node)
+
       // Cancel timeouts
-      clearTimeout(node.checkservingtimeout);
-      clearTimeout(node.tryconnecttimeout);
-      clearInterval(node.heartbeatinterval);
+      try {
+        clearTimeout(node.checkservingtimeout);
+        clearTimeout(node.tryconnecttimeout);
+        clearInterval(node.heartbeatinterval);
+      } catch (error) {
+        node.error(`Error in close > clearTimeout: ${error}`);
+      }
 
       // Remove old routes, without a new deploy would break it..
-      RED.httpNode._router.stack.forEach(function(route,i,routes) {
-        if (route.route && route.route.path === postUrlAction) {
-          node.log(` -> Remove Route '${route.route.path}'`);
-          routes.splice(i,1);
-        }
-      });
-      RED.httpNode._router.stack.forEach(function(route,i,routes) {
-        if (route.route && route.route.path === postUrlGeofence) {
-          node.log(` -> Remove Route '${route.route.path}'`);
-          routes.splice(i,1);
-        }
-      });
-      RED.httpNode._router.stack.forEach(function(route,i,routes) {
-        if (route.route && route.route.path === getUrl) {
-          node.log(` -> Remove Route '${route.route.path}'`);
-          routes.splice(i,1);
-        }
-      });
+      try {
+        RED.httpNode._router.stack.forEach(function(route,i,routes) {
+          if (route.route && route.route.path === postUrlAction) {
+            node.log(` -> Remove Route '${route.route.path}'`);
+            routes.splice(i,1);
+          }
+        });
+        RED.httpNode._router.stack.forEach(function(route,i,routes) {
+          if (route.route && route.route.path === postUrlGeofence) {
+            node.log(` -> Remove Route '${route.route.path}'`);
+            routes.splice(i,1);
+          }
+        });
+        RED.httpNode._router.stack.forEach(function(route,i,routes) {
+          if (route.route && route.route.path === getUrl) {
+            node.log(` -> Remove Route '${route.route.path}'`);
+            routes.splice(i,1);
+          }
+        });
+      } catch (error) {
+        node.error(`Error in close > remove routs: ${error}`);
+      }
+
+      // Signal close done
+      done();
     });
 
   }

package/nodes/remote-commons.js

@@ -1,5 +1,5 @@
-const https = require('https')
-const axios = require('axios')
+const https = require('https');
+const axios = require('axios');
 const fs = require('fs');
 const crypto = require('crypto');
 const path = require('path');
@@ -18,7 +18,26 @@ module.exports = {
         }
       }
     });
-    return axios.create({ httpsAgent: httpsAgent, timeout: 5000 });
+    return axios.create({
+      httpsAgent: httpsAgent,
+      timeout: 30000,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  testUrlAvailable: async function(url) {
+    const httpsAgent = new https.Agent({
+      rejectUnauthorized: false,
+    });
+    const axiosInstance = axios.create({ httpsAgent: httpsAgent, timeout: 2000 });
+    try {
+      let responseUi = await axiosInstance.get(url);
+      if (responseUi.status >= 200 && responseUi.status <= 399) return true;
+    } catch (err) {
+    }
+    return false;
   },
 
   getNodeVersion: function() {

package/nodes/remote-config.html

@@ -5,7 +5,7 @@
     defaults: {
       name: {value:"Node-RED UI"},
       host: {value:"localhost"},
-      protocol: {value:"http"},
+      protocol: {value:""},
       port: {value:0, validate:RED.validators.number()},
       baseurl: {value:""},
       instancehash: {value:""},
@@ -48,11 +48,21 @@
         if (document.getElementById('node-config-input-port').value === '') {
           document.getElementById('node-config-input-port').value = data.port
         }
+        if (document.getElementById('node-config-input-protocol').value === '') {
+          document.getElementById('node-config-input-protocol').value = data.protocol
+        }
+        
       });
 
-      // Show backup info?
+      // Show change info / backup info?
       const instancehash = document.getElementById('node-config-input-instancehash').value;
       const instanceauth = document.getElementById('node-config-input-instanceauth').value;
+      if (instancehash !== "" && instanceauth !== "") {
+        document.getElementById('changeInfo').style.visibility = 'visible';
+        document.getElementById('backupInfo').style.marginBottom = '20px';
+        document.getElementById('changeInfo').style.padding = '10px';
+        document.getElementById('changeInfo').style.removeProperty('max-height');
+      }
       if (instancehash !== "" && instanceauth === "") {
         document.getElementById('backupInfo').style.visibility = 'visible';
         document.getElementById('backupInfo').style.marginTop = '40px';
@@ -119,6 +129,7 @@
     const server = document.getElementById('node-config-input-server').value;
     const name = document.getElementById('node-config-input-name').value;
     const host = document.getElementById('node-config-input-host').value;
+    const protocol = document.getElementById('node-config-input-protocol').value;
     const localport = document.getElementById('node-config-input-port').value;
     const baseurl = document.getElementById('node-config-input-baseurl').value;
 
@@ -128,6 +139,7 @@
       'server': server,
       'name': name,
       'host': host,
+      'protocol': protocol,
       'localport': localport,
       'baseurl': baseurl
     }
@@ -168,21 +180,30 @@
     }
   }
 
-  function testNetworkButtonClicked() {
+  function registerButtonClicked() {
+    // Get maybe existing values
+    const instancehash = document.getElementById('node-config-input-instancehash').value;
+    const instanceauth = document.getElementById('node-config-input-instanceauth').value;
+
+    // Check for backup
+    if (instancehash !== "" && instanceauth === "") {
+      alert(document.getElementById('backupInfoLabel').innerHTML);
+      return;
+    }
+
     // Disable Button
-    document.getElementById('testNetworkButton').disabled = true;
+    document.getElementById('registerRemoteAppButton').disabled = true;
 
-    $.get(`contrib-remote/testNetwork`, function(data) {
-      if ( data.error == undefined ) {
-        alert(data);
-      } else {
-        // Show error
-        alert('Error while registering app: ' + data.error);
-      }
+    // Remove last QR-Code
+    document.getElementById('registerRemoteAppQRCode').src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z/C/HgAGgwJ/lK3Q6wAAAABJRU5ErkJggg==";
 
-      // Enable button
-      document.getElementById('testNetworkButton').disabled = false;
-    });
+    // Request InstanceHash when empty
+    if ( instancehash === undefined || instancehash === '' ) {
+      registerInstance();
+    } else {
+      // Register app
+      registerApp();
+    }
   }
 
   function openSupportMailButtonClicked() {
@@ -195,8 +216,12 @@
 </script>
 
 <script type="text/html" data-template-name="remote-config">
-  <div id="backupInfo" style="visibility: collapse; max-height: 0px; max-width: 460px; border-width: 1px; border-style: dashed; border-color: #666;">
-    <label data-i18n="remote-config.label.backup_info" style="font-weight: bold;"></label>
+  <div id="changeInfo" style="visibility: collapse; max-height: 0px; max-width: 460px; border-width: 1px; border-style: dashed; border-color: #666;">
+    <label data-i18n="remote-config.label.change_info"></label>
+  </div>
+
+  <div id="backupInfo" style="visibility: collapse; max-height: 0px; max-width: 460px; border-width: 1px; border-style: dashed; border-color: red;">
+    <label id="backupInfoLabel" data-i18n="remote-config.label.backup_info" style="font-weight: bold; color: red;"></label>
   </div>
 
   <div class="form-row">
@@ -218,8 +243,8 @@
   <div class="form-row">
     <label for="node-config-input-protocol"><i class="fa fa-tag"></i> <span data-i18n="remote-config.label.protocol"></label>
     <select id="node-config-input-protocol">
-        <option value="http">http</option>
-        <option value="https">https</option>
+      <option value="http">http</option>
+      <option value="https">https</option>
     </select>
   </div>
   <div class="form-row">
@@ -242,8 +267,6 @@
   </div>
   <label><i class="fa fa-info-circle"></i> <span data-i18n="remote-config.label.region_desc"></label>
 
-  <label><i class="fa fa-info-circle"></i> <span data-i18n="remote-config.label.change_info"></label>
-
   <br>
   <button id="registerRemoteAppButton" type="button" class="red-ui-button" onclick="registerButtonClicked()">
     <span id="registerRemoteAppButtonText" data-i18n="remote-config.actions.register_app">

package/nodes/remote-config.js

@@ -94,14 +94,24 @@ module.exports = function(RED) {
     res.json(testResults);
   });
 
-  RED.httpAdmin.get("/contrib-remote/connectionData", RED.auth.needsPermission('remote-config.read'), function(req,res) {
-    // Return the internal IP and the mountpath
+  RED.httpAdmin.get("/contrib-remote/connectionData", RED.auth.needsPermission('remote-config.read'), async function(req,res) {
+    // Return the internal IP, the port, the protocol and the calculated baseurl
     const ipData = {
-      'ipv4': internalIp.v4.sync(),
-      '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'
+      ipv4: internalIp.v4.sync(),
+      port: (RED.settings.uiPort !== undefined) ? String(RED.settings.uiPort) : '1880',
+      protocol: (RED.settings.https !== undefined) ? 'https' : 'http',
     }
-    console.log(`${JSON.stringify(ipData)}`);
+
+    // Check Dashbaord 2 url
+    const availableDashbaord = await commons.testUrlAvailable(`${ipData.protocol}://${ipData.ipv4}:${ipData.port}${RED.httpNode.mountpath}dashboard`);
+    if (availableDashbaord) {
+      ipData.baseurl = `${RED.httpNode.mountpath}dashboard`;
+    } else {
+      // Dashbaord 2 not founnd, use UI settings instead
+      ipData.baseurl =  RED.httpNode.mountpath + ((RED.settings.ui !== undefined && RED.settings.ui.path !== undefined) ? RED.settings.ui.path : 'ui');
+    }
+
+    // console.log(`${JSON.stringify(ipData)}`);
     res.json(ipData);
   });
 
@@ -152,24 +162,22 @@ module.exports = function(RED) {
     })
     .then(response => {
       var localip = req.body.host;
-      if (localip.toLowerCase() == 'localhost') {
-        localip = internalIp.v4.sync();
-      }
-      if (localip === undefined) {
-        localip = "";
-      }
+      if (localip.toLowerCase() == 'localhost') localip = internalIp.v4.sync();
+      if (localip === undefined) localip = "";  
 
       const qrCodeData = {
         'name': req.body.name,
         'server': req.body.server,
         'localip': localip,
         'localport': req.body.localport,
+        'localprotocol': req.body.protocol,
         'baseurl': req.body.baseurl,
         'instancehash': response.data.instancehash,
         'apphash': response.data.apphash,
         'password': response.data.password,
         'customerhash': response.data.customerhash,
-        'nodeversion': 1.1
+        'nodeversion': 2.0,
+        'timestamp': Date.now()
       };
       const qrCodeString = JSON.stringify(qrCodeData);
       const qrCodeStringBuffer = Buffer.from(qrCodeString);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-remote",
-  "version": "1.6.1",
+  "version": "2.0.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",
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "axios": "^0.21.0",
+    "axios": "^1.7.2",
     "internal-ip": "^6.1.0",
     "limiter": "^1.1.5",
     "path": "^0.12.7",