mini_program_gizwits_sdk 3.3.2 → 3.3.25-kuka

package/dist/src/aepApi/aepApiRequest.d.ts

@@ -0,0 +1,7 @@
+export interface IServiceResult<T> {
+    success: boolean;
+    data?: T;
+    err?: IError;
+}
+declare const aepApiRequest: <T>(url: string, options: any, needToken?: boolean) => Promise<IServiceResult<T>>;
+export default aepApiRequest;

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

@@ -38,7 +38,7 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private serviceUUIDSuffix;
     connectedList: ConnectDevice[];
     private connectingDevId;
-    pks: string[];
+    private pks;
     private listenDevOfflineTimer;
     private boradcastTimer;
     private boradcastDataCache;
@@ -48,9 +48,6 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private disableScanFlag;
     private peripheralServer;
     private isActive;
-    private _offlineThreshold;
-    set offlineThreshold(value: any);
-    get offlineThreshold(): any;
     scanList: IDevice[];
     constructor({ pks, bleHandleParams, offlineThreshold, }: ConstructorParams);
     private onBluetoothAdapterStateChange;

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

@@ -18,7 +18,7 @@ export interface TLanHandleEvent {
 }
 export declare class LanHandle extends EventListener<TLanHandleEvent> {
     connectedList: ConnectDevice[];
-    pks: string[];
+    private pks;
     scanList: ILanDevice[];
     private boradcastTimer;
     private UDPSocket;

package/dist/src/sdk.d.ts

@@ -21,7 +21,7 @@ export interface ISetCommonDeviceOnboardingDeployProps {
     password: string;
     timeout: number;
     isBind?: boolean;
-    mode?: 0 | 3;
+    mode?: 0 | 3 | 10;
     softAPSSIDPrefix?: string;
 }
 export interface ISetDeviceOnboardingDeployProps extends ISetCommonDeviceOnboardingDeployProps {
@@ -75,6 +75,7 @@ export interface IResult<T> {
 }
 interface ICloudServiceInfo {
     openAPIInfo: string;
+    aepInfo: string;
 }
 export declare type TimeoutHandle = ReturnType<typeof setTimeout> | null;
 export declare type IntervalHandle = ReturnType<typeof setInterval> | null;
@@ -92,6 +93,7 @@ interface GizwitsSdkOption {
     offlineThreshold?: number;
 }
 declare class GizwitsMiniSDK {
+    private version;
     private listenerMap;
     private keepScanTimer;
     private _deviceList;
@@ -118,12 +120,10 @@ declare class GizwitsMiniSDK {
     private syncDataTimoutTimer;
     private SYNC_TIMEOUT;
     private syncDevice?;
-    constructor(props: GizwitsSdkOption);
+    constructor({ appID, appSecret, productInfo, cloudServiceInfo, token, uid, offlineThreshold, }: GizwitsSdkOption);
     private get bleHandle();
     private get lanHandle();
     private get socketHandle();
-    private init;
-    reInit(props: GizwitsSdkOption): void;
     get specialProductKeys(): string[];
     get specialProductKeySecrets(): string[];
     private handleBleError;
@@ -138,7 +138,7 @@ declare class GizwitsMiniSDK {
     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: () => {
+    getVersion: () => {
         success: boolean;
         data: string;
     };

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

@@ -0,0 +1,67 @@
+import { IResult } from "../sdk";
+import ConfigBase from "./ConfigBase";
+import { BleHandle } from "../handler/ble";
+interface IVerifyOnlineResult {
+    data: {
+        mac: string;
+        onlineStatus: number;
+        lastOnlineTime: string;
+    };
+}
+interface IConfigResult {
+    mac: string;
+    productKey: string;
+}
+interface IArgs {
+    bleDeviceId: string;
+    arrayBuffer: ArrayBuffer;
+    serviceUUIDSuffix?: string;
+    characteristicUUIDSuffix?: string;
+    bleHandle: BleHandle;
+}
+export declare function sendBLEConfigCmd({ bleDeviceId, arrayBuffer, serviceUUIDSuffix, characteristicUUIDSuffix, bleHandle }: IArgs): Promise<boolean | void>;
+interface configBLEDeviceParams {
+    ssid: string;
+    password: string;
+    softAPSSIDPrefix?: string;
+    timeout: number;
+}
+interface ISetDeviceOnboardingDeployProps {
+    timeout: number;
+    isBind: boolean;
+    softAPSSIDPrefix: string;
+}
+interface IOnlieTimeMap {
+    [key: string]: string;
+}
+declare class BLEAliCloudConfig extends ConfigBase {
+    bleHandle: BleHandle;
+    lastestOnlineTimeMap: IOnlieTimeMap;
+    constructor(ssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[], bleHandle: BleHandle);
+    destroy: () => void;
+    isValidBleDevice: (bleDevice: WechatMiniprogram.BlueToothDevice, softAPSSIDPrefix?: string) => boolean;
+    enableBluetoothDevicesDescovery: () => Promise<{
+        success: false;
+        err: IError;
+    } | {
+        success: true;
+    }>;
+    enableAndGetBluetoothDevices: (softAPSSIDPrefix?: string) => Promise<{
+        success: false;
+        err: IError;
+    } | {
+        success: true;
+        bleDevices?: WechatMiniprogram.BlueToothDevice[];
+    }>;
+    setDeviceOnboardingDeploy: ({ timeout, isBind, softAPSSIDPrefix, }: ISetDeviceOnboardingDeployProps) => Promise<IResult<IDevice[]>>;
+    getDeviceLastestOnlineTime: ({ productKey, mac }: {
+        productKey: string;
+        mac: string;
+    }) => Promise<import("../aepApi/aepApiRequest").IServiceResult<IVerifyOnlineResult>>;
+    verifyDeviceOnline: ({ productKey, mac }: {
+        productKey: string;
+        mac: string;
+    }) => Promise<IResult<IVerifyOnlineResult>>;
+    configBLEDevice: ({ ssid, password, softAPSSIDPrefix, }: configBLEDeviceParams) => Promise<IResult<IConfigResult>>;
+}
+export default BLEAliCloudConfig;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.3.2",
-  "description": "增加代理蓝牙设备重置功能",
+  "version": "3.3.25-kuka",
+  "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",

package/src/aepApi/aepApiRequest.ts

@@ -0,0 +1,62 @@
+import request from '../request';
+import { getGlobalData } from "../globalData";
+import errorCode from '../errorCode';
+
+interface IResult<T> {
+  data: T;
+  errMsg: string;
+  statusCode: number;
+}
+
+export interface IServiceResult<T> {
+  success: boolean;
+  data?: T;
+  err?: IError;
+}
+
+
+const aepApiRequest = async <T>(url: string, options: any, needToken: boolean = true): Promise<IServiceResult<T>> => {
+  const requestOptions = { ...options };
+  const headers: any = {
+    'Content-Type': 'application/json',
+    'X-Gizwits-Application-Id': getGlobalData('appID'),
+  };
+
+  if (needToken) {
+    headers['Authorization'] = getGlobalData('token');
+  }
+
+  requestOptions.header = { ...headers, ...options.headers };
+  delete requestOptions.headers;
+  const aepApiUrl = getGlobalData('cloudServiceInfo').aepInfo;
+  const res = await request<IResult<T>>(aepApiUrl + url, requestOptions);
+  // 统一封装OPEN API的错误码
+  if (res.statusCode >= 200 && res.statusCode < 300) {
+    return {
+      success: true,
+      data: res.data
+    }
+  }
+
+  let baseError = {
+    success: false,
+    err: {
+      errorCode: errorCode.GIZ_SDK_HTTP_REQUEST_FAILED.errorCode,
+      errorMessage: '',
+    }
+  }
+  try {
+    baseError = {
+      success: false,
+      err: {
+        errorCode: (res.data as any).error_code,
+        errorMessage: (res.data as any).error_message,
+      }
+    }
+  } catch (error) {
+
+  }
+  return baseError;
+}
+
+export default aepApiRequest;

package/src/handler/ble.ts

@@ -18,7 +18,6 @@ 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 = (
@@ -73,12 +72,12 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   // private characteristicUUIDSuffix: string;
   public connectedList: ConnectDevice[] = [];
   private connectingDevId: string | null = null;
-  public pks: string[] = [];
+  private pks: string[] = [];
   private listenDevOfflineTimer: any = null; 
 
   private boradcastTimer: any;
   private boradcastDataCache: any = {}
-  private baseServices: string[] = ['ABF8', 'ABF0', 'F0AB', 'F8AB'];
+  private baseServices: string[] = [];
 
   private tmpBleData = ''; // 接收分包数据用
   private tmpDataNum = 0; // 剩余字节数
@@ -88,23 +87,13 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
   private isActive = true; // 小程序是否活跃
 
-  private _offlineThreshold = null;
-  public set offlineThreshold(value) {
-    this._offlineThreshold = value;
-  }
-
-  public get offlineThreshold() {
-    return this._offlineThreshold || 10000;
-  }
-
-
   // private globalListenerMap = {};
   public scanList: IDevice[] = [];
   constructor({
     pks = [],
     bleHandleParams = {
-      serviceUUIDSuffix: 'abf0',
-      characteristicUUIDSuffix: 'abf7',
+      serviceUUIDSuffix: 'fe60',
+      characteristicUUIDSuffix: 'fe61',
     },
     offlineThreshold,
   }: ConstructorParams) {
@@ -118,8 +107,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     // 或 addEventListener 参数 deviceData deviceList error
     // this.globalListenerMap = globalListenerMap;
 
-    this.offlineThreshold = offlineThreshold;
-    this.listenDevOffline();
+    this.listenDevOffline(offlineThreshold ?? 10000);
     this.listenConnection();
     
     wx.onAppShow(this.onAppShow);
@@ -152,7 +140,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   }
 
   
-  private listenDevOffline = () => {
+  private listenDevOffline = (offlineThreshold: number) => {
     // 定时检查设备列表，移除超时设备
     this.listenDevOfflineTimer = setInterval(() => {
       // 非激活状态不处理
@@ -167,9 +155,9 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
         }
         // 广播类型的设备由于性能问题，双倍的时间才触发离线
         if (d.connectType === "BLE_BROADCAST") {
-          return now - d.ctime < this.offlineThreshold * 2;
+          return now - d.ctime < offlineThreshold * 2;
         }
-        return now - d.ctime < this.offlineThreshold;
+        return now - d.ctime < offlineThreshold;
       });
       if (newDeviceList.length !== this.scanList.length) {
         this.scanList = newDeviceList;
@@ -390,6 +378,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
      */
     (unionBy(resData.devices, 'deviceId') as GizwitsWxBlueToothDevice[]).map((device) => {
       const { advertisData, deviceId, name, localName } = device;
+
       const advertisDataStr = ab2hex(advertisData);
 
         // 从服务uuid里面扫描广播类的设备
@@ -590,36 +579,34 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
         })
         .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',
-          };
-        }
-      }
-
-      // 绑定失败，异常退出断开蓝牙
-      await wx.closeBLEConnection({
-        deviceId,
-      });
+      // 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) {
+
+      //     return {
+      //       success: true,
+      //       message: 'ok',
+      //     };
+      //   }
+      // }
+
+      // // 绑定失败，异常退出断开蓝牙
+      // await wx.closeBLEConnection({
+      //   deviceId,
+      // });
 
       return {
-        success: false,
+        success: true,
         message: 'ok',
       };
     } finally {

package/src/handler/lan.ts

@@ -33,7 +33,7 @@ export interface TLanHandleEvent {
 export class LanHandle extends EventListener<TLanHandleEvent> {
   // private characteristicUUIDSuffix: string;
   public connectedList: ConnectDevice[] = [];
-  public pks: string[] = [];
+  private pks: string[] = [];
   // private globalListenerMap = {};
   public scanList: ILanDevice[] = [];
 

package/src/handler/socket.ts

@@ -28,9 +28,9 @@ interface IGWSProps extends ICommonProps {
 
 export default class GizwitsWS {
 
-  public appID: string;
-  public token: string;
-  public uid: string;
+  appID: string;
+  token: string;
+  uid: string;
   _maxSocketNum: number;
   _bindingDevices: { [did: string]: IDevice } | null = null;
   _connections: { [wsInfo: string]: Connection } = {};
@@ -425,6 +425,13 @@ export class Connection {
           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)) {
         this._websocket.send({

package/src/sdk.ts

@@ -4,6 +4,7 @@ import GizwitsWS from './handler/socket';
 
 import ApConfig from './wifiConfig/ap';
 import BLEConfig from './wifiConfig/ble';
+import BLEAliConfig from './wifiConfig/ble_ailCloud';
 import GizLog, { TLogType } from './GizLog';
 import { errorCode } from '..';
 import { AnonymousLogin, ILoginRes } from './services/login';
@@ -34,11 +35,7 @@ import { CancelSync, DeletePackage, RequestSync, SyncPackage } from './protocol/
 import { uploadP0 } from './services/uploadP0';
 import sleep from './sleep';
 import Ntp from './protocol/Ntp';
-import sdkConfig from '../package.json';
-import Reset from './protocol/Reset';
-import SetReset from './protocol/SetReset';
 
-const version = sdkConfig.version;
 interface SyncCallBackParams {
   event: TSyncEvnet;
   currentNum?: number;
@@ -61,7 +58,7 @@ export interface ISetCommonDeviceOnboardingDeployProps {
   password: string;
   timeout: number;
   isBind?: boolean;
-  mode?: 0 | 3; // 0 AP 3 BLE
+  mode?: 0 | 3 | 10; // 0 AP 3 BLE 10 BLE Ali
   softAPSSIDPrefix?: string;
 }
 
@@ -128,6 +125,7 @@ export interface IResult<T> {
 
 interface ICloudServiceInfo {
   openAPIInfo: string;
+  aepInfo: string;
 }
 
 export type TimeoutHandle = ReturnType<typeof setTimeout> | null;
@@ -147,6 +145,7 @@ interface GizwitsSdkOption {
 }
 
 class GizwitsMiniSDK {
+  private version = '3.1.11-1';
   private listenerMap: any = {};
   private keepScanTimer: any = null;
 
@@ -269,8 +268,38 @@ class GizwitsMiniSDK {
   private SYNC_TIMEOUT: number = 4 * 60 * 1000
   private syncDevice?: IDevice;
 
-  constructor(props: GizwitsSdkOption) {
-    this.init(props);
+  constructor({
+    appID,
+    appSecret,
+    productInfo,
+    cloudServiceInfo,
+    token,
+    uid,
+    offlineThreshold,
+  }: GizwitsSdkOption) {
+    this.productInfo = productInfo;
+    // 保存相关信息
+    setGlobalData('appID', appID);
+    setGlobalData('appSecret', appSecret);
+    setGlobalData('productInfo', productInfo);
+    setGlobalData('token', token);
+    setGlobalData('uid', uid);
+
+    /**
+     * 同时也设置域名信息
+     */
+    this.setDomain(cloudServiceInfo);
+
+    this.offlineThreshold = offlineThreshold;
+
+    GizLog.debug(`init sdk success, current version: ${this.version}`);
+
+    /**
+     * lan 比较特殊
+     * 初始化sdk的时候就要开始扫描设备
+     */
+    this.initLan();
+    
   }
 
   private get bleHandle() {
@@ -307,63 +336,6 @@ class GizwitsMiniSDK {
     return this._gizSocket;
   }
 
-
-  private init = ({
-    appID,
-    appSecret,
-    productInfo,
-    cloudServiceInfo,
-    token,
-    uid,
-    offlineThreshold,
-  }: GizwitsSdkOption) => {
-    this.productInfo = productInfo;
-    // 保存相关信息
-    setGlobalData('appID', appID);
-    setGlobalData('appSecret', appSecret);
-    setGlobalData('productInfo', productInfo);
-    setGlobalData('token', token);
-    setGlobalData('uid', uid);
-
-    /**
-     * 同时也设置域名信息
-     */
-    this.setDomain(cloudServiceInfo);
-
-    this.offlineThreshold = offlineThreshold;
-
-    GizLog.debug(`init sdk success, current version: ${GizwitsMiniSDK.getVersion().data}`);
-
-    /**
-     * lan 比较特殊
-     * 初始化sdk的时候就要开始扫描设备
-     */
-    this.initLan();
-  }
-  public reInit(props: GizwitsSdkOption) {
-    this.init(props);
-
-    // 更新handler 参数
-    this.lanHandle.pks = this.specialProductKeys;
-    this.bleHandle.pks = this.specialProductKeys;
-    this.bleHandle.offlineThreshold = props.offlineThreshold;
-
-    const { appID, token, cloudServiceInfo = {openAPIInfo: ''} } = props;
-    const openAPIInfo = (cloudServiceInfo && cloudServiceInfo.openAPIInfo) || 'api.gizwits.com';
-    if (appID !== getGlobalData('appID') || 
-        token !== getGlobalData('token') ||
-        openAPIInfo !== getGlobalData('cloudServiceInfo').openAPIInfo
-      ) {
-      // 需要重启
-      this.socketHandle.destory();
-      this._gizSocket = null;
-      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-      this.socketHandle;
-
-      this.getBindingList();
-    }
-  }
-
   get specialProductKeys() {
     return this.productInfo.map((item) => item.productKey ?? '');
   }
@@ -454,32 +426,6 @@ class GizwitsMiniSDK {
           }
           break
         }
-        case '0062': {
-          // 蓝牙重置命令，app代理设备进行重置
-          const resetInfo = new Reset(bleBytesData)
-          GizLog.debug("收到代理重置事件", resetInfo)
-
-          if (resetInfo.status === 1) {
-            // 需要重置
-            this.deviceSafetyApi({
-              mac: target.mac,
-              productKey: target.productKey,
-              isReset: true
-            }).then(async data => {
-              GizLog.debug("代理重置结果", data)
-              if (data.success && data.data.successDevices.length > 0) {
-                // 回写数据
-                GizLog.debug("重置成功，回写数据")
-                await this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(SetReset.pack(0)).buffer)
-              }
-            })
-          }
-          break;
-        }
-        case '0064': {
-          // 回写重置结果ack，暂时先忽略
-          break;
-        }
         case '0052': {
           // 设备回复是否允许同步数据
           const requestSyncData = new RequestSync(bleBytesData)
@@ -710,10 +656,10 @@ class GizwitsMiniSDK {
     }
   };
 
-  static getVersion = () => {
+  getVersion = () => {
     return {
       success: true,
-      data: version,
+      data: this.version,
     };
   };
 
@@ -1244,6 +1190,26 @@ class GizwitsMiniSDK {
           GizLog.debug('GIZ_SDK: 配网用时:' + (eTime - sTime));
           return data;
         }
+        case 10: {
+          this.currentWifiConfigHandle = new BLEAliConfig(
+            ssid,
+            password,
+            this.specialProductKeys,
+            this.specialProductKeySecrets,
+            this.bleHandle
+          );
+          const data =
+            await this.currentWifiConfigHandle.setDeviceOnboardingDeploy({
+              timeout,
+              isBind,
+              softAPSSIDPrefix,
+            });
+          this.currentWifiConfigHandle = null;
+          const eTime = new Date().getTime();
+          GizLog.debug('GIZ_SDK: 配网结束时间:' + eTime);
+          GizLog.debug('GIZ_SDK: 配网用时:' + (eTime - sTime));
+          return data;
+        }
       }
     } catch (error) {
       GizLog.error("GIZ_SDK: setDeviceOnboardingDeploy", new Error(JSON.stringify(error)));
@@ -1268,8 +1234,10 @@ class GizwitsMiniSDK {
   private setDomain = (cloudServiceInfo: ICloudServiceInfo) => {
     const openAPIInfo =
       (cloudServiceInfo && cloudServiceInfo.openAPIInfo) || 'api.gizwits.com';
+    const aepInfo =
+      (cloudServiceInfo && cloudServiceInfo.aepInfo) || 'https://gj-app.iotsdk.com/';
 
-    const newData = { ...(cloudServiceInfo || {}), openAPIInfo };
+    const newData = { ...(cloudServiceInfo || {}), openAPIInfo, aepInfo };
     setGlobalData('cloudServiceInfo', newData);
   };