bt-sensors-plugin-sk 1.1.0-beta.2.2.0 → 1.1.0-beta.2.2.1.0

package/BTSensor.js

@@ -227,7 +227,7 @@ class BTSensor extends EventEmitter {
         const _propsProxy = await this._getPropsProxy(device)
         try{
             const rawProps = await _propsProxy.Get(device.helper.iface,prop)
-            return rawProps?.value
+            return rawProps?.value 
         }
         catch(e){
             return null //Property $prop (probably) doesn't exist in $device
@@ -258,7 +258,7 @@ class BTSensor extends EventEmitter {
         if (!md) return null 
         const keys = Object.keys(md)
         if (keys && keys.length>0){
-            return parseInt(keys[0])
+            return parseInt(keys[keys.length-1])
         }
         return null
     }
@@ -374,16 +374,21 @@ class BTSensor extends EventEmitter {
      * NOTE: The function mucks about with node-ble internal functions to help make sure the
      * DBUS connection stays alive, doesn't tax resources and doesn't spit out spurious errors.
      */
-     initPropertiesChanged(){
+    initPropertiesChanged(){
 
         this.propertiesChanged.bind(this)
         this.device.helper._prepare()
         this.device.helper.on("PropertiesChanged",
             ((props)=> {
-                this.propertiesChanged(props)
+                try{
+                    this.propertiesChanged(props)
+                }
+                catch(error){
+                    this.debug(`Error occured on ${this.getNameAndAddress()}: ${error?.message??error}`)
+                    this.debug(error)
+                }
             }))
      }
-
     //END instance initialization functions
 
     //Metadata functions
@@ -569,8 +574,12 @@ class BTSensor extends EventEmitter {
 
 
     listen(){
-        this.initPropertiesChanged()       
-        this.propertiesChanged(this.currentProperties)
+        try{
+            this.initPropertiesChanged()       
+            this.propertiesChanged(this.currentProperties)
+        } catch(e){
+            this.debug(e)
+        }
         if (this.usingGATT()){
             this.initGATTConnection().then(async ()=>{
                 this.emitGATT()

package/README.md

@@ -1,8 +1,16 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org)
 
+## BETA 2.2.1
+
+### What's New
+
+GoveeH50xx sensor support. Selectable bluetooth adapter on config screen (in case you have more than bluetooth adapter on your server).
+
+
 ## BETA 2.2.0
 
 ### What's New
+
 Support for Aranet4 environment sensor and Renogy Rover/Wanderer Controllers. Untested support for Renogy Battery and Inverter clients. If you have a Renogy Battery or Inverter with bluetooth support, please give it a try and let me know how it goes. 
 
 ### RENOGY NOTES 
@@ -30,7 +38,7 @@ Signalk users with a Linux boat-puter (Windows and MacOS are NOT currently suppo
 
 ## REQUIREMENTS
 
-* A Linux Signalk boat-puter with System-D (NOTE: Most Linux installations support System-D)
+* A Linux Signalk boat-puter with bluetooth-DBUS support 
 * A Bluetooth adapter
 * [Bluez](https://www.bluez.org) installed
 (Go here for [Snap installation instructions](https://snapcraft.io/bluez))
@@ -57,6 +65,7 @@ If you want to install directly from source (this is mostly of interest to custo
   git clone https://github.com/naugehyde/bt-sensors-plugin-sk
   cd bt-sensors-plugin-sk
   git switch '1.1.0'
+  git pull
   npm i
   [sudo] npm link
   cd [signalk_home] 

package/index.js

@@ -102,6 +102,8 @@ module.exports =  function (app) {
 				const sensor = new c(device,config?.params, config?.gattParams)
 				sensor.debug=app.debug
 				await sensor.init()
+				app.debug(`instantiated ${await BTSensor.getDeviceProp(device,"Address")}`)
+				
 				return sensor
 			}
 		}} catch(error){
@@ -174,8 +176,11 @@ module.exports =  function (app) {
 		"2) You will have to wait until the scanner has found your device before seeing your device's config fields and saving the configuration. \n"+
 		"3) To refresh the list of available devices and their configurations, just open and close the config screen by clicking on the arrow symbol in the config's top bar. \n"+
 		"4) If you submit and get errors it may be because the configured devices have not yet all been discovered.",
-		required:["discoveryTimeout", "discoveryInterval"],
+		required:["adapter","discoveryTimeout", "discoveryInterval"],
 		properties: {
+			adapter: {title: "Bluetooth adapter",
+				type: "string", default: "hci0"},
+
 			discoveryTimeout: {title: "Default device discovery timeout (in seconds)", 
 				type: "integer", default: 30,
 				minimum: 10,
@@ -358,13 +363,16 @@ module.exports =  function (app) {
 			createSensor(adapter, deviceConfig).then((sensor)=>{
 				deviceConfig.sensor=sensor
 				if (deviceConfig.active) {
-					createPaths(deviceConfig)
-					initPaths(deviceConfig)
+					if (deviceConfig.paths){
+						createPaths(deviceConfig)
+						initPaths(deviceConfig)
+					}
 					const result = Promise.resolve(deviceConfig.sensor.listen())
 					result.then(() => {
 						app.debug(`Listening for changes from ${deviceConfig.sensor.getDisplayName()}`);
 						app.setPluginStatus(`Initial scan complete. Listening to ${++found} sensors.`);
 					})
+
 				}
 
 			})
@@ -417,13 +425,32 @@ module.exports =  function (app) {
 		sensorMap.clear()
 		deviceConfigs=options?.peripherals??[]
 
+		
+
 		if (plugin.stopped) {
 			await sleep(5000) //Make sure plugin.stop() completes first			
 						  //plugin.start is called asynchronously for some reason
 						  //and does not wait for plugin.stop to complete
 			plugin.stopped=false
 		}
-		adapter = await bluetooth.getAdapter(app.settings?.btAdapter??adapterID)
+		var adapterID=options.adapter
+
+		if (!adapterID || adapterID==="")
+			adapterID = "hci0"
+
+		app.debug(`Connecting to bluetooth adapter ${adapterID}`);
+
+		const activeAdapters = await bluetooth.activeAdapters()
+		plugin.schema.properties.adapter.enum=[]
+		plugin.schema.properties.adapter.enumNames=[]
+		for (a of activeAdapters){
+			plugin.schema.properties.adapter.enum.push(a.adapter)
+			plugin.schema.properties.adapter.enumNames.push(`${a.adapter} @ ${ await a.getAddress()} (${await a.getName()})`)
+		}
+
+		plugin.uiSchema.adapter={'ui:disabled': (activeAdapters.length==1)}
+
+		adapter = await bluetooth.getAdapter(adapterID)
 		await startScanner()
 		if (starts>0){
 			app.debug(`Plugin ${packageInfo.version} restarting...`);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.2.0",
+  "version": "1.1.0-beta.2.2.1.0",
   "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic wind meters, Mopeka tank readers, Renogy Battery and Solar Controllers (new), Aranet4 environment sensors, and Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {
     "dbus-next": "^0.10.2",
-    "node-ble": "^1.9.0",
+    "node-ble": "^1.12.0",
     "int24":"^0.0.1"
   },
   "scripts": {

package/sensor_classes/BlackListedDevice.js

@@ -2,10 +2,13 @@ const BTSensor = require("../BTSensor");
 class BLACKLISTED extends BTSensor{
     static isSystem = true
     static async identify(device){
-        if (await this.getManufacturerID(device)===0x004C)   //apple devices use 
-            return this                                     //randomised macs and clog up our list
-        else
-            return null
+        const md = await this.getDeviceProp(device,'ManufacturerData')
+        if (md){
+            const keys = Object.keys(md)
+            if (keys.length==1 && keys[0]==0x004C)
+                return this
+        }
+        return null
     }
     async init(){
         await super.init()
@@ -13,7 +16,7 @@ class BLACKLISTED extends BTSensor{
     }
     reasonForBlacklisting() {
         switch ( this.getManufacturerID()){
-            case (0x004C): return "Randomized MAC address"
+            case (0x004C): return "Randomized MAC address (Apple)"
             case (0x02e1): return "Device is using VE.Smart" //NOTE: Victron/VictronSensor class 
                                                              //determines if a device is using VE.Smart
                                                              //in identify(). If so, identify() returns

package/sensor_classes/GoveeH50xx.js

@@ -0,0 +1,47 @@
+const BTSensor = require("../BTSensor");
+
+class GoveeH50xx extends  BTSensor {
+
+    static async  identify(device){
+        const regex = /^Govee_H50[0-9]{2}_[a-f,A-F,0-9]{4}$/
+        //this.getManufacturer()
+        const name = await this.getDeviceProp(device,"Name")
+        const uuids = await this.getDeviceProp(device,'UUIDs')
+ 
+        if (name && name.match(regex) && 
+            uuids && uuids.length > 0 && 
+            uuids[0] == '0000ec88-0000-1000-8000-00805f9b34fb')
+            return this
+        else
+            return null
+        t
+    }
+
+    async init(){
+        await super.init()
+        this.initMetadata()
+    }
+    initMetadata(){
+        this.addMetadatum('temp','K', 'temperature', 
+            (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) 
+        })
+        this.addMetadatum('humidity','ratio', 'humidity', 
+            (buffer)=>{return buffer.readUInt16LE(3)/10000    
+        })
+        this.addMetadatum('battery','ratio', 'battery strength', (buffer)=>{return buffer.readUInt8(5)/100})
+    }
+
+    getManufacturer(){
+        return "Govee"
+    }
+    async propertiesChanged(props){
+        super.propertiesChanged(props)    
+        if (props.ManufacturerData) {
+            const buffer = this.getManufacturerData(0xec88)
+            if (buffer) {
+               this.emitValuesFrom(buffer)
+            }      
+        }
+   }                         
+}
+module.exports=GoveeH50xx

package/sensor_classes/{GoveeTH.js → GoveeH510x.js}

@@ -18,10 +18,10 @@ function decodeTempHumid(tempHumidBytes) {
       return {t: tempAsFloat, h: humid};
     }
   }
-class GoveeTH extends BTSensor{
+class GoveeH510x extends BTSensor{
 
     static async  identify(device){
-        const regex = /^GVH5[0-9]{3}_[a-f,A-F,0-9]{4}$/
+        const regex = /^GVH510[0-9]_[a-f,A-F,0-9]{4}$/
         const name = await this.getDeviceProp(device,"Name")
         const uuids = await this.getDeviceProp(device,'UUIDs')
 
@@ -64,4 +64,4 @@ class GoveeTH extends BTSensor{
         }
    }                         
 }
-module.exports=GoveeTH
+module.exports=GoveeH510x

package/sensor_classes/Victron/VictronSensor.js

@@ -64,7 +64,7 @@ function sleep(x) {
 
     decrypt(data){
         if (!this.encryptionKey)
-            throw Error("Unable to decrypt: no encryption key set")
+            throw new Error("Unable to decrypt: no encryption key set")
 
         const encMethod = 'aes-128-ctr';
         const iv = data.readUInt16LE(5); 

package/sensor_classes/XiaomiMiBeacon.js

@@ -166,6 +166,9 @@ class XiaomiMiBeacon extends BTSensor{
         if (this.usingGATT()) return
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
         var dec
+        if (!this.encryptionKey){
+            throw new Error(`${this.getNameAndAddress()} requires an encryption key.`)
+        }
         if (this.encryptionVersion >= 4) {
             dec = this.decryptV4and5(data)
         } else {