node-red-contrib-sun-position - npm Package Compare versions

Comparing version 0.1.3 to 0.1.4

.eslintrc.js

@@ -0,0 +0,0 @@ module.exports = {

nodes/locales/de/within-time-switch.json

@@ -8,5 +8,6 @@ {
             "addTimes": "alternate start or end time",
-            "property": "Property",
+            "propertyStart": "Alt. Start on",
             "startTime": "Start time",
             "startTimeAlt": "Start time",
+            "propertyEnd": "Alt. End on",
             "endTime": "End time",
@@ -67,3 +68,4 @@ "endTimeAlt": "End time",
             "error-title": "internal error",
-            "invalid-property-type": "Invalid Property Type: __type__",
+            "invalid-propertyStart-type": "Invalid Property Type for alternate start: __type__",
+            "invalid-propertyEnd-type": "Invalid Property Type for alternate end: __type__",
             "invalid-json": "Invalid 'to' JSON property",
@@ -70,0 +72,0 @@ "invalid-jsonata-expr": "Invalid JSONata expression: __error__",

nodes/locales/en-US/within-time-switch.json

@@ -8,5 +8,6 @@ {
             "addTimes": "alternate start or end time",
-            "property": "Property",
+            "propertyStart": "Alt. Start on",
             "startTime": "Start time",
             "startTimeAlt": "Start time",
+            "propertyEnd": "Alt. End on",
             "endTime": "End time",
@@ -67,3 +68,4 @@ "endTimeAlt": "End time",
             "error-title": "internal error",
-            "invalid-property-type": "Invalid Property Type: __type__",
+            "invalid-propertyStart-type": "Invalid Property Type for alternate start: __type__",
+            "invalid-propertyEnd-type": "Invalid Property Type for alternate end: __type__",
             "invalid-json": "Invalid 'to' JSON property",
@@ -70,0 +72,0 @@ "invalid-jsonata-expr": "Invalid JSONata expression: __error__",

nodes/within-time-switch.js

@@ -47,13 +47,13 @@ /********************************************
 
-        let alternateTimes = node.propertyType !== 'none';
-        if (alternateTimes && msg) {
-            //node.debug('alternate times enabled ' + node.propertyType + '.' + node.property);
+        let alternateStartTime = (node.propertyStartType !== 'none') && (msg || (node.propertyStartType !== 'msg'));
+        if (alternateStartTime) {
+            node.debug('alternate start times enabled ' + node.propertyStartType + '.' + node.property);
             try {
                 //evaluateNodeProperty(node.property, type, node, msg, callback)
-                let res = RED.util.evaluateNodeProperty(node.property, node.propertyType, node, msg);
-                alternateTimes = ((res == true) || (res == 'true'));
+                let res = RED.util.evaluateNodeProperty(node.property, node.propertyStartType, node, msg);
+                alternateStartTime = ((res == true) || (res == 'true'));
             } catch (err) {
-                alternateTimes = false;
-                hlp.errorHandler(node, err, RED._("within-time-switch.errors.invalid-property-type", {
-                    type: node.propertyType,
+                alternateStartTime = false;
+                hlp.errorHandler(node, err, RED._("within-time-switch.errors.invalid-propertyStart-type", {
+                    type: node.propertyStartType,
                     value: node.property
@@ -65,17 +65,34 @@ }));
 
-        if (alternateTimes && config.startTimeAltType !== 'none') {
-            //node.debug('using alternate start time');
+        let alternateEndTime = (node.propertyEndType !== 'none') && (msg || (node.propertyEndType !== 'msg'));
+        if (alternateEndTime) {
+            node.debug('alternate end times enabled ' + node.propertyEndType + '.' + node.property);
+            try {
+                //evaluateNodeProperty(node.property, type, node, msg, callback)
+                let res = RED.util.evaluateNodeProperty(node.property, node.propertyEndType, node, msg);
+                alternateEndTime = ((res == true) || (res == 'true'));
+            } catch (err) {
+                alternateEndTime = false;
+                hlp.errorHandler(node, err, RED._("within-time-switch.errors.invalid-propertyEnd-type", {
+                    type: node.propertyEndType,
+                    value: node.property
+                }));
+                node.debug(JSON.stringify(err));
+            }
+        }
+
+        if (alternateStartTime && config.startTimeAltType !== 'none') {
+            node.debug('using alternate start time ' + alternateStartTime + ' - ' + config.startTimeAltType);
             result.start = node.positionConfig.getTimeProp(node, msg, config.startTimeAltType, config.startTimeAlt, (config.startOffsetAlt || 0) * (config.startOffsetAltMultiplier || 60));
             result.startSuffix = '⎇ ';
         } else {
-            //node.debug('using standard start time ' + alternateTimes + ' - ' + config.startTimeAltType);
+            node.debug('using standard start time ' + alternateStartTime + ' - ' + config.startTimeAltType);
             result.start = node.positionConfig.getTimeProp(node, msg, config.startTimeType, config.startTime, (config.startOffset || 0) * (config.startOffsetMultiplier || 60));
         }
 
-        if (alternateTimes && config.endTimeAltType !== 'none') {
-            //node.debug('using alternate end time');
+        if (alternateEndTime && config.endTimeAltType !== 'none') {
+            node.debug('using alternate end time ' + alternateEndTime + ' - ' + config.startTimeAltType);
             result.end = node.positionConfig.getTimeProp(node, msg, config.endTimeAltType, config.endTimeAlt, (config.endOffsetAlt || 0) * (config.endOffsetAltMultiplier || 60));
             result.endSuffix = ' ⎇';
         } else {
-            //node.debug('using standard end time ' + alternateTimes + ' - ' + config.startTimeAltType);
+            node.debug('using standard end time ' + alternateEndTime + ' - ' + config.startTimeAltType);
             result.end = node.positionConfig.getTimeProp(node, msg, config.endTimeType, config.endTime, (config.endOffset || 0) * (config.endOffsetMultiplier || 60));
@@ -95,3 +112,4 @@ }
         this.property = config.property;
-        this.propertyType = config.propertyType || "global";
+        this.propertyStartType = config.propertyStartType || "none";
+        this.propertyEndType = config.propertyEndType || "none";
         var node = this;
@@ -98,0 +116,0 @@

package.json

 {
     "name": "node-red-contrib-sun-position",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "description": "NodeRED nodes to get sun and moon position",
@@ -5,0 +5,0 @@ "main": "none",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Deprecated

Maintenance

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Deprecated

Maintenance

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

571853

increased by0.51%

Lines of code

2327

increased by0.91%

No dependency changes