@mschaeffler/node-red-bthome 0.2.1 → 0.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bthome.html +16 -5
- package/bthome.js +6 -0
- package/package.json +1 -1
package/bthome.html
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
statusPrefix:{value:""},
|
|
9
9
|
eventPrefix:{value:""},
|
|
10
10
|
contextVar:{value:"bthome",required:true},
|
|
11
|
-
contextStore:{value:"",required:true}
|
|
11
|
+
contextStore:{value:"none",required:true}
|
|
12
12
|
},
|
|
13
13
|
inputs:1,
|
|
14
14
|
outputs:2,
|
|
@@ -39,6 +39,17 @@
|
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
41
|
const currentStore = node.contextStore || '';
|
|
42
|
+
// set changed handler
|
|
43
|
+
$("#node-input-contextStore").on('change',function() {
|
|
44
|
+
console.log($("#node-input-contextStore").val());
|
|
45
|
+
if( $("#node-input-contextStore").val() == "none" ) {
|
|
46
|
+
$("#node-contextVar-line").hide();
|
|
47
|
+
$("#node-input-contextVar").val("bthome");
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
$("#node-contextVar-line").show();
|
|
51
|
+
}
|
|
52
|
+
});
|
|
42
53
|
// select the current option
|
|
43
54
|
$("#node-input-contextStore").val(currentStore);
|
|
44
55
|
}
|
|
@@ -62,14 +73,14 @@
|
|
|
62
73
|
<label for="node-input-eventPrefix"><i class="fa fa-star-o"></i> Event-Prefix</label>
|
|
63
74
|
<input type="text" id="node-input-eventPrefix"></input>
|
|
64
75
|
</div>
|
|
65
|
-
<div class="form-row">
|
|
66
|
-
<label for="node-input-contextVar"><i class="fa fa-database"></i> Context-Variable</label>
|
|
67
|
-
<input type="text" id="node-input-contextVar"></input>
|
|
68
|
-
</div>
|
|
69
76
|
<div class="form-row">
|
|
70
77
|
<label for="node-input-contextStore"><i class="fa fa-database"></i> Contextstore</label>
|
|
71
78
|
<select type="text" id="node-input-contextStore"></select>
|
|
72
79
|
</div>
|
|
80
|
+
<div class="form-row" id="node-contextVar-line">
|
|
81
|
+
<label for="node-input-contextVar"><i class="fa fa-database"></i> Context-Variable</label>
|
|
82
|
+
<input type="text" id="node-input-contextVar"></input>
|
|
83
|
+
</div>
|
|
73
84
|
</script>
|
|
74
85
|
|
|
75
86
|
<script type="text/x-red" data-help-name="bthome">
|
package/bthome.js
CHANGED
|
@@ -98,12 +98,18 @@ module.exports = function(RED) {
|
|
|
98
98
|
const uuid16 = [0xD2,0xFC];
|
|
99
99
|
const ciphertext = Buffer.from( rawdata.slice( 0, -8 ) );
|
|
100
100
|
const counter = rawdata.slice( -8, -4 );
|
|
101
|
+
const counterInt = counter[0] | (counter[1]<<8) | (counter[2]<<16) | (counter[3]<<24);
|
|
101
102
|
const mic = Buffer.from( rawdata.slice( -4 ) );
|
|
102
103
|
const nonce = Buffer.from( mac.concat( uuid16, dib, counter ) );
|
|
103
104
|
const decipher = Crypto.createDecipheriv( "aes-128-ccm", node.devices[msg.payload.addr].key, nonce, { authTagLength: 4 } );
|
|
104
105
|
decipher.setAuthTag( mic );
|
|
105
106
|
rawdata = Array.from( decipher.update( ciphertext ) );
|
|
106
107
|
decipher.final();
|
|
108
|
+
|
|
109
|
+
if( Date.now() - counterInt*1000 > 7500 )
|
|
110
|
+
{
|
|
111
|
+
node.error("bthome "+name+" "+(new Date(counterInt*1000))+" "+(Date.now()-counterInt*1000));
|
|
112
|
+
}
|
|
107
113
|
}
|
|
108
114
|
|
|
109
115
|
function setData(name,value)
|