bt-sensors-plugin-sk 1.2.0-beta.0.0.2 → 1.2.0-beta.0.0.4

package/BTSensor.js

@@ -1,7 +1,7 @@
 const { Variant } = require('dbus-next');
 const { log } = require('node:console');
 const EventEmitter = require('node:events');
-var {exec} = require('child_process');
+const AutoQueue =  require("./Queue.js")
 
 /** 
  * @author Andrew Gerngross <oh.that.andy@gmail.com>
@@ -12,6 +12,7 @@ var {exec} = require('child_process');
  */
 
 const BTCompanies = require('./bt_co.json');
+const connectQueue = new AutoQueue()
 
 /**
  * @global A map of company names keyed by their Bluetooth ID
@@ -450,8 +451,7 @@ class BTSensor extends EventEmitter {
         throw new Error("::initGATTNotifications() should be implemented by the BTSensor subclass")
     }
 
-    async deviceConnect() {
-        await this.device.connect()
+    deviceConnect() {
 
         /* CAUTION: HACK AHEAD 
 
@@ -465,16 +465,23 @@ class BTSensor extends EventEmitter {
 
         You know, the little things.
       */
-        try {
-            await this._adapter.helper.callMethod('SetDiscoveryFilter', {
-                Transport: new Variant('s', this._adapter?._transport??"le")
-            })
-                         
-        } catch (e){
-            //probably ignorable error. probably.
-            console.log(e)
-        }
-        /* END HACK*/
+        return connectQueue.enqueue( async ()=>{
+            this.debug(`Connecting to ${this.getName()}`)
+            await this.device.connect()
+            try {
+
+                await this._adapter.helper.callMethod('StopDiscovery')
+                await this._adapter.helper.callMethod('SetDiscoveryFilter', {
+                    Transport: new Variant('s', this._adapter?._transport??"le")
+                })
+                await this._adapter.helper.callMethod('StartDiscovery')   
+                
+            } catch (e){
+                //probably ignorable error. probably.
+                console.log(e)
+            }
+        })
+    /* END HACK*/
   }
 
     /**
@@ -767,12 +774,15 @@ class BTSensor extends EventEmitter {
     //End instance utility functions
 
      createPaths(config, id){
+//        const source = `${this.getName()} (${id})`
+
 		Object.keys(this.getPaths()).forEach((tag)=>{
             const pathMeta=this.getPath(tag)
             const path = config.paths[tag]
             if (!(path===undefined))
                 this.app.handleMessage(id, 
                 {
+//                $source: source,
                 updates: 
                     [{ meta: [{path: preparePath(this, path), value: { units: pathMeta?.unit }}]}]
                 })
@@ -780,6 +790,7 @@ class BTSensor extends EventEmitter {
 	}
 
 	 initPaths(deviceConfig, id){
+        const source = this.getName()
 		Object.keys(this.getPaths()).forEach((tag)=>{
             const pathMeta=this.getPath(tag)
 			const path = deviceConfig.paths[tag];
@@ -788,14 +799,14 @@ class BTSensor extends EventEmitter {
 					if (pathMeta.notify){
 						this.app.notify(tag, val, id )
 					} else {
-						this.updatePath(preparePath(this,path),val,id)
+						this.updatePath(preparePath(this,path),val, id, source)
 					}
                 })
 			}
 		})
 	}
-	updatePath(path, val,id){
-		this.app.handleMessage(id, {updates: [ { values: [ {path: path, value: val }] } ] })
+	updatePath(path, val, id, source){
+		this.app.handleMessage(id, {updates: [ { $source: source, values: [ { path: path, value: val }] } ] })
   	}  
     elapsedTimeSinceLastContact(){
         return (Date.now()-this?._lastContact??Date.now())/1000

package/Queue.js

@@ -0,0 +1,48 @@
+/*
+see: https://stackoverflow.com/questions/53540348/js-async-await-tasks-queue 
+*/
+ class Queue {
+    constructor() { this._items = []; }
+    enqueue(item) { this._items.push(item); }
+    dequeue()     { return this._items.shift(); }
+    get size()    { return this._items.length; }
+  }
+  
+   class AutoQueue extends Queue {
+    constructor() {
+      super();
+      this._pendingPromise = false;
+    }
+  
+    enqueue(action) {
+      return new Promise((resolve, reject) => {
+        super.enqueue({ action, resolve, reject });
+        this.dequeue();
+      });
+    }
+  
+    async dequeue() {
+      if (this._pendingPromise) return false;
+  
+      let item = super.dequeue();
+  
+      if (!item) return false;
+  
+      try {
+        this._pendingPromise = true;
+  
+        let payload = await item.action(this);
+  
+        this._pendingPromise = false;
+        item.resolve(payload);
+      } catch (e) {
+        this._pendingPromise = false;
+        item.reject(e);
+      } finally {
+        this.dequeue();
+      }
+  
+      return true;
+    }
+  }
+  module.exports = AutoQueue   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.0-beta.0.0.2",
+  "version": "1.2.0-beta.0.0.4",
   "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, Aranet4 environment sensors, SwitchBot temp and humidity sensors, KilovaultHLXPlus smart batteries, and Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/JBDBMS.js

@@ -73,15 +73,13 @@ class JBDBMS extends BTSensor {
   hasGATT(){
     return true
   }
-  initCharacteristics(){ 
-    return new Promise( async (resolve,reject )=>{ 
+  async initCharacteristics(){ 
       const gattServer = await this.device.gatt()
       const txRxService= await gattServer.getPrimaryService(this.constructor.TX_RX_SERVICE)
       this.rxChar = await txRxService.getCharacteristic(this.constructor.NOTIFY_CHAR_UUID)
       this.txChar = await txRxService.getCharacteristic(this.constructor.WRITE_CHAR_UUID)
       await this.rxChar.startNotifications()
-      resolve(this)
-   .catch((e)=>{ reject(e.message) }) }) 
+      return this
   }
 
   async initGATTNotifications(){
@@ -92,7 +90,7 @@ class JBDBMS extends BTSensor {
 
   emitGATT(){
     this.getAndEmitBatteryInfo()
-    setTimeout(()=>{this.getAndEmitCellVoltages()}, 5000)
+    setTimeout(()=>{this.getAndEmitCellVoltages()}, 10000)
   }
 
   async getNumberOfCellsAndTemps(){

package/testqueue.js

@@ -0,0 +1,64 @@
+
+
+import {createBluetooth} from 'node-ble'
+
+import {AutoQueue} from "./Queue.js"
+import  {Variant}  from 'dbus-next'
+
+const {bluetooth, destroy} = createBluetooth()
+const connectQueue = new AutoQueue()
+const adapter = await bluetooth.getAdapter("hci0")
+await adapter.startDiscovery()
+
+function deviceConnect(mac) {
+
+        /* CAUTION: HACK AHEAD 
+
+        Bluez for some cockamamie reason (It's 2025 for chrissake. 
+        BLUETOOTH ISN'T JUST FOR DESKTOPS ANYMORE, BLUEZ DEVS!)
+        SUSPENDS scanning while connected to a device.
+
+        The next line of code gives the scanner a kick in the arse, 
+        starting it up again so, I dunno, another device might be able 
+        to connect and sensor classes could maybe get beacon updates.
+
+        You know, the little things.
+      */
+    adapter.waitDevice(mac,(30000)).then((device) =>{
+
+        return connectQueue.enqueue( async ()=>{
+            console.log("Connecting to "+mac)
+            try {await device.connect()} catch {(e)=>console.log(e)}
+            try {
+                console.log("Connected to "+mac)
+                console.log("Stopping discovery for "+mac)
+            
+                await adapter.helper.callMethod('StopDiscovery')
+                console.log("Discovery stopped for "+mac)
+                await adapter.helper.callMethod('SetDiscoveryFilter', {
+                    Transport: new Variant('s', "le")
+                })
+                console.log("Starting discovery for "+mac)
+                await adapter.helper.callMethod('StartDiscovery')   
+                console.log("Discovery started for "+mac)
+                
+            } catch (e){
+                //probably ignorable error. probably.
+                console.log(e)
+            }
+        })
+    })
+    /* END HACK*/
+}
+ setInterval( ()=>{
+    deviceConnect("D1:06:00:C6:16:4A")
+ }, 5000)
+ setInterval( ()=>{
+  
+ for (const mac of (["D1:06:01:46:49:39","A4:C1:38:3E:7E:94"])){
+    try { deviceConnect(mac) } catch { (e)=>console.log(e) }
+ }
+}, 10000)
+
+
+