mini_program_gizwits_sdk 3.4.9 → 3.4.12

package/src/wifiConfig/ble.ts

@@ -10,7 +10,12 @@ import {
   getBLEDeviceCharacteristics, getBLEDeviceServices, getBluetoothAdapterState, getBluetoothDevices,
   notifyBLECharacteristicValueChange, retryConnect, startBluetoothDevicesDiscovery, unpackWriteBLECharacteristicValue
 } from '../wechatApi';
-import ConfigBase from "./ConfigBase";
+import ConfigBase, { ConfigEventData } from "./ConfigBase";
+
+type EnableAndGetBluetoothDevicesRes = Promise<
+| { success: false; err: IError }
+| { success: true; bleDevices?: IDevice[] }
+>;
 
 interface IArgs {
   bleDeviceId: string;
@@ -18,174 +23,11 @@ interface IArgs {
   serviceUUIDSuffix?: string;
   characteristicUUIDSuffix?: string;
   bleHandle: BleHandle;
+  eventCallBack: (event: ConfigEventData) => void, // 配网回调
 }
 
 const configAck = '0000000303000002';
 
-export function sendBLEConfigCmd({
-  bleDeviceId,
-  arrayBuffer,
-  serviceUUIDSuffix = 'abf0',
-  characteristicUUIDSuffix = 'abf7',
-  bleHandle
-}: IArgs) {
-  let sendInterval = null;
-  let closeTimeout = null;
-
-  const checkInterrupt = () => {
-    if (closeTimeout === null) {
-      sendInterval && clearInterval(sendInterval);
-      return true;
-    }
-    return false;
-  }
-
-  return new Promise<boolean>(async (resolve, reject) => {
-    try {
-      GizLog.debug(
-        'GIZ_SDK: ssid info: ', arrayBuffer
-      );
-      // 设置超时
-      closeTimeout = setTimeout(() => {
-        sendInterval && clearInterval(sendInterval);
-        // 发送超时 返回失败
-        closeTimeout = null;
-        resolve(false);
-      }, 5 * 1000)
-      GizLog.debug(
-        'GIZ_SDK: createBLEConnection start: ', bleDeviceId
-      );
-      await bleHandle.disableScan()
-
-      const connectData = await retryConnect(bleDeviceId, 10 * 1000);
-      bleHandle.enableScan();
-
-      GizLog.debug(
-        'GIZ_SDK: createBLEConnection end, res:', connectData
-      );
-      const services = await getBLEDeviceServices(bleDeviceId);
-      GizLog.debug(
-        'GIZ_SDK: getBLEDeviceServices end, res:', services
-      );
-      const service = services.find((s) =>
-        s.uuid.split('-')[0].toLowerCase().endsWith(serviceUUIDSuffix)
-      );
-      if (!service) {
-        // 获取蓝牙设备服务异常
-        GizLog.debug(
-          'GIZ_SDK: get ble device services fail',
-          bleDeviceId,
-          services
-        );
-        resolve(false);
-        return;
-      }
-
-      const characteristics = await getBLEDeviceCharacteristics(
-        bleDeviceId,
-        service.uuid
-      );
-      GizLog.debug(
-        'GIZ_SDK: getBLEDeviceCharacteristics end, res:', characteristics
-      );
-      const characteristic = characteristics.find((c) =>
-        c.uuid.split('-')[0].toLowerCase().endsWith(characteristicUUIDSuffix)
-      );
-      if (!characteristic) {
-        // 获取蓝牙设备特征值异常
-        GizLog.debug(
-          'GIZ_SDK: get ble device characteristics fail',
-          bleDeviceId,
-          characteristics
-        );
-        resolve(false);
-        return;
-      }
-
-      if (
-        !characteristic.properties.notify &&
-        !characteristic.properties.indicate
-      ) {
-        GizLog.debug(
-          'GIZ_SDK: the ble device characteristic not support notify or indicate',
-          bleDeviceId,
-          characteristic
-        );
-        // 该设备不支持 notify & indicate 操作
-        resolve(false);
-        return;
-      }
-
-      GizLog.debug(
-        'GIZ_SDK: check characteristic and  service success',
-      );
-
-      await notifyBLECharacteristicValueChange(
-        bleDeviceId,
-        service.uuid,
-        characteristic.uuid
-      );
-
-      // 这里有个问题，模组好像不一定每次都会回
-      const handleBLECharacteristicValueChange = (res: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult) => {
-        const hexString = ab2hex(res.value);
-        GizLog.debug('GIZ_SDK: 收到设备返回ack', hexString)
-        if (hexString === configAck) {
-          // 发送成功
-          bleHandle.removeEventListener("GizBleDeviceData", handleBLECharacteristicValueChange)
-          resolve(true);
-        }
-      };
-
-      bleHandle.addEventListener("GizBleDeviceData", handleBLECharacteristicValueChange)
-
-      // 订阅特征值变化
-      // wx.onBLECharacteristicValueChange(handleBLECharacteristicValueChange);
-
-      GizLog.debug(
-        'GIZ_SDK: on notifyBLECharacteristicValueChange success',
-      );
-
-      if (checkInterrupt()) return;
-
-      await unpackWriteBLECharacteristicValue(
-        bleDeviceId,
-        service.uuid,
-        characteristic.uuid,
-        arrayBuffer
-      );
-      sendInterval = setInterval(() => {
-        if (checkInterrupt()) return;
-        unpackWriteBLECharacteristicValue(
-          bleDeviceId,
-          service.uuid,
-          characteristic.uuid,
-          arrayBuffer
-        );
-      }, 2000)
-
-      // if (res.errCode === 0) {
-      //   resolve(true);
-      // } else{
-      //   resolve(false);
-      // }
-      GizLog.debug('GIZ_SDK: unpackWriteBLECharacteristicValue end');
-    } catch (error) {
-      reject(false);
-      GizLog.debug('GIZ_SDK: sendBLEConfigCmd error', error);
-    }
-  })
-    .catch((error) => {
-      GizLog.debug('GIZ_SDK: sendBLEConfigCmd error', error);
-    })
-    .finally(() => {
-      // 关闭连接
-      closeTimeout && clearTimeout(closeTimeout);
-      sendInterval && clearInterval(sendInterval);
-      wx.closeBLEConnection({ deviceId: bleDeviceId });
-    });
-}
-
 interface configBLEDeviceParams {
   ssid: string;
   password: string;
@@ -198,42 +40,243 @@ interface ISetDeviceOnboardingDeployProps {
   timeout: number;
   isBind: boolean;
   softAPSSIDPrefix: string;
+  eventCallBack: (event: ConfigEventData) => void; // 配网回调
 }
 
 
 class BLEConfig extends ConfigBase {
   bleHandle: BleHandle;
 
-  constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[],bleHandle: BleHandle) {
+  constructor(
+    ssid: string, bssid: string, 
+    password: string, specialProductKeys: string[], 
+    specialProductKeySecrets: string[],
+    bleHandle: BleHandle,
+    ) {
     super(ssid, bssid, password,specialProductKeys,specialProductKeySecrets)
     this.bleHandle = bleHandle;
   }
+
+  sendBLEConfigCmd = ({
+    bleDeviceId,
+    arrayBuffer,
+    serviceUUIDSuffix = 'abf0',
+    characteristicUUIDSuffix = 'abf7',
+    bleHandle,
+    eventCallBack
+  }: IArgs) => {
+    let sendInterval = null;
+    let closeTimeout = null;
+  
+    const checkInterrupt = () => {
+      if (closeTimeout === null) {
+        sendInterval && clearInterval(sendInterval);
+        return true;
+      }
+      return !this.hasTimeoutHandler();
+    }
+  
+    return new Promise<boolean>(async (resolve, reject) => {
+      try {
+        GizLog.debug(
+          'GIZ_SDK: ssid info: ', arrayBuffer
+        );
+        // 设置超时
+        closeTimeout = setTimeout(() => {
+          sendInterval && clearInterval(sendInterval);
+          // 发送超时 返回失败
+          closeTimeout = null;
+          resolve(false);
+        }, 5 * 1000)
+        GizLog.debug(
+          'GIZ_SDK: createBLEConnection start: ', bleDeviceId
+        );
+        await bleHandle.disableScan()
+  
+        const connectData = await retryConnect(bleDeviceId, 10 * 1000);
+
+        eventCallBack?.({
+          event: "GIZ_CONNECT_SUCCESS",
+          deviceID: bleDeviceId
+        })
+  
+        bleHandle.enableScan();
+  
+        GizLog.debug(
+          'GIZ_SDK: createBLEConnection end, res:', connectData
+        );
+        const services = await getBLEDeviceServices(bleDeviceId);
+        GizLog.debug(
+          'GIZ_SDK: getBLEDeviceServices end, res:', services
+        );
+        const service = services.find((s) =>
+          s.uuid.split('-')[0].toLowerCase().endsWith(serviceUUIDSuffix)
+        );
+        if (!service) {
+          // 获取蓝牙设备服务异常
+          GizLog.debug(
+            'GIZ_SDK: get ble device services fail',
+            bleDeviceId,
+            services
+          );
+          resolve(false);
+          return;
+        }
+  
+        const characteristics = await getBLEDeviceCharacteristics(
+          bleDeviceId,
+          service.uuid
+        );
+        GizLog.debug(
+          'GIZ_SDK: getBLEDeviceCharacteristics end, res:', characteristics
+        );
+        const characteristic = characteristics.find((c) =>
+          c.uuid.split('-')[0].toLowerCase().endsWith(characteristicUUIDSuffix)
+        );
+        if (!characteristic) {
+          // 获取蓝牙设备特征值异常
+          GizLog.debug(
+            'GIZ_SDK: get ble device characteristics fail',
+            bleDeviceId,
+            characteristics
+          );
+          resolve(false);
+          return;
+        }
+  
+        if (
+          !characteristic.properties.notify &&
+          !characteristic.properties.indicate
+        ) {
+          GizLog.debug(
+            'GIZ_SDK: the ble device characteristic not support notify or indicate',
+            bleDeviceId,
+            characteristic
+          );
+          // 该设备不支持 notify & indicate 操作
+          resolve(false);
+          return;
+        }
+  
+        GizLog.debug(
+          'GIZ_SDK: check characteristic and  service success',
+        );
+        
+  
+        await notifyBLECharacteristicValueChange(
+          bleDeviceId,
+          service.uuid,
+          characteristic.uuid
+        );
+  
+        eventCallBack?.({
+          event: "GIZ_CONFIG_SEND_SUCCESS",
+          deviceID: bleDeviceId
+        })
+  
+        // 这里有个问题，模组好像不一定每次都会回
+        const handleBLECharacteristicValueChange = (res: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult) => {
+          const hexString = ab2hex(res.value);
+          GizLog.debug('GIZ_SDK: 收到设备返回ack', hexString)
+          eventCallBack({
+            event: "GIZ_CONFIG_RECV_SUCCESS",
+            deviceID: bleDeviceId
+          })
+          if (hexString === configAck) {
+            // 发送成功
+            bleHandle.removeEventListener("GizBleDeviceData", handleBLECharacteristicValueChange)
+            resolve(true);
+          }
+        };
+  
+        bleHandle.addEventListener("GizBleDeviceData", handleBLECharacteristicValueChange)
+  
+        // 订阅特征值变化
+        // wx.onBLECharacteristicValueChange(handleBLECharacteristicValueChange);
+  
+        GizLog.debug(
+          'GIZ_SDK: on notifyBLECharacteristicValueChange success',
+        );
+  
+        if (checkInterrupt()) return;
+  
+        await unpackWriteBLECharacteristicValue(
+          bleDeviceId,
+          service.uuid,
+          characteristic.uuid,
+          arrayBuffer
+        );
+        sendInterval = setInterval(() => {
+          if (checkInterrupt()) return;
+          unpackWriteBLECharacteristicValue(
+            bleDeviceId,
+            service.uuid,
+            characteristic.uuid,
+            arrayBuffer
+          );
+        }, 2000)
+  
+        // if (res.errCode === 0) {
+        //   resolve(true);
+        // } else{
+        //   resolve(false);
+        // }
+        GizLog.debug('GIZ_SDK: unpackWriteBLECharacteristicValue end');
+      } catch (error) {
+        reject(false);
+        GizLog.debug('GIZ_SDK: sendBLEConfigCmd error', error);
+      }
+    })
+      .catch((error) => {
+        GizLog.debug('GIZ_SDK: sendBLEConfigCmd error', error);
+      })
+      .finally(() => {
+        // 关闭连接
+        closeTimeout && clearTimeout(closeTimeout);
+        sendInterval && clearInterval(sendInterval);
+        this.bleHandle.disConnectDevice(bleDeviceId)
+      });
+  }
+  
+
   destroy = () => {
     this.cleanTimeout();
   }
-  isValidBleDevice = (
-    bleDevice: WechatMiniprogram.BlueToothDevice,
-    softAPSSIDPrefix?: string
-  ) => {
-    if (!bleDevice || !bleDevice.advertisData) {
-      // 无效蓝牙设备或者蓝牙设备广播数据为空，返回失败
+  isValidBleDevice = (device:IDevice, softAPSSIDPrefix?: string) => {
+    if (device.bleWorkStatus === 0) return false;
+    if (!this.specialProductKeys.includes(device.productKey)) {
       return false;
     }
 
-    const {productKey, mac} = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
-
-
-    if (!this.specialProductKeys.includes(productKey)) {
-      // 不在PK列表
-      return false;
-    }
-    GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${mac} pk: ${productKey} name: ${bleDevice.name}`)
-    GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix)}`)
+    GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${device.mac} pk: ${device.productKey} name: ${device.name}`)
+    GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${device.name && device.name.startsWith(softAPSSIDPrefix)}`)
     return (
       !softAPSSIDPrefix ||
-      (bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix))
-    );
-  };
+      (device.name && device.name.startsWith(softAPSSIDPrefix))
+    )
+  }
+  // isValidBleDevice = (
+  //   bleDevice: WechatMiniprogram.BlueToothDevice,
+  //   softAPSSIDPrefix?: string
+  // ) => {
+  //   if (!bleDevice || !bleDevice.advertisData) {
+  //     // 无效蓝牙设备或者蓝牙设备广播数据为空，返回失败
+  //     return false;
+  //   }
+  //   const {productKey, mac, bleWorkStatus} = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
+  //   if (!this.specialProductKeys.includes(productKey)) {
+  //     // 不在PK列表
+  //     return false;
+  //   }
+  //   // 判断广播包是否可以配网
+  //   if (bleWorkStatus !== 1) return;
+  //   GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${mac} pk: ${productKey} name: ${bleDevice.name}`)
+  //   GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix)}`)
+  //   return (
+  //     !softAPSSIDPrefix ||
+  //     (bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix))
+  //   );
+  // };
 
 
   enableBluetoothDevicesDescovery = async (): Promise<
@@ -263,19 +306,17 @@ class BLEConfig extends ConfigBase {
 
   enableAndGetBluetoothDevices = async (
     softAPSSIDPrefix?: string
-  ): Promise<
-    | { success: false; err: IError }
-    | { success: true; bleDevices?: WechatMiniprogram.BlueToothDevice[] }
-  > => {
+  ): EnableAndGetBluetoothDevicesRes => {
     const discoveryRes = await this.enableBluetoothDevicesDescovery();
     if (!discoveryRes.success) {
       return discoveryRes;
     }
     GizLog.debug('GIZ_SDK: start enableAndGetBluetoothDevices');
 
-    const bleDevices: WechatMiniprogram.BlueToothDevice[] = (
-      await getBluetoothDevices()
-    ).filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));
+    // const bleDevices: WechatMiniprogram.BlueToothDevice[] = (
+    //   await getBluetoothDevices()
+    // ).filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));
+    const bleDevices: IDevice[] = this.bleHandle.scanList.filter(d => this.isValidBleDevice(d, softAPSSIDPrefix))
     GizLog.debug('GIZ_SDK: getBluetoothDevices success', bleDevices);
     return {
       success: true,
@@ -286,8 +327,17 @@ class BLEConfig extends ConfigBase {
     timeout,
     isBind = true,
     softAPSSIDPrefix,
+    eventCallBack = (e) => {},
   }: ISetDeviceOnboardingDeployProps) => {
+    this.eventCallBack = eventCallBack;
     return new Promise<IResult<IDevice[]>>(async (res, rej) => {
+
+      // 清空扫描缓存
+      this.bleHandle.scanList = [];
+      this.eventCallBack?.({
+        event: "GIZ_CONFIG_START",
+        deviceID: null
+      })
       const ssid = this.ssid;
       const password = this.password;
       this.destroy();
@@ -360,24 +410,27 @@ class BLEConfig extends ConfigBase {
         return rej(enableAndGetRes);
       }
 
-      const { bleDevices } = enableAndGetRes;
+      let bleDevices: IDevice[] = enableAndGetRes.bleDevices as IDevice[];
 
       GizLog.debug('GIZ_SDK: enableAndGetBluetoothDevices success, target devices: ', bleDevices);
 
-      const handleFoundDevices = async ({
-        devices,
-      }: {
-        devices: WechatMiniprogram.BlueToothDevice[];
-      }) => {
-        this.hasTimeoutHandler()
-          ? Array.prototype.push.apply(
-              bleDevices,
-              devices.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix))
-            )
-          : wx.offBluetoothDeviceFound(()=>{});
-      };
-
-      wx.onBluetoothDeviceFound(handleFoundDevices);
+      // const handleFoundDevices = async ({
+      //   devices,
+      // }: {
+      //   devices: WechatMiniprogram.BlueToothDevice[];
+      // }) => {
+      //   if(this.hasTimeoutHandler()) {
+      //     Array.prototype.push.apply(
+      //       bleDevices,
+      //       devices.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix))
+      //     )
+      //   } else {
+      //     wx.offBluetoothDeviceFound(()=>{});
+      //   }
+      // };
+
+      // wx.onBluetoothDeviceFound(handleFoundDevices);
+      await startBluetoothDevicesDiscovery(true);
 
       const appendPassword = this.appendExtendData(password)
       const uint8Array = WifiConfig.pack(ssid,appendPassword);
@@ -386,30 +439,36 @@ class BLEConfig extends ConfigBase {
         if (!this.hasTimeoutHandler()) {
           return;
         }
-        const bleDevice = bleDevices.shift();
+        const bleDevice = bleDevices.shift() as IDevice;
         if (bleDevice) {
+          this.eventCallBack?.({
+            event: "GIZ_DISCOVER_SUCCESS",
+            deviceID: bleDevice.bleDeviceID
+          })
           GizLog.debug('GIZ_SDK: startConfigDevice, target device: ', bleDevice);
         }
 
-        const success =
-          bleDevice &&
-          (await sendBLEConfigCmd({
-            bleDeviceId: bleDevice.deviceId,
+        let success = false;
+        if (bleDevice) {
+          success = await this.sendBLEConfigCmd({
+            bleDeviceId: bleDevice.bleDeviceID,
             arrayBuffer: uint8Array.buffer,
-            bleHandle: this.bleHandle
-          }));
+            bleHandle: this.bleHandle,
+            eventCallBack: this.eventCallBack
+          }) === true
+        }
 
         if (!success) {
           // 如果校验设备或者发送不成功，重试下一个设备
           await sleep(500);
-          await startBluetoothDevicesDiscovery();
+          bleDevices = this.bleHandle.scanList.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));;
           await startConfigDevice();
           return;
         }
 
         // 如果有一个设备发送成功，则不再发现新设备
         GizLog.debug("GIZ_SDK: offBluetoothDeviceFound ready search device")
-        wx.offBluetoothDeviceFound(() => {});
+        // wx.offBluetoothDeviceFound(() => {});
       };
 
       // 开始大循环搜索