mini_program_gizwits_sdk 3.4.9-configEvent.6 → 3.4.9-configEvent.7

package/dist/src/wifiConfig/ConfigBase.d.ts

@@ -1,4 +1,4 @@
-import { IRandomCodesResult, IResult } from "../sdk";
+import { IRandomCodesResult, IResult, TimeoutHandle } from "../sdk";
 interface IRejectCallback {
     (result: IResult<unknown>): void;
 }
@@ -14,7 +14,7 @@ declare class ConfigBase {
     specialProductKeys: string[];
     disableSearchDevice: boolean;
     specialProductKeySecrets: string[];
-    private timeoutHandler;
+    timeoutHandler: TimeoutHandle;
     eventCallBack: (event: ConfigEventData) => void;
     private setDeviceOnboardingDeployRej?;
     constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[]);

package/dist/src/wifiConfig/ble.d.ts

@@ -9,7 +9,6 @@ interface IArgs {
     bleHandle: BleHandle;
     eventCallBack: (event: ConfigEventData) => void;
 }
-export declare function sendBLEConfigCmd({ bleDeviceId, arrayBuffer, serviceUUIDSuffix, characteristicUUIDSuffix, bleHandle, eventCallBack }: IArgs): Promise<boolean | void>;
 interface configBLEDeviceParams {
     ssid: string;
     password: string;
@@ -25,6 +24,7 @@ interface ISetDeviceOnboardingDeployProps {
 declare class BLEConfig extends ConfigBase {
     bleHandle: BleHandle;
     constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[], bleHandle: BleHandle);
+    sendBLEConfigCmd: ({ bleDeviceId, arrayBuffer, serviceUUIDSuffix, characteristicUUIDSuffix, bleHandle, eventCallBack }: IArgs) => Promise<boolean | void>;
     destroy: () => void;
     isValidBleDevice: (bleDevice: WechatMiniprogram.BlueToothDevice, softAPSSIDPrefix?: string) => boolean;
     enableBluetoothDevicesDescovery: () => Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.4.9-configEvent.6",
+  "version": "3.4.9-configEvent.7",
   "description": "增加配网回调",
   "main": "./dist/index.js",
   "scripts": {

package/src/wifiConfig/ConfigBase.ts

@@ -20,7 +20,7 @@ class ConfigBase {
   specialProductKeys: string[] = [];
   disableSearchDevice = false;
   specialProductKeySecrets: string[] = []
-  private timeoutHandler: TimeoutHandle = null;
+  timeoutHandler: TimeoutHandle = null;
   eventCallBack: (event: ConfigEventData) => void;
 
   private setDeviceOnboardingDeployRej?: (value: unknown) => void = () => {}; // 保存promise的rej，用于临时中断

package/src/wifiConfig/ble.ts

@@ -23,186 +23,6 @@ interface IArgs {
 
 const configAck = '0000000303000002';
 
-export function 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 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);
-      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);
-      wx.closeBLEConnection({ deviceId: bleDeviceId });
-    });
-}
-
 interface configBLEDeviceParams {
   ssid: string;
   password: string;
@@ -231,6 +51,189 @@ class BLEConfig extends ConfigBase {
     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);
+        wx.closeBLEConnection({ deviceId: bleDeviceId });
+      });
+  }
+  
+
   destroy = () => {
     this.cleanTimeout();
   }
@@ -395,72 +398,23 @@ class BLEConfig extends ConfigBase {
 
       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 appendPassword = this.appendExtendData(password)
-      const uint8Array = WifiConfig.pack(ssid,appendPassword);
-      const startConfigDevice = async () => {
-        GizLog.debug('GIZ_SDK: startConfigDevice');
-        if (!this.hasTimeoutHandler()) {
-          return;
-        }
-        const bleDevice = bleDevices.shift();
-        if (bleDevice) {
-          this.eventCallBack?.({
-            event: "GIZ_DISCOVER_SUCCESS",
-            deviceID: bleDevice.deviceId
-          })
-          GizLog.debug('GIZ_SDK: startConfigDevice, target device: ', bleDevice);
-        }
-
-        const success =
-          bleDevice &&
-          (await sendBLEConfigCmd({
-            bleDeviceId: bleDevice.deviceId,
-            arrayBuffer: uint8Array.buffer,
-            bleHandle: this.bleHandle,
-            eventCallBack: this.eventCallBack
-          }));
-
-        if (!success) {
-          // 如果校验设备或者发送不成功，重试下一个设备
-          await sleep(500);
-          bleDevices = (await getBluetoothDevices()).filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));;
-          // await startBluetoothDevicesDiscovery();
-          await startConfigDevice();
-          return;
+      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(()=>{});
         }
-
-        // 如果有一个设备发送成功，则不再发现新设备
-        GizLog.debug("GIZ_SDK: offBluetoothDeviceFound ready search device")
-        wx.offBluetoothDeviceFound(() => {});
       };
 
-      // 开始大循环搜索
-      try {
-        // const devicesReturn = await this.searchDevice({ ssid, password });
-        this.searchDevice({ ssid, password }).then(devicesReturn => {
-          res(devicesReturn);
-        })
-      } catch (error) {
-        rej(error);
-        GizLog.error("GIZ_SDK: searchDevice error", new Error(JSON.stringify(error)))
-      }
+      wx.onBluetoothDeviceFound(handleFoundDevices);
 
-      await startConfigDevice();
     });
   };
 }