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

package/sensor_classes/ShenzhenLiOnBMS.js

@@ -148,25 +148,19 @@ class ShenzhenLiONBMS extends BTSensor{
         this.getJSONSchema().properties.params.required=["batteryID", "numberOfCells" ]
     }
 
-    async initGATTConnection(){ 
-
-        return new Promise((resolve,reject )=>{ 
-            this.deviceConnect().then(async ()=>{ 
-            if (!this.gattServer) { 
-                this.gattServer = await this.device.gatt() 
-                this.service = await this.gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 
-                this.rxCharacteristic = await this.service.getCharacteristic("0000ffe1-0000-1000-8000-00805f9b34fb")
-                this.txCharacteristic = await this.service.getCharacteristic("0000ffe2-0000-1000-8000-00805f9b34fb")
-            }
-            resolve(this)
-        })})
+    async initGATTConnection(isReconnecting){ 
+
+        await super.initGATTConnection(isReconnecting)
+        const gattServer = await this.getGATTServer()
+        const service = await gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 
+        this.txCharacteristic = await service.getCharacteristic("0000ffe2-0000-1000-8000-00805f9b34fb")
+        this.rxCharacteristic = await service.getCharacteristic("0000ffe1-0000-1000-8000-00805f9b34fb")
     }
 
     async initGATTInterval(){
         await this.initGATTNotifications() 
     }
-    emitGATT(){
-        
+    emitGATT(){ 
     }
     async initGATTNotifications() { 
         await this.rxCharacteristic.startNotifications()    
@@ -180,15 +174,9 @@ class ShenzhenLiONBMS extends BTSensor{
         )    
     }
   
-    async stopListening(){
-        super.stopListening() //clears IntervalID as it happens
-        if (this.rxCharacteristic  && await this.rxCharacteristic.isNotifying()) {
-            await this.rxCharacteristic.stopNotifications()
-            this.rxCharacteristic=null
-        }
-        if (await this.device.isConnected()){
-            await this.device.disconnect()
-        }
+    async deactivateGATT(){
+        await this.stopGATTNotifications(this.rxCharacteristic)
+        await super.deactivateGATT() 
     }
 }
 module.exports=ShenzhenLiONBMS

package/sensor_classes/UltrasonicWindMeter.js

@@ -52,53 +52,36 @@ class UltrasonicWindMeter extends BTSensor{
         .default='environment.wind.speedApparent'
     }
 
-    initGATTConnection(){ 
-        return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
-            if (!this.gattServer) { 
-                this.gattServer = await this.device.gatt() 
-                this.battService = await this.gattServer.getPrimaryService("0000180f-0000-1000-8000-00805f9b34fb") 
-                this.battCharacteristic = await this.battService.getCharacteristic("00002a19-0000-1000-8000-00805f9b34fb")
-                this.envService = await this.gattServer.getPrimaryService("0000181a-0000-1000-8000-00805f9b34fb") 
-                this.awsCharacteristic = await this.envService.getCharacteristic("00002a72-0000-1000-8000-00805f9b34fb") 
-                this.awaCharacteristic = await this.envService.getCharacteristic("00002a73-0000-1000-8000-00805f9b34fb") } 
-                resolve(this)
-             }) .catch((e)=>{ reject(e.message) }) }) 
+    async initGATTConnection(isReconnecting){ 
+        await super.initGATTConnection(isReconnecting)
+        const gattServer = await this.getGATTServer() 
+        const battService = await gattServer.getPrimaryService("0000180f-0000-1000-8000-00805f9b34fb") 
+        this.battCharacteristic = await battService.getCharacteristic("00002a19-0000-1000-8000-00805f9b34fb")
+        const envService = await gattServer.getPrimaryService("0000181a-0000-1000-8000-00805f9b34fb") 
+        this.awsCharacteristic = await envService.getCharacteristic("00002a72-0000-1000-8000-00805f9b34fb") 
+        this.awaCharacteristic = await envService.getCharacteristic("00002a73-0000-1000-8000-00805f9b34fb") 
     }
-    initGATTNotifications() { 
-        Promise.resolve(this.battCharacteristic.startNotifications().then(()=>{    
-            this.battCharacteristic.on('valuechanged', buffer => {
-                this.emitData("batt",buffer)
-            })
-        }))
-        Promise.resolve(this.awaCharacteristic.startNotifications().then(()=>{    
-            this.awaCharacteristic.on('valuechanged', buffer => {
+    async initGATTNotifications() { 
+        await this.battCharacteristic.startNotifications()
+        this.battCharacteristic.on('valuechanged', buffer => {
+            this.emitData("batt",buffer)
+        })
+    
+        await this.awaCharacteristic.startNotifications()
+        this.awaCharacteristic.on('valuechanged', buffer => {
                 this.emitData("awa", buffer)
-            })
-        }))
-        Promise.resolve(this.awsCharacteristic.startNotifications().then(()=>{    
-            this.awsCharacteristic.on('valuechanged', buffer => {
+        })
+        await this.awsCharacteristic.startNotifications()
+        this.awsCharacteristic.on('valuechanged', buffer => {
                 this.emitData("aws", buffer)
-            })
-        }))
-    }
+        })
+}
   
-    async stopListening(){
-        super.stopListening()
-        if (this.battCharacteristic  && await this.battCharacteristic.isNotifying()) {
-            await this.battCharacteristic.stopNotifications()
-            this.battCharacteristic=null
-        }
-        if (this.awaCharacteristic  && await this.awaCharacteristic.isNotifying()) {
-            await this.awaCharacteristic.stopNotifications()
-            this.awaCharacteristic=null
-        }
-        if (this.awsCharacteristic  && await this.awsCharacteristic.isNotifying()) {
-            await this.awsCharacteristic.stopNotifications()
-            this.awsCharacteristic=null
-        }
-        if (await this.device.isConnected()){
-            await this.device.disconnect()
-        }
+    async deactivateGATT(){
+        await this.stopGATTNotifications(this.battCharacteristic)
+        await this.stopGATTNotifications(this.awaCharacteristic)
+        await this.stopGATTNotifications(this.awsCharacteristic)
+        await super.deactivateGATT()
     }
 }
 module.exports=UltrasonicWindMeter

package/sensor_classes/XiaomiMiBeacon.js

@@ -110,18 +110,11 @@ class XiaomiMiBeacon extends BTSensor{
         return ""
     }
 
-    initGATTConnection(){
-        return new Promise((resolve,reject )=>{
-            this.deviceConnect().then(async ()=>{
-                const gatt = await this.getGATTServer()
-                this.gattService = await gatt.getPrimaryService("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6")
-                this.gattCharacteristic = await this.gattService.getCharacteristic("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6")                
-                resolve(this)
-            })
-            .catch((e)=>{
-                reject(e.message)
-            })
-        })
+    async initGATTConnection(isReconnecting){
+        await super.initGATTConnection(isReconnecting)
+        const gatt = await this.getGATTServer()
+        const gattService = await gatt.getPrimaryService("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6")
+        this.gattCharacteristic = await gattService.getCharacteristic("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6")                
     }
 
     emitGATT(){
@@ -132,11 +125,10 @@ class XiaomiMiBeacon extends BTSensor{
     }
 
     async initGATTNotifications() { 
-        Promise.resolve(this.gattCharacteristic.startNotifications().then(()=>{    
-            this.gattCharacteristic.on('valuechanged', buffer => {
-                this.emitValues(buffer)
-            })
-        }))
+        await this.gattCharacteristic.startNotifications()
+        this.gattCharacteristic.on('valuechanged', buffer => {
+            this.emitValues(buffer)
+        })
     }
 
     decryptV2and3(data){
@@ -244,20 +236,11 @@ class XiaomiMiBeacon extends BTSensor{
             return super.getName()
         else
             return this?.name??`${dt.name} ${dt.model}`
-
     }
 
     async deactivateGATT(){
-        await this.disconnectGATTCharacteristic()
+        await this.stopGATTNotifications(this.gattCharacteristic)
         await super.deactivateGATT()
     }
-
-    async disconnectGATTCharacteristic(){
-        if (this.gattCharacteristic  && await this.gattCharacteristic.isNotifying()) {
-            this.gattCharacteristic.removeAllListeners()
-            await this.gattCharacteristic.stopNotifications()
-            this.gattCharacteristic=null
-        }
-    }
 }
 module.exports=XiaomiMiBeacon

package/src/components/PluginConfigurationPanel.js

@@ -133,7 +133,6 @@ async function fetchJSONData(path, data = {}) {
 
   }
 
-
   async function getSensorInfo(mac, sensorClass){
     
     const response = await fetchJSONData("getSensorInfo",{mac_address: mac, class: sensorClass})
@@ -387,7 +386,7 @@ function createListGroupItem(sensor){
         {`${sensor._changesMade?"*":""}${sensor.info.name} MAC: ${sensor.info.mac} RSSI: ${ifNullNaN(sensor.info.RSSI)}`  }
         <div class="d-flex justify-content-between ">
           {
-            sensor.info.state
+            `${sensor.info.state} ${sensor.info.error?" (ERROR)": "" }`
           }
         <div class="d-flex justify-content-between ">
           {