bt-sensors-plugin-sk 1.2.5-1 → 1.2.6-beta

package/sensor_classes/VictronBatteryMonitor.js

@@ -7,18 +7,18 @@ const VC=require("./Victron/VictronConstants.js")
 const int24 = require('int24')
 class VictronBatteryMonitor extends VictronSensor{
 
-
-    static async identify(device){
-        return await this.identifyMode(device, 0x02)
-    }
-    static _test(data, key){
-        var b = Buffer.from(data.replaceAll(" ",""),"hex")
+        static _test(data, key){
+        var b
+        if (data instanceof String)
+            b = Buffer.from(data.replaceAll(" ",""),"hex")
+        else
+            b = data
         const d = new this()
 
         if (key) {
-            d.encryptionKey = key
-        
-        }
+            d.encryptionKey = key       
+        } else
+            d.auxMode=b.readInt8(8)&0x3
         d.currentProperties = {}
         d.currentProperties.ManufacturerData={}
         d.currentProperties.ManufacturerData[0x02e1]=b
@@ -28,18 +28,21 @@ class VictronBatteryMonitor extends VictronSensor{
         Object.keys(d.getPaths()).forEach((tag)=>{
                 d.on(tag,(v)=>console.log(`${tag}=${v}`))
         })
-        b = d.decrypt(b)
+        if (key)
+            b = d.decrypt(b)
+        else
+
         console.log(b)
         d.emitValuesFrom(b)
         d.removeAllListeners()
     
     }
+    static ImageFile = "VictronSmartShunt.jpg"
 
     characteristics=[]
 
-
-    initSchema(){
-        super.initSchema()
+    async initSchema(){
+        await super.initSchema()
         this.addDefaultParam("batteryID").default="house"
         //"default": "electrical.batteries.{batteryID}.voltage"
 
@@ -73,26 +76,31 @@ class VictronBatteryMonitor extends VictronSensor{
         
         this.addDefaultPath( 'ttg',"electrical.batteries.capacity.timeRemaining") 
             .read=(buff,offset=0)=>{return this.NaNif(buff.readUInt16LE(offset),0xFFFF)*60}
-        this.getPath("ttg").gatt='65970ffe-4bda-4c1e-af4b-551c4cf74769'
+        this.getPath("ttg").gatt='65970ffe-4bda-4c1e-af4b-551c4cf74769';
+
         this.auxMode=VC.AuxMode.STARTER_VOLTAGE
-        try {
-        if (this.encryptionKey){
-            const decData = this.decrypt(this.getManufacturerData(0x02e1))
-            if (decData)
-                this.auxMode=decData.readInt8(8)&0x3   
-        }
-        } catch(e){ 
-            this.debug(`Unable to determine device AuxMode. ${e.message}`)
-            this.debug(e)
-            this.auxMode=VC.AuxMode.DISABLED
-        }   
 
+        if (!this.auxMode){
+            const md=await this.constructor.getDataPacket(this.device, this.getManufacturerData(this.constructor.ManufacturerID))
+            try {
+                if (this.encryptionKey){
+                    const decData = this.decrypt(md)
+                    if (decData)
+                        this.auxMode=decData.readInt8(8)&0x3   
+            }
+            } catch(e){ 
+                this.debug(`Unable to determine device AuxMode. ${e.message}`)
+                this.debug(e)
+                this.auxMode=VC.AuxMode.DISABLED
+            }
+        }
+    
         switch(this.auxMode){
             case VC.AuxMode.STARTER_VOLTAGE:
                 this.addMetadatum('starterVoltage','V', 'starter battery voltage', 
                     (buff,offset=0)=>{return buff.readInt16LE(offset)/100},
                     '6597ed7d-4bda-4c1e-af4b-551c4cf74769')
-                    .default="electrical.batteries.secondary.voltage"
+                    .default="electrical.batteries.starter.voltage"
                     break;
             case VC.AuxMode.MIDPOINT_VOLTAGE:
                 this.addMetadatum('midpointVoltage','V', 'midpoint battery voltage', 
@@ -110,9 +118,11 @@ class VictronBatteryMonitor extends VictronSensor{
             default:
                 break
         }
+                
     }
     
     emitValuesFrom(decData){
+        
         this.emitData("ttg",decData,0)
         this.emitData("voltage",decData,2);
         const alarm = this.getPath("alarm").read(decData,4)
@@ -211,5 +221,6 @@ class VictronBatteryMonitor extends VictronSensor{
             this.debug(`Disconnected from ${ this.getName()}`)
         }
     }
+    
 }
 module.exports=VictronBatteryMonitor

package/sensor_classes/VictronDCDCConverter.js

@@ -3,10 +3,7 @@ const VC=require("./Victron/VictronConstants.js")
 
 class VictronDCDCConverter extends VictronSensor{
     
-    static async identify(device){
-        return await this.identifyMode(device,0x04)
-    }
-   
+    static ImageFile="VictronOrionTrIsolated.webp"
    
     initSchema(){
         super.initSchema()

package/sensor_classes/VictronDCEnergyMeter.js

@@ -5,10 +5,7 @@ const int24 = require("int24");
 const _BitReader = require("./_BitReader.js");
 class VictronDCEnergyMeter extends VictronSensor{
     
-    static async identify(device){
-        return await this.identifyMode(device, 0x0D)
-    }
-    async init(){
+     async init(){
         await super.init()
         try {
         if (this.encryptionKey){

package/sensor_classes/VictronGXDevice.js

@@ -22,10 +22,7 @@ Alarms
 TBD
 117 43 Unuse
 */
-    static async identify(device){
-        return await this.identifyMode(device, 0x07)
-    }   
-
+    static ImageFile = "VictronCerboGX.webp"
     initSchema(){
         super.initSchema()
         this.addMetadatum('voltage','V', 'channel #1 voltage', 

package/sensor_classes/VictronInverter.js

@@ -3,9 +3,8 @@ const VC=require("./Victron/VictronConstants.js")
 const BitReader = require('./_BitReader')
 
 class VictronInverter extends VictronSensor{
-    static async identify(device){
-        return await this.identifyMode(device, 0x03)
-    }
+  
+    static ImageFile="VictronPhoenixSmart1600.webp"
 
     initSchema(){
         super.initSchema()

package/sensor_classes/VictronInverterRS.js

@@ -5,10 +5,8 @@ function toBinaryString(buff){
     return [...buff].map((b) => b.toString(2).padStart(8, "0")).join("");
     }
 class VictronInverterRS extends VictronSensor{
-    static async identify(device){
-        return await this.identifyMode(device, 0x06)
-    }
-    
+
+    static ImageFile = "VictronInverterRS.webp"
 
      initSchema() {
         super.initSchema()

package/sensor_classes/VictronLynxSmartBMS.js

@@ -18,10 +18,7 @@ const VC = require("./Victron/VictronConstants.js")
 const BitReader = require("./_BitReader")
 class VictronLynxSmartBMS extends VictronSensor{
 
-    static async identify(device){
-        return await this.identifyMode(device, 0x0A)
-    }   
-
+    static ImageFile="VictronLynxSmartBMS"
     initSchema(){
         super.initSchema()
         this.addDefaultParam("batteryID")

package/sensor_classes/VictronOrionXS.js

@@ -5,9 +5,7 @@ const VictronSensor = require ("./Victron/VictronSensor.js")
 const VC = require("./Victron/VictronConstants.js")
 class VictronOrionXS extends VictronSensor{
 
-    static async identify(device){
-        return await this.identifyMode(device, 0x0F)
-    }   
+    static ImageFile="VictronOrionTrIsolated.webp"
      initSchema() {
         super.initSchema()
         this.addDefaultParam("id")

package/sensor_classes/VictronSmartBatteryProtect.js

@@ -19,10 +19,7 @@ const VictronSensor = require ("./Victron/VictronSensor.js")
 const VC = require("./Victron/VictronConstants.js")
 class VictronSmartBatteryProtect extends VictronSensor{
 
-    static async identify(device){
-        return await this.identifyMode(device, 0x09)
-    }   
-
+    static ImageFile="VictronSmartBatteryProte.jpg"
 
     initSchema(){
         super.initSchema()

package/sensor_classes/VictronSmartLithium.js

@@ -34,10 +34,7 @@ function _toCellVoltage(val){
 }
 class VictronSmartLithium extends VictronSensor{
 
-    static async identify(device){
-        return await this.identifyMode(device, 0x05)
-    }   
-
+    static ImageFile="VictronSmartLithiumBattery.jpg"
     initSchema(){
         super.initSchema()
         this.addDefaultParam("batteryID")

package/sensor_classes/VictronSolarCharger.js

@@ -2,9 +2,7 @@ const VictronSensor = require ("./Victron/VictronSensor.js")
 const VC = require("./Victron/VictronConstants.js")
 class VictronSolarCharger extends VictronSensor{
 
-    static async identify(device){
-        return await this.identifyMode(device, 0x01)
-    }   
+    static ImageFile="VictronSmartSolarMPPT.webp"
 
     initSchema() {
         super.initSchema()

package/sensor_classes/VictronVEBus.js

@@ -5,10 +5,7 @@ AC_IN_STATE=["AC in 1","AC in 2","NOT CONNECTED", "NA"]
 ALARM_STATE=["None","warning", "alarm","NA"]
 class VictronVEBus extends VictronSensor{
 
-    static async identify(device){
-        return await this.identifyMode(device, 0x0C)
-    }   
-
+    static ImageFile="VictronVEBus.webp"
     initSchema(){
         super.initSchema()
         this.addMetadatum('chargeState','', 'charge state', 

package/sensor_classes/XiaomiMiBeacon.js

@@ -72,7 +72,7 @@ const DEVICE_TYPES = new Map([
 
 class XiaomiMiBeacon extends BTSensor{
     static Domain = BTSensor.SensorDomains.environmental
-		
+	static ImageFile = "LYWSD03MMC-Device.jpg"
     constructor(device, config, gattConfig){
         super(device, config, gattConfig)
         this.encryptionKey = config?.encryptionKey
@@ -91,7 +91,8 @@ class XiaomiMiBeacon extends BTSensor{
                 return null
         }
     }
-    
+    static ImageFile="LYWSD03MMC-Device.jpg"
+
     emitValues(buffer){
         this.emitData("temp", buffer, 0)
         this.emit("humidity", buffer.readUInt8(2)/100)
@@ -206,6 +207,8 @@ class XiaomiMiBeacon extends BTSensor{
 
         await super.init()
         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

package/sensor_classes/iBeaconSensor.js

@@ -0,0 +1,40 @@
+
+const BTSensor = require("../BTSensor");
+const iBeacon = require("./Beacon/iBeacon")
+
+class iBeaconSensor extends BTSensor {
+
+    static async identify (device){
+      return null
+    }
+    static IsRoaming = true;
+    static Domain = BTSensor.SensorDomains.beacons
+    static ImageFile = "iBeacon.jpg"
+    
+
+    beacon=new iBeacon(this)
+
+    initSchema(){
+        super.initSchema()
+        this.beacon.initSchema()
+    }
+
+    initListen(){
+      super.initListen()
+      this.beacon.initListen()
+    }
+    elapsedTimeSinceLastContact(){
+      return this.beacon.elapsedTimeSinceLastContact(super.elapsedTimeSinceLastContact())
+    }
+
+    propertiesChanged(props){
+      super.propertiesChanged(props);
+      this.beacon.propertiesChanged(props) 
+    }
+
+    getTextDescription(){
+        return `${this.getName()} iBeacon device`
+    }
+  }
+
+module.exports = iBeaconSensor;

package/src/components/PluginConfigurationPanel.js

@@ -23,7 +23,10 @@ export function BTConfig (props)  {
 
    const _uiSchema= {
     "ui:options": {label: false},
-    'title': { 'ui:widget': 'hidden' }
+    "paths":{
+      enableMarkdownInDescription:true
+    },
+    'title': { 'ui:widget': 'hidden' },
   }
 
   const baseUISchema = 
@@ -94,23 +97,25 @@ const useStyles = makeStyles((theme) => ({
       headers:headers
     })
   }
-
-  async function fetchJSONData(path){
-    var result
-    try {
-      result = fetch(`/plugins/bt-sensors-plugin-sk/${path}`, {
-        credentials: 'include'
-      })
-    } catch (e) {
-      result=
-        {
-          status: 500,
-          statusText: e.toString()
-        }
-    }
-    return result
+async function fetchJSONData(path, data = {}) {
+  let result;
+  try {
+    // Convert data object to query string
+    const query = Object.keys(data).length
+      ? '?' + new URLSearchParams(data).toString()
+      : '';
+    result = await fetch(`/plugins/bt-sensors-plugin-sk/${path}${query}`, {
+      credentials: 'include',
+      method: 'GET'
+    });
+  } catch (e) {
+    result = {
+      status: 500,
+      statusText: e.toString()
+    };
   }
-
+  return result;
+}
   async function getSensors(){
     const response = await fetchJSONData("getSensors")
     if (response.status!=200){
@@ -122,6 +127,16 @@ const useStyles = makeStyles((theme) => ({
 
   }
 
+
+  async function getSensorInfo(mac, sensorClass){
+    const response = await fetchJSONData("getSensorInfo",{mac_address: mac, class: sensorClass})
+    if (response.status!=200){
+      throw new Error(`Unable get sensor info: ${response.statusText} (${response.status}) `)
+    }
+    const json = await response.json()
+    return json
+  }
+
   async function getBaseData(){
     const response = await fetchJSONData("getBaseData")
     if (response.status!=200){
@@ -262,6 +277,27 @@ const useStyles = makeStyles((theme) => ({
     
  },[])
 
+
+ useEffect(()=>{
+  
+  if (!(sensorData && sensorMap) )  return
+  
+  const _sensor = sensorMap.get(sensorData.mac_address)
+  if (_sensor && schema && sensorData  &&
+    Object.hasOwn(sensorData,"params" )){
+    
+      if (_sensor.info.class == "UNKNOWN" && sensorData.params.sensorClass && sensorData.params.sensorClass != "UNKNOWN") {
+      getSensorInfo(sensorData.mac_address, sensorData.params.sensorClass).then((json)=>{
+        debugger
+        setSchema(json.schema)
+      })
+    }
+  
+  }
+  
+ },[sensorData])
+
+
 useEffect(()=>{
   if (pluginState=="started") {
     getBaseData().then((json) => {

package/bt-sensors-plugin-sk copy.json

@@ -1,170 +0,0 @@
-{
-  "configuration": {
-    "discoveryInterval": 10,
-    "peripherals": [
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "ATC_9FF77E",
-          "zone": "inside.cabin",
-          "parser": "ATC-LE",
-          "sensorClass": "ATC"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "batteryStrength": "sensors.{macAndName}.battery.strength",
-          "voltage": "sensors.{macAndName}.battery.voltage",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity"
-        },
-        "mac_address": "A4:C1:38:9F:F7:7E"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "tps",
-          "zone": "inside.refrigerator",
-          "sensorClass": "Inkbird"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "temp": "environment.{zone}.temperature",
-          "battery": "sensors.{macAndName}.battery.strength"
-        },
-        "mac_address": "49:22:05:17:2B:AE"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "Ruuvi BC7E",
-          "zone": "inside.navdesk",
-          "sensorClass": "RuuviTag"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity",
-          "pressure": "environment.{zone}.pressure",
-          "accX": "sensors.{macAndName}.accX",
-          "accY": "sensors.{macAndName}.accY",
-          "accZ": "sensors.{macAndName}.accZ",
-          "battV": "sensors.{macAndName}.battery.voltage",
-          "mc": "sensors.{macAndName}.movementCounter",
-          "msc": "sensors.{macAndName}.measurementSequenceCounter"
-        },
-        "mac_address": "F9:B0:6E:63:BC:7E"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "SBMO-003Z-db1b",
-          "zone": "inside",
-          "sensorClass": "ShellySBMO003Z"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "motion": "environment.{zone}.motion",
-          "illuminance": "environment.{zone}.illuminance",
-          "battery": "sensors.{macAndName}.battery.strength",
-          "button": "sensors.{macAndName}.button"
-        },
-        "mac_address": "E8:E0:7E:97:DB:1B"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "LYWSD03MMC",
-          "zone": "inside.vberth",
-          "encryptionKey": "3985f4ebc032f276cc316f1f6ecea085",
-          "sensorClass": "XiaomiMiBeacon"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity",
-          "batteryStrength": "sensors.{macAndName}.battery.strength",
-          "voltage": "sensors.{macAndName}.battery.voltage"
-        },
-        "gattParams": {
-          "useGATT": false
-        },
-        "mac_address": "A4:C1:38:3E:7E:94"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "SmartShunt HQ2204C2GHD",
-          "batteryID": "house",
-          "encryptionKey": "8cce8529307cf9dd0c85611c4fef42d9",
-          "sensorClass": "VictronBatteryMonitor"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "current": "electrical.batteries.{batteryID}.current",
-          "power": "electrical.batteries.{batteryID}.power",
-          "voltage": "electrical.batteries.{batteryID}.voltage",
-          "alarm": "electrical.batteries.{batteryID}.alarm",
-          "consumed": "electrical.batteries.{batteryID}.capacity.ampHoursConsumed",
-          "soc": "electrical.batteries.{batteryID}.capacity.stateOfCharge",
-          "ttg": "electrical.batteries.{batteryID}.capacity.timeRemaining",
-          "starterVoltage": "electrical.batteries.secondary.voltage"
-        },
-        "gattParams": {
-          "useGATT": false
-        },
-        "mac_address": "D4:50:46:39:38:C5"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 90,
-        "params": {
-          "name": "aft propane tank",
-          "medium": "PROPANE",
-          "tankHeight": "325",
-          "id": "propane",
-          "sensorClass": "MopekaTankSensor"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "battVolt": "sensors.{macAndName}.battery.voltage",
-          "battStrength": "sensors.{macAndName}.battery.strength",
-          "temp": "tanks.{id}.temperature",
-          "tankLevel": "tanks.{id}.currentLevel",
-          "readingQuality": "sensors.{macAndName}.readingQuality",
-          "accX": "sensors.{macAndName}.accelerationXAxis",
-          "accY": "sensors.{macAndName}.accelerationYAxis"
-        },
-        "mac_address": "D4:40:59:BE:2A:8C"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "SBHT-003C",
-          "zone": "outside.deck",
-          "sensorClass": "ShellySBHT003C"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "battery": "sensors.{macAndName}.battery.strength",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity",
-          "button": "sensors.{macAndName}.button"
-        },
-        "mac_address": "7C:C6:B6:AF:49:5F"
-      }
-    ],
-    "adapter": "hci0",
-    "transport": "le",
-    "duplicateData": false,
-    "discoveryTimeout": 30
-  },
-  "enabled": true,
-  "enableDebug": false
-}