node-red-contrib-remote 1.5.2 → 1.6.0

package/README.md

@@ -36,8 +36,14 @@ You will find more information on [www.remote-red-com](https://www.remote-red.co
 
 ## Version History
 
+Version 1.6.0
+- Compatibility to 'node-red-contrib-remote-cli' version 1.1.0.
+
+Version 1.5.3
+- Improved error logging while the instance registration process.
+
 Version 1.5.2
-- Compatibility to 'node-red-contrib-remote-cli'
+- Compatibility to 'node-red-contrib-remote-cli'.
 
 Version 1.5.1
 - Added support for running Node-RED with a self signed https certificate.

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

@@ -21,6 +21,7 @@
         "actions" : {
           "register_app": "Remote-RED App verbinden",
           "register_app_next": "Weitere Remote-RED App verbinden",
+          "test_network": "Netzwerk testen",
           "support_mail": "Mail an Support öffnen"
         },
         "legal": {

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

@@ -21,6 +21,7 @@
         "actions" : {
           "register_app": "Connect Remote-RED App",
           "register_app_next": "Connect another Remote-RED App",
+          "test_network": "Test network",
           "support_mail": "Open mail to support"
         },
         "legal": {

package/nodes/remote-config.html

@@ -10,7 +10,9 @@
       baseurl: {value:""},
       instancehash: {value:""},
       server: {value:""},
-      region: {value:"de"}
+      region: {value:"de"},
+      customerhash: {value:""},
+      customerkey: {value:""}
     },
     credentials: {
       instanceauth: {type:"text"}
@@ -91,7 +93,7 @@
   function registerInstance() {
     // Request InstanceHash when empty
     const region = document.getElementById('node-config-input-region').value;
-    $.getJSON('contrib-remote/requestInstanceHash/' + region, function(data) {
+    $.getJSON('contrib-remote/requestInstanceHash/' + region + '/0/0', function(data) {
       if ( data.error == undefined ) {
         // Fill UI
         document.getElementById('node-config-input-instancehash').value = data.instancehash;
@@ -166,6 +168,23 @@
     }
   }
 
+  function testNetworkButtonClicked() {
+    // Disable Button
+    document.getElementById('testNetworkButton').disabled = true;
+
+    $.get(`contrib-remote/testNetwork`, function(data) {
+      if ( data.error == undefined ) {
+        alert(data);
+      } else {
+        // Show error
+        alert('Error while registering app: ' + data.error);
+      }
+
+      // Enable button
+      document.getElementById('testNetworkButton').disabled = false;
+    });
+  }
+
   function openSupportMailButtonClicked() {
     // Get InstanceHash and Server from UI
     const instanceHash = document.getElementById('node-config-input-instancehash').value;
@@ -243,7 +262,7 @@
   <span id='terms_url_template' data-i18n="remote-config.legal.termsurl" style="display: none;"></span>
 
   <div id="registerRemoteAppQRCodeContainer" style="visibility: collapse; height: 0px;">
-    <img id="registerRemoteAppQRCode" src=""></img>
+    <img id="registerRemoteAppQRCode" src="">
     <div id="apphelp" style="max-width: 460px; border-width: 1px; border-style: dashed; border-color: #666; padding: 10px; margin-top: 6px; margin-bottom: 20px;">
       <label data-i18n="remote-config.apphelp.title" style="font-weight: bold;"></label>
       <label data-i18n="remote-config.apphelp.para1"></label>
@@ -270,6 +289,12 @@
     </div>
   </div>
 
+  <!-- 
+  <button id="testNetworkButton" type="button" class="red-ui-button" onclick="testNetworkButtonClicked()">
+    <span id="testNetworkButtonText" data-i18n="remote-config.actions.test_network">
+  </button>
+  -->
+
   <div id="help" style="max-width: 460px; border-width: 1px; border-style: dashed; border-color: #666; padding: 10px; margin-top: 40px; margin-bottom: 20px;">
     <label data-i18n="remote-config.help.title" style="font-weight: bold;"></label>
     <label data-i18n="remote-config.help.para1"></label>

package/nodes/remote-config.js

@@ -1,6 +1,9 @@
 module.exports = function(RED) {
   const commons = require('./remote-commons');
   const internalIp = require('internal-ip');
+  const ping = require('ping');
+  const dns = require('dns'); 
+  const dnsPromises = dns.promises;
   const fs = require('fs');
   var QRCode = require('qrcode');
 
@@ -23,6 +26,74 @@ module.exports = function(RED) {
     }
   });
 
+  function getErrorMessage(error) {
+    let errorMessage = error.message;
+    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);
+    }
+    return errorMessage;
+  }
+
+  RED.httpAdmin.get("/contrib-remote/testNetwork", RED.auth.needsPermission('remote-config.read'), async function(req,res) {
+    // Test the network conditions
+
+    const testResults = [];
+
+    const axiosInstance = commons.createAxiosInstance();
+
+    // All servers to check
+    const serversToCheck = ['contact-dev.remote-red.comx', 'contact-de.remote-red.com'];
+
+    // DNS probe
+    const promisesDns = serversToCheck.map(host => {
+      return dnsPromises.lookup(host, {all: true})
+            .then(res => {
+              const v4 = res.some(e => e.family === 4);
+              const v6 = res.some(e => e.family === 6);
+              testResults.push({type: 'DNS', test: `DNS lookup ${host}`, result: getErrorMessage(error)});
+              console.log(res);
+              // testResults.push({test: `DNS lookup ${host}`, result: res.alive ? `${res.time}ms` : 'Error'});
+            })
+            .catch(error => {
+              console.log(error);
+              console.log(`dns resolve ${host}: ${getErrorMessage(error)}`);
+              // console.log(error);
+              testResults.push({type: 'DNS', test: `DNS lookup ${host}`, result: getErrorMessage(error)});
+            });
+    });
+    await Promise.all(promisesDns);
+
+    // Ping hosts
+    const additionalPingHosts = ['google.com', '173.212.245.41', '2a02:c207:3006:3079::1'];
+    const promisesPings = [...serversToCheck, ...additionalPingHosts].map(host => {
+      return ping.promise.probe(host)
+            .then(res => {
+              testResults.push({type: 'PING', test: `ping ${host}`, result: res.alive ? `${res.time}ms` : 'Error'});
+            });
+    });
+    await Promise.all(promisesPings);
+
+    // Make https test call
+    const promisesHttpsCalls = serversToCheck.map(url => {
+      return axiosInstance.get(`https://${url}/testNetwork`)
+      .then(response => {
+        testResults.push({test: `https call to ${url}`, result: 'OK'});
+      })
+      .catch(error => {
+        console.log(`https call to ${url}: ${getErrorMessage(error)}`);
+        // console.log(error);
+        testResults.push({type: 'HTTPS', test: `https call to ${url}`, result: getErrorMessage(error)});
+      });
+    });
+    await Promise.all(promisesHttpsCalls);
+    
+    console.log(testResults);
+    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
     const ipData = {
@@ -34,7 +105,7 @@ module.exports = function(RED) {
     res.json(ipData);
   });
 
-  RED.httpAdmin.get("/contrib-remote/requestInstanceHash/:regionorserver", RED.auth.needsPermission('remote-config.read'), function(req,res) {
+  RED.httpAdmin.get("/contrib-remote/requestInstanceHash/:regionorserver/:customerhash/:customerkey", RED.auth.needsPermission('remote-config.read'), function(req,res) {
     // Call API for a instacehash and a instanceauth
     const axiosInstance = commons.createAxiosInstance();
 
@@ -49,12 +120,17 @@ module.exports = function(RED) {
     }
 
     // Call API
-    axiosInstance.post(url, {})
+    axiosInstance.post(url, {
+      'customerhash': req.params.customerhash,
+      'customerkey': req.params.customerkey,
+      'version': commons.getNodeVersion()
+    })
     .then(response => {
       res.json(response.data);
     })
     .catch((error) => {
       console.log("ERROR: requestInstanceHash: " + error);
+      console.error(error);
       let errorMessage = error.message;
       if ( error.response && error.response.data && error.response.data.message ) {
         errorMessage = errorMessage + " / " + error.response.data.message;
@@ -72,7 +148,7 @@ module.exports = function(RED) {
     axiosInstance.post(`https://api-${req.body.server}/registerApp`, {
       'instancehash': req.body.instancehash,
       'instanceauth': req.body.instanceauth,
-      'customerhash': req.body.customerhash
+      'version': commons.getNodeVersion()
     })
     .then(response => {
       var localip = req.body.host;
@@ -92,12 +168,13 @@ module.exports = function(RED) {
         'instancehash': response.data.instancehash,
         'apphash': response.data.apphash,
         'password': response.data.password,
-        'nodeversion': 1.0
+        'customerhash': response.data.customerhash,
+        'nodeversion': commons.getNodeVersion()
       };
       const qrCodeString = JSON.stringify(qrCodeData);
       const qrCodeStringBuffer = Buffer.from(qrCodeString);
       const qrCodeStringBase64 = qrCodeStringBuffer.toString('base64');
-      const link = 'remotered://add?data=' + qrCodeStringBase64;
+      const link = response.data.appurl + '://add?data=' + qrCodeStringBase64;
       QRCode.toDataURL(qrCodeStringBase64, function (err, url) {
         const responseData = {
           'qrcode': url,
@@ -108,6 +185,7 @@ module.exports = function(RED) {
     })
     .catch((error) => {
       console.log("ERROR: registerApp: " + error);
+      console.error(error);
       let errorMessage = error.message;
       if ( error.response && error.response.data && error.response.data.message ) {
         errorMessage = errorMessage + " / " + error.response.data.message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-remote",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "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",
@@ -17,10 +17,10 @@
     "internal-ip": "^6.1.0",
     "limiter": "^1.1.5",
     "path": "^0.12.7",
+    "ping": "^0.4.4",
     "qrcode": "^1.4.4"
   },
   "main": "remote-config.js",
-  "devDependencies": {},
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },