node-red-contrib-remote 1.5.0 → 1.5.1

package/README.md

@@ -36,6 +36,10 @@ 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.

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=';
@@ -26,11 +27,15 @@ 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}`)
     }

package/nodes/remote-notification.js

@@ -24,10 +24,8 @@ module.exports = function(RED) {
         }
         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
@@ -77,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

@@ -24,10 +24,8 @@ module.exports = function(RED) {
         }
         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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-remote",
-  "version": "1.5.0",
+  "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",