bt-sensors-plugin-sk 1.2.6-beta-4 → 1.2.6-beta-5

package/BTSensor.js

@@ -267,16 +267,16 @@ class BTSensor extends EventEmitter {
 
     debug(message){
         if (this._app)
-            this._app.debug(message)
+            this._app.debug(`${this.getName()}) ${message}`)
         else
-            console.log(message)
+            console.log(`${this.getName()}) ${message}`)
         this._debugLog.push({timestamp:Date.now(), message:message})
     }
 
     setError(message){
         if (this._app){
-            this._app.debug(message)
-            this._app.setPluginError(message)
+            this._app.debug(`${this.getName()}) ${message}`)
+            this._app.setPluginError(`${this.getName()}) ${message}`)
         }
         else
             console.log(message)

package/README.md

@@ -1,6 +1,10 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org) 
 
 ## WHAT'S NEW  
+# Version 1.2.6-beta-5
+
+- JikongBMS fixes
+
 # Version 1.2.6-beta-4
 
 - Improved reconnect logic for connected devices
@@ -111,12 +115,12 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
 |Redodo| Rebranded LiTime |
 |Kilovault| [Kilovault HLX+ smart batteries ](https://sunwatts.com/content/manual/KiloVault_HLX_PLUS_Datasheet_06252021%20%281%29.pdf?srsltid=AfmBOooY-cGnC_Qm6V1T9Vg5oZzBCJurS0AOGoWqWeyy-dwz2vA-l1Jb) (Note: Kilovault appears to be out of business as of March 2024) |
 |[Lancol](www.Lancol.com)| [Micro 10C 12V Car Battery Monitor](https://www.lancol.com/product/12v-bluetooth-4-0-battery-tester-micro-10-c/)|
+|[Jikong](https://jikongbms.com/)| https://jikongbms.com/product/ |
 |[Junctek](https://www.junteks.com)|[Junctek BMS](https://www.junteks.com/pages/product/index) |
 |[Remoran](https://remoran.eu)| [Remoran Wave.3](https://remoran.eu/wave.html)|
 |[AC DC Systems](https://marinedcac.com) | [Bank Manager] hybrid (Pb and Li) charger(https://marinedcac.com/pages/bankmanager)|
 |[Ective](https://ective.de/)| Also Topband(?), Skanbatt and others |
 
-
 ### Environmental 
 | Manufacturer |  Devices | 
 |--------------|----------|

package/index.js

@@ -85,6 +85,9 @@ class MissingSensor  {
 	isActive(){
 		return false
 	}
+	isConnected(){return false}
+
+	
 	elapsedTimeSinceLastContact(){
 		return NaN
 	}
@@ -94,6 +97,12 @@ class MissingSensor  {
 	prepareConfig(){
 		
 	}
+	getErrorLog(){
+		return []
+	}
+	getDebugLog(){
+		return []
+	}
 
 }
 module.exports =   function (app) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.6-beta-4",
+  "version": "1.2.6-beta-5",
   "description": "Bluetooth Sensors for Signalk - see https://www.npmjs.com/package/bt-sensors-plugin-sk#supported-sensors for a list of supported sensors",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/JikongBMS.js

@@ -1,3 +1,4 @@
+const { ThemeProvider } = require("react-bootstrap");
 const BTSensor = require("../BTSensor");
 let FakeDevice,FakeGATTService,FakeGATTCharacteristic;
 
@@ -108,6 +109,7 @@ class JikongBMS extends BTSensor {
     }
   }
 
+  pollFreq=20
   async initSchema() {
     super.initSchema();
     this.addDefaultParam("batteryID");
@@ -452,26 +454,49 @@ class JikongBMS extends BTSensor {
     this.debug(`${this.getName()}::initGATTConnection`);
 
     await super.initGATTConnection(isReconnecting);
-  
-    this.rxService = await this.getGATTServer().getPrimaryService(
+    const gattServer = await this.getGATTServer();
+
+    this.rxService = await gattServer.getPrimaryService(
       this.constructor.RX_SERVICE
     );
+    
+    if (this.rxChar)
+      try {
+        await this.rxChar.stopNotifications()
+      }
+      catch(e){
+        this.rxChar.removeAllListeners()
+
+        this.debug(`error while stopping notifications`)
+        this.debug(e)
+      }
+
     this.rxChar = await this.rxService.getCharacteristic(
       this.constructor.RX_CHAR_UUID
     );
 
     await this.rxChar.startNotifications();
-    await this.getBuffer(0x97);
+    try {
+      await this.getBuffer(0x97)
+    } catch (e) {
+      this.setError(e.message)
+    }
+
     //this.debug(`(${this.getName()}) Connections: ${this.connections++}`)
   }
 
   activate(config, plugin) {
     super.activate(config, plugin);
     this.initGATTConnection().then(async () => {
-      await this.getAndEmitBatteryInfo();
+      try {
+        await this.getAndEmitBatteryInfo();
+      } catch(e) {
+        this.setError(e.message)
+      }
       this.intervalID = setInterval(async () => {
-        if (!(await this.device.isConnected()))
+        if (!(await this.device.isConnected())) {
           await this.initGATTConnection(true);
+        }
         await this.getAndEmitBatteryInfo();
       }, this.pollFreq * 1000);
     });