mini_program_gizwits_sdk 3.6.1 → 3.6.3

package/dist/src/GizLog.d.ts

@@ -11,7 +11,7 @@ declare class Log {
     error: (info: string, error: Error) => void;
     setLogLevel: (type: TLogType) => {
         success: boolean;
-        err: IError;
+        err: import("./types").IError;
     };
 }
 declare const _default: Log;

package/dist/src/errorCode.d.ts

@@ -1,5 +1,3 @@
-interface IErrorCode {
-    [key: string]: IError;
-}
+import { IErrorCode } from "./types";
 declare const errorCode: IErrorCode;
 export default errorCode;

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

@@ -1,69 +1,9 @@
-import { wrapErrorInfo } from '../utils';
 import EventListener from './EventListener';
-import { IOTAType, IResult } from '../sdk';
 import DeviceInfo from '../protocol/DeviceInfo';
-type GizBleDeviceListotifications = (devices: IDevice[]) => void;
-type GizBleDeviceDataNotifications = (curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult, hexString: string) => void;
-type GizBleErrorNotifications = (err: {
-    errCode: number;
-    errMsg: string;
-}) => void;
-interface CheckOTAParams {
-    device: IDevice;
-    type: IOTAType;
-}
-type OTAEventCode = 'GizOTAEventPretreatment' | 'GizOTAEventDownload' | 'GizOTAEventTransmit' | 'GizOTAEventReboot' | 'GizOTAEventFinish';
-interface OTAEvent {
-    code: OTAEventCode;
-}
-interface OTAProgressEvent {
-    firmwareSize: number;
-    packageMaxLen: number;
-    currentNumber: number;
-    currentProgress: number;
-}
-export type OTAProgressEventCallback = (event: OTAProgressEvent) => void;
-export type OTAEventCallback = (event: OTAEvent) => void;
-interface StartUpgradeParams extends CheckOTAParams {
-    onProgress: OTAProgressEventCallback;
-    onEvent: OTAEventCallback;
-    productKey: string;
-}
-export interface TBleHandleEvent {
-    GizBleDeviceData: GizBleDeviceDataNotifications;
-    GizBleDeviceList: GizBleDeviceListotifications;
-    GizBleError: GizBleErrorNotifications;
-}
-export interface GizwitsWxBlueToothDevice extends WechatMiniprogram.BlueToothDevice {
-    communicationType: 'BLE_BROADCAST' | 'BLE';
-}
-interface BleHandleParams {
-    serviceUUIDSuffix: string;
-    characteristicUUIDSuffix: string;
-}
-export interface IStartScanResult {
-    scanList: IDevice[];
-    err?: ReturnType<typeof wrapErrorInfo>;
-}
-interface IDeviceReq<T> {
-    success: boolean;
-    data: T;
-}
-export type OnScanDevice = (scanList: IDevice[]) => void;
-interface ConnectDevice {
-    deviceId?: string;
-    serviceId?: string;
-    characteristicId?: string;
-    errMsg?: string;
-}
-interface ConstructorParams {
-    pks: string[];
-    bleHandleParams?: BleHandleParams;
-    offlineThreshold?: number;
-}
+import { BleConnectDevice, IDevice, IResult, TBleHandleEvent, BleConstructorParams, IStartScanResult, IDeviceReq, StartUpgradeParams, CheckOTAParams } from '../types';
 export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private serviceUUIDSuffix;
-    connectedList: ConnectDevice[];
+    connectedList: BleConnectDevice[];
     private connectingDevId;
     pks: string[];
     private listenDevOfflineTimer;
@@ -82,7 +22,7 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     set offlineThreshold(value: any);
     get offlineThreshold(): any;
     scanList: IDevice[];
-    constructor({ pks, bleHandleParams, offlineThreshold, }: ConstructorParams);
+    constructor({ pks, bleHandleParams, offlineThreshold, }: BleConstructorParams);
     private onBluetoothAdapterStateChange;
     private onAppShow;
     private onAppHide;
@@ -138,11 +78,11 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private handleWatchBleData;
     private handleBindReq;
     private handleLoginReq;
-    startUpgrade: ({ device, type, onEvent, onProgress, productKey }: StartUpgradeParams) => Promise<import("../openApiRequest").IServiceResult<import("../services/ota").OTARes>>;
+    startUpgrade: ({ device, type, onEvent, onProgress, productKey }: StartUpgradeParams) => Promise<import("../types").IServiceResult<import("../types").OTARes>>;
     getDeviceInfo: ({ deviceId }: {
         deviceId: string;
     }) => Promise<IResult<DeviceInfo>>;
-    checkUpdate: ({ device, type }: CheckOTAParams) => Promise<import("../openApiRequest").IServiceResult<import("../services/ota").OTARes>>;
+    checkUpdate: ({ device, type }: CheckOTAParams) => Promise<import("../types").IServiceResult<import("../types").OTARes>>;
     watchBleDevice: (deviceId: any, func: any) => Promise<{
         success: boolean;
         message: string;
@@ -163,4 +103,3 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private getTargetDevice;
     destory: () => void;
 }
-export {};

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

@@ -1,23 +1,8 @@
 import DiscoverUDP from "../protocol/DiscoverUDP";
-import { IResult } from "../sdk";
+import { IDevice, ILanDevice, IResult, LanConnectDevice, TLanHandleEvent } from "../types";
 import EventListener from "./EventListener";
-interface ConnectDevice {
-    mac: string;
-    productKey: string;
-    socketHandle: TCPHandler;
-}
-interface ILanDevice extends IDevice {
-    expandData: DiscoverUDP;
-    ip: string;
-}
-type GizLanDeviceListNotifications = (devices: IDevice[]) => void;
-type GizLanDeviceDataNotifications = (mac: string, data: string) => void;
-export interface TLanHandleEvent {
-    GizLanDeviceList: GizLanDeviceListNotifications;
-    GizLanDeviceData: GizLanDeviceDataNotifications;
-}
 export declare class LanHandle extends EventListener<TLanHandleEvent> {
-    connectedList: ConnectDevice[];
+    connectedList: LanConnectDevice[];
     pks: string[];
     scanList: ILanDevice[];
     private boradcastTimer;
@@ -71,7 +56,7 @@ interface ITCPHandlerProps {
     onClose: (ip: any) => void;
     onData: (mac: string, data: string) => void;
 }
-declare class TCPHandler {
+export declare class TCPHandler {
     private deviceTCPPort;
     private ip;
     private productKey;

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

@@ -1,3 +1,4 @@
+import { IDevice, IError, IOnDeviceStatusChanged, IDeviceStatusChangedProps, IDeviceRawStatusChangedProps, IOnSocketStatusChanged, IEmptyFn, ICommonObj } from "../types";
 interface IRespError {
     err?: IError;
 }

package/dist/src/openApiRequest.d.ts

@@ -1,7 +1,3 @@
-export interface IServiceResult<T> {
-    success: boolean;
-    data?: T;
-    err?: IError;
-}
+import { IServiceResult } from './types';
 declare const openApiRequest: <T>(url: string, options: any, needToken?: boolean) => Promise<IServiceResult<T>>;
 export default openApiRequest;

package/dist/src/productConfigFileManage.d.ts

@@ -1,14 +1,11 @@
-import { IDataPointConfig } from './protocol/DataPoint';
-interface IData {
-    [key: string]: IDataPointConfig;
-}
+import { IProductConfigData, IDataPointConfig } from './types';
 declare class ProductConfigFileManage {
-    data: IData;
+    data: IProductConfigData;
     key: string;
     init: () => Promise<void>;
     getConfigFileMap: Record<string, Promise<IDataPointConfig | null>>;
     getConfigFile: (pk: string) => Promise<IDataPointConfig | null>;
-    getAttrItem: (pk: string, key: string) => Promise<import("./protocol/DataPoint").IDataPointAttr>;
+    getAttrItem: (pk: string, key: string) => Promise<import("./types").IDataPointAttr>;
 }
 declare const productConfigFileManage: ProductConfigFileManage;
 export default productConfigFileManage;

package/dist/src/protocol/OTA/CheckCanOTA.d.ts

@@ -1,4 +1,4 @@
-import { IOTAType } from "../../sdk";
+import { IOTAType } from "../../types";
 import ProtocolBase from "../ProtocolBase";
 declare class CheckCanOTA extends ProtocolBase {
     type: IOTAType;

package/dist/src/protocol/{DataPoint.d.ts → dataPoint.d.ts}

@@ -1,37 +1,3 @@
-export interface IDataPointConfig {
-    name: string;
-    protocolType: 'var_len' | 'standard';
-    entities: IDataPointEntitie[];
-}
-interface IDataPointEntitie {
-    display_name: string;
-    attrs: IDataPointAttr[];
-}
-interface IDataPointPosition {
-    byte_offset: number;
-    unit: 'bit' | 'byte';
-    len: number;
-    bit_offset: number;
-}
-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';
-export interface IDataPointAttr {
-    display_name: string;
-    uint_spec: IUnitSpec;
-    name: string;
-    data_type: TDataType;
-    position: IDataPointPosition;
-    type: TDataOptionType;
-    id: number;
-    enum: string[];
-    desc: string;
-}
 interface IRawData {
     header: string;
     len: string;

package/dist/src/randomCode.d.ts

@@ -1,7 +1,3 @@
-interface IGetRandomCodes {
-    SSID: string;
-    password: string;
-    pks: string[];
-}
+import { IGetRandomCodes } from './types';
 declare const getRandomCodes: ({ SSID, password, pks }: IGetRandomCodes) => string[];
 export default getRandomCodes;

package/dist/src/sdk.d.ts

@@ -1,101 +1,6 @@
-import { IDataPointConfig } from './protocol/DataPoint';
-import { OTAEventCallback, OTAProgressEventCallback } from './handler/ble';
 import { TLogType } from './GizLog';
-import { IOpenApiDevice, ISafeRegisterReturn, IUnbindReturn } from './services/devices';
-import { ILoginRes } from './services/login';
-import { ConfigEventData } from './wifiConfig/ConfigBase';
-interface SyncCallBackParams {
-    event: TSyncEvnet;
-    currentNum?: number;
-    totalNum?: number;
-    message?: string;
-}
-type TSyncEvnet = 'SYNC_START' | 'SYNC_END' | 'SYNC_FAIL' | 'SYNC_CANCEL' | 'SYNC_PROGRESS';
-export type SyncCallBack = (data: SyncCallBackParams) => void;
-export type IOTAType = 'MCU' | 'MODULE';
-export interface ISDKResult<T> {
-    data?: T;
-    err?: IError;
-    message?: string;
-    success: boolean;
-}
-export interface ISetCommonDeviceOnboardingDeployProps {
-    ssid: string;
-    bssid?: string;
-    password: string;
-    timeout: number;
-    isBind?: boolean;
-    mode?: 0 | 3 | 5;
-    softAPSSIDPrefix?: string;
-}
-export interface ISetDeviceOnboardingDeployProps extends ISetCommonDeviceOnboardingDeployProps {
-    softAPSSIDPrefix: string;
-    eventCallBack: (event: ConfigEventData) => void;
-}
-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;
-}
-type TDeviceListNotifications = (devices: IDevice[]) => void;
-type TDeviceStatusNotifications = (data: IDeviceStatusNoti) => void;
-type TDeviceAttrsNotifications = (data: IDeviceAttrsNoti) => void;
-type OnScanListChange = (devices: IDevice[]) => void;
-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 type TimeoutHandle = ReturnType<typeof setTimeout> | null;
-export 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;
-}
+import { ISafeRegisterReturn, IUnbindReturn } from './services/devices';
+import { IDevice, TConnectType, IOpenApiDevice, GizwitsSdkOption, SyncCallBack, ISDKResult, IResult, IOTAType, IBindRemoteDeviceParams, TListenerType, ISetDeviceOnboardingDeployProps, IDataPointConfig, OTAEventCallback, OTAProgressEventCallback, ILoginRes, IDeviceSafetyRegisterParams } from './types';
 declare class GizwitsMiniSDK {
     private listenerMap;
     private keepScanTimer;
@@ -163,7 +68,7 @@ declare class GizwitsMiniSDK {
     getDeviceStatus: (device: IDevice, attrNames?: string[]) => Promise<any>;
     subscribe: (device: IDevice, connectType?: TConnectType, _autoGetDeviceStatus?: boolean) => Promise<IResult<any> | {
         success: boolean;
-        errorCode: IError;
+        errorCode: import("./types").IError;
     } | {
         success: boolean;
         errorCode?: undefined;
@@ -173,7 +78,7 @@ declare class GizwitsMiniSDK {
     }>;
     batchSubscribe: (devices: IDevice[], connectType?: TConnectType) => Promise<{
         success: boolean;
-        errorCode: IError;
+        errorCode: import("./types").IError;
     } | {
         success: boolean;
         errorCode?: undefined;
@@ -191,7 +96,7 @@ declare class GizwitsMiniSDK {
     checkUpdate: ({ device, type }: {
         device: IDevice;
         type: IOTAType;
-    }) => Promise<import("./openApiRequest").IServiceResult<import("./services/ota").OTARes>>;
+    }) => Promise<import("./types").IServiceResult<import("./types").OTARes>>;
     getDeviceInfo: ({ device }: {
         device: IDevice;
     }) => Promise<IResult<import("./protocol/DeviceInfo").default>>;
@@ -200,7 +105,7 @@ declare class GizwitsMiniSDK {
         type: IOTAType;
         onProgress: OTAProgressEventCallback;
         onEvent: OTAEventCallback;
-    }) => Promise<import("./openApiRequest").IServiceResult<import("./services/ota").OTARes>>;
+    }) => Promise<import("./types").IServiceResult<import("./types").OTARes>>;
     unbindDevice: ({ devices, }: {
         devices: IDevice[];
     }) => Promise<ISDKResult<IUnbindReturn>>;
@@ -209,14 +114,14 @@ declare class GizwitsMiniSDK {
     setDeviceOnboardingDeploy: ({ ssid, bssid, password, mode, timeout, isBind, softAPSSIDPrefix, eventCallBack }: ISetDeviceOnboardingDeployProps) => Promise<ISDKResult<IDevice[]>>;
     private setDomain;
     private deviceSafetyApi;
-    getBindingList: () => Promise<import("./openApiRequest").IServiceResult<IDevice[]>>;
+    getBindingList: () => Promise<import("./types").IServiceResult<IDevice[]>>;
     getDevices: () => Promise<ISDKResult<IDevice[]>>;
     stopDeviceOnboardingDeploy: () => void;
     setLogLevel: (level: TLogType) => {
         success: boolean;
-        err: IError;
+        err: import("./types").IError;
     };
-    renameDevice: (device: IDevice, name: string) => Promise<import("./openApiRequest").IServiceResult<import("./services/devices").IRenamePropsReturn> | {
+    renameDevice: (device: IDevice, name: string) => Promise<import("./types").IServiceResult<import("./services/devices").IRenamePropsReturn> | {
         success: boolean;
         message: string;
     }>;

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

@@ -1,20 +1,4 @@
-import { IServiceResult } from '../openApiRequest';
-import { IRandomCodesResult } from '../sdk';
-export interface IOpenApiDevice {
-    product_key: string;
-    did: string;
-    mac: string;
-    passcode: string;
-    is_online: boolean;
-    host: string;
-    port: string;
-    port_s: string;
-    ws_port: number;
-    wss_port: number;
-    dev_alias: string;
-    remark: string;
-    type: 'normal' | 'center_control' | 'sub_dev';
-}
+import { IDevice, IOpenApiDevice, IRandomCodesResult, IServiceResult } from '../types';
 export declare const getBindingList: () => Promise<IServiceResult<IDevice[]>>;
 export interface IBindMacParams {
     mac: string;

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

@@ -1,8 +1,4 @@
-export interface ILoginRes {
-    expire_at: number;
-    token: string;
-    uid: string;
-}
+import { ILoginRes } from "../types";
 export declare function AnonymousLogin({ uid }: {
     uid: string;
-}): Promise<import("../openApiRequest").IServiceResult<ILoginRes>>;
+}): Promise<import("../types").IServiceResult<ILoginRes>>;

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

@@ -1,3 +1,4 @@
+import { IDevice } from '../types';
 type EventType = "BleDeviceConnectStart" | "BleDeviceConnectEnd" | "BleDeviceConnectBind" | "BleDeviceConnectLogin" | "BleDeviceConnectFinish";
 type FailureType = Omit<EventType, 'BleDeviceConnectStart' | 'BleDeviceConnectFinish'>;
 interface IProps {
@@ -7,5 +8,5 @@ interface IProps {
     success: boolean;
     failureType?: FailureType;
 }
-export declare function reportEvent({ device, eventID, eventType, success, failureType }: IProps): Promise<import("../openApiRequest").IServiceResult<any>>;
+export declare function reportEvent({ device, eventID, eventType, success, failureType }: IProps): Promise<import("../types").IServiceResult<any>>;
 export {};

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

@@ -1,11 +1,7 @@
-import { IOTAType } from "../sdk";
-export interface OTARes {
-    download_url: string;
-    soft_ver: string;
-}
+import { IOTAType, OTARes } from "../types";
 export declare function checkUpdate({ did, type, hardVersion, softVersion }: {
     did: string;
     type: IOTAType;
     hardVersion: string;
     softVersion: string;
-}): Promise<import("../openApiRequest").IServiceResult<OTARes>>;
+}): Promise<import("../types").IServiceResult<OTARes>>;

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

@@ -1,3 +1,4 @@
+import { IDevice } from "../types";
 export interface IUploadRes {
 }
 interface IData {
@@ -9,5 +10,5 @@ interface IProps {
     data: IData[];
     productSecret: string;
 }
-export declare function uploadP0({ device, data, productSecret }: IProps): Promise<import("../openApiRequest").IServiceResult<IUploadRes>>;
+export declare function uploadP0({ device, data, productSecret }: IProps): Promise<import("../types").IServiceResult<IUploadRes>>;
 export {};