bt-sensors-plugin-sk 1.3.2 → 1.3.4-beta

package/sensor_classes/VictronInverter.js

@@ -17,7 +17,6 @@ class VictronInverter extends VictronSensor{
         const md = this.addMetadatum('alarmReason','', 'reason for alarm',
             (buff)=>{return buff.readIntU16LE(1)})
         .default="electrical.inverters.{id}.alarm"
-        md.notify=true
 
         this.addDefaultPath('dcVoltage','electrical.inverters.dc.voltage') 
             .read=(buff)=>{return this.NaNif(buff.readInt16LE(3),0x7FFF)/100}

package/sensor_classes/VictronInverterRS.js

@@ -18,7 +18,6 @@ class VictronInverterRS extends VictronSensor{
         const md = this.addMetadatum('chargerError','', 'charger error',
             (buff)=>{return VC.ChargerError(buff.readIntU8(1))})
             md.default='electrical.inverters.{id}.error'
-            md.notify=true
 
         this.addMetadatum('batteryVoltage','V', 'battery voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})

package/sensor_classes/VictronSmartBatteryProtect.js

@@ -33,7 +33,6 @@ class VictronSmartBatteryProtect extends VictronSensor{
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(3))})
         this.addMetadatum('alarmReason','', 'alarm reason', 
             (buff)=>{return buff.readUInt16LE(4)})
-        this.getPath("alarmReason").notify=true
         this.addMetadatum('warningReason','', 'warning reason', //TODO
             (buff)=>{return (buff.readUInt16LE(5))})
         this.addMetadatum('channel1Voltage','V', 'channel one voltage', 
@@ -45,9 +44,9 @@ class VictronSmartBatteryProtect extends VictronSensor{
         }
           emitValuesFrom(decData){
             super.emitValuesFrom(decData)
-            const alarm = this.getPath("alarm").read(decData)
+            const alarm = this.getPath("alarmReason").read(decData)
             if (alarm>0)
-                this.emitAlarm("alarm",alarm)
+                this.emitAlarm("alarmReason",alarm)
           }
 
 }

package/sensor_classes/XiaomiMiBeacon.js

@@ -100,7 +100,7 @@ class XiaomiMiBeacon extends BTSensor{
     }
 
     getDescription(){
-        return `<div><p><img src="../bt-sensors-plugin-sk/images/LYWSD03MMC-Device.jpg" alt=LYWSD03MMC image" style="float: left; margin-right: 10px;" /> The LYWSD03MMC temperature and humidity sensor is an inexpensive environmental sensor from Xiaomi Inc. <p> WARNING: If you use the GATT connection, you won't need an encrypytion//bind key to get your data but the energy cost of maintaining a GATT connection is high and will drain your battery in about 2 weeks of persistent use. Instead follow the instructions <a href=https://github.com/PiotrMachowski/Xiaomi-cloud-tokens-extractor/?tab=readme-ov-file#linux--home-assistant-in-ssh--web-terminal target="_blank">here</a> to get your device's encryption key.<div>`
+        return `<div><p><img src="../bt-sensors-plugin-sk/images/LYWSD03MMC-Device.jpg" alt=LYWSD03MMC image" style="float: left; margin-right: 10px;" /> The LYWSD03MMC temperature and humidity sensor is an inexpensive environmental sensor from Xiaomi Inc. <p> Follow the instructions <a href=https://github.com/PiotrMachowski/Xiaomi-cloud-tokens-extractor/?tab=readme-ov-file#linux--home-assistant-in-ssh--web-terminal target="_blank">here</a> to get your device's encryption key.<div>`
     }
     
     getManufacturer(){
@@ -131,19 +131,18 @@ class XiaomiMiBeacon extends BTSensor{
         })
     }
 
-    decryptV2and3(data){
+    decryptV2and3(data, index=11){
         const encryptedPayload = data.subarray(-4);
-        const xiaomi_mac = data.subarray(5,11)
-        const nonce = Buffer.concat([data.subarray(0, 5), data.subarray(-4,-1), xiaomi_mac.subarray(-1)]);
+        const nonce = Buffer.concat([data.subarray(0, 5), data.subarray(-4,-1), (this._mac_reversed)]);
         const cipher = crypto.createDecipheriv('aes-128-ccm', Buffer.from(this.encryptionKey,"hex"), nonce, { authTagLength: 4});
         cipher.setAAD(Buffer.from('11', 'hex'), { plaintextLength: encryptedPayload.length });
         
         return cipher.update(encryptedPayload)
     }
-    decryptV4and5(data){
-        const encryptedPayload = data.subarray(11,-7);
-        const xiaomi_mac = data.subarray(5,11)
-        const nonce = Buffer.concat([xiaomi_mac, data.subarray(2, 5), data.subarray(-7,-4)]);
+    decryptV4and5(data, index=11){
+        
+        const encryptedPayload = data.subarray(index,-7);
+        const nonce = Buffer.concat([(this._mac_reversed), data.subarray(2, 5), data.subarray(-7,-4)]);
         const cipher = crypto.createDecipheriv('aes-128-ccm', Buffer.from(this.encryptionKey,"hex"), nonce, { authTagLength: 4});
         cipher.setAAD(Buffer.from('11', 'hex'), { plaintextLength: encryptedPayload.length });
         cipher.setAuthTag(data.subarray(-4))    
@@ -151,7 +150,7 @@ class XiaomiMiBeacon extends BTSensor{
     }
 
     hasGATT(){
-        return true
+        return false
     }
 
     propertiesChanged(props){
@@ -160,35 +159,64 @@ class XiaomiMiBeacon extends BTSensor{
         if (!props.hasOwnProperty("ServiceData")) return
         
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
-        var dec
+        if (data.length<12) return
+        
+        let dec=[]
+        let dataIndex=5
+
+        const frameControl = data.readUInt16LE(0)
+        const isEncrypted = (frameControl >> 3) & 1
+        const encryptionVersion = frameControl >> 12 
+        const mesh = (frameControl >> 7) & 1;           // mesh device
+        const authMode = (frameControl >> 10) & 3;
+        const solicited = (frameControl >> 9) & 1;
+        const registered = (frameControl >> 8) & 1;
+        const objectInclude = (frameControl >> 6) & 1;     // object/payload data present
+        const capabilityInclude = (frameControl >> 5) & 1; // capability byte present
+        const macInclude = (frameControl >> 4) & 1;        // MAC address included in payload
+        const requestTiming = frameControl & 1;     
+    
         if (!this.encryptionKey){
             throw new Error(`${this.getNameAndAddress()} requires an encryption key.`)
         }
-        if (this.encryptionVersion >= 4) {
-            dec = this.decryptV4and5(data)
+        if (encryptionVersion >= 4) {
+            dec = this.decryptV4and5(data, macInclude?11:5)
         } else {
-            if(this.encryptionVersion>=2){
-                dec=this.decryptV2and3(data)
+            if(encryptionVersion>=2){
+                dec=this.decryptV2and3(data, macInclude?11:5)
             }
         }
         if (dec.length==0)
             throw new Error(`${this.getNameAndAddress()} received empty decrypted packet. Check that the bind/encryption key in config is correct.`)
 
-        switch(dec[0]){
-        case 0x0D:
+        const objCode = dec.readUInt16LE(0)
+
+        switch(objCode){
+        case 0x100D:
             this.emitData("temp",dec,3)  
             this.emitData("humidity",dec,5)      
             break    
 
-        case 0x0A:
+        case 0x100A:
             this.emitData("batteryStrength",dec,3)
             break
-        case 0x04:    
+        case 0x1004:    
             this.emitData("temp",dec,3)  
             break        
-        case 0x06:
+        case 0x1006:
             this.emitData("humidity",dec,3)          
             break
+        case 0x4C01:
+            this.emit("temp",dec.readFloatLE(3)+273.15)          
+            break
+                   
+        case 0x4C02:
+            this.emit("humidity",dec[3]/100)          
+            break
+        case 0x4C03:
+            this.emit("batteryStrength",dec[3]/100)          
+            break
+        
         default:
             throw new Error(`${this.getNameAndAddress()} unable to parse decrypted service data (${util.inspect(dec)})`)
             
@@ -198,13 +226,13 @@ class XiaomiMiBeacon extends BTSensor{
     async init(){
 
         await super.init()
+        this._mac_reversed = (Buffer.from(this.getMacAddress().replaceAll(":",""), "hex")).reverse()
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
         if (!data || data.length<4)
-            throw new Error(`Service Data ${this.constructor.SERVICE_MIBEACON} not available for ${this.getName()}`)
-        const frameControl = data[0] + (data[1] << 8)
-        this.deviceID = data[2] + (data[3] << 8)
-        this.isEncrypted = (frameControl >> 3) & 1
-        this.encryptionVersion = frameControl >> 12 
+            this.setError(`Service Data ${this.constructor.SERVICE_MIBEACON} not available for ${this.getName()}`)
+        else
+            this.deviceID = data[2] + (data[3] << 8)
+
     }   
     initSchema(){
         super.initSchema()