fix |> fix ble disconnect error

zepp-health · May 16, 2024 · 4e37ca9 · 4e37ca9
1 parent 847b7d4
commit 4e37ca9
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/src/shared/message.js b/src/shared/message.js
@@ -289,6 +289,18 @@ export class MessageBuilder extends EventBus {
     this.on('response', (resp) => {
       this.onResponse(resp)
     })
+
+    ble?.addListener((status) => {
+      DEBUG && logger.debug('ble change to=>', status)
+
+      if (!status) {
+        logger.error('ble disconnect')
+        this.shakeTask.reject(
+          new MessageError(MessageErrorCode.BLE_CLOSE, 'ble disconnect'),
+        )
+        this.shakeStatus = ShakeStatus.failure
+      }
+    })
   }
 
   fork(timeout = MessageShakeTimeOut) {
@@ -308,6 +320,17 @@ export class MessageBuilder extends EventBus {
       )
     }, timeout)
 
+    try {
+      this.errorIfBleDisconnect()
+    } catch (error) {
+      logger.error('error ble disconnect %j', error)
+      this.shakeTask.reject(
+        new MessageError(MessageErrorCode.BLE_CLOSE, 'ble disconnect'),
+      )
+      this.shakeStatus = ShakeStatus.failure
+      return this.waitingShakePromise
+    }
+
     this.shakeStatus = ShakeStatus.pending
     this.sendShake()
 
@@ -444,7 +467,7 @@ export class MessageBuilder extends EventBus {
   }
 
   sendShake() {
-    DEBUG && logger.info('shake send')
+    DEBUG && logger.debug('shake send')
     const shake = this.buildShake()
     this.sendMsg(shake)
   }
@@ -967,6 +990,7 @@ export class MessageBuilder extends EventBus {
     }
 
     const isBleConnected = this.ble.connectStatus()
+    DEBUG && logger.debug('isBleConnected=>', isBleConnected)
 
     if (!isBleConnected) {
       throw new MessageError(MessageErrorCode.BLE_CLOSE, 'ble disconnect')
@@ -1057,13 +1081,16 @@ export class MessageBuilder extends EventBus {
     try {
       this.errorIfBleDisconnect()
     } catch (error) {
+      logger.error('error ble disconnect %j', error)
       return Promise.reject(error)
     }
 
     const requestTask = () => {
       this.errorIfBleDisconnect()
       this.errorIfSideServiceDisconnect()
 
+      DEBUG && logger.debug('request start %j', data)
+
       let contentType = DataType.bin
 
       if (typeof data === 'string') {