@mschaeffler/node-red-bthome 0.3.0 → 0.4.0

package/README.md

@@ -83,6 +83,7 @@ There are two output ports:
 |config       | type   | description                       |
 |:------------|:-------|:----------------------------------|
 |Devices      | JSON   | configuration of the BT-Home devices |
+|counter is time|Boolean| the counter in encrypted messages is checked again the actual time |
 |Status-Prefix| string | prefix for the topic for state output |
 |Event-Prefix | string | prefix for the topic for event output |
 |Context-Variable| string | name of the variable in flow context storage |
@@ -124,7 +125,7 @@ Example:
         "encrypted": false,
         "battery":   100,
         "gw":        { "Shelly Gateway": { "time": 1745395033113, "rssi":-85 } },
-        data":       { "humidity":56, "temperature":-21.3 }
+        "data":      { "humidity":56, "temperature":-21.3 }
     }
 }
 ```

package/bthome.html

@@ -167,6 +167,8 @@
     <dl class="message-properties">
         <dt>Devices <span class="property-type">JSON</span></dt>
         <dd> configuration of the BT-Home devices.</dd>
+        <dt>counter is times <span class="property-type">Boolean</span></dt>
+        <dd> the counter in encrypted messages is checked again the actual time.</dd>
         <dt>Status-Prefix <span class="property-type">string</span></dt>
         <dd> prefix for the topic for state output.</dd>
         <dt>Event-Prefix <span class="property-type">string</span></dt>
@@ -208,7 +210,7 @@
         "encrypted": false,<br>
         "battery":   100,<br>
         "gw":        { "Shelly Gateway": { "time": 1745395033113, "rssi":-85 } },<br>
-        data":       { "humidity":56, "temperature":-21.3 }<br>
+        "data":      { "humidity":56, "temperature":-21.3 }<br>
     }
 }<code>
     

package/bthome.js

@@ -16,6 +16,7 @@ module.exports = function(RED) {
         this.contextVar   = config.contextVar   ?? "bthome";
         this.contextStore = config.contextStore ?? "none";
         this.data         = {};
+        this.statistics   = { ok:0, err:0, old:0, dup:0 };
         node.status( "" );
         if( node.contextStore !== "none" )
         {
@@ -34,6 +35,7 @@ module.exports = function(RED) {
                     }
                 }
             } );
+            node.flowcontext.set( node.contextVar+"-stat", node.statistics );
         }
         for( const mac in node.devices )
         {
@@ -52,6 +54,7 @@ module.exports = function(RED) {
         node.on('input', function(msg,send,done) {
             if( ! Array.isArray( msg.payload.data ) )
             {
+                node.statistics.err++;
                 done( "msg.payload.data must be an Array!" );
                 return;
             }
@@ -84,8 +87,8 @@ module.exports = function(RED) {
                 if( node.counterTime )
                 {
                     const counterInt = counter[0] | (counter[1]<<8) | (counter[2]<<16) | (counter[3]<<24);
-                    const delta      = msgTime - counterInt*1000;
-                    if( delta < -5000 || delta > 15000 )
+                    const delta      = Math.abs( msgTime - counterInt*1000 );
+                    if( delta > 15000 )
                     {
                         throw new Error( "bthome "+msg.payload.gateway+" "+name+" "+(new Date(counterInt*1000))+" "+delta );
                     }
@@ -172,6 +175,7 @@ module.exports = function(RED) {
                 if( pid < item.pid && pid > 10 /*&& pid > item.pid - 10*/ )
                 {
                     // veraltete Nachricht und nicht reboot
+                    node.statistics.old++;
                     node.warn( `old ble message ${name} from ${msg.payload.gateway} dropped, ${pid} < ${item.pid}` );
                     return false;
                 }
@@ -182,7 +186,16 @@ module.exports = function(RED) {
                         rssi: msg.payload.rssi ?? null
                     };
                 }
-                return pid !== null && pid !== item.pid;
+                if( pid !== null && pid !== item.pid )
+                {
+                    node.statistics.ok++;
+                    return true;
+                }
+                else
+                {
+                    node.statistics.dup++;
+                    return false;
+                }
             }
 
             function newMessage()
@@ -232,6 +245,7 @@ module.exports = function(RED) {
             }
             catch( e )
             {
+                node.statistics.err++;
                 done( e.message );
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mschaeffler/node-red-bthome",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "description": "A Node Red node to decrypt and decode BT-Home frames",
     "author": {
         "name": "Mathias Schäffler",