mini_program_gizwits_sdk 3.2.30 → 3.3.2

package/dist/src/GizLog.d.ts

@@ -1,4 +1,4 @@
-export type TLogType = 'debug' | 'info' | 'warn' | 'error';
+export declare type TLogType = 'debug' | 'info' | 'warn' | 'error';
 declare class Log {
     logMap: {
         id: string;

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

@@ -1,8 +1,8 @@
 import { wrapErrorInfo } from '../utils';
 import EventListener from './EventListener';
-type GizBleDeviceListotifications = (devices: IDevice[]) => void;
-type GizBleDeviceDataNotifications = (curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult, hexString: string) => void;
-type GizBleErrorNotifications = (err: {
+declare type GizBleDeviceListotifications = (devices: IDevice[]) => void;
+declare type GizBleDeviceDataNotifications = (curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult, hexString: string) => void;
+declare type GizBleErrorNotifications = (err: {
     errCode: number;
     errMsg: string;
 }) => void;
@@ -22,11 +22,7 @@ export interface IStartScanResult {
     scanList: IDevice[];
     err?: ReturnType<typeof wrapErrorInfo>;
 }
-interface IDeviceReq<T> {
-    success: boolean;
-    data: T;
-}
-export type OnScanDevice = (scanList: IDevice[]) => void;
+export declare type OnScanDevice = (scanList: IDevice[]) => void;
 interface ConnectDevice {
     deviceId?: string;
     serviceId?: string;
@@ -93,24 +89,9 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     stopScan: () => Promise<any>;
     disableScan: () => Promise<WechatMiniprogram.BluetoothError>;
     enableScan: () => void;
-    private connectDeviceBle;
-    private connectDeviceBindRequest;
-    private connectDeviceLoginRequest;
-    private _connectDevice;
-    connectDevice: (device: IDevice) => Promise<{
+    connectDevice: (deviceId: string) => Promise<{
         success: boolean;
         message: any;
-        data?: undefined;
-    } | {
-        success: boolean;
-        data: {
-            serviceId: any;
-            characteristicId: any;
-        };
-        message?: undefined;
-    } | IDeviceReq<string> | {
-        success: boolean;
-        message: string;
     }>;
     private handleBindReq;
     private handleLoginReq;

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

@@ -10,8 +10,8 @@ interface ILanDevice extends IDevice {
     expandData: DiscoverUDP;
     ip: string;
 }
-type GizLanDeviceListNotifications = (devices: IDevice[]) => void;
-type GizLanDeviceDataNotifications = (mac: string, data: string) => void;
+declare type GizLanDeviceListNotifications = (devices: IDevice[]) => void;
+declare type GizLanDeviceDataNotifications = (mac: string, data: string) => void;
 export interface TLanHandleEvent {
     GizLanDeviceList: GizLanDeviceListNotifications;
     GizLanDeviceData: GizLanDeviceDataNotifications;
@@ -48,7 +48,7 @@ export declare class LanHandle extends EventListener<TLanHandleEvent> {
     connectDevice: (device: any) => Promise<IResult<any>>;
     onError: (err: any) => void;
     isMatchPk: (pk: any) => boolean;
-    onMessage: (res: WechatMiniprogram.UDPSocketOnMessageListenerResult) => void;
+    onMessage: (res: WechatMiniprogram.UDPSocketOnMessageCallbackResult) => void;
     onDeviceClose: ({ productKey, mac }: {
         productKey: any;
         mac: any;

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

@@ -35,7 +35,7 @@ export default class GizwitsWS {
     }) => void;
     _getDevice: (did: string) => IDevice | IError;
     _getConnect: (device: IDevice) => Connection;
-    _getDeviceAndConnect: (did: string) => [IDevice, Connection] | IError;
+    _getDeviceAndConnect: (did: string) => IError | [IDevice, Connection];
     connectDevice: (device: IDevice) => {
         success: boolean;
         errorCode: IError;
@@ -97,7 +97,7 @@ export declare class Connection {
     _checkConnectTimerId?: any;
     constructor({ appID, token, uid, wsInfo, onDeviceStatusChanged, onBindingChanged, onSocketStatusChanged, }: IConnectProps);
     destory: () => void;
-    _networkChange: (res: WechatMiniprogram.OnNetworkStatusChangeListenerResult) => Promise<void>;
+    _networkChange: (res: WechatMiniprogram.OnNetworkStatusChangeCallbackResult) => Promise<void>;
     _appShow: () => Promise<void>;
     _addSubDid: (did: any) => void;
     _removeSubDid: (did: any) => void;

package/dist/src/productConfigFileManage.d.ts

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

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

@@ -13,14 +13,14 @@ interface IDataPointPosition {
     len: number;
     bit_offset: number;
 }
-type TDataType = 'bool' | 'uint8' | 'uint16' | 'uint32' | 'binary' | 'enum' | 'number';
+declare type TDataType = 'bool' | 'uint8' | 'uint16' | 'uint32' | 'binary' | 'enum' | 'number';
 interface IUnitSpec {
     addition: number;
     max: number;
     ratio: number;
     min: number;
 }
-type TDataOptionType = 'status_writable' | 'status_readonly' | 'alert' | 'fault' | 'ALL';
+declare type TDataOptionType = 'status_writable' | 'status_readonly' | 'alert' | 'fault' | 'ALL';
 export interface IDataPointAttr {
     display_name: string;
     uint_spec: IUnitSpec;
@@ -41,7 +41,7 @@ interface IRawData {
     action: string;
     payload: string;
 }
-type messageType = 'APP2DEV' | 'DEV2APP' | 'UNKNOW';
+declare type messageType = 'APP2DEV' | 'DEV2APP' | 'UNKNOW';
 declare const unpack: (data: number[], pk: string) => Promise<{
     kvData: {};
     rawData: IRawData;
@@ -60,8 +60,8 @@ declare const pack: (data: object, pk: string) => Promise<{
     };
 }>;
 declare const padBoradcastData: (data: number[]) => string;
-type TargetType = 'int' | 'string';
+declare type TargetType = 'int' | 'string';
 declare const formatEnum: (attrs: any, pk: string, targetType: TargetType) => Promise<any>;
-type BTargetType = 'string' | 'object';
+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/protocol/DiscoverUdp.d.ts

@@ -1,5 +1,5 @@
 import ProtocolBase from "./ProtocolBase";
-type TDecodeType = 'ASCII' | 'HEX';
+declare type TDecodeType = 'ASCII' | 'HEX';
 declare class DiscoverUDP extends ProtocolBase {
     did: string;
     mac: string;

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

@@ -0,0 +1,8 @@
+import ProtocolBase from "./ProtocolBase";
+declare type IStatus = 0 | 1;
+declare class Reset extends ProtocolBase {
+    status: IStatus;
+    constructor(data: number[]);
+    static pack: () => number[];
+}
+export default Reset;

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

@@ -0,0 +1,7 @@
+import ProtocolBase from "./ProtocolBase";
+declare type IStatus = 0 | 1;
+declare class SetReset extends ProtocolBase {
+    status: IStatus;
+    static pack: (status: 0 | 1) => number[];
+}
+export default SetReset;

package/dist/src/sdk.d.ts

@@ -0,0 +1,212 @@
+import { TLogType } from './GizLog';
+import { ILoginRes } from './services/login';
+import { IOpenApiDevice, ISafeRegisterReturn, IUnbindReturn } from './services/devices';
+import { IDataPointConfig } from './protocol/DataPoint';
+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 {
+    ssid: string;
+    password: string;
+    timeout: number;
+    isBind?: boolean;
+    mode?: 0 | 3;
+    softAPSSIDPrefix?: string;
+}
+export interface ISetDeviceOnboardingDeployProps extends ISetCommonDeviceOnboardingDeployProps {
+    softAPSSIDPrefix: string;
+}
+export interface IRandomCodesResult {
+    random_code: string;
+    product_key: string;
+    mac: string;
+    did: string;
+    user_id: string;
+    timestamp: number;
+    type: string;
+    wifi_soft_ver: string;
+    lan_proto_ver: string;
+}
+interface IBindRemoteDeviceParams {
+    productKey: string;
+    mac: string;
+    beOwner?: boolean;
+    alias?: string;
+}
+interface IDeviceStatusNoti {
+    device: IDevice;
+    connectType: TConnectType;
+}
+interface IDeviceAttrsNoti {
+    device: IDevice;
+    data: object;
+}
+export interface TListenerType {
+    GizDeviceListNotifications: TDeviceListNotifications;
+    GizDeviceStatusNotifications: TDeviceStatusNotifications;
+    GizDeviceAttrsNotifications: TDeviceAttrsNotifications;
+    onScanListChange: OnScanListChange;
+    onBleHandleError: OnBleHandleError;
+}
+declare type TDeviceListNotifications = (devices: IDevice[]) => void;
+declare type TDeviceStatusNotifications = (data: IDeviceStatusNoti) => void;
+declare type TDeviceAttrsNotifications = (data: IDeviceAttrsNoti) => void;
+declare type OnScanListChange = (devices: IDevice[]) => void;
+declare type OnBleHandleError = (error: IError) => void;
+interface IDeviceSafetyRegisterParams {
+    mac: string;
+    productKey: string;
+}
+export interface IResult<T> {
+    success: boolean;
+    data?: T;
+    err?: IError;
+}
+interface ICloudServiceInfo {
+    openAPIInfo: string;
+}
+export declare type TimeoutHandle = ReturnType<typeof setTimeout> | null;
+export declare type IntervalHandle = ReturnType<typeof setInterval> | null;
+export interface IProductInfo {
+    productKey: string;
+    productSecret: string;
+}
+interface GizwitsSdkOption {
+    appID: string;
+    appSecret: string;
+    productInfo: IProductInfo[];
+    cloudServiceInfo?: ICloudServiceInfo;
+    token?: string;
+    uid?: string;
+    offlineThreshold?: number;
+}
+declare class GizwitsMiniSDK {
+    private listenerMap;
+    private keepScanTimer;
+    private _deviceList;
+    private get deviceList();
+    private set deviceList(value);
+    private _bleDevices;
+    get bleDevices(): IDevice[];
+    set bleDevices(data: IDevice[]);
+    private _lanDevices;
+    private get lanDevices();
+    private set lanDevices(value);
+    private get allDevices();
+    private get bleScanDevice();
+    private productInfo;
+    private currentWifiConfigHandle;
+    private _bleHandle;
+    private _lanHandle;
+    private _gizSocket;
+    private offlineThreshold?;
+    private syncDataCallBack?;
+    private syncDataLengthCallback?;
+    private syncTotalNum;
+    private syncCurrnetNum;
+    private syncDataTimoutTimer;
+    private SYNC_TIMEOUT;
+    private syncDevice?;
+    constructor(props: GizwitsSdkOption);
+    private get bleHandle();
+    private get lanHandle();
+    private get socketHandle();
+    private init;
+    reInit(props: GizwitsSdkOption): void;
+    get specialProductKeys(): string[];
+    get specialProductKeySecrets(): string[];
+    private handleBleError;
+    private handleBleDevices;
+    handleLanDevices: (devices: IDevice[]) => void;
+    private handleLanDeviceData;
+    private handleBleDeviceData;
+    private handleSocketDeviceData;
+    private handleSocketStatus;
+    private notiDeviceList;
+    private initLan;
+    startAutoScan: (services?: string[]) => void;
+    stopAutoScan: () => 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;
+    static getVersion: () => {
+        success: boolean;
+        data: string;
+    };
+    initBle: () => Promise<ISDKResult<null>>;
+    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;
+    }>;
+    writeRaw: (device: IDevice, data: number[]) => Promise<IError | import("./wechatApi").IWechatResult | {
+        success: boolean;
+    }>;
+    setDeviceTimeStamp: (device: IDevice) => Promise<import("./wechatApi").IWechatResult | {
+        success: boolean;
+        message: string;
+    }>;
+    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>>;
+    getDeviceStatus: (device: IDevice, attrNames?: string[]) => Promise<import("./wechatApi").IWechatResult | {
+        success: boolean;
+    }>;
+    subscribe: (device: IDevice, connectType?: TConnectType, _autoGetDeviceStatus?: boolean) => Promise<{
+        success: boolean;
+        message: any;
+    } | {
+        success: boolean;
+        errorCode: IError;
+    } | IResult<any>>;
+    unSubscribe: (device: IDevice) => Promise<{
+        success: boolean;
+    }>;
+    bindRemoteDevice: ({ mac, productKey, alias, beOwner, }: IBindRemoteDeviceParams) => Promise<ISDKResult<IOpenApiDevice>>;
+    unbindDevice: ({ devices, }: {
+        devices: IDevice[];
+    }) => Promise<ISDKResult<IUnbindReturn>>;
+    deviceSafetyRegister: ({ mac, productKey, }: IDeviceSafetyRegisterParams) => Promise<ISDKResult<ISafeRegisterReturn>>;
+    deviceSafetyUnbind: ({ mac, productKey, }: IDeviceSafetyRegisterParams) => Promise<ISDKResult<ISafeRegisterReturn>>;
+    setDeviceOnboardingDeploy: ({ ssid, password, mode, timeout, isBind, softAPSSIDPrefix, }: ISetDeviceOnboardingDeployProps) => Promise<ISDKResult<IDevice[]>>;
+    private setDomain;
+    private deviceSafetyApi;
+    getBindingList: () => Promise<import("./openApiRequest").IServiceResult<IDevice[]>>;
+    getDevices: () => Promise<ISDKResult<IDevice[]>>;
+    stopDeviceOnboardingDeploy: () => void;
+    setLogLevel: (level: TLogType) => {
+        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;
+    };
+    addEventListener: <K extends "GizDeviceListNotifications" | "GizDeviceStatusNotifications" | "GizDeviceAttrsNotifications" | "onScanListChange" | "onBleHandleError">(type: K, func: TListenerType[K]) => Promise<{
+        success: boolean;
+    }>;
+    destory: () => void;
+}
+export default GizwitsMiniSDK;

package/dist/src/utils.d.ts

@@ -28,8 +28,8 @@ export declare const getFirstConnectType: (device: IDevice, type?: TConnectType)
 export declare const getProductInfoThroughPK: (pk: string, productInfos: IProductInfo[]) => IProductInfo;
 export declare const mergeObject: (obj1: any, obj2: any) => any;
 export declare function hex2ab(str: any): Uint8Array;
-type BroadcastCmd = 0x19 | 0x94;
-type TBoradcastRes = {
+declare type BroadcastCmd = 0x19 | 0x94;
+declare type TBoradcastRes = {
     mac: string;
     cmd: BroadcastCmd;
     data: string[];

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

@@ -1,6 +1,6 @@
 import { IRandomCodesResult, IResult } from "../sdk";
-import { BleHandle } from "../handler/ble";
 import ConfigBase from "./ConfigBase";
+import { BleHandle } from "../handler/ble";
 interface IArgs {
     bleDeviceId: string;
     arrayBuffer: ArrayBuffer;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.2.30",
-  "description": "修正flag转换",
+  "version": "3.3.2",
+  "description": "增加代理蓝牙设备重置功能",
   "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",
     "testBle": "node_modules/mocha/bin/_mocha -r ts-node/register tests/utils/randomCode.spec.ts -file ./tests/setup-wx.js -timeout 60s",
-    "build": "rm -rf ./dist && webpack",
+    "build": "rm -r ./dist && webpack",
     "release": "npm run build && release-it",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha -- -r ts-node/register tests/**/*.spec.ts -file ./tests/setup-wx.js -timeout 60s",
     "coveralls": "npm run cover -- --report lcovonly && cat ./coverage/lcov.info | coveralls"
@@ -31,13 +31,13 @@
     "chai": "^4.2.0",
     "coveralls": "^3.0.11",
     "istanbul": "^1.1.0-alpha.1",
-    "miniprogram-api-typings": "^3.9.0",
+    "miniprogram-api-typings": "^3.5.0",
     "mocha": "^7.1.1",
     "release-it": "^14.2.2",
     "sinon": "^9.2.4",
     "ts-loader": "^6.2.2",
     "ts-node": "^8.8.1",
-    "typescript": "^4.9.5",
+    "typescript": "^3.8.3",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "webpack": "^4.42.1",
     "webpack-bundle-analyzer": "^4.5.0",