mini_program_gizwits_sdk 3.1.20 → 3.2.1

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

@@ -49,6 +49,7 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private isActive;
     scanList: IDevice[];
     constructor({ pks, bleHandleParams, offlineThreshold, }: ConstructorParams);
+    private onBluetoothAdapterStateChange;
     private onAppShow;
     private onAppHide;
     private listenDevOffline;
@@ -84,9 +85,6 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     disableScan: () => Promise<WechatMiniprogram.BluetoothError>;
     enableScan: () => void;
     connectDevice: (deviceId: string) => Promise<{
-        success: boolean;
-        message?: undefined;
-    } | {
         success: boolean;
         message: any;
     }>;

package/dist/src/handler/lan.d.ts

@@ -10,9 +10,11 @@ interface ILanDevice extends IDevice {
     expandData: DiscoverUDP;
     ip: string;
 }
-declare type GizLanDeviceDataNotifications = (devices: IDevice[]) => void;
+declare type GizLanDeviceListNotifications = (devices: IDevice[]) => void;
+declare type GizLanDeviceDataNotifications = (mac: string, data: string) => void;
 export interface TLanHandleEvent {
-    GizLanDeviceList: GizLanDeviceDataNotifications;
+    GizLanDeviceList: GizLanDeviceListNotifications;
+    GizLanDeviceData: GizLanDeviceDataNotifications;
 }
 export declare class LanHandle extends EventListener<TLanHandleEvent> {
     connectedList: ConnectDevice[];
@@ -33,6 +35,7 @@ export declare class LanHandle extends EventListener<TLanHandleEvent> {
     private onAppHide;
     private listenDevOffline;
     private notifyDevices;
+    private notifyDeviceData;
     isSameDevice: (deviceA: IDevice, deviceB: IDevice) => boolean;
     disConnectDevice: (target: IDevice) => {
         success: boolean;
@@ -41,6 +44,7 @@ export declare class LanHandle extends EventListener<TLanHandleEvent> {
         success: boolean;
         err: any;
     };
+    onData: (mac: string, hexString: string) => void;
     connectDevice: (device: any) => Promise<IResult<any>>;
     onError: (err: any) => void;
     isMatchPk: (pk: any) => boolean;
@@ -65,6 +69,7 @@ interface ITCPHandlerProps {
     mac: string;
     productKey: string;
     onClose: (ip: any) => void;
+    onData: (mac: string, data: string) => void;
 }
 declare class TCPHandler {
     private deviceTCPPort;
@@ -72,8 +77,9 @@ declare class TCPHandler {
     private productKey;
     private mac;
     private tcpHandler;
+    private onData;
     private onCloseListener;
-    constructor({ ip, onClose, mac, productKey }: ITCPHandlerProps);
+    constructor({ ip, onClose, mac, productKey, onData }: ITCPHandlerProps);
     connect: () => Promise<IResult<any>>;
     write: (data: ArrayBuffer) => {
         success: boolean;

package/dist/src/handler/socket.d.ts

@@ -29,6 +29,10 @@ export default class GizwitsWS {
     _onBindingChanged?: IEmptyFn;
     constructor({ appID, token, uid, limitSocketNum, }: IGWSProps);
     init(): Promise<IError>;
+    updateToken: ({ token, uid }: {
+        token: any;
+        uid: any;
+    }) => void;
     _getDevice: (did: string) => IDevice | IError;
     _getConnect: (device: IDevice) => Connection;
     _getDeviceAndConnect: (did: string) => IError | [IDevice, Connection];

package/dist/src/productConfigFileManage.d.ts

@@ -7,6 +7,7 @@ declare class ProductConfigFileManage {
     key: string;
     init: () => Promise<void>;
     getConfigFile: (pk: string) => Promise<IDataPointConfig>;
+    getAttrItem: (pk: string, key: string) => Promise<import("./protocol/DataPoint").IDataPointAttr>;
 }
 declare const productConfigFileManage: ProductConfigFileManage;
 export default productConfigFileManage;

package/dist/src/protocol/DataPoint.d.ts

@@ -60,4 +60,8 @@ declare const pack: (data: object, pk: string) => Promise<{
     };
 }>;
 declare const padBoradcastData: (data: number[]) => string;
-export { pack, unpack, padBoradcastData };
+declare type TargetType = 'int' | 'string';
+declare const formatEnum: (attrs: any, pk: string, targetType: TargetType) => Promise<any>;
+declare type BTargetType = 'string' | 'object';
+declare const formatBinary: (attrs: any, pk: string, targetType: BTargetType) => Promise<any>;
+export { pack, unpack, padBoradcastData, formatEnum, formatBinary };

package/dist/src/sdk.d.ts

@@ -112,6 +112,7 @@ declare class GizwitsMiniSDK {
     private handleBleError;
     private handleBleDevices;
     handleLanDevices: (devices: IDevice[]) => void;
+    private handleLanDeviceData;
     private handleBleDeviceData;
     private handleSocketDeviceData;
     private handleSocketStatus;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.1.20",
-  "description": "云端推送解除绑定的时候，移除m2m的订阅",
+  "version": "3.2.1",
+  "description": "优化扫描策略，根据UUID过滤",
   "main": "./dist/index.js",
   "scripts": {
     "test": "node_modules/mocha/bin/_mocha -r ts-node/register tests/**/*.spec.ts -file ./tests/setup-wx.js -timeout 60s",

package/src/handler/ble.ts

@@ -108,9 +108,23 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     // this.globalListenerMap = globalListenerMap;
 
     this.listenDevOffline(offlineThreshold ?? 10000);
+    this.listenConnection();
     
     wx.onAppShow(this.onAppShow);
     wx.onAppHide(this.onAppHide);
+
+    wx.onBluetoothAdapterStateChange(this.onBluetoothAdapterStateChange)
+  }
+
+  private onBluetoothAdapterStateChange = (res: WechatMiniprogram.OnBluetoothAdapterStateChangeCallbackResult) => {
+    GizLog.debug("onBluetoothAdapterStateChange", res)
+    if (res.available) {
+      // this.startScan(() => {}, 4000);
+    } else {
+      // 不可用状态
+      this.scanList = [];
+      this.notifyDevices();
+    }
   }
 
   private onAppShow = () => {
@@ -241,7 +255,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     }
   }
 
-  private listenConnection = (deviceId: string) => {
+  private listenConnection = () => {
     /**
      * 之前的写法会导致每订阅一个设备都会创建一次监听
      * 监听也不会销毁
@@ -250,22 +264,12 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
      * 另一个角度来分析，蓝牙连接上之后，没有那么容易断开
      */
     wx.onBLEConnectionStateChange((res) => {
-      const isInConnectedList = this.connectedList
-        .map((d) => d.deviceId)
-        .includes(deviceId);
-
-      const shouldReConnect =
-        isInConnectedList &&
-        res.deviceId === deviceId &&
-        res.connected === false;
-      GizLog.log('蓝牙状态变化', {
-        connectedList: this.connectedList,
-        res,
-        deviceId,
-      });
-
-      if (shouldReConnect) {
-        this.connectDevice(deviceId);
+      if (res.connected === false) {
+        const index = this.connectedList.findIndex(item => item.deviceId === res.deviceId);
+        if (index !== -1) {
+          this.connectedList.splice(index, 1);
+          this.notifyDevices();
+        }
       }
     });
   };
@@ -456,9 +460,10 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
       GizLog.debug("GIZ_SDK: start scan", delay);
       await wx.startBluetoothDevicesDiscovery({
+        services: ['ABF8', 'ABF7'],
         powerLevel: 'high',
         allowDuplicatesKey: true,
-        interval: 0,
+        interval: 200,
       });
 
       if (delay > 0) {
@@ -502,19 +507,21 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
         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') {
-          return {success: true}
+        if (error?.errMsg !== 'createBLEConnection:fail:already connect') {
+          this.notifyError(error);
+          return { success: false, message: error?.errMsg };
         }
-        this.notifyError(error);
-        return { success: false, message: error?.errMsg };
+        
       }
+      
       const getServicesRes = (await wx
         .getBLEDeviceServices({ deviceId })
         .catch((err) => this.notifyError(err))) as any;
@@ -540,6 +547,9 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
         .catch((err) => this.notifyError(err))) as any;
 
       const characteristicId = getCharRes?.characteristics[0].uuid!;
+      
+
+      // 登录成功 把设备插入 connectedList
       const isNewDevice = this.connectedList.every(
         (device) => device.deviceId !== deviceId
       );
@@ -570,18 +580,19 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
           this.notifyError(err)
         )) as any;
         if (loginData?.success) {
+          
           return {
             success: true,
             message: 'ok',
           };
         }
-      } else {
-        // 绑定失败，异常退出断开蓝牙
-        await wx.closeBLEConnection({
-          deviceId,
-        });
       }
 
+      // 绑定失败，异常退出断开蓝牙
+      await wx.closeBLEConnection({
+        deviceId,
+      });
+
       return {
         success: false,
         message: 'ok',
@@ -801,5 +812,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     this.listenDevOfflineTimer && clearInterval(this.listenDevOfflineTimer);
     wx.offAppShow(this.onAppShow);
     wx.offAppHide(this.onAppHide);
+    wx.offBluetoothAdapterStateChange(this.onBluetoothAdapterStateChange)
   }
 }

package/src/handler/lan.ts

@@ -3,10 +3,10 @@ import Bind from "../protocol/Bind";
 import DiscoverUDP from "../protocol/DiscoverUdp";
 import Login from "../protocol/Login";
 import ProtocolBase from "../protocol/ProtocolBase";
-import { arrayToString, arrayToUint8 } from "../protocol/tool";
+import { arrayToString, arrayToUint8, hexStrint2byte } from "../protocol/tool";
 import { IResult } from "../sdk";
 import sleep from "../sleep";
-import { ab2numbers } from "../utils";
+import { ab2hex, ab2numbers } from "../utils";
 import EventListener from "./EventListener";
 
 // 局域网连接设备结构
@@ -22,9 +22,11 @@ interface ILanDevice extends IDevice {
   ip: string
 }
 
-type GizLanDeviceDataNotifications = (devices: IDevice[]) => void;
+type GizLanDeviceListNotifications = (devices: IDevice[]) => void;
+type GizLanDeviceDataNotifications = (mac: string, data: string) => void;
 export interface TLanHandleEvent {
-  GizLanDeviceList: GizLanDeviceDataNotifications;
+  GizLanDeviceList: GizLanDeviceListNotifications;
+  GizLanDeviceData: GizLanDeviceDataNotifications
 }
 
 
@@ -53,15 +55,17 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
   }
 
   init = () => {
-    this.UDPSocket = wx.createUDPSocket();
-    this.UDPSocket.bind();
-    this.UDPSocket.onMessage(this.onMessage);
-    this.UDPSocket.onError(this.onError);
-    GizLog.info('Start UDP Discover')
-    this.startDiscover();
-    this.listenDevOffline(this.offlineThreshold);
-    wx.onAppShow(this.onAppShow);
-    wx.onAppHide(this.onAppHide);
+    if (this.UDPSocket) {
+      this.UDPSocket = wx.createUDPSocket();
+      this.UDPSocket.bind();
+      this.UDPSocket.onMessage(this.onMessage);
+      this.UDPSocket.onError(this.onError);
+      GizLog.info('Start UDP Discover')
+      this.startDiscover();
+      this.listenDevOffline(this.offlineThreshold);
+      wx.onAppShow(this.onAppShow);
+      wx.onAppHide(this.onAppHide);
+    }
   }
 
   private onAppShow = () => {
@@ -100,6 +104,13 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
       });
     }
   }
+  private notifyDeviceData = (mac: string, data: string) => {
+    if (this.listenerMap['GizLanDeviceData']) {
+      this.listenerMap['GizLanDeviceData'].map((item) => {
+        item(mac, data);
+      });
+    }
+  }
 
   isSameDevice = (deviceA: IDevice, deviceB: IDevice) => {
     return deviceA.mac === deviceB.mac && deviceA.productKey === deviceB.productKey
@@ -121,6 +132,10 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
     }
   }
 
+  onData = (mac: string, hexString: string) => {
+    this.notifyDeviceData(mac, hexString);
+  }
+
   connectDevice = async (device) => {
     const target = this.scanList.find(item => this.isSameDevice(device, item));
     // 检查是否有连接
@@ -136,7 +151,7 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
         success: true
       }
     } else {
-      const tcpHandler = new TCPHandler({ip: target.ip, mac: target.mac, productKey: target.productKey, onClose: this.onDeviceClose})
+      const tcpHandler = new TCPHandler({ip: target.ip, mac: target.mac, productKey: target.productKey, onClose: this.onDeviceClose, onData: this.onData})
       const res = await tcpHandler.connect()
       if (res.success) {
         this.connectedList.push({
@@ -256,6 +271,7 @@ interface ITCPHandlerProps {
   mac: string
   productKey: string
   onClose: (ip) => void
+  onData: (mac: string, data: string) => void
 }
 class TCPHandler {
   private deviceTCPPort = 12416
@@ -263,13 +279,15 @@ class TCPHandler {
   private productKey = ""
   private mac = ""
   private tcpHandler: WechatMiniprogram.TCPSocket = null;
+  private onData = (mac: string, data: string) => {}
 
   private onCloseListener = ({mac, productKey}) => {}
 
-  constructor({ip, onClose, mac, productKey}: ITCPHandlerProps) {
+  constructor({ip, onClose, mac, productKey, onData}: ITCPHandlerProps) {
     this.ip = ip;
     this.mac = mac;
     this.productKey = productKey;
+    this.onData = onData;
     this.onCloseListener = onClose;
   }
 
@@ -360,8 +378,14 @@ class TCPHandler {
   }
 
   onMessage = (message) => {
-    const baseProtocol = new ProtocolBase(ab2numbers(message.message))
-    GizLog.debug("on tcp message", baseProtocol)
+    try {
+      const hexString = ab2hex(message.message);
+      const baseProtocol = new ProtocolBase(hexStrint2byte(hexString))
+      GizLog.debug("on tcp message", baseProtocol)
+      this.onData(this.mac, hexString)
+    } catch (error) {
+      
+    }
   }
 
   onError = () => {}

package/src/handler/socket.ts

@@ -70,6 +70,11 @@ export default class GizwitsWS {
     }
   }
 
+  updateToken = ({token, uid}) => {
+    this.token = token;
+    this.uid = uid;
+  }
+
   _getDevice = (did: string): IDevice | IError => {
     if (this._bindingDevices === null) {
       return errorCode.GIZ_SDK_SDK_NOT_INITIALIZED

package/src/productConfigFileManage.ts

@@ -36,6 +36,20 @@ class ProductConfigFileManage {
     }
     return this.data[pk];
   }
+
+  public getAttrItem = async (pk:string, key: string) => {
+    if (!this.data[pk]) {
+      await this.getConfigFile(pk)
+    }
+
+    for (let index in this.data[pk].entities[0].attrs) {
+      const item = this.data[pk].entities[0].attrs[index]
+      if (item.name === key) {
+        return item;
+      }
+    }
+    return null;
+  }
 }
 
 const productConfigFileManage = new ProductConfigFileManage();

package/src/protocol/dataPoint.ts

@@ -1,5 +1,5 @@
 import productConfigFileManage from "../productConfigFileManage";
-import { arrayToString, checkHeader, fillString, getProtocolLen } from "./tool";
+import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte } from "./tool";
 
 export interface IDataPointConfig {
   name: string;
@@ -89,7 +89,12 @@ const getData = (type: TDataType, data: any, item: IDataPointAttr) => {
       break;
     }
     case 'binary': {
-      const value = data[item.name] || '';
+      // 做个兼容，兼容16进制字符串和数组
+      let value = data[item.name] || '';
+      if (value instanceof Array) {
+        // 数组转string
+        value = arrayToString(value);
+      }
       // 数量不够在后面补0
       const newValue = fillString(value, item.position.len * 2, true);
       for (let i = 0; i < newValue.length / 2; i++) {
@@ -668,7 +673,12 @@ function calculationCmdData({ attrs, flagString, boolEnumLength, cmdData, accumu
 const unpack = async (data: number[], pk: string) => {
   const productConfig = await productConfigFileManage.getConfigFile(pk);
   if (productConfig) {
-    return PToDataPoint({config: (await productConfig).entities[0].attrs, data})
+    const resData =  PToDataPoint({config: (await productConfig).entities[0].attrs, data})
+    if (resData.kvData) {
+      // 格式化binary
+      resData.kvData = await formatBinary(resData?.kvData, pk, 'object');
+    }
+    return resData;
   }
   return null;
 }
@@ -691,5 +701,39 @@ const padBoradcastData = (data: number[]) => {
   return arrayToString(head.concat(lengthArr).concat(flagToEnd));
 }
 
+type TargetType = 'int' | 'string';
+// 格式化enum 兼容sdk 和 socket 之间的差异
+const formatEnum = async (attrs: any, pk: string, targetType: TargetType ) => {
+  for(let key in attrs) {
+    const itemData = await productConfigFileManage.getAttrItem(pk, key);
+    if (itemData && itemData.data_type ==='enum') {
+      if (targetType === 'int' && typeof attrs[key] === 'string') {
+        // 转成int 
+        const enumIndex = itemData.enum.findIndex(item => item === attrs[key]);
+        attrs[key] = enumIndex || 0;
+      }
+      if (targetType === 'string' && typeof attrs[key] === 'number') {
+        attrs[key] = itemData.enum[attrs[key]]
+      }
+    }
+  }
+  return attrs
+}
+
+type BTargetType = 'string' | 'object';
+const formatBinary = async (attrs: any, pk: string, targetType: BTargetType ) => {
+  for(let key in attrs) {
+    const itemData = await productConfigFileManage.getAttrItem(pk, key);
+    if (itemData && itemData.data_type ==='binary') {
+      if (targetType === 'object' && typeof attrs[key] === 'string') {
+        attrs[key] = hexStrint2byte(attrs[key])
+      }
+      if (targetType === 'string' && typeof attrs[key] === 'object') {
+        attrs[key] = arrayToString(attrs[key])
+      }
+    }
+  }
+  return attrs
+}
 
-export {pack, unpack, padBoradcastData};
+export {pack, unpack, padBoradcastData, formatEnum, formatBinary};

package/src/sdk.ts

@@ -25,7 +25,7 @@ import {
   numberArray2Uint8Array,
 } from './utils';
 import productConfigFileManage from './productConfigFileManage';
-import { IDataPointConfig, pack, unpack } from './protocol/DataPoint';
+import { formatEnum, IDataPointConfig, pack, unpack } from './protocol/DataPoint';
 import { hexStrint2byte } from './protocol/tool';
 import { LanHandle } from './handler/lan';
 
@@ -326,12 +326,30 @@ class GizwitsMiniSDK {
   private handleBleDevices = (devices: IDevice[]) => {
     GizLog.log('handleBleDevices', devices);
     this.bleDevices = devices;
+    // this.notiDeviceList();
   };
 
   handleLanDevices = (devices: IDevice[]) => {
     this.lanDevices = devices;
   }
 
+  private handleLanDeviceData = async (mac: string, hexString: string) => {
+    const target = this.allDevices.find(
+      (item) => item.mac === mac
+    );
+    if (target) {
+      const data = await unpack(hexStrint2byte(hexString), target.productKey);
+      // 如果有kydata 则上报
+      if (data?.kvData && this.listenerMap['GizDeviceAttrsNotifications']) {
+        this.listenerMap['GizDeviceAttrsNotifications'].map((item) => {
+          item({
+            device: target,
+            data: data?.kvData,
+          });
+        });
+      }
+    }
+  }
   private handleBleDeviceData = async (
     curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult,
     hexString: string
@@ -353,7 +371,7 @@ class GizwitsMiniSDK {
     }
   };
 
-  private handleSocketDeviceData: IOnDeviceStatusChanged = (data) => {
+  private handleSocketDeviceData: IOnDeviceStatusChanged = async (data) => {
     const target = this.allDevices.find((item) => item.did === data.did);
     if (!target) {
       return;
@@ -364,6 +382,11 @@ class GizwitsMiniSDK {
     }
     
     if (this.listenerMap['GizDeviceAttrsNotifications']) {
+
+      // 需要把枚举 拓展格式化回来
+      if ((data as IDeviceStatusChangedProps).attrs) {
+        (data as IDeviceStatusChangedProps).attrs = await formatEnum((data as IDeviceStatusChangedProps).attrs, target.productKey, 'int');
+      }
       this.listenerMap['GizDeviceAttrsNotifications'].map((item) => {
         item({
           device: target,
@@ -395,8 +418,16 @@ class GizwitsMiniSDK {
   };
 
   private initLan = () => {
-    this.lanHandle.init();
-    this.lanHandle.addEventListener('GizLanDeviceList', this.handleLanDevices);
+    try {
+      this.lanHandle.init();
+      this.lanHandle.addEventListener('GizLanDeviceList', this.handleLanDevices);
+      this.lanHandle.addEventListener(
+        'GizLanDeviceData',
+        this.handleLanDeviceData
+      );
+    } catch (error) {
+      GizLog.error('init lan error', error)
+    }
   }
 
   /**
@@ -532,7 +563,10 @@ class GizwitsMiniSDK {
           }
         }
         case 'WAN': {
-          return this.socketHandle.writeData(target, attrs);
+          // 枚举要转换成枚举值
+          const newAttrs = await formatEnum(attrs, target.productKey, 'string')
+
+          return this.socketHandle.writeData(target, newAttrs);
         }
         case 'LAN': {
           return this.lanHandle.write(target, numberArray2Uint8Array(value).buffer);
@@ -609,6 +643,7 @@ class GizwitsMiniSDK {
     if (data.success) {
       setGlobalData('token', data.data?.token);
       setGlobalData('uid', data.data?.uid);
+      this.socketHandle.updateToken({token: data.data.token, uid: data.data.uid})
     }
     return data;
   };
@@ -655,7 +690,8 @@ class GizwitsMiniSDK {
     let target = this.allDevices.find((item) => isSameDevice(item, device));
     if (!target) {
       GizLog.warn('Device Target Not Found')
-      return { success: false };
+      GizLog.warn('current devices ', this.allDevices)
+      return { success: false, message: "device not found" };
     }
 
     // 广播模式不需要连接，所以默认是连接状态

package/src/utils.ts

@@ -188,6 +188,8 @@ export const merageBleLocalDevices = (
     } else {
       target.isBleOnline = true;
       target.bleDeviceID = localD.bleDeviceID;
+      // 蓝牙设备比较特殊，有广播类型 广播类型是写在本地设备属性里面的，但是又不属于已经连接的设备，先骚处理一下
+      target.connectType = localD.connectType;
       target.bleWorkStatus = localD.bleWorkStatus;
     }
   });

package/src/wechatApi.ts

@@ -67,7 +67,7 @@ export function startBluetoothDevicesDiscovery(allowDuplicatesKey = true) {
       fail: rej,
       allowDuplicatesKey,
       powerLevel: 'high',
-      interval: 0
+      interval: 200
     })
   })
 }