mini_program_gizwits_sdk 3.2.30 → 3.2.32-FeiSiMan

package/src/wifiConfig/ble.ts

@@ -1,5 +1,5 @@
 import errorCode from "../errorCode";
-import { IRandomCodesResult, IResult } from "../sdk";
+import { IConfigResult, IResult } from "../sdk";
 import { ab2hex, advertisData2PkAndMac, isWXDevicesResult } from '../utils';
 
 import GizLog from "../GizLog";
@@ -11,6 +11,14 @@ import {
   notifyBLECharacteristicValueChange, retryConnect, startBluetoothDevicesDiscovery, unpackWriteBLECharacteristicValue
 } from '../wechatApi';
 import ConfigBase from "./ConfigBase";
+import aepApiRequest from "../aepApi/aepApiRequest";
+
+interface IVerifyOnlineResult {
+  data: {
+    status: number; // 2表示离线 3表示在线
+  }
+}
+
 
 interface IArgs {
   bleDeviceId: string;
@@ -204,8 +212,8 @@ interface ISetDeviceOnboardingDeployProps {
 class BLEConfig extends ConfigBase {
   bleHandle: BleHandle;
 
-  constructor(ssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[],bleHandle: BleHandle) {
-    super(ssid,password,specialProductKeys,specialProductKeySecrets)
+  constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[],bleHandle: BleHandle) {
+    super(ssid, bssid, password,specialProductKeys,specialProductKeySecrets)
     this.bleHandle = bleHandle;
   }
   destroy = () => {
@@ -260,6 +268,52 @@ class BLEConfig extends ConfigBase {
     return { success: true };
   };
 
+  getDeviceLastestOnlineTime = async ({ productKey, mac }:
+    { productKey: string, mac: string }) => {
+    GizLog.debug('GIZ_SDK: getDeviceLastestOnlineTime', mac);
+    const res = await aepApiRequest<IVerifyOnlineResult>(`/applet/device/getDeviceInfo/${(mac ?? '')}`, { method: 'get' });
+    GizLog.debug('GIZ_SDK: 请求结果', res);
+    return res;
+  }
+
+  // 配网后确认设备是否上线
+  verifyDeviceOnline = ({ productKey, mac }: { productKey: string, mac: string }) => {
+    return new Promise<IResult<IVerifyOnlineResult>>((res, rej) => {
+      GizLog.debug('GIZ_SDK: 开始确认设备上线')
+      const query = async () => {
+
+        if (!this.hasTimeoutHandler()) {
+          return;
+        }
+
+        try {
+          await sleep(2000);
+          const data = await this.getDeviceLastestOnlineTime({ productKey, mac })
+          GizLog.debug('GIZ_SDK: 确认到设备是否在线', data.data.data.status);
+          if (data.success && data.data && data.data.data && data.data.data.status == 3) {
+            // 确认设备最后一次上线时间有更新
+            GizLog.debug('GIZ_SDK: 确认到设备是在线的', data);
+            res({
+              success: true,
+              data: data.data,
+            });
+          } else {
+            // 重新请求
+            GizLog.debug('GIZ_SDK: 未确认到设备是在线');
+            await sleep(1500);
+            !this.disableSearchDevice && query();
+          }
+        } catch (error) {
+          // 重新请求
+          await sleep(3000);
+          !this.disableSearchDevice && query();
+          // GizLog.debug('GIZ_SDK: random codes error', error);
+        }
+      };
+      query();
+    });
+  };
+
 
   enableAndGetBluetoothDevices = async (
     softAPSSIDPrefix?: string
@@ -301,19 +355,20 @@ class BLEConfig extends ConfigBase {
           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,
-          }
-        })
+        const newData: IDevice[] = [result.data as IDevice];
+        // 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 {
@@ -341,7 +396,7 @@ class BLEConfig extends ConfigBase {
     password,
     softAPSSIDPrefix,
   }: configBLEDeviceParams) => {
-    return new Promise<IResult<IRandomCodesResult[]>>(async (res, rej) => {
+     return new Promise<IResult<IConfigResult>>(async (res, rej) => {
       GizLog.debug('GIZ_SDK: start config ble device');
       const enableAndGetRes = await this.enableAndGetBluetoothDevices(
         softAPSSIDPrefix
@@ -374,18 +429,19 @@ class BLEConfig extends ConfigBase {
               bleDevices,
               devices.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix))
             )
-          : wx.offBluetoothDeviceFound();
+          : wx.offBluetoothDeviceFound(()=>{});
       };
 
       wx.onBluetoothDeviceFound(handleFoundDevices);
 
       const uint8Array = WifiConfig.pack(ssid,password);
+       const bleDevice = bleDevices.shift();
+       const { productKey, mac } = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
       const startConfigDevice = async () => {
         GizLog.debug('GIZ_SDK: startConfigDevice');
         if (!this.hasTimeoutHandler()) {
           return;
         }
-        const bleDevice = bleDevices.shift();
         if (bleDevice) {
           GizLog.debug('GIZ_SDK: startConfigDevice, target device: ', bleDevice);
         }
@@ -408,21 +464,25 @@ class BLEConfig extends ConfigBase {
 
         // 如果有一个设备发送成功，则不再发现新设备
         GizLog.debug("GIZ_SDK: offBluetoothDeviceFound ready search device")
-        wx.offBluetoothDeviceFound();
+        wx.offBluetoothDeviceFound(() => {});
       };
+       await startConfigDevice();
 
-      // 开始大循环搜索
+      // 开始确认设备是否上线
       try {
         // const devicesReturn = await this.searchDevice({ ssid, password });
-        this.searchDevice({ ssid, password }).then(devicesReturn => {
-          res(devicesReturn);
-        })
+        // this.searchDevice({ ssid, password }).then(devicesReturn => {
+        //   res(devicesReturn);
+        // })
+        await sleep(5000);
+        // const devicesReturn = await this.searchDevice({ ssid, password });
+        this.verifyDeviceOnline({ productKey, mac }).then(devicesReturn => {
+          res({ ...devicesReturn, data: { ...devicesReturn.data.data, mac, productKey } });
+        });
       } catch (error) {
         rej(error);
         GizLog.error("GIZ_SDK: searchDevice error", new Error(JSON.stringify(error)))
       }
-
-      await startConfigDevice();
     });
   };
 }

package/src/wifiConfig/nfc/disposeData.ts

@@ -0,0 +1,63 @@
+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

@@ -0,0 +1,46 @@
+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

@@ -0,0 +1,59 @@
+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;
+};

package/src/wifiConfig/nfc/index.ts

@@ -0,0 +1,136 @@
+import { disposeData } from './disposeData';
+import { formatData } from './formatData';
+import { formatSSID } from './formatSSID';
+import { transceive } from './transceive.wx';
+import errorCode from "../../errorCode";
+import GizLog from "../../GizLog";
+import WifiConfig from "../../protocol/WifiConfig";
+import { IRandomCodesResult, IResult, IntervalHandle } from "../../sdk";
+import ConfigBase from "../ConfigBase";
+
+// type IParams = {
+//   SSID: string;
+//   BSSID: string;
+//   pwd: string;
+//   passIP: string;
+// };
+/**
+ * 配网
+ */
+// export const distribution = ({ SSID, BSSID, pwd, passIP }: IParams) => {
+//   const { SSIDTLV, isSSIDIncludedCH } = formatSSID(SSID);
+//   const BSSIDTLV = formatData(BSSID, 'BSSID');
+//   const pwdTLV = formatData(pwd, 'pwd');
+//   const passIPTLV = formatData(passIP, 'passIP');
+//   const DATA = disposeData(SSIDTLV, isSSIDIncludedCH, pwdTLV, passIPTLV, BSSIDTLV);
+//   console.log(DATA, 'DATA');
+
+//   // 发送数据
+//   transceive(DATA);
+// };
+
+
+
+interface configDeviceParams {
+  ssid: string;
+  password: string;
+  bssid: string;
+  address: string;
+}
+
+interface ISetDeviceOnboardingDeployProps {
+  timeout: number;
+  isBind: boolean;
+  BSSID: string;
+  softAPSSIDPrefix: string;
+}
+class NFCConfig extends ConfigBase {
+  // 服务器地址
+  address: string = '';
+  constructor(ssid: string, bssid: string, password: string, 
+    specialProductKeys: string[], specialProductKeySecrets: string[], address: string) {
+    super(ssid, bssid, password, specialProductKeys, specialProductKeySecrets)
+    this.address = address;
+  }
+
+  destroy = () => {
+    this.cleanTimeout();
+  }
+
+  /**
+   * 负责发指令
+   */
+   configDevice = async ({ ssid, password, bssid, address }: configDeviceParams) => {
+    // TODO 发包
+    const { SSIDTLV, isSSIDIncludedCH } = formatSSID(ssid);
+    const BSSIDTLV = formatData(bssid, 'BSSID');
+    const pwdTLV = formatData(password, 'pwd');
+    const passIPTLV = formatData(address, 'address');
+    const DATA = disposeData(SSIDTLV, isSSIDIncludedCH, pwdTLV, passIPTLV, BSSIDTLV);
+    console.log(DATA, 'DATA');
+
+    // 发送数据
+    transceive(DATA);
+    // 大循环搜索
+    const devicesReturn = await this.searchDevice({ ssid, password });
+    return devicesReturn
+  };
+  /**
+   * 配网接口
+   * setDeviceOnboardingDeploy方法不可重复调用
+   */
+   setDeviceOnboardingDeploy = ({
+    timeout,
+    isBind = true,
+  }: ISetDeviceOnboardingDeployProps) => {
+    const ssid = this.ssid;
+    const password = this.password;
+    return new Promise<IResult<IDevice[]>>(async (res, rej) => {
+      console.log('ssid0', ssid, password, this.bssid, this.address)
+      this.destroy();
+      this.initDeviceOnboardingDeploy(res, rej);
+      this.startTimeoutTimer(timeout);
+      console.log('ssid', ssid, password, this.bssid, this.address)
+      try {
+        const result = await this.configDevice({
+          ssid,
+          password,
+          bssid: this.bssid,
+          address: this.address
+        });
+        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) {
+          try {
+            res(await this.bindDevices(newData));
+          } catch (error) {
+            rej(error);
+          }
+        } else {
+          // 不需要绑定 直接返回成功
+          res({
+            success: true,
+            data: newData,
+          });
+        }
+      } catch (error) {
+        rej(error);
+      } finally {
+        this.destroy();
+      }
+    });
+  };
+}
+
+export default NFCConfig;

package/src/wifiConfig/nfc/isIncludedCH.ts

@@ -0,0 +1,8 @@
+/**
+ * 判断SSID是否含有中文
+ * @param str SSID
+ * @returns boolean 参数含有中文时为true
+ */
+export default function isIncludedCH(str: string): boolean {
+  return /.*[\u4e00-\u9fa5]+.*$/.test(str);
+}

package/src/wifiConfig/nfc/nfcAConnect.ts

@@ -0,0 +1,30 @@
+type T = {
+  success: boolean;
+  nfcA: any;
+};
+
+/**
+ * 连接NFCA实例
+ * @param NFCAdapter NFCAdapter实例
+ * @returns Promise<{success: boolean, nfcA: any}>
+ */
+export const nfcAConnect = (NFCAdapter: any): Promise<T> => {
+  return new Promise((resolve) => {
+    // nfcA实例
+    const nfcA = NFCAdapter.getNfcA();
+    nfcA.connect({
+      success() {
+        resolve({
+          success: true,
+          nfcA,
+        });
+      },
+      fail() {
+        resolve({
+          success: false,
+          nfcA,
+        });
+      },
+    });
+  });
+};

package/src/wifiConfig/nfc/nfcATransceive.ts

@@ -0,0 +1,29 @@
+type T = {
+  transceiveSuccess: boolean;
+};
+
+/**
+ * NfcA.transceive
+ * @param nfcA: NFCA实例
+ * @param buffer: ArrayBuffer实例
+ * @returns Promise<T>
+ */
+export const nfcATransceive = (nfcA: any, buffer: ArrayBuffer): Promise<T> => {
+  return new Promise((resolve) => {
+    nfcA.transceive({
+      data: buffer,
+      success: (res) => {
+        console.log('success', res);
+        resolve({
+          transceiveSuccess: true,
+        });
+      },
+      fail: (err) => {
+        console.log('fail', err);
+        resolve({
+          transceiveSuccess: false,
+        });
+      },
+    });
+  });
+};

package/src/wifiConfig/nfc/ssIDToASC.ts

@@ -0,0 +1,12 @@
+/**
+ * 传入不含中文的SSID，返回SSID(TLV)中的Value
+ * @param SSID string;
+ * @returns Uint8Array SSID(Value部分)
+ */
+export const ssIDToASC = (SSID: string): Uint8Array => {
+  const uint8Array = new Uint8Array(SSID.length);
+  SSID.split('').forEach((byte, index) => {
+    uint8Array[index] = byte.charCodeAt(0);
+  });
+  return uint8Array;
+};

package/src/wifiConfig/nfc/stringToGbk.ts

@@ -0,0 +1,51 @@
+const encoding = require('./text-encoding-master/lib/encoding')
+const ranges = [
+  [0xA1, 0xA9, 0xA1, 0xFE],
+  [0xB0, 0xF7, 0xA1, 0xFE],
+  [0x81, 0xA0, 0x40, 0xFE],
+  [0xAA, 0xFE, 0x40, 0xA0],
+  [0xA8, 0xA9, 0x40, 0xA0],
+  [0xAA, 0xAF, 0xA1, 0xFE],
+  [0xF8, 0xFE, 0xA1, 0xFE],
+  [0xA1, 0xA7, 0x40, 0xA0],
+];
+const codes = new Uint16Array(23940);
+let i = 0;
+
+for (const [b1Begin, b1End, b2Begin, b2End] of ranges) {
+  for (let b2 = b2Begin; b2 <= b2End; b2++) {
+    if (b2 !== 0x7F) {
+      for (let b1 = b1Begin; b1 <= b1End; b1++) {
+        codes[i++] = b2 << 8 | b1;
+      }
+    }
+  }
+}
+const str = new encoding.TextDecoder('gbk').decode(codes);
+const table = new Uint16Array(65536);
+for (let i = 0; i < str.length; i++) {
+  table[str.charCodeAt(i)] = codes[i];
+}
+
+/**
+ * string转GBK编码
+ * @param str 
+ * @returns 参数的GBK编码
+ */
+export default function stringToGbk(str: string): Uint8Array {
+  const buf = new Uint8Array(str.length * 2);
+  let n = 0;
+
+  for (let i = 0; i < str.length; i++) {
+    const code = str.charCodeAt(i);
+    if (code < 0x80) {
+      buf[n++] = code;
+    } else {
+      const gbk = table[code];
+      buf[n++] = gbk & 0xFF;
+      buf[n++] = gbk >> 8;
+    }
+  }
+  return buf.subarray(0, n);
+}
+