@mschaeffler/node-red-logic 0.0.6 → 0.0.7

package/README.md

@@ -12,7 +12,41 @@ $ npm install @mschaeffler/node-red-logic
 
 ## Usage
 
-.
+### bool
+
+Converts payload to a bool value:
+|type|value|is converted to|
+|:---|:----|:--------------|
+|bool|false|false|
+||true|true|
+|number|0|false|
+||1|true|
+|string|false|false|
+||0|false|
+||off|false|
+||true|true|
+||1|true|
+||on|true|
+
+#### Input
+
+The message property to be used as payload can be defined with the `Property` property.
+
+|msg.    | type   | description                       |
+|:-------|:-------|:----------------------------------|
+|payload | | input value.          |
+
+#### Output
+
+|msg.    | type   | description                       |
+|:-------|:-------|:----------------------------------|
+|payload | boolean | bool value of payload.|
+
+#### Parameters
+
+|config| type   | description                       |
+|:-----|:-------|:----------------------------------|
+|Property| string | defines the message property to be used as payload.|
 
 ### or
 

package/counter.js

@@ -7,20 +7,18 @@ module.exports = function(RED) {
         var context = this.context();
 
         node.on('input', function(msg,send,done) {
-            let data = context.get( "data" ) ?? 0;
+            msg.count = context.get( "count" ) ?? 0;
             if( msg.reset || msg.topic==="init" )
             {
-                data = 0;
+                msg.count = 0;
             }
             else
             {
-                data++;
+                msg.count++;
             }
-            context.set( "data", data );
+            context.set( "count", msg.count );
 
-            msg.count = data;
-
-            node.status( data );
+            node.status( msg.count );
             send( msg );
             done();
         });

package/logic_and.html

@@ -4,8 +4,10 @@
         color: "#C0DEED",
         defaults: {
             name:{value:""},
-            property:{value:"payload",required:true},
-            minData:{value:"1",validate:RED.validators.number(),required:true}
+            property:{value:"payload", required:true},
+            minData:{value:"1", required:true, validate:function(v){
+                return v!=='' && !isNaN(v) && Number(v)>0;
+            }}
         },
         inputs:1,
         outputs:1,

package/logic_and.js

@@ -12,29 +12,32 @@ module.exports = function(RED) {
         node.on('input', function(msg,send,done) {
             const payload = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
 
-            let data = context.get( "data" ) ?? {};
-            data[msg.topic] = payload;
-            context.set( "data", data );
-
-            msg.payload = true;
-            let count   = 0;
-            for( const item in data )
+            if( payload !=== null )
             {
-                count++;
-                if( ! data[item] )
+                let data = context.get( "data" ) ?? {};
+                data[msg.topic] = payload;
+                context.set( "data", data );
+
+                msg.payload = true;
+                msg.count   = 0;
+                for( const item in data )
                 {
-                    msg.payload = false;
+                    msg.count++;
+                    if( ! data[item] )
+                    {
+                         msg.payload = false;
+                    }
                 }
-            }
 
-            if( count >= node.minData )
-            {
-                node.status( msg.payload );
-                send( msg );
-            }
-            else
-            {
-                node.status( "waiting for data" );
+                if( msg.count >= node.minData )
+                {
+                    node.status( msg.payload );
+                    send( msg );
+                }
+                else
+                {
+                    node.status( "waiting for data" );
+                }
             }
 
             done();

package/logic_bool.js

@@ -10,8 +10,15 @@ module.exports = function(RED) {
         node.on('input', function(msg,send,done) {
             msg.payload = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
 
-            node.status( msg.payload );
-            send( msg );
+            if( msg.payload !== null )
+            {
+                node.status( msg.payload );
+                send( msg );
+            }
+            else
+            {
+                node.status( "error" );
+            }
             done();
         });
     }

package/logic_or.html

@@ -4,8 +4,10 @@
         color: "#C0DEED",
         defaults: {
             name:{value:""},
-            property:{value:"payload",required:true},
-            minData:{value:"1",validate:RED.validators.number(),required:true}
+            property:{value:"payload", required:true},
+            minData:{value:"1", required:true, validate:function(v){
+                return v!=='' && !isNaN(v) && Number(v)>0;
+            }}
         },
         inputs:1,
         outputs:1,

package/logic_or.js

@@ -12,29 +12,32 @@ module.exports = function(RED) {
         node.on('input', function(msg,send,done) {
             const payload = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
 
-            let data = context.get( "data" ) ?? {};
-            data[msg.topic] = payload;
-            context.set( "data", data );
-
-            msg.payload = false;
-            let count   = 0;
-            for( const item in data )
+            if( payload !== null )
             {
-                count++;
-                if( data[item] )
+                let data = context.get( "data" ) ?? {};
+                data[msg.topic] = payload;
+                context.set( "data", data );
+
+                msg.payload = false;
+                msg.count   = 0;
+                for( const item in data )
                 {
-                    msg.payload = true;
+                    msg.count++;
+                    if( data[item] )
+                    {
+                        msg.payload = true;
+                    }
                 }
-            }
 
-            if( count >= node.minData )
-            {
-                node.status( msg.payload );
-                send( msg );
-            }
-            else
-            {
-                node.status( "waiting for data" );
+                if( msg.count >= node.minData )
+                {
+                     node.status( msg.payload );
+                     send( msg );
+                }
+                else
+                {
+                    node.status( "waiting for data" );
+                }
             }
 
             done();

package/{math_plus.html → math_number.html}

@@ -1,20 +1,20 @@
 <script type="text/javascript">
-    RED.nodes.registerType('plus',{
+    RED.nodes.registerType('tonumber',{
         category: 'function',
         color: "#C0DEED",
         defaults: {
             name:{value:""},
-            property:{value:"payload",required:true},
-            minData:{value:"1",validate:RED.validators.number(),required:true}
+            property:{value:"payload",required:true}
         },
         inputs:1,
         outputs:1,
-        icon: "font-awesome/fa-plus",
+        icon: "font-awesome/fa-adjust",
         label: function() {
-            return this.name||"plus";
+            return this.name||"to number";
         },
+        paletteLabel: "to number",
         inputLabels: 'input',
-        outputLabels: 'plus',
+        outputLabels: 'number',
         oneditprepare: function() {
             $("#node-input-property").typedInput({
                 type:"msg",
@@ -25,7 +25,7 @@
     });
 </script>
 
-<script type="text/html" data-template-name="plus">
+<script type="text/html" data-template-name="tonumber">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
@@ -35,13 +35,9 @@
         <input type="text" id="node-input-property">
         <input type="hidden" id="node-input-property-type">
     </div>
-    <div class="form-row">
-        <label for="node-input-minData"><i class="fa fa-tag"></i> min. Data</label>
-        <input type="text" id="node-input-minData">
-    </div>
 </script>
 
-<script type="text/html" data-help-name="plus">
+<script type="text/html" data-help-name="tonumber">
     
     <p>.</p>
 

package/math_number.js

@@ -0,0 +1,26 @@
+module.exports = function(RED) {
+
+    function NumberNode(config) {
+        RED.nodes.createNode(this,config);
+        //this.config = config;
+        var node = this;
+        this.property = config.property || "payload";
+
+        node.on('input', function(msg,send,done) {
+            msg.payload = Number( RED.util.getMessageProperty( msg, node.property ) );
+
+            if( ! isNaN( msg.payload ) )
+            {
+                node.status( msg.payload );
+                send( msg );
+            }
+            else
+            {
+                node.status( "not a Number" );
+            }
+            done();
+        });
+    }
+
+    RED.nodes.registerType("tonumber",NumberNode);
+}

package/math_reduce.html

@@ -0,0 +1,94 @@
+<script type="text/javascript">
+    RED.nodes.registerType('reduce',{
+        category: 'function',
+        color: "#C0DEED",
+        defaults: {
+            name:{value:""},
+            property:{value:"payload", required:true},
+            minMean:{value:"1", required:true, validate:function(v){
+                return v!=='' && !isNaN(v) && Number(v)>0;}
+            },
+            maxMean:{value:"1", required:true, validate:function(v){
+                const minMean = $("#node-input-minMean").length ? $("#node-input-minMean").val() : this.minMean;
+                return v!=='' && !isNaN(v) && Number(v)>=minMean;}
+            },
+            minData:{value:"1", required:true, validate:function(v){
+                return v!=='' && !isNaN(v) && Number(v)>0;}
+            },
+            algo:{value:"", required:true}
+        },
+        inputs:1,
+        outputs:1,
+        icon: function() {
+            switch( this.algo )
+            {
+                case "add":  return "font-awesome/fa-plus";
+                case "mean": return "font-awesome/fa-indent";
+                case "prod": return "font-awesome/fa-asterisk";
+                case "min":  return "font-awesome/fa-sort-numeric-desc";
+                case "max":  return "font-awesome/fa-sort-numeric-asc";
+                default:     return "font-awesome/fa-flask";
+            }
+        },
+        label: function() {
+            return this.name||this.algo||"reduce";
+        },
+        inputLabels: 'input',
+        outputLabels: 'output',
+        oneditprepare: function() {
+            $("#node-input-property").typedInput({
+                type:"msg",
+                types:["msg"],
+                typeField: "#node-input-property-type"
+            });
+            $("#node-input-algo").typedInput({
+                types:[{
+                    value:"algo",
+                    options: [
+                        { value: "add", label: "Addition"},
+                        { value: "mean", label: "Mean Value"},
+                        { value: "prod", label: "Product"},
+                        { value: "min", label: "Minimum" },
+                        { value: "max", label: "Maximum" }
+                    ]
+                }]
+            })
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="reduce">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-input"><i class="fa fa-ellipsis-h"></i> Eigenschaft</label>
+        <input type="text" id="node-input-property">
+        <input type="hidden" id="node-input-property-type">
+    </div>
+    <div class="form-row">
+       <label for="node-input-minMean"><i class="fa fa-hourglass-o"></i> min. Mean</label>
+       <input type="text" id="node-input-minMean">
+    </div>
+    <div class="form-row">
+       <label for="node-input-maxMean"><i class="fa fa-hourglass"></i> max. Mean</label>
+       <input type="text" id="node-input-maxMean">
+    </div>
+    <div class="form-row">
+        <label for="node-input-minData"><i class="fa fa-check-square-o "></i> min. Data</label>
+        <input type="text" id="node-input-minData">
+    </div>
+    <div class="form-row">
+        <label for="node-input-algo"><i class="fa fa-flask"></i> Algorithm</label>
+        <input type="text" id="node-input-algo">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="reduce">
+    
+    <p>.</p>
+
+    <h3>Input</h3>
+
+</script>

package/math_reduce.js

@@ -0,0 +1,86 @@
+module.exports = function(RED) {
+
+    function ReduceNode(config) {
+        RED.nodes.createNode(this,config);
+        //this.config = config;
+        var node = this;
+        var context = this.context();
+        this.property = config.property || "payload";
+        this.minMean  = Number( config.minMean );
+        this.maxMean  = Number( config.maxMean );
+        this.minData  = Number( config.minData );
+        this.algo     = config.algo;
+
+        node.on('input', function(msg,send,done) {
+            if( msg.reset || msg.topic==="init" )
+            {
+                context.set( "data", {} );
+                node.status( "" );
+            }
+            else
+            {
+                const payload = Number( RED.util.getMessageProperty( msg, node.property ) );
+                if( ! isNaN( payload ) )
+                {
+                    let data = context.get( "data" ) ?? {};
+                    let item = data[msg.topic] ?? [];
+                    item.push( payload )
+                    data[msg.topic] = item;
+
+                    msg.count = 0;
+                    switch( node.algo )
+                    {
+                        case "add":
+                        case "mean": msg.payload = 0; break;
+                        case "prod": msg.payload = 1; break;
+                        case "min":  msg.payload = Number.MAX_SAFE_INTEGER; break;
+                        case "max":  msg.payload = Number.MIN_SAFE_INTEGER; break;
+                        default:     done( "invalid algo: "+node.algo ); return;
+                    }
+                    for( const key in data )
+                    {
+                        if( data[key].length >= node.minMean )
+                        {
+                            msg.count++;
+                            while( data[key].length > node.maxMean )
+                            {
+                                data[key].shift();
+                            }
+                            const help = data[key].reduce( (accumulator,value)=>accumulator+value ) / data[key].length;
+                            switch( node.algo )
+                            {
+                                case "add":
+                                case "mean": msg.payload += help; break;
+                                case "prod": msg.payload *= help; break;
+                                case "min":  msg.payload  = Math.min( msg.payload, help ); break;
+                                case "max":  msg.payload  = Math.max( msg.payload, help ); break;
+                            }
+                        }
+                    }
+                    context.set( "data", data );
+
+                    if( msg.count >= node.minData )
+                    {
+                        switch( node.algo )
+                        {
+                            case "mean": msg.payload /= msg.count; break;
+                        }
+                        node.status({fill:"green",shape:"dot",text:msg.payload});
+                        send( msg );
+                    }
+                    else
+                    {
+                        node.status({fill:"gray",shape:"dot",text:"to less data"});
+                    }
+                }
+                else
+                {
+                    node.status({fill:"red",shape:"dot",text:"payload is NaN"});
+                }
+            }
+            done();
+        });
+    }
+
+    RED.nodes.registerType("reduce",ReduceNode);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mschaeffler/node-red-logic",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "nodes for simple mathematical operations.",
   "license": "LGPL-2.1",
   "homepage": "https://github.com/m-schaeffler/node-red-my-nodes/tree/main/node-red-logic",
@@ -17,11 +17,12 @@
   "node-red": {
     "version": ">=1.3.7",
     "nodes": {
+      "tobool":"logic_bool.js",
+      "tonumber":"math_number.js",
       "or":"logic_or.js",
       "and":"logic_and.js",
-      "tobool":"logic_bool.js",
       "counter":"counter.js",
-      "plus":"math_plus.js"
+      "reduce":"math_reduce.js"
     }
   },
   "author": {

package/math_plus.js

@@ -1,41 +0,0 @@
-module.exports = function(RED) {
-
-    function PlusNode(config) {
-        RED.nodes.createNode(this,config);
-        //this.config = config;
-        var node = this;
-        var context = this.context();
-        this.property = config.property || "payload";
-        this.minData  = Number( config.minData );
-
-        node.on('input', function(msg,send,done) {
-            const payload = Number( RED.util.getMessageProperty( msg, node.property ) );
-
-            let data = context.get( "data" ) ?? {};
-            data[msg.topic] = payload;
-            context.set( "data", data );
-
-            msg.payload = 0;
-            let count   = 0;
-            for( const item in data )
-            {
-                count++;
-                msg.payload += data[item];
-            }
-
-            if( count >= node.minData )
-            {
-                node.status( msg.payload );
-                send( msg );
-            }
-            else
-            {
-                node.status( "waiting for data" );
-            }
-
-            done();
-        });
-    }
-
-    RED.nodes.registerType("plus",PlusNode);
-}