bt-sensors-plugin-sk 1.2.0-beta.0.0.3 → 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');
-const AutoQueue = require("./Queue")
+const AutoQueue =  require("./Queue.js")
 
 /** 
  * @author Andrew Gerngross <oh.that.andy@gmail.com>

package/Queue.js

@@ -1,14 +1,14 @@
 /*
 see: https://stackoverflow.com/questions/53540348/js-async-await-tasks-queue 
 */
-class 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 {
+   class AutoQueue extends Queue {
     constructor() {
       super();
       this._pendingPromise = false;
@@ -45,4 +45,4 @@ class Queue {
       return true;
     }
   }
-  module.exports = AutoQueue
+  module.exports = AutoQueue   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.0-beta.0.0.3",
+  "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(){

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)
+
+
+