mini_program_gizwits_sdk 3.2.20-beta → 3.2.20

package/dist/src/GizLog.d.ts

@@ -3,7 +3,7 @@ declare class Log {
     logMap: {
         id: string;
     }[];
-    console: any;
+    console: Console;
     debug: (...data: any[]) => void;
     info: (...data: any[]) => void;
     log: (...data: any[]) => void;

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

@@ -26,7 +26,6 @@ export declare type OnScanDevice = (scanList: IDevice[]) => void;
 interface ConnectDevice {
     deviceId?: string;
     serviceId?: string;
-    isLogin?: boolean;
     characteristicId?: string;
     errMsg?: string;
 }
@@ -43,6 +42,7 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private listenDevOfflineTimer;
     private boradcastTimer;
     private boradcastDataCache;
+    private baseServices;
     private tmpBleData;
     private tmpDataNum;
     private disableScanFlag;
@@ -79,9 +79,10 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
         success: boolean;
     }>;
     private updateDevice;
+    private updateCtime;
     private checkDeviceIsChange;
     private handleBluetoothDeviceFound;
-    startScan: (onScanDevice: OnScanDevice, delay?: number) => Promise<IStartScanResult>;
+    startScan: (onScanDevice: OnScanDevice, delay?: number, services?: string[]) => Promise<IStartScanResult>;
     stopScan: () => Promise<any>;
     disableScan: () => Promise<WechatMiniprogram.BluetoothError>;
     enableScan: () => void;
@@ -89,7 +90,6 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
         success: boolean;
         message: any;
     }>;
-    private updateDeviceIsLogin;
     private handleBindReq;
     private handleLoginReq;
     watchBleDevice: (deviceId: any, func: any) => Promise<{

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

@@ -0,0 +1,5 @@
+import ProtocolBase from "./ProtocolBase";
+declare class Ntp extends ProtocolBase {
+    static pack: () => number[];
+}
+export default Ntp;

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

@@ -0,0 +1,23 @@
+import ProtocolBase from "./ProtocolBase";
+export declare class RequestSync extends ProtocolBase {
+    state: number;
+    len: number;
+    constructor(data: number[]);
+    static pack: () => number[];
+}
+export declare class SyncPackage extends ProtocolBase {
+    id: number;
+    timestemp: number;
+    payloadLen: number;
+    payload: number[];
+    constructor(data: number[]);
+    static pack: (id: number) => number[];
+}
+export declare class DeletePackage extends ProtocolBase {
+    static pack: (id: number) => number[];
+}
+export declare class CancelSync extends ProtocolBase {
+    state: number;
+    constructor(data: number[]);
+    static pack: () => number[];
+}

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

@@ -1,4 +1,5 @@
 declare const checkHeader: (data: any) => number | false;
+export declare const completeBlock: (cmd: string) => number[];
 declare const getProtocolLen: (data: any) => number;
 declare function arrayToString(arr: number[]): string;
 declare const fillString: (string: string, num: number, foot?: boolean) => string;

package/dist/src/sdk.d.ts

@@ -2,9 +2,18 @@ import { TLogType } from './GizLog';
 import { ILoginRes } from './services/login';
 import { IOpenApiDevice, ISafeRegisterReturn, IUnbindReturn } from './services/devices';
 import { IDataPointConfig } from './protocol/DataPoint';
-interface ISDKResult<T> {
+interface SyncCallBackParams {
+    event: TSyncEvnet;
+    currentNum?: number;
+    totalNum?: number;
+    message?: string;
+}
+declare type TSyncEvnet = 'SYNC_START' | 'SYNC_END' | 'SYNC_FAIL' | 'SYNC_CANCEL' | 'SYNC_PROGRESS';
+export declare type SyncCallBack = (data: SyncCallBackParams) => void;
+export interface ISDKResult<T> {
     data?: T;
     err?: IError;
+    message?: string;
     success: boolean;
 }
 export interface ISetCommonDeviceOnboardingDeployProps {
@@ -103,6 +112,13 @@ declare class GizwitsMiniSDK {
     private _lanHandle;
     private _gizSocket;
     private offlineThreshold?;
+    private syncDataCallBack?;
+    private syncDataLengthCallback?;
+    private syncTotalNum;
+    private syncCurrnetNum;
+    private syncDataTimoutTimer;
+    private SYNC_TIMEOUT;
+    private syncDevice?;
     constructor({ appID, appSecret, productInfo, cloudServiceInfo, token, uid, offlineThreshold, }: GizwitsSdkOption);
     private get bleHandle();
     private get lanHandle();
@@ -118,25 +134,36 @@ declare class GizwitsMiniSDK {
     private handleSocketStatus;
     private notiDeviceList;
     private initLan;
-    startAutoScan: () => void;
+    startAutoScan: (services?: string[]) => void;
     stopAutoScan: () => void;
-    setDeviceMeta: <K extends "did" | "mac" | "productKey" | "bleWorkStatus" | "name" | "isBind" | "rootDeviceId" | "bleDeviceID" | "remark" | "connectType" | "isOnline" | "isLanOnline" | "isBleOnline" | "host" | "wss_port" | "ctime">(curDev: IDevice, key: K, value: IDevice[K], force?: boolean) => void;
+    setDeviceMeta: <K extends "did" | "mac" | "productKey" | "bleWorkStatus" | "name" | "isBind" | "rootDeviceId" | "bleDeviceID" | "remark" | "passcode" | "connectType" | "isOnline" | "isLanOnline" | "isBleOnline" | "host" | "wss_port" | "ctime">(curDev: IDevice, key: K, value: IDevice[K], force?: boolean) => void;
     getVersion: () => {
         success: boolean;
         data: string;
     };
     initBle: () => Promise<ISDKResult<null>>;
-    scanBleDevice: (delay: number) => Promise<ISDKResult<IDevice[]>>;
-    write: (device: IDevice, attrs: object) => Promise<{
+    scanBleDevice: (delay: number, services?: string[]) => Promise<ISDKResult<IDevice[]>>;
+    write: (device: IDevice, attrs: object) => Promise<import("./wechatApi").IWechatResult | {
+        success: boolean;
+        message: string;
+    } | {
         success: boolean;
         message?: undefined;
-    } | import("./wechatApi").IWechatResult | {
+    }>;
+    writeRaw: (device: IDevice, data: number[]) => Promise<IError | import("./wechatApi").IWechatResult | {
+        success: boolean;
+    }>;
+    setDeviceTimeStamp: (device: IDevice) => Promise<import("./wechatApi").IWechatResult | {
         success: boolean;
         message: string;
     }>;
-    writeRaw: (device: IDevice, data: number[]) => Promise<IError | import("./wechatApi").IWechatResult | {
+    syncDeviceData: (device: IDevice, callback?: SyncCallBack) => Promise<import("./wechatApi").IWechatResult | {
         success: boolean;
+        message: string;
     }>;
+    queryNeedSyncDataLength: (device: IDevice) => Promise<ISDKResult<number>>;
+    cancelSyncDeviceData: () => Promise<void>;
+    private cleanSyncDeviceData;
     getProductConfig: (pk: string) => Promise<ISDKResult<IDataPointConfig>>;
     stopScanBleDevice: () => void;
     login: (openID: string) => Promise<ISDKResult<ILoginRes>>;
@@ -169,6 +196,10 @@ declare class GizwitsMiniSDK {
         success: boolean;
         err: IError;
     };
+    renameDevice: (device: IDevice, name: string) => Promise<import("./openApiRequest").IServiceResult<import("./services/devices").IRenamePropsReturn> | {
+        success: boolean;
+        message: string;
+    }>;
     removeEventListener: <K extends "GizDeviceListNotifications" | "GizDeviceStatusNotifications" | "GizDeviceAttrsNotifications" | "onScanListChange" | "onBleHandleError">(type: K, func: TListenerType[K]) => {
         success: boolean;
     };

package/dist/src/services/devices.d.ts

@@ -50,4 +50,14 @@ export interface ISafeRegisterReturn {
     failedDevices: IDevice[];
 }
 export declare function safeRegister({ productKey, productSecret, mac, passcode, gwDid, isReset, }: ISafeRegisterParams): Promise<IServiceResult<ISafeRegisterReturn>>;
+interface IRenameProps {
+    name?: string;
+    did: string;
+    remark?: string;
+}
+export interface IRenamePropsReturn {
+    remark: string;
+    dev_alias: string;
+}
+export declare function editBindInfo({ name, remark, did, }: IRenameProps): Promise<IServiceResult<IRenamePropsReturn>>;
 export {};

package/dist/src/services/uploadP0.d.ts

@@ -0,0 +1,13 @@
+export interface IUploadRes {
+}
+interface IData {
+    raw: string;
+    created_at: number;
+}
+interface IProps {
+    device: IDevice;
+    data: IData[];
+    productSecret: string;
+}
+export declare function uploadP0({ device, data, productSecret }: IProps): Promise<import("../openApiRequest").IServiceResult<IUploadRes>>;
+export {};

package/global.d.ts

@@ -25,4 +25,4 @@ type TModeOfOperation = {
 declare namespace aesjs {
   const utils: TUtils;
   const ModeOfOperation: TModeOfOperation;
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.2.20-beta",
-  "description": "兼容协议解析拓展性，支持数组",
+  "version": "3.2.20",
+  "description": "增加蓝牙搜索services参数",
   "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/GizLog.ts

@@ -2,7 +2,6 @@ import errorCode from './errorCode';
 import sentry from './sentry';
 
 export type TLogType = 'debug' | 'info' | 'warn' | 'error';
-
 class Log {
 
   logMap = [
@@ -12,7 +11,7 @@ class Log {
     {id: 'error'}
   ]
 
-  console = {...console as any};
+  console = console
   // debug info(log) warn error
   debug = (...data)=> {
     this.console.debug(...data);

package/src/global.d.ts

@@ -39,6 +39,7 @@ interface IDevice {
   rootDeviceId?: string;
   bleDeviceID?: string;
   remark?: string;
+  passcode?: string;
   connectType: TConnectType;
   isOnline: boolean; // 代表大循环在线
   isLanOnline: boolean; // 代表小循环在线

package/src/handler/ble.ts

@@ -14,7 +14,6 @@ import { hexStrint2byte } from '../protocol/tool';
 import ProtocolBase from '../protocol/ProtocolBase';
 import Login from '../protocol/Login';
 import GetDeviceStatus from '../protocol/GetDeviceStatus';
-import Sdk from '../Sdk';
 import { padBoradcastData } from '../protocol/DataPoint';
 import GizLog from '../GizLog';
 import EventListener from './EventListener';
@@ -58,7 +57,6 @@ export type OnScanDevice = (scanList: IDevice[]) => void;
 interface ConnectDevice {
   deviceId?: string;
   serviceId?: string;
-  isLogin?: boolean;
   characteristicId?: string;
   errMsg?: string;
 }
@@ -79,6 +77,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
   private boradcastTimer: any;
   private boradcastDataCache: any = {}
+  private baseServices: string[] = ['ABF8', 'ABF0', 'F0AB', 'F8AB'];
 
   private tmpBleData = ''; // 接收分包数据用
   private tmpDataNum = 0; // 剩余字节数
@@ -190,14 +189,13 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     });
   };
 
-  private handleOnBLECharacteristicValueChange = (
+  private handleOnBLECharacteristicValueChange = async (
     curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult
   ) => {
     // 不存在数据
     if (!curDevice.value) {
       return;
     }
-    console.log('handleOnBLECharacteristicValueChange', curDevice)
     const hexString = ab2hex(curDevice.value);
     try {
       const data = new ProtocolBase(hexStrint2byte(hexString));
@@ -348,6 +346,14 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     }
   }
 
+  private updateCtime = (device: WechatMiniprogram.BlueToothDevice) => {
+    const id = device.deviceId;
+    const index = this.scanList.findIndex(item => id == item.bleDeviceID);
+    if (index !== -1) {
+      this.scanList[index].ctime = Date.now();
+    }
+  }
+
   private checkDeviceIsChange = (a: IDevice, b: IDevice) => {
     //检查设备是否发生变更
 
@@ -398,6 +404,8 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
         }
         this.boradcastDataCache[deviceId] = ab2hex(advertisData);
         const fullData = padBoradcastData(broadcastCmdData.data.map(item => parseInt(item, 16)))
+
+        this.updateCtime(device)
         this.notiDeviceDataToSdk(device as any, fullData);
         return;
       }
@@ -447,7 +455,8 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
   public startScan = async (
     onScanDevice: OnScanDevice,
-    delay: number = 5000
+    delay: number = 5000,
+    services?: string[]
   ) => {
     if (this.disableScanFlag) {
       return {
@@ -461,9 +470,11 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
       GizLog.debug("GIZ_SDK: start scan", delay);
       await wx.startBluetoothDevicesDiscovery({
+        // 如果有传的话，就按传入的方式来搜索
+        services: services || this.baseServices,
         powerLevel: 'high',
         allowDuplicatesKey: true,
-        interval: 0,
+        interval: 200,
       });
 
       if (delay > 0) {
@@ -580,8 +591,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
           this.notifyError(err)
         )) as any;
         if (loginData?.success) {
-          // 登录成功，标记成已经登陆
-          this.updateDeviceIsLogin(deviceId)
+          
           return {
             success: true,
             message: 'ok',
@@ -603,13 +613,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     }
   };
 
-  private updateDeviceIsLogin = (deviceId: string) => {
-    const index = this.connectedList.findIndex(item => item.deviceId === deviceId);
-    if (index !== -1) {
-      this.connectedList[index].isLogin = true;
-    }
-  }
-
   private handleBindReq = (deviceId: string) => {
     // 处理设备回复绑定消息
     return new Promise<IDeviceReq<string>>((res) => {

package/src/handler/socket.ts

@@ -375,7 +375,12 @@ export class Connection {
 
   _connectWS = () => {
     GizLog.log('GIZ_SDK: start connect ws')
-    this._websocket = wx.connectSocket({ url: this._wsUrl });
+    this._websocket = wx.connectSocket({
+      url: this._wsUrl,
+      fail: (res) => {
+        GizLog.error('GIZ_SDK: connectSocket error', new Error(JSON.stringify(res)));
+      }
+    });
     this._websocket.onClose(this.handleClose);
     this._websocket.onOpen(this.handleOpen);
     this._websocket.onError(this.handleError);
@@ -405,15 +410,27 @@ export class Connection {
   }
 
   _send = (data: object, forced: boolean = false) => {
-    GizLog.log('Socket send', data, forced);
+    GizLog.log('GIZ_SDK: Socket send', data, forced);
     return new Promise<IWriteRes>((resolve) => {
-      if (!this._websocket && !this.ready) {
-        this._waitSends.push(data);
+      if (!this._websocket) {
         resolve({
-          success: true,
-          message: '',
+          success: false,
+          message: 'Socket not init'
         })
-        GizLog.debug('GIZ_SDK: cache data wait socket ready');
+        return;
+      }
+      if (!forced && !this.ready) {
+        resolve({
+          success: false,
+          message: 'Socket not ready'
+        })
+        return;
+        // this._waitSends.push(data);
+        // resolve({
+        //   success: true,
+        //   message: '',
+        // })
+        // GizLog.debug('GIZ_SDK: cache data wait socket ready');
         return;
       }
       if (this._websocket && (forced || this.ready)) {
@@ -465,7 +482,7 @@ export class Connection {
   }
 
   handleClose = (res: { code: number, reason: string }) => {
-    GizLog.debug('GIZ_SDK: socket close', res);
+    GizLog.error('GIZ_SDK: socket close', new Error(JSON.stringify(res)));
     this.close();
     this._stopPing();
   }
@@ -477,7 +494,7 @@ export class Connection {
   }
 
   handleMessage = ({ data }: { data: string | ArrayBuffer }) => {
-    GizLog.log('message', data);
+    GizLog.log('GIZ_SDK: message', data);
     const res = JSON.parse(data as string);
     const handle = this._socketRespHandleMap[res.cmd];
     handle && handle(res.data);

package/src/protocol/Ntp.ts

@@ -0,0 +1,13 @@
+import ProtocolBase from "./ProtocolBase";
+import { completeBlock, fillString, string2Bytes } from "./tool";
+
+class Ntp extends ProtocolBase {
+  static pack = () => {
+    const time = parseInt(`${Date.now() / 1000}`, 10);
+    const timeString = fillString(time.toString(2), 5 * 8)
+    
+    return [0,0,0,3,8,0,0,89].concat(completeBlock(timeString));
+  }
+}
+
+export default Ntp;

package/src/protocol/OffLineData.ts

@@ -0,0 +1,81 @@
+import ProtocolBase from "./ProtocolBase";
+import { arrayToString, completeBlock, fillString, hexStrint2byte } from "./tool";
+
+export class RequestSync extends ProtocolBase {
+  state: number = 0; // 0 允许同步 1 没有数据 2其他
+  len: number = 0; // 需要同步的数据长度
+  constructor(data: number[]) {
+    super(data);
+    let index = 0
+    
+    this.len = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
+    index += 2
+
+    this.state = this.content[index];
+  }
+  static pack = () => {
+    return [0,0,0,3,3,0,0,81];
+  }
+}
+
+
+export class SyncPackage extends ProtocolBase {
+  id: number = 0;
+  timestemp: number = 0;
+  payloadLen: number = 0;
+  payload: number[] = []; 
+  constructor(data: number[]) {
+    super(data);
+
+    let index = 0;
+    this.id = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
+    
+    index += 2;
+
+    this.timestemp = parseInt(arrayToString(this.content.slice(index, index + 5)), 16);
+    index += 5;
+
+    this.payloadLen = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
+    index += 2;
+
+    this.payload = this.content.slice(index, this.content.length)
+  }
+  static pack = (id: number) => {
+    let stringData = id.toString(2)
+    stringData = fillString(stringData, 8 * 2)
+    const packageData = [0,0,0,3, 5].concat([0,0,83]).concat(completeBlock(stringData))
+    return packageData;
+  }
+}
+
+// 删除数据
+export class DeletePackage extends ProtocolBase {
+  static pack = (id: number) => {
+    let stringData = id.toString(2)
+    stringData = fillString(stringData, 8 * 2)
+    const packageData = [0,0,0,3,5].concat([0,0,85]).concat(completeBlock(stringData))
+    return packageData;
+  }
+}
+
+// let time = 1669711410;
+// let timeBytes: any = time.toString(16)
+// timeBytes = fillString(timeBytes, 10)
+// timeBytes = hexStrint2byte(timeBytes)
+// console.log(timeBytes)
+
+// const syncPackage = new SyncPackage([0,0,0,3,15 ,0, 0, 83,1,1,1,1].concat(timeBytes).concat([0, 1, 1]))
+// console.log(syncPackage)
+
+
+export class CancelSync extends ProtocolBase {
+  state: number = 0; // 0 同步完成 01 异常 02 其他
+  constructor(data: number[]) {
+    super(data);
+    this.state = this.content[0];
+  }
+  static pack = () => {
+    const packageData = [0,0,0,3, 3, 0, 0, 87]
+    return packageData;
+  }
+}

package/src/protocol/WifiConfig.ts

@@ -38,4 +38,5 @@ class WifiConfig extends ProtocolBase {
   }
 }
 
+// console.log(Array.from(WifiConfig.pack("aiottest", "aiottest")).map(item => item.toString(16)))
 export default WifiConfig;

package/src/protocol/dataPoint.ts

@@ -1,5 +1,5 @@
 import productConfigFileManage from "../productConfigFileManage";
-import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte } from "./tool";
+import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte, completeBlock} from "./tool";
 
 export interface IDataPointConfig {
   name: string;
@@ -44,16 +44,6 @@ export interface IDataPointAttr {
   desc: string;
 }
 
-// 从协议计算一个区块的数据
-const completeBlock = (cmd: string) => {
-  // 补0到8的倍数
-  const newCmd = fillString(cmd, Math.ceil(cmd.length / 8) * 8);
-  const data: number[] = [];
-  for (let i = 0; i < newCmd.length; i += 8) {
-    data.push(parseInt(newCmd.substring(i, i + 8), 2));
-  }
-  return data;
-};
 const fixType = (type: TDataType) => {
   return type.indexOf('uint') !== -1 ? 'number' : type;
 };
@@ -284,15 +274,6 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
     }
   };
 };
-
-/**
- * p0 转json
- * @param {*} config
- * @param {*} data
- * 设备到app
- * header len flag cmd sn action data
- * action 0x04定长上报 0x05定长下发 0x11变长下发 0x14变长上报 0x12变长下发读数据点 0x02定长读数据点
- */
  
 interface IPToDataPointParams {
   config: IDataPointAttr[];
@@ -323,6 +304,14 @@ function getVariableLength(data: number[]) {
   return lengthArr;
 }
 
+/**
+ * p0 转json
+ * @param {*} config
+ * @param {*} data
+ * 设备到app
+ * header len flag cmd sn action data
+ * action 0x04定长上报 0x05定长下发 0x11变长下发 0x14变长上报 0x12变长下发读数据点 0x02定长读数据点
+ */
 function PToDataPoint({ config = [], data }: IPToDataPointParams) {
   let action: number;
   let message = '';

package/src/protocol/tool.ts

@@ -9,6 +9,17 @@ const checkHeader = (data) => {
   return pointer;
 };
 
+// 从2进制，转换成10进制数组
+export const completeBlock = (cmd: string) => {
+  // 补0到8的倍数
+  const newCmd = fillString(cmd, Math.ceil(cmd.length / 8) * 8);
+  const data: number[] = [];
+  for (let i = 0; i < newCmd.length; i += 8) {
+    data.push(parseInt(newCmd.substring(i, i + 8), 2));
+  }
+  return data;
+};
+
 const getProtocolLen = (data) => {
   /**
    * 插入len