mini_program_gizwits_sdk 3.6.4 → 3.6.5

package/src/wifiConfig/ConfigBase.ts

@@ -1,235 +0,0 @@
-import { IRandomCodesResult, IRejectCallback, IResult, TimeoutHandle } from "../types";
-import sleep from "../sleep";
-import errorCode from "../errorCode";
-import { bindMac, checkDeviceRegister } from '../services/devices';
-import GizLog from "../GizLog";
-import { ConfigEventData, IDevice } from "../types";
-// import timeZoneDic from './timeZoneName.json'
-class ConfigBase {
-  ssid = '';
-  bssid = '';
-  password = '';
-  specialProductKeys: string[] = [];
-  disableSearchDevice = false;
-  specialProductKeySecrets: string[] = []
-  timeoutHandler: TimeoutHandle = null;
-  eventCallBack: (event: ConfigEventData) => void;
-
-  private setDeviceOnboardingDeployRej?: (value: unknown) => void = () => {}; // 保存promise的rej，用于临时中断
-  // private setDeviceOnboardingDeployRes?: (value: unknown) => void = () => {}; // 保存promise的res，用于临时中断
-
-  constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[]) {
-    this.ssid = ssid;
-    this.bssid = bssid;
-    this.password = password;
-    this.specialProductKeys = specialProductKeys;
-    this.specialProductKeySecrets = specialProductKeySecrets;
-  }
-
-  public cleanTimeout = () => {
-    this.disableSearchDevice = true;
-    this.timeoutHandler && clearTimeout(this.timeoutHandler);
-    this.timeoutHandler = null;
-  }
-
-  stopDeviceOnboardingDeploy = (): void => {
-    if (this.setDeviceOnboardingDeployRej) {
-      this.setDeviceOnboardingDeployRej({
-        success: false,
-        err: errorCode.GIZ_SDK_ONBOARDING_STOPPED,
-      });
-    }
-    this.cleanTimeout();
-  };
-
-  // 插入配网扩展信息
-  appendExtendData = (key: string) => {
-    const cmd = 0 // 小程序默认国内
-    // 以东八区为例，模组用的是+8，需要反过来
-    const zone: number = -new Date().getTimezoneOffset() / 60; //手机时区
-    let hour: number = Math.floor(zone);
-    let m: number = 0; //最终下发的时区精度
-    let h: string = ""; //最终下发的时区
-    let zoneAccuracy: number = zone - hour;
-    // 写死上海
-    let timeZoneCode =309
-    // const timeZoneName = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-    if (hour >= 0 && hour <= 9) { //时区0~9
-      h = String.fromCharCode('0'.charCodeAt(0) + hour);
-    } else if (hour > 9) { //A~F
-      h = String.fromCharCode(hour - 10 + 'A'.charCodeAt(0));
-    } else { //a~o
-      h = String.fromCharCode(-hour - 1 + 'a'.charCodeAt(0));
-    }
-
-    if (zoneAccuracy < 0) { //转正数
-      zoneAccuracy = -zoneAccuracy;
-    }
-
-    if (zoneAccuracy >= 0 && zoneAccuracy < 0.25) { //精度
-      m = 0;
-    } else if (zoneAccuracy >= 0.25 && zoneAccuracy < 0.5) {
-      m = 1;
-    } else if (zoneAccuracy >= 0.5 && zoneAccuracy < 0.75) {
-      m = 2;
-    } else {
-      m = 3;
-    }
-
-    // Object.entries(timeZoneDic).forEach(([key, value]) => {
-    //   if (value === timeZoneName) {
-    //     timeZoneCode = parseInt(key);
-    //     return;
-    //   }
-    // });
-
-    return key + `\0\x1b` + cmd + "\x1b" + h + m + "\x1b" + timeZoneCode;
-  }
-
-  hasTimeoutHandler = (cb?: IRejectCallback) => {
-    if (this.timeoutHandler) {
-      // 方法还在执行中
-      cb &&
-        cb({
-          success: false,
-          err: errorCode.GIZ_SDK_DEVICE_CONFIG_IS_RUNNING,
-        });
-      return true;
-    }
-    return false;
-  };
-
-  handleTimeout = () => {
-    if (this.setDeviceOnboardingDeployRej) {
-      this.setDeviceOnboardingDeployRej({
-        success: false,
-        err: {
-          errorCode: errorCode.CONFIG_TIME_OUT,
-          errorMessage: 'time out',
-        },
-      });
-    }
-    this.timeoutHandler = null;
-  }
-
-  /**
-   * 大循环确认
-   */
-  protected searchDevice = ({ ssid, password }: { ssid: string; password: string }) => {
-    return new Promise<IResult<IRandomCodesResult[]>>((res, rej) => {
-      GizLog.debug('GIZ_SDK: 开始大循环搜索设备')
-      const query = async () => {
-
-        if (!this.hasTimeoutHandler()) {
-          return;
-        }
-
-        try {
-          const data = await checkDeviceRegister({
-            SSID: ssid,
-            password,
-            productKeys: this.specialProductKeys,
-          })
-
-          // GizLog.debug('GIZ_SDK: try get device random codes', data);
-          if (data.err?.errorCode === errorCode.GIZ_OPENAPI_TOKEN_INVALID.errorCode) {
-            // token 失效
-            rej({
-              success: false,
-              err: errorCode.GIZ_OPENAPI_TOKEN_INVALID,
-            });
-            return;
-          }
-
-          if (data.err || (data.data as IRandomCodesResult[]).length === 0) {
-            // 重新请求
-            // GizLog.debug('GIZ_SDK: 大循环没有发现设备');
-            await sleep(250);
-            !this.disableSearchDevice && query();
-          } else {
-            // 搜索到设备
-            this.eventCallBack?.({
-              event: "GIZ_CONFIG_SUCCESS",
-            });
-            GizLog.debug('GIZ_SDK: 大循环搜索到设备', data);
-            res({
-              success: true,
-              data: data.data,
-            });
-          }
-        } catch (error) {
-          // 重新请求
-          await sleep(3000);
-          !this.disableSearchDevice && query();
-          // GizLog.debug('GIZ_SDK: random codes error', error);
-        }
-      };
-      query();
-    });
-  };
-
-  initDeviceOnboardingDeploy = (_res, rej) => {
-    // this.setDeviceOnboardingDeployRes = res;
-
-    // 都用res 返回，不然外面需要trh
-    this.setDeviceOnboardingDeployRej = _res;
-    this.disableSearchDevice = false;
-  };
-
-  protected startTimeoutTimer = (timeout: number) => {
-    /**
-     * 设置超时时间
-     */
-    this.timeoutHandler = setTimeout(this.handleTimeout, timeout * 1000);
-  };
-
-  /**
-   * 绑定多个设备
-   */
-   protected bindDevices = (devices: IDevice[]) => {
-    GizLog.log('GIZ_SDK: start bind device');
-    return new Promise<IResult<IDevice[]>>(async (res, rej) => {
-      const promises = devices.map((item) => {
-        const index = this.specialProductKeys.findIndex(
-          (pk) => item.productKey === pk
-        );
-        if (index === -1) return;
-        const ps = this.specialProductKeySecrets[index];
-
-        return bindMac({
-          mac: item.mac,
-          productKey: item.productKey,
-          productSecret: ps,
-        })
-      });
-
-      try {
-        const data = await Promise.all(promises);
-        const successDevices = devices.filter((_, index) => {
-          const item = data[index];
-          return item && item.success;
-        });
-        if (successDevices.length > 0) {
-          GizLog.log('GIZ_SDK: bind device success', successDevices);
-          // 绑定成功，重新初始化socket
-          res({
-            success: true,
-            data: successDevices,
-          });
-        } else {
-          GizLog.log('GIZ_SDK: bind device error', data);
-          rej({
-            success: false,
-            data: devices,
-            err: errorCode.GIZ_SDK_BIND_DEVICE_FAILED,
-          });
-        }
-      } catch (error) {
-        rej(error);
-      }
-    });
-  };
-}
-
-export default ConfigBase;

package/src/wifiConfig/ap.ts

@@ -1,185 +0,0 @@
-import errorCode from "../errorCode";
-import GizLog from "../GizLog";
-import WifiConfig from "../protocol/WifiConfig";
-import { IDevice, IRandomCodesResult, IResult, IntervalHandle, configDeviceParams, ISetDeviceOnboardingDeployProps } from "../types";
-import ConfigBase from "./ConfigBase";
-
-class ApConfig extends ConfigBase {
-
-  disableSendUDP = false;
-  private sendMessageInterval: IntervalHandle = null;
-  private UDPSocketHandler: WechatMiniprogram.UDPSocket | null = null;
-
-  destroy = () => {
-    this.cleanTimeout();
-    this.sendMessageInterval && clearInterval(this.sendMessageInterval);
-    this.sendMessageInterval = null;
-
-    if (this.UDPSocketHandler) {
-      this.UDPSocketHandler.offError();
-      this.UDPSocketHandler.offMessage();
-      this.UDPSocketHandler.close();
-    }
-  }
-
-  /**
-   * 负责发指令
-   */
-   configDevice = ({ ssid, password, softAPSSIDPrefix }: configDeviceParams) => {
-
-
-    return new Promise<IResult<IRandomCodesResult[]>>((res, rej) => {
-      GizLog.debug('GIZ_SDK: start config device');
-      let searchingDevice = false;
-      let UDP_ERROR_NUM = 0;
-      const appendPassword = this.appendExtendData(password)
-      const uint8Array = WifiConfig.pack(ssid,appendPassword);
-      /**
-       * 连接socket 发送
-       */
-      this.UDPSocketHandler = wx.createUDPSocket();
-      this.UDPSocketHandler.bind();
-
-      this.disableSendUDP = false;
-
-      /**
-       * TODO
-       * 收到设备回的包后终止
-       * 或者超时
-       * 或者成功
-       */
-      const sendMessage = () => {
-        try {
-          !this.disableSendUDP &&
-            this.UDPSocketHandler!.send({
-              address: '10.10.100.254',
-              port: 12414,
-              message: uint8Array,
-              offset: 0,
-              length: uint8Array.byteLength,
-            });
-        } catch (error) {
-        }
-      };
-
-      // 执行
-      this.sendMessageInterval = setInterval(() => {
-        sendMessage();
-      }, 2000);
-
-      this.UDPSocketHandler.onError((data: any) => {
-        UDP_ERROR_NUM += 1;
-        // UDPSocketHandler.close();
-        // 重试三次不行还是失败
-        if (UDP_ERROR_NUM > 2) {
-          this.destroy();
-          rej({
-            success: false,
-            err: {
-              errorCode: errorCode.WECHAT_ERROR.errorCode,
-              errorMessage: data.errMsg,
-            },
-          });
-        }
-      });
-
-      // 清理一些监听，调用搜索设备
-      const searchDeviceHandle = async () => {
-        if (searchingDevice) return;
-        this.UDPSocketHandler!.offMessage();
-        this.UDPSocketHandler!.offError();
-        this.sendMessageInterval && clearInterval(this.sendMessageInterval);
-        this.disableSendUDP = true;
-        // 标记可以停止监听
-        searchingDevice = true;
-        // 关闭socket
-        try {
-          const devicesReturn = await this.searchDevice({ ssid, password });
-          res(devicesReturn);
-        } catch (error) {
-          rej(error);
-        }
-      };
-
-      this.UDPSocketHandler.onMessage((_data) => {
-        // 收到回调 可以停止发包
-        searchDeviceHandle();
-      });
-
-      // 没有收到udp回复的时候不进入配网
-      wx.onNetworkStatusChange(async () => {
-        // 发生网络切换的时候也停止发包，进入大循环配网
-        // 搜索中的时候不要重复搜索
-        !searchingDevice &&
-          wx.getConnectedWifi({
-            success: async (data) => {
-              /**
-               * 检查当前网络还是不是热点网络
-               */
-              data.wifi.SSID.indexOf(softAPSSIDPrefix) === -1 &&
-                searchDeviceHandle();
-            },
-          });
-      });
-    });
-  };
-  /**
-   * 配网接口
-   * setDeviceOnboardingDeploy方法不可重复调用
-   */
-   setDeviceOnboardingDeploy = ({
-    timeout,
-    isBind = true,
-    softAPSSIDPrefix,
-  }: ISetDeviceOnboardingDeployProps) => {
-    const ssid = this.ssid;
-    const password = this.password;
-    // 插入时区信息
-    return new Promise<IResult<IDevice[]>>(async (res, rej) => {
-      this.destroy();
-      this.initDeviceOnboardingDeploy(res, rej);
-      this.startTimeoutTimer(timeout);
-
-      try {
-        const result = await this.configDevice({
-          ssid,
-          password,
-          softAPSSIDPrefix,
-        });
-        const newData: IDevice[] = (result.data || []).map(item => {
-          return {
-            mac: item.mac,
-            productKey: item.product_key,
-            did: item.did,
-            name: '',
-            isBind: false,
-            localName: '',
-            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 ApConfig;