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

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")
 
 /** 
  * @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.3",
   "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

@@ -92,7 +92,7 @@ class JBDBMS extends BTSensor {
 
   emitGATT(){
     this.getAndEmitBatteryInfo()
-    setTimeout(()=>{this.getAndEmitCellVoltages()}, 5000)
+    setTimeout(()=>{this.getAndEmitCellVoltages()}, 10000)
   }
 
   async getNumberOfCellsAndTemps(){