@mschaeffler/node-red-bthome 0.2.3 → 0.3.0

package/bthome.js

@@ -1,4 +1,5 @@
 const Crypto  = require( 'node:crypto' );
+const Tools   = require( './tools.js' );
 const Rawdata = require( "./rawdata.js" );
 const BtEvent = require( "./btevent.js" );
 
@@ -37,28 +38,14 @@ module.exports = function(RED) {
         for( const mac in node.devices )
         {
             const device = node.devices[mac];
-            switch( typeof device.key )
+            try
             {
-                case "undefined":
-                    break;
-                case "string":
-                    if( device.key.length == 32 )
-                    {
-                        const buf = Buffer.alloc( 16 );
-                        for( let i=0; i<16 ; i++ )
-                        {
-                            buf[i] = Number.parseInt( device.key.slice( i*2, i*2 + 2 ), 16 );
-                        }
-                        device.key = buf;
-                    }
-                    else
-                    {
-                        device.key = Buffer.alloc( 16 );
-                        node.log( mac + " keylength must be 16 bytes" );
-                    }
-                    break;
-                default:
-                    device.key = Buffer.from( device.key );
+                device.key = Tools.key2bytes( device.key );
+            }
+            catch( e )
+            {
+                node.log( mac + e.message );
+                device.key = null;
             }
         }
 
@@ -91,25 +78,24 @@ module.exports = function(RED) {
 
             function decryptMsg()
             {
-                let mac = [];
-                for( const help of msg.payload.addr.split( ":" ) )
-                {
-                    mac.push( Number.parseInt( help, 16 ) );
-                }
-                const uuid16     = [0xD2,0xFC];
+                const mac        = Tools.mac2bytes( msg.payload.addr );
                 const ciphertext = Buffer.from( rawdata.slice( 0, -8 ) );
                 const counter    = rawdata.slice( -8, -4 );
-                const counterInt = counter[0] | (counter[1]<<8) | (counter[2]<<16) | (counter[3]<<24);
+                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 )
+                    {
+                        throw new Error( "bthome "+msg.payload.gateway+" "+name+" "+(new Date(counterInt*1000))+" "+delta );
+                    }
+                }
                 const mic        = Buffer.from( rawdata.slice( -4 ) );
-                const nonce      = Buffer.from( mac.concat( uuid16, dib, counter ) );
+                const nonce      = Buffer.from( mac.concat( Tools.uuid16, dib, counter ) );
                 const decipher   = Crypto.createDecipheriv( "aes-128-ccm", node.devices[msg.payload.addr].key, nonce, { authTagLength: 4 } );
                 decipher.setAuthTag( mic );
                 rawdata = Array.from( decipher.update( ciphertext ) );
                 decipher.final();
-                if( node.counterTime && Date.now() - counterInt*1000 > 7500 )
-                {
-                    node.error("bthome "+name+" "+(new Date(counterInt*1000))+" "+(Date.now()-counterInt*1000));
-                }
             }
 
             function setData(name,value)
@@ -186,13 +172,13 @@ module.exports = function(RED) {
                 if( pid < item.pid && pid > 10 /*&& pid > item.pid - 10*/ )
                 {
                     // veraltete Nachricht und nicht reboot
-                    node.warn( `old ble message (${name}) dropped, ${msg.payload.pid} < ${item.data?.pid}` );
+                    node.warn( `old ble message ${name} from ${msg.payload.gateway} dropped, ${pid} < ${item.pid}` );
                     return false;
                 }
                 if( msg.payload.gateway )
                 {
                     item.gw[msg.payload.gateway] = {
-                        time: msg.payload.time ?? Date.now(),
+                        time: msgTime,
                         rssi: msg.payload.rssi ?? null
                     };
                 }
@@ -201,7 +187,7 @@ module.exports = function(RED) {
 
             function newMessage()
             {
-                item.time      = msg.payload.time ?? Date.now();
+                item.time      = msgTime;
                 item.pid       = pid;
                 item.encrypted = encrypted;
                 if( node.contextStore !== "none" )
@@ -216,6 +202,7 @@ module.exports = function(RED) {
             }
 
             const name      = node.devices[msg.payload.addr]?.topic;
+            const msgTime   = msg.payload.time ?? Date.now()
             const dib       = msg.payload.data[0];
             let   rawdata   = msg.payload.data.slice( 1 );
             const encrypted = Boolean( dib & 0x1 );

package/package.json

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

package/tools.js

@@ -0,0 +1,38 @@
+// Tooling for bthome
+
+exports.uuid16 = [0xd2,0xfc];
+
+exports.key2bytes = function(str)
+{
+    switch( typeof str )
+    {
+        case "undefined":
+            return null;
+        case "string":
+            if( str.length == 32 )
+            {
+                const buf = Buffer.alloc( 16 );
+                for( let i=0; i<16 ; i++ )
+                {
+                    buf[i] = Number.parseInt( str.slice( i*2, i*2 + 2 ), 16 );
+                }
+                return buf;
+            }
+            else
+            {
+                throw new Error( " keylength must be 16 bytes" );
+            }
+        default:
+            return Buffer.from( str );
+    }
+}
+
+exports.mac2bytes = function(str)
+{
+    let mac = [];
+    for( const help of str.split( ":" ) )
+    {
+        mac.push( Number.parseInt( help, 16 ) );
+    }
+    return mac;
+}