@mschaeffler/node-red-bthome 0.1.3 → 0.2.0

package/bthome.js

@@ -9,8 +9,8 @@ module.exports = function(RED) {
         var node = this;
         this.flowcontext  = this.context().flow;
         this.devices      = JSON.parse( config.devices ?? "{}" );
-        this.statusPrefix = config.statusPrefix ? config.statusPrefix+'/' :"";
-        this.eventPrefix  = config.eventPrefix ? config.eventPrefix+'/' : "";
+        this.statusPrefix = config.statusPrefix ? config.statusPrefix+'/' : "";
+        this.eventPrefix  = config.eventPrefix  ? config.eventPrefix +'/' : "";
         this.contextVar   = config.contextVar   ?? "bthome";
         this.contextStore = config.contextStore ?? "none";
         this.data         = {};
@@ -25,7 +25,7 @@ module.exports = function(RED) {
                 }
                 else
                 {
-                    console.log( "context read", value );
+                    //console.log( "context read", value );
                     if( value !== undefined )
                     {
                         node.data = value;
@@ -64,9 +64,7 @@ module.exports = function(RED) {
         node.on('input', function(msg,send,done) {
             if( ! Array.isArray( msg.payload.data ) )
             {
-                node.error( "msg.payload.data must be an Array!" );
-                node.trace( "msg processed" );
-                done();
+                done( "msg.payload.data must be an Array!" );
                 return;
             }
 
@@ -74,30 +72,38 @@ module.exports = function(RED) {
             {
                 if( name === undefined )
                 {
-                    node.error( "unknown BT-Home " + msg.payload.addr );
+                    throw new Error( "unknown BT-Home " + msg.payload.addr );
                 }
                 else if( version !== 2 )
                 {
-                    node.error( "wrong BT-Home version " + version );
+                    throw new Error( "wrong BT-Home version " + version );
                 }
                 else if( encrypted && !node.devices[msg.payload.addr].key )
                 {
-                    node.error( name + " encryption key needed" );
+                    throw new Error( name + " encryption key needed" );
                 }
                 else if( (!encrypted) && node.devices[msg.payload.addr].key )
                 {
-                    node.error( name + " encrypted messages needed" );
+                    throw new Error( name + " encrypted messages needed" );
                 }
-                else
-                {
-                    return true;
-                }
-                return false;
             }
 
             function decryptMsg()
             {
-                console.log("encrypted");
+                let mac = [];
+                for( const help of msg.payload.addr.split( ":" ) )
+                {
+                    mac.push( Number.parseInt( help, 16 ) );
+                }
+                const uuid16     = [0xD2,0xFC];
+                const ciphertext = Buffer.from( rawdata.slice( 0, -8 ) );
+                const counter    = rawdata.slice( -8, -4 );
+                const mic        = Buffer.from( rawdata.slice( -4 ) );
+                const nonce      = Buffer.from( mac.concat( 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();
             }
 
             function setData(name,value)
@@ -212,12 +218,12 @@ module.exports = function(RED) {
             const events    = new BtEvent( node.eventPrefix );
             let   item      = node.data[name];
 
-            if( checkMsg() )
+            try
             {
+                checkMsg();
                 if( encrypted )
                 {
                     decryptMsg();
-                    done();return;
                 }
                 if( item == undefined )
                 {
@@ -229,9 +235,12 @@ module.exports = function(RED) {
                 {
                     newMessage();
                 }
+                done();
+            }
+            catch( e )
+            {
+                done( e.message );
             }
-            node.trace( "msg processed" );
-            done();
         });
     }
 

package/package.json

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