mini_program_gizwits_sdk 3.6.3 → 3.6.5

package/src/wifiConfig/ble.ts

@@ -1,481 +0,0 @@
-import errorCode from "../errorCode";
-import { ab2hex, advertisData2PkAndMac, isWXDevicesResult } from '../utils';
-
-import GizLog from "../GizLog";
-import { BleHandle } from "../handler/ble";
-import WifiConfig from "../protocol/WifiConfig";
-import sleep from "../sleep";
-import {
-  getBLEDeviceCharacteristics, getBLEDeviceServices, getBluetoothAdapterState, getBluetoothDevices,
-  notifyBLECharacteristicValueChange, retryConnect, startBluetoothDevicesDiscovery, unpackWriteBLECharacteristicValue
-} from '../wechatApi';
-import ConfigBase from "./ConfigBase";
-import { IDevice, IError, ConfigEventData, IRandomCodesResult, IResult, configBLEDeviceParams } from "../types";
-
-type EnableAndGetBluetoothDevicesRes = Promise<
-| { success: false; err: IError }
-| { success: true; bleDevices?: IDevice[] }
->;
-
-interface IArgs {
-  bleDeviceId: string;
-  arrayBuffer: ArrayBuffer;
-  serviceUUIDSuffix?: string;
-  characteristicUUIDSuffix?: string;
-  bleHandle: BleHandle;
-  eventCallBack: (event: ConfigEventData) => void, // 配网回调
-}
-
-const configAck = '0000000303000002';
-
-
-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,
-    ) {
-    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",
-        })
-  
-        // 这里有个问题，模组好像不一定每次都会回
-        const handleBLECharacteristicValueChange = (res: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult) => {
-          const hexString = ab2hex(res.value);
-          GizLog.debug('GIZ_SDK: 收到设备返回ack', hexString)
-          eventCallBack({
-            event: "GIZ_CONFIG_RECV_SUCCESS",
-          })
-          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 = (device:IDevice, softAPSSIDPrefix?: string) => {
-    if (device.bleWorkStatus === 0) return false;
-    if (!this.specialProductKeys.includes(device.productKey)) {
-      return false;
-    }
-
-    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 ||
-      (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<
-    { success: false; err: IError } | { success: true }
-  > => {
-    // try {
-    //   await closeBluetoothAdapter();
-    //   await openBluetoothAdapter();
-    // } catch (error) {
-
-    // }
-    const stateRes = await getBluetoothAdapterState();
-    if (!stateRes.available) {
-      return {
-        success: false,
-        err: {
-          errorCode: errorCode.GIZ_SDK_BLE_BLUETOOTH_FUNCTION_NOT_TURNED_ON.errorCode,
-          errorMessage: '蓝牙状态不可用',
-        },
-      };
-    }
-
-    await startBluetoothDevicesDiscovery();
-    return { success: true };
-  };
-
-
-  enableAndGetBluetoothDevices = async (
-    softAPSSIDPrefix?: string
-  ): 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: IDevice[] = this.bleHandle.scanList.filter(d => this.isValidBleDevice(d, softAPSSIDPrefix))
-    GizLog.debug('GIZ_SDK: getBluetoothDevices success', bleDevices);
-    return {
-      success: true,
-      bleDevices,
-    };
-  };
-  setDeviceOnboardingDeploy = ({
-    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();
-      this.initDeviceOnboardingDeploy(res, rej);
-      this.startTimeoutTimer(timeout);
-      try {
-        const result = await this.configBLEDevice({
-          ssid,
-          password,
-          timeout: timeout * 1000,
-          softAPSSIDPrefix,
-        });
-
-        const newData: IDevice[] = (result.data || []).map(item => {
-          return {
-            mac: item.mac,
-            productKey: item.product_key,
-            did: item.did,
-            name: '',
-            isBind: false,
-            connectType: 'NONE',
-            isBleOnline: false,
-            isLanOnline: false,
-            isOnline: false,
-          }
-        })
-        if (isBind) {
-          res(await this.bindDevices(newData));
-        } else {
-          // 不需要绑定 直接返回成功
-          res({
-            success: true,
-            data: newData,
-          });
-        }
-      } catch (error) {
-        res({
-          success: false,
-          data: error
-        });
-      } finally {
-        this.destroy();
-      }
-    });
-  }
-  /**
-   * 负责发蓝牙设备指令
-   */
-   configBLEDevice = ({
-    ssid,
-    password,
-    softAPSSIDPrefix,
-  }: configBLEDeviceParams) => {
-    return new Promise<IResult<IRandomCodesResult[]>>(async (res, rej) => {
-      GizLog.debug('GIZ_SDK: start config ble device');
-      const enableAndGetRes = await this.enableAndGetBluetoothDevices(
-        softAPSSIDPrefix
-      ).catch((error) => {
-        return {
-          success: false,
-          err: {
-            errorCode: errorCode.WECHAT_ERROR.errorCode,
-            errorMessage: JSON.stringify(error),
-          },
-        };
-      });
-
-      if (!isWXDevicesResult(enableAndGetRes)) {
-        // 开启获取蓝牙失败
-        return rej(enableAndGetRes);
-      }
-
-      let bleDevices: IDevice[] = enableAndGetRes.bleDevices as IDevice[];
-
-      GizLog.debug('GIZ_SDK: enableAndGetBluetoothDevices success, target devices: ', bleDevices);
-
-      // 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);
-      const startConfigDevice = async () => {
-        GizLog.debug('GIZ_SDK: startConfigDevice');
-        if (!this.hasTimeoutHandler()) {
-          return;
-        }
-        const bleDevice = bleDevices.shift() as IDevice;
-        if (bleDevice) {
-          this.eventCallBack?.({
-            event: "GIZ_DISCOVER_SUCCESS",
-            deviceID: bleDevice.mac
-          })
-          GizLog.debug('GIZ_SDK: startConfigDevice, target device: ', bleDevice);
-        }
-
-        let success = false;
-        if (bleDevice) {
-          success = await this.sendBLEConfigCmd({
-            bleDeviceId: bleDevice.bleDeviceID,
-            arrayBuffer: uint8Array.buffer,
-            bleHandle: this.bleHandle,
-            eventCallBack: this.eventCallBack
-          }) === true
-        }
-
-        if (!success) {
-          // 如果校验设备或者发送不成功，重试下一个设备
-          await sleep(500);
-          bleDevices = this.bleHandle.scanList.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));;
-          await startConfigDevice();
-          return;
-        }
-
-        // 如果有一个设备发送成功，则不再发现新设备
-        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)))
-      }
-
-      await startConfigDevice();
-    });
-  };
-}
-
-export default BLEConfig;

package/src/wifiConfig/nfc/disposeData.ts

@@ -1,63 +0,0 @@
-import { IDATA } from './types';
-
-/**
- * 配网标志位
- */
-const formatSign = (): Uint8Array => {
-  const buffer = new ArrayBuffer(1);
-  const uint8Array = new Uint8Array(buffer);
-  uint8Array[0] = 1;
-  return uint8Array;
-};
-/**
- * 标志位，APP端设置，含有中⽂字符SSID置为1，不含中⽂字符SSID置为0，默认为0
- * @param isSSIDincludeCH
- */
-const formatRouterType = (isSSIDincludeCH: boolean): Uint8Array => {
-  const buffer = new ArrayBuffer(1);
-  const uint8Array = new Uint8Array(buffer);
-  uint8Array[0] = 0;
-  if (isSSIDincludeCH) {
-    uint8Array[0] = 1;
-  }
-  return uint8Array;
-};
-/**
- * 模块初始化标志位，默认未初始化，值为 0x55 0xaa代表已初始化，其他代表未初始化。
- */
-const formatInitValue = (): Uint8Array => {
-  const buffer = new ArrayBuffer(2);
-  const uint8Array = new Uint8Array(buffer);
-  uint8Array[0] = parseInt('0x55', 16);
-  uint8Array[1] = parseInt('0xaa', 16);
-  return uint8Array;
-};
-/**
- * 处理整合传入的数据
- * @param SSID SSIDTLV
- * @param isSSIDincludeCH SSID是否含有中文
- * @param pwd pwdTLV
- * @param passIP passIPTLV
- * @param BSSID BSSIDTLV
- * @returns 最终要写入固件的数据
- */
-export const disposeData = (
-  SSID: Uint8Array,
-  isSSIDincludeCH: boolean,
-  pwd: Uint8Array,
-  passIP: Uint8Array,
-  BSSID: Uint8Array
-): IDATA => {
-  const sign = formatSign();
-  const routerType = formatRouterType(isSSIDincludeCH);
-  const initValue = formatInitValue();
-
-  const uint8Array_sign = Uint8Array.from([...sign, ...routerType, ...initValue]);
-  const uint8Array_others = Uint8Array.from([...SSID, ...pwd, ...passIP, ...BSSID]);
-  console.log(uint8Array_sign.buffer, 'uint8Array_sign.buffer', uint8Array_sign);
-  console.log(uint8Array_others.buffer, 'uint8Array_others.buffer', uint8Array_others);
-  return {
-    ArrayBuffer_sign: uint8Array_sign.buffer,
-    ArrayBuffer_others: uint8Array_others.buffer,
-  };
-};

package/src/wifiConfig/nfc/formatData.ts

@@ -1,46 +0,0 @@
-type IType = 'BSSID' | 'pwd' | 'address';
-/**
- * BSSID去除冒号，转TLV编码（总长8字节）& pwd | passIP转TLV编码
- * @param data BSSID | pwd | passIP
- * @param type 'BSSID' & 'pwd' & 'passIP'
- * @returns BSSID(TLV) & pwd(TLV) & passIP(TLV):  Uint8Array;
- */
-export const formatData = (data: string, type: IType): Uint8Array => {
-  const isNull = data.length === 0;
-  const Data = type === 'BSSID' ? data.split(':') : data.split('');
-  let length: number = 0;
-  let T: any = null;
-  let L: number = 0;
-  switch (type) {
-    case 'BSSID':
-      length = isNull ? 3 : Data.length + 2;
-      T = 'b';
-      L = isNull ? 0 : Data.length;
-      break;
-    case 'pwd':
-      length = data.length + 2;
-      T = 'p';
-      L = data.length;
-      break;
-    case 'address':
-      length = isNull ? 3 : Data.length + 2;
-      T = 'i';
-      L = isNull ? 0 : Data.length;
-      break;
-  }
-  const buffer = new ArrayBuffer(length);
-  const uint8Array = new Uint8Array(buffer);
-  uint8Array[0] = T.charCodeAt(0); // Tag
-  uint8Array[1] = L; // Length
-
-  if (isNull) {
-    uint8Array[2] = 0;
-  } else {
-    Data.forEach((byte, index) => {
-      const v = type === 'BSSID' ? parseInt(byte, 16) : byte.charCodeAt(0);
-      uint8Array[index + 2] = v; // 前两个字节为Tag\Length预留
-    });
-  }
-  console.log(buffer, uint8Array, 'formatData', type);
-  return uint8Array;
-};

package/src/wifiConfig/nfc/formatSSID.ts

@@ -1,59 +0,0 @@
-import { formatCodesFromStr, arrayToString } from '../../protocol/tool';
-import { unionBy } from '../../utils';
-import isIncludedCH from './isIncludedCH';
-import { ssIDToASC } from './ssIDToASC';
-import stringToGbk from './stringToGbk';
-
-interface IExport {
-  SSIDTLV: any;
-  isSSIDIncludedCH: boolean;
-}
-/**
- * SSID转TLV编码 / 判断SSID是否含有中文
- * @param SSID
- * @returns SSIDTLV: TLV(Uint8Array), isSSIDIncludedCH: boolean
- */
-export const formatSSID = (SSID: string): IExport => {
-  const _export: IExport = {
-    SSIDTLV: null,
-    isSSIDIncludedCH: isIncludedCH(SSID),
-  };
-  // const enCode = isIncludedCH(SSID) ? stringToGbk(SSID) : ssIDToASC(SSID);
-  // const length = enCode.byteLength;
-
-  const [enCode, length] = formatCodesFromStr(SSID);
-  const codeLength = parseInt(arrayToString(length), 16);
-  if (codeLength <= 127) {
-    const buffer = new ArrayBuffer(codeLength + 2);
-    const uint8Array = new Uint8Array(buffer);
-    uint8Array[0] = 's'.charCodeAt(0); // T
-    uint8Array[1] = codeLength; // L
-    enCode.forEach((byte, index) => {
-      uint8Array[index + 2] = byte;
-    });
-    _export['SSIDTLV'] = uint8Array;
-  } else {
-    // @ts-ignore
-    const extra_L = parseInt(length / 255) + 1;
-    const buffer = new ArrayBuffer(codeLength + 2 + extra_L);
-    const uint8Array = new Uint8Array(buffer);
-    uint8Array[0] = 's'.charCodeAt(0); // T
-    uint8Array[1] = 128 + extra_L; // L@No1.Byte
-    if (extra_L === 1) {
-      uint8Array[2] = codeLength; // L@No2.Byte
-    } else {
-      uint8Array[extra_L] = 255;
-      uint8Array[extra_L + 1] = codeLength - 255 * (extra_L - 1);
-      for (let d = extra_L; d >= 1; d--) {
-        if (uint8Array[extra_L - d] === 0) {
-          uint8Array[extra_L - d] = 255;
-        }
-      }
-    }
-    enCode.forEach((byte, index) => {
-      uint8Array[index + 2 + extra_L] = byte;
-    });
-    _export['SSIDTLV'] = uint8Array;
-  }
-  return _export;
-};