mini_program_gizwits_sdk 3.2.28 → 3.3.2

package/src/handler/ble.ts

@@ -1,12 +1,3 @@
-import GizLog from '../GizLog';
-import Bind from '../protocol/Bind';
-import { padBoradcastData } from '../protocol/DataPoint';
-import GetDeviceStatus from '../protocol/GetDeviceStatus';
-import Login from '../protocol/Login';
-import ProtocolBase from '../protocol/ProtocolBase';
-import { hexStrint2byte } from '../protocol/tool';
-import { reportEvent } from '../services/monitor';
-import sleep from '../sleep';
 import {
   ab2hex,
   ab2numbers,
@@ -15,14 +6,23 @@ import {
   numberArray2Uint8Array,
   parseBroadcastData,
   unionBy,
-  wrapErrorInfo
+  wrapErrorInfo,
 } from '../utils';
 import { retryConnect, unpackWriteBLECharacteristicValue } from '../wechatApi';
+import Bind from '../protocol/Bind';
+import { hexStrint2byte } from '../protocol/tool';
+import ProtocolBase from '../protocol/ProtocolBase';
+import Login from '../protocol/Login';
+import GetDeviceStatus from '../protocol/GetDeviceStatus';
+import { padBoradcastData } from '../protocol/DataPoint';
+import GizLog from '../GizLog';
 import EventListener from './EventListener';
+import sleep from '../sleep';
+import Reset from '../protocol/Reset';
 
 type GizBleDeviceListotifications = (devices: IDevice[]) => void;
 type GizBleDeviceDataNotifications = (
-  curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult,
+  curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult,
   hexString: string
 ) => void;
 type GizBleErrorNotifications = (err: { errCode: number; errMsg: string }) => void;
@@ -68,81 +68,13 @@ interface ConstructorParams {
   offlineThreshold?: number;
 }
 
-function createUUID32() {
-  let dt = new Date().getTime();
-  let uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
-    /[xy]/g,
-    function (c) {
-      let r = (dt + Math.random() * 16) % 16 | 0;
-      dt = Math.floor(dt / 16);
-      return (c == "x" ? r : (r & 0x3) | 0x8).toString(16);
-    }
-  );
-  return uuid;
-}
-
-function reportConnectingEvent(eventType: "BleDeviceConnectEnd" | "BleDeviceConnectBind" | "BleDeviceConnectLogin") {
-  return function (
-    target: any,
-    propertyName: string,
-    descriptor: TypedPropertyDescriptor<any>
-
-  ) {
-    const { value: method } = descriptor;
-    descriptor.value = function (...args: any[]) {
-      const ret = method!.apply(this, args);
-      return ret.then(({ _failureType_, ...res }) => {
-        reportEvent({
-          device: args[0] as IDevice,
-          eventID: (this as unknown as any).__event_id__,
-          eventType,
-          success: res.success,
-        });
-        return {
-          ...res,
-          _failureType_: eventType,
-        };
-      })
-    };
-  }
-}
-
-function reportConnectEvent(
-  target: any,
-  propertyName: string,
-  descriptor: TypedPropertyDescriptor<any>
-) {
-  const { value: method } = descriptor;
-  descriptor.value = function (...args: any[]) {
-    const that = Object.create(this);
-    that.__event_id__ = createUUID32();
-    reportEvent({
-      device: args[0] as IDevice,
-      eventID: that.__event_id__,
-      eventType: 'BleDeviceConnectStart',
-      success: true,
-    });
-    const ret = method!.apply(that, args);
-    return ret.then(({ _failureType_, ...res }) => {
-      reportEvent({
-        device: args[0] as IDevice,
-        eventID: that.__event_id__,
-        eventType: 'BleDeviceConnectFinish',
-        success: res.success,
-        ...(res.success ? {} : { failureType: _failureType_ })
-      });
-      return res;
-    })
-  };
-}
-
 export class BleHandle extends EventListener<TBleHandleEvent> {
   private serviceUUIDSuffix: string;
   // private characteristicUUIDSuffix: string;
   public connectedList: ConnectDevice[] = [];
   private connectingDevId: string | null = null;
   public pks: string[] = [];
-  private listenDevOfflineTimer: any = null;
+  private listenDevOfflineTimer: any = null; 
 
   private boradcastTimer: any;
   private boradcastDataCache: any = {}
@@ -189,14 +121,14 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     this.offlineThreshold = offlineThreshold;
     this.listenDevOffline();
     this.listenConnection();
-
+    
     wx.onAppShow(this.onAppShow);
     wx.onAppHide(this.onAppHide);
 
     wx.onBluetoothAdapterStateChange(this.onBluetoothAdapterStateChange)
   }
 
-  private onBluetoothAdapterStateChange = (res: WechatMiniprogram.OnBluetoothAdapterStateChangeListenerResult) => {
+  private onBluetoothAdapterStateChange = (res: WechatMiniprogram.OnBluetoothAdapterStateChangeCallbackResult) => {
     GizLog.debug("onBluetoothAdapterStateChange", res)
     if (res.available) {
       // this.startScan(() => {}, 4000);
@@ -219,7 +151,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     this.isActive = false;
   }
 
-
+  
   private listenDevOffline = () => {
     // 定时检查设备列表，移除超时设备
     this.listenDevOfflineTimer = setInterval(() => {
@@ -248,6 +180,8 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     }, 500);
   };
 
+  
+
   private openBluetoothAdapter = (mode: 'central' | 'peripheral' = 'central') => {
     return new Promise((resolve, reject) => {
       wx.openBluetoothAdapter({
@@ -268,7 +202,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   };
 
   private handleOnBLECharacteristicValueChange = async (
-    curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult
+    curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult
   ) => {
     // 不存在数据
     if (!curDevice.value) {
@@ -304,7 +238,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     this.tmpDataNum = 0;
   };
 
-  private notiDeviceDataToSdk = (curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult, data: string) => {
+  private notiDeviceDataToSdk = (curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult, data: string) => {
     if (this.listenerMap['GizBleDeviceData']) {
       this.listenerMap['GizBleDeviceData'].map((item) => {
         item(curDevice, data);
@@ -435,7 +369,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   private checkDeviceIsChange = (a: IDevice, b: IDevice) => {
     //检查设备是否发生变更
 
-    if (a.bleWorkStatus !== b.bleWorkStatus ||
+    if (a.bleWorkStatus !== b.bleWorkStatus || 
       a.name !== b.name ||
       a.isBleOnline !== b.isBleOnline ||
       a.isOnline !== b.isOnline
@@ -446,7 +380,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   }
 
   private handleBluetoothDeviceFound = (
-    resData: WechatMiniprogram.OnBluetoothDeviceFoundListenerResult,
+    resData: WechatMiniprogram.OnBluetoothDeviceFoundCallbackResult,
     onScanDevice: OnScanDevice
   ) => {
     /**
@@ -585,136 +519,109 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   public enableScan = () => {
     this.disableScanFlag = false;
   }
+  
 
-  @reportConnectingEvent('BleDeviceConnectEnd')
-  private async connectDeviceBle(device: IDevice) {
-    try {
-      // 连接前 先停止搜索
-      await this.disableScan();
-      const connectRes = await retryConnect(device.bleDeviceID)
-      this.enableScan();
-      GizLog.debug("connect res", connectRes)
-
-      // if (connectRes && connectRes.errCode == 0 && connectRes.errMsg === 'createBLEConnection:ok') {
-      //   this.listenConnection(deviceId);
-      // }
-    } catch (error) {
-      // 已经连接，继续往下走登录流程
-      GizLog.error('GIZ_SDK: createBLEConnection error', new Error(JSON.stringify(error)))
-      if (error?.errMsg !== 'createBLEConnection:fail:already connect') {
-        this.notifyError(error);
-        return { success: false, message: error?.errMsg };
+  public connectDevice = async (deviceId: string) => {
+    // 先锁定这个设备 防止被剔除
+    try{
+      this.connectingDevId = deviceId;
+      try {
+        // 连接前 先停止搜索
+        await this.disableScan();
+        const connectRes = await retryConnect(deviceId)
+        this.enableScan();
+        GizLog.debug("connect res", connectRes)
+        
+        // if (connectRes && connectRes.errCode == 0 && connectRes.errMsg === 'createBLEConnection:ok') {
+        //   this.listenConnection(deviceId);
+        // } 
+      } catch (error) {
+        // 已经连接，继续往下走登录流程
+        GizLog.error('GIZ_SDK: createBLEConnection error', new Error(JSON.stringify(error)))
+        if (error?.errMsg !== 'createBLEConnection:fail:already connect') {
+          this.notifyError(error);
+          return { success: false, message: error?.errMsg };
+        }
+        
       }
+      
+      const getServicesRes = (await wx
+        .getBLEDeviceServices({ deviceId })
+        .catch((err) => this.notifyError(err))) as any;
+
+      const serviceId = getServicesRes?.services.find(
+        (service) =>
+          service.isPrimary &&
+          service.uuid.toLowerCase().includes(this.serviceUUIDSuffix)
+      )?.uuid;
+      if (!serviceId) {
+        return {
+          message: 'can not find valid serviceId',
+          success: false,
+        };
+      }
+        
 
-    }
-
-    const getServicesRes = (await wx
-      .getBLEDeviceServices({ deviceId: device.bleDeviceID })
-      .catch((err) => this.notifyError(err))) as any;
-
-    const serviceId = getServicesRes?.services.find(
-      (service) =>
-        service.isPrimary &&
-        service.uuid.toLowerCase().includes(this.serviceUUIDSuffix)
-    )?.uuid;
-    if (!serviceId) {
-      return {
-        message: 'can not find valid serviceId',
-        success: false,
-      };
-    }
-
+      const getCharRes = (await wx
+        .getBLEDeviceCharacteristics({
+          deviceId,
+          serviceId,
+        })
+        .catch((err) => this.notifyError(err))) as any;
 
-    const getCharRes = (await wx
-      .getBLEDeviceCharacteristics({
-        deviceId: device.bleDeviceID,
-        serviceId,
-      })
-      .catch((err) => this.notifyError(err))) as any;
+      const characteristicId = getCharRes?.characteristics[0].uuid!;
+      
 
-    const characteristicId = getCharRes?.characteristics[0].uuid!;
-
-    return {
-      success: true,
-      data: {
-        serviceId,
-        characteristicId,
+      // 登录成功 把设备插入 connectedList
+      const isNewDevice = this.connectedList.every(
+        (device) => device.deviceId !== deviceId
+      );
+      isNewDevice &&
+        this.connectedList.push({ deviceId, serviceId, characteristicId });
+
+      // 连接成功以后默认监听设备
+      await wx
+        .notifyBLECharacteristicValueChange({
+          deviceId,
+          serviceId,
+          characteristicId,
+          state: true,
+          type: 'notification',
+        })
+        .catch((err) => this.notifyError(err));
+
+      this.write(deviceId, numberArray2Uint8Array(Bind.pack()).buffer);
+      const data = await this.handleBindReq(deviceId);
+      GizLog.log('handleBindReq', data);
+
+      if (data.success) {
+        this.write(
+          deviceId,
+          numberArray2Uint8Array(Login.pack({ passcode: data.data })).buffer
+        );
+        const loginData = (await this.handleLoginReq(deviceId).catch((err) =>
+          this.notifyError(err)
+        )) as any;
+        if (loginData?.success) {
+
+          // 登录成功后查询一下 重置状态
+          this.write(deviceId, numberArray2Uint8Array(Reset.pack()).buffer);
+          return {
+            success: true,
+            message: 'ok',
+          };
+        }
       }
-    }
-  }
 
-  @reportConnectingEvent('BleDeviceConnectBind')
-  private async connectDeviceBindRequest(device: IDevice) {
-    this.write(device.bleDeviceID, numberArray2Uint8Array(Bind.pack()).buffer);
-    const data = await this.handleBindReq(device.bleDeviceID);
-    GizLog.log('handleBindReq', data);
-    if (!data.success) {
       // 绑定失败，异常退出断开蓝牙
       await wx.closeBLEConnection({
-        deviceId: device.bleDeviceID,
+        deviceId,
       });
-    }
-    return data;
-  }
-
-  @reportConnectingEvent('BleDeviceConnectLogin')
-  private async connectDeviceLoginRequest(device: IDevice, passcode: string) {
-    this.write(
-      device.bleDeviceID,
-      numberArray2Uint8Array(Login.pack({ passcode })).buffer
-    );
-    const loginData = (await this.handleLoginReq(device.bleDeviceID).catch((err) =>
-      this.notifyError(err)
-    )) as any;
-    return {
-      success: !!loginData?.success,
-      message: 'ok',
-    };
-  }
 
-  @reportConnectEvent
-  private async _connectDevice(device: IDevice) {
-    const connectRet = await this.connectDeviceBle(device);
-    if (!connectRet.success) {
-      return connectRet;
-    }
-
-    const { serviceId, characteristicId } = connectRet.data;
-
-    // 登录成功 把设备插入 connectedList
-    const isNewDevice = this.connectedList.every(
-      (d) => d.deviceId !== device.bleDeviceID
-    );
-    isNewDevice &&
-      this.connectedList.push({ deviceId: device.bleDeviceID, serviceId, characteristicId });
-
-    // 连接成功以后默认监听设备
-    await wx
-      .notifyBLECharacteristicValueChange({
-        deviceId: device.bleDeviceID,
-        serviceId,
-        characteristicId,
-        state: true,
-        type: 'notification',
-      })
-      .catch((err) => this.notifyError(err));
-
-    const bindRet = await this.connectDeviceBindRequest(device);
-
-    if (!bindRet.success) {
-      return bindRet;
-    }
-
-    const loginRet = await this.connectDeviceLoginRequest(device, bindRet.data);
-    return loginRet;
-  }
-
-
-  public connectDevice = async (device: IDevice) => {
-    // 先锁定这个设备 防止被剔除
-    try {
-      this.connectingDevId = device.bleDeviceID;
-      return this._connectDevice(device);
+      return {
+        success: false,
+        message: 'ok',
+      };
     } finally {
       this.connectingDevId = null;
     }
@@ -724,7 +631,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     // 处理设备回复绑定消息
     return new Promise<IDeviceReq<string>>((res) => {
       const onListener = (
-        _curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult,
+        _curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult,
         hexString: string
       ) => {
         if (_curDevice.deviceId !== deviceId) {
@@ -754,7 +661,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   private handleLoginReq = (deviceId) => {
     return new Promise<IDeviceReq<String>>((res) => {
       const onListener = (
-        _curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult,
+        _curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult,
         hexString: string
       ) => {
         //TODO 销毁监听
@@ -839,7 +746,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
         },
       });
       GizLog.debug("GIZ_SDK: start adv", serviceUuids)
-
+      
       this.boradcastTimer = setTimeout(() => {
         this.peripheralServer.stopAdvertising({});
         this.boradcastTimer = null;
@@ -856,7 +763,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
       };
     }
 
-
+    
 
   }
 

package/src/handler/lan.ts

@@ -3,7 +3,7 @@ import Bind from "../protocol/Bind";
 import DiscoverUDP from "../protocol/DiscoverUdp";
 import Login from "../protocol/Login";
 import ProtocolBase from "../protocol/ProtocolBase";
-import { arrayToUint8, hexStrint2byte } from "../protocol/tool";
+import { arrayToString, arrayToUint8, hexStrint2byte } from "../protocol/tool";
 import { IResult } from "../sdk";
 import sleep from "../sleep";
 import { ab2hex, ab2numbers } from "../utils";
@@ -46,7 +46,7 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
   private offlineThreshold = 20000 // 超过20s 没有信号，则认为离线
   private isActive = true //当前是否是前台
 
-  private listenDevOfflineTimer: any = null;
+  private listenDevOfflineTimer: any = null; 
 
 
   constructor({pks}) {
@@ -179,7 +179,7 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
     }
   }
 
-  onMessage = (res: WechatMiniprogram.UDPSocketOnMessageListenerResult) => {
+  onMessage = (res: WechatMiniprogram.UDPSocketOnMessageCallbackResult) => {
     const numberArrary = ab2numbers(res.message)
     const discoverPackage = new DiscoverUDP(numberArrary)
     if (discoverPackage.mac !== '' && this.isMatchPk(discoverPackage.productKey)) {
@@ -306,7 +306,7 @@ class TCPHandler {
           err: err
         })
       }
-      const onMessage = (message: WechatMiniprogram.TCPSocketOnMessageListenerResult) => {
+      const onMessage = (message: WechatMiniprogram.TCPSocketOnMessageCallbackResult) => {
         // 接收绑定回复
         // 然后再发起登录
         const baseProtocol = new ProtocolBase(ab2numbers(message.message))
@@ -339,7 +339,7 @@ class TCPHandler {
 
       try {
         this.tcpHandler = wx.createTCPSocket();
-
+        
         // 设置监听
         this.tcpHandler.onConnect(onConnect)
         this.tcpHandler.onError(onError)
@@ -384,7 +384,7 @@ class TCPHandler {
       GizLog.debug("on tcp message", baseProtocol)
       this.onData(this.mac, hexString)
     } catch (error) {
-
+      
     }
   }
 

package/src/handler/socket.ts

@@ -348,7 +348,7 @@ export class Connection {
     this.close();
   }
 
-  _networkChange = async (res: WechatMiniprogram.OnNetworkStatusChangeListenerResult) => {
+  _networkChange = async (res: WechatMiniprogram.OnNetworkStatusChangeCallbackResult) => {
     GizLog.log('network change', res);
     // if (res.isConnected && !this._websocket) {
     //   // 网络断开重连
@@ -394,7 +394,7 @@ export class Connection {
         }
       }, 1000);
     }
-
+    
   }
 
   _subDevices = (dids: string[]) => {
@@ -443,12 +443,12 @@ export class Connection {
             let success = false;
             if (res.errMsg === "sendSocketMessage:ok") {
               success = true
-            }
+            } 
             resolve({
               success,
               message: res.errMsg
             })
-
+            
           },
           fail: (e) => {
             GizLog.error('GIZ_SDK: Socket send error', new Error(JSON.stringify(e)));
@@ -524,7 +524,7 @@ export class Connection {
   _startPing = () => {
     this._heartbeatTimerId = setInterval(() => {
       this._send({ cmd: 'ping' });
-
+      
     }, this._heartbeatInterval * 1000);
   }
 

package/src/openApiRequest.ts

@@ -1,6 +1,6 @@
-import errorCode from './errorCode';
-import { getGlobalData } from "./globalData";
 import request from './request';
+import { getGlobalData } from "./globalData";
+import errorCode from './errorCode';
 
 interface IResult<T> {
   data: T;
@@ -54,9 +54,9 @@ const openApiRequest = async <T>(url: string, options: any, needToken: boolean =
       }
     }
   } catch (error) {
-
+    
   }
   return baseError;
 }
 
-export default openApiRequest;
+export default openApiRequest;

package/src/protocol/Reset.ts

@@ -0,0 +1,16 @@
+import ProtocolBase from "./ProtocolBase";
+import { arrayToString } from "./tool";
+
+type IStatus = 0 | 1;
+class Reset extends ProtocolBase {
+  status: IStatus = 0; // 0 没有进入重置 1 进入了重置状态
+  constructor(data: number[]) {
+    super(data);
+    this.status = this.content[0] as IStatus;
+  }
+  static pack = () => {
+    return [0,0,0,3,3,0,0,0x61];
+  }
+}
+
+export default Reset;

package/src/protocol/SetReset.ts

@@ -0,0 +1,13 @@
+import ProtocolBase from "./ProtocolBase";
+import { arrayToString } from "./tool";
+
+
+type IStatus = 0 | 1;
+class SetReset extends ProtocolBase {
+  status: IStatus = 0; // 0 没有进入重置 1 进入了重置状态
+  static pack = (status: IStatus) => {
+    return [0,0,0,3,3,0,0,0x63, status];
+  }
+}
+
+export default SetReset;