mini_program_gizwits_sdk 3.2.30 → 3.3.0

package/src/sdk.ts

@@ -1,17 +1,12 @@
-import { getGlobalData, setGlobalData } from './globalData';
+import { setGlobalData, getGlobalData } from './globalData';
 import { BleHandle } from './handler/ble';
 import GizwitsWS from './handler/socket';
 
-import { errorCode } from '..';
-import sdkConfig from '../package.json';
+import ApConfig from './wifiConfig/ap';
+import BLEConfig from './wifiConfig/ble';
 import GizLog, { TLogType } from './GizLog';
-import { LanHandle } from './handler/lan';
-import productConfigFileManage from './productConfigFileManage';
-import { formatEnum, IDataPointConfig, pack, unpack } from './protocol/DataPoint';
-import Ntp from './protocol/Ntp';
-import { CancelSync, DeletePackage, RequestSync, SyncPackage } from './protocol/OffLineData';
-import ProtocolBase from './protocol/ProtocolBase';
-import { arrayToString, hexStrint2byte } from './protocol/tool';
+import { errorCode } from '..';
+import { AnonymousLogin, ILoginRes } from './services/login';
 import {
   bindMac,
   editBindInfo,
@@ -20,21 +15,28 @@ import {
   ISafeRegisterReturn,
   IUnbindReturn,
   safeRegister,
-  unbindDevice
+  unbindDevice,
 } from './services/devices';
-import { AnonymousLogin, ILoginRes } from './services/login';
-import { uploadP0 } from './services/uploadP0';
-import sleep from './sleep';
 import {
   getFirstConnectType,
   getProductInfoThroughPK,
   isSameDevice,
   merageBleLocalDevices,
   merageLanLocalDevices,
-  numberArray2Uint8Array
+  numberArray2Uint8Array,
 } from './utils';
-import ApConfig from './wifiConfig/ap';
-import BLEConfig from './wifiConfig/ble';
+import productConfigFileManage from './productConfigFileManage';
+import { formatEnum, IDataPointConfig, pack, unpack } from './protocol/DataPoint';
+import { arrayToString, hexStrint2byte } from './protocol/tool';
+import { LanHandle } from './handler/lan';
+import ProtocolBase from './protocol/ProtocolBase';
+import { CancelSync, DeletePackage, RequestSync, SyncPackage } from './protocol/OffLineData';
+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 {
@@ -252,7 +254,7 @@ class GizwitsMiniSDK {
 
   private _bleHandle: BleHandle;
   private _lanHandle: LanHandle;
-
+  
   // private autoScanInterval: IntervalHandle = null;
 
   private _gizSocket: GizwitsWS;
@@ -348,7 +350,7 @@ class GizwitsMiniSDK {
 
     const { appID, token, cloudServiceInfo = {openAPIInfo: ''} } = props;
     const openAPIInfo = (cloudServiceInfo && cloudServiceInfo.openAPIInfo) || 'api.gizwits.com';
-    if (appID !== getGlobalData('appID') ||
+    if (appID !== getGlobalData('appID') || 
         token !== getGlobalData('token') ||
         openAPIInfo !== getGlobalData('cloudServiceInfo').openAPIInfo
       ) {
@@ -405,7 +407,7 @@ class GizwitsMiniSDK {
     }
   }
   private handleBleDeviceData = async (
-    curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult,
+    curDevice: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult,
     hexString: string
   ) => {
     const target = this.allDevices.find(
@@ -426,7 +428,7 @@ class GizwitsMiniSDK {
             if (productConfig) {
               const uploadTime = parseInt(`${Date.now() / 1000}`, 10)
               uploadP0({
-                device: target,
+                device: target, 
                 data: [
                   {
                     raw: hexString,
@@ -438,7 +440,7 @@ class GizwitsMiniSDK {
                 GizLog.debug("设备上报数据:timestemp", new Date(uploadTime * 1000).toLocaleString(), data)
               })
             }
-
+            
           }
           const data = await unpack(hexStrint2byte(hexString), target.productKey);
           // 如果有kydata 则上报
@@ -452,6 +454,32 @@ 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)
@@ -493,7 +521,7 @@ class GizwitsMiniSDK {
           try {
             GizLog.debug("设备上报离线数据:timestemp", new Date(syncPackageData.timestemp * 1000).toLocaleString())
           } catch (error) {
-
+            
           }
 
           const productConfig = this.productInfo.find(item => item.productKey === this.syncDevice.productKey)
@@ -510,7 +538,7 @@ class GizwitsMiniSDK {
             })
             GizLog.debug("上传离线数据结果", uploadRes)
           }
-
+          
           this.syncCurrnetNum += 1;
           // 通知设备删除
           this.syncDataCallBack({
@@ -529,7 +557,7 @@ class GizwitsMiniSDK {
           } else {
             // 结束同步
             GizLog.debug("send cancel sync to device")
-            this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(CancelSync.pack()).buffer)
+            this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(CancelSync.pack()).buffer) 
             this.syncDataCallBack({
               event: "SYNC_END",
             })
@@ -576,7 +604,7 @@ class GizwitsMiniSDK {
       const isOnline = (data as IDeviceStatusChangedProps).attrs.is_online;
       this.setDeviceMeta(target, 'isOnline', isOnline);
     }
-
+    
     if (this.listenerMap['GizDeviceAttrsNotifications']) {
 
       // 需要把枚举 拓展格式化回来
@@ -900,7 +928,7 @@ class GizwitsMiniSDK {
             try {
               res({success: false, message: 'timeout'})
             } catch (error) {
-
+              
             }
           }, 3000)
         })
@@ -1022,9 +1050,9 @@ class GizwitsMiniSDK {
     switch (type) {
       case 'BLE': {
         // 连接BLE
-        const data = await this.bleHandle.connectDevice(target);
+        const data = await this.bleHandle.connectDevice(target.bleDeviceID);
         if (data.success) {
-
+          
           // 蓝牙设备比较特殊，在get 里面从bleHandle里找到连接的设备，再把connectType 设置成BLE，所以这里更新metaData 要强制更新并推送
           this.setDeviceMeta(target, 'connectType', 'BLE', true);
           setTimeout(() => {
@@ -1270,8 +1298,6 @@ class GizwitsMiniSDK {
   public getBindingList = async () => {
     const data = await getBindingList();
     this.deviceList = data.data || [];
-    // 推送
-    this.notiDeviceList();
     return data;
   };
 
@@ -1375,4 +1401,4 @@ class GizwitsMiniSDK {
     this.keepScanTimer && clearInterval(this.keepScanTimer);
   };
 }
-export default GizwitsMiniSDK;
+export default GizwitsMiniSDK;

package/src/services/devices.ts

@@ -1,10 +1,10 @@
+import {  enc, AES, mode, pad } from 'crypto-js';
 import openApiRequest, { IServiceResult } from '../openApiRequest';
 import getRandomCodes from '../randomCode';
 import { IRandomCodesResult } from '../sdk';
 import { psKeySign } from './tool';
 // eslint-disable-next-line import/no-commonjs
 // const CryptoJS = require('crypto-js');
-import {  enc, AES, mode, pad } from 'crypto-js';
 
 export interface IOpenApiDevice {
   product_key: string;
@@ -26,6 +26,59 @@ interface IDeviceRes {
   devices: IOpenApiDevice[];
 }
 
+// 云端aes 特殊解码
+class Padding {
+  /**
+   * Pads data using the algorithm defined in PKCS #5/7.
+   *
+   * @param data The data to pad.
+   * @param blockSize The multiple that the data should be padded to.
+   *
+   * @example
+   *
+   *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+   */
+  pad = (data, blockSize) => {
+  }
+  
+
+  /**
+   * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+   *
+   * @param data The data to unpad.
+   *
+   * @example
+   *
+   *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+   */
+  unpad = (data) => {
+    const AES_BLOCK_LEN = 16;
+    const len = data.sigBytes;
+    let readed = 0;
+    let repeat = 1;
+    const stringData=  data.toString(enc.Utf8);
+    while(readed + AES_BLOCK_LEN <= len)
+    {
+        readed += AES_BLOCK_LEN;
+    }
+    for(let i = 0; i < (AES_BLOCK_LEN - 2) / 2; i++)
+    { 
+        const start = readed  - i * 2;
+        if(stringData.substring(start, start - 2) == stringData.substring(start - 2, start - 4))
+        {
+            repeat++;
+        }
+        else
+        {
+            readed -= repeat * 2;
+
+            break;
+        }
+    }
+    data.sigBytes = readed;
+  }
+}
+
 export const getBindingList = async (): Promise<IServiceResult<IDevice[]>> => {
   const data = await openApiRequest<IDeviceRes>(
     '/app/bindings?show_disabled=0&limit=1000&skip=0',
@@ -195,12 +248,23 @@ export async function safeRegister({
     false
   );
   if (data.success) {
-    // 解码
+    const successDevices = unPackSafeRegisterRes({productSecret, iv, data: data.data});
+    const failedDevices = [];
+
+    const targetDevice = successDevices.find(item => item.mac === mac);
+    if (!targetDevice) {
+      // 不存在
+      failedDevices.push({
+        mac,
+      })
+    }
+    
+    // TODO 解码
     return {
       success: true,
       data: {
-        successDevices: [],
-        failedDevices: [],
+        successDevices,
+        failedDevices,
       },
     };
   }
@@ -210,6 +274,30 @@ export async function safeRegister({
   };
 }
 
+const unPackSafeRegisterRes = ({productSecret, data, iv}: {productSecret: string, data: string, iv: any}) => {
+  const aesKey = enc.Hex.parse(productSecret)
+  const bodyHex = enc.Hex.parse(data)
+  let resEncrypted = AES.decrypt(enc.Base64.stringify(bodyHex), aesKey, { iv: iv, mode: mode.ECB, padding: new Padding() });
+  const resString = resEncrypted.toString(enc.Utf8);
+  const newData = [];
+  resString.split(',').map(item => {
+    const tmp = item.split('&');
+    const mac = tmp[0].replace('mac=', '');
+    const did = tmp[1].replace('did=', '');
+    newData.push({
+      mac, did
+    })
+  })
+  return newData;
+}
+
+// const unPackSafeRegister = unPackSafeRegisterRes({
+//   productSecret: 'aaa0840301e04748adaf9fcd160e7508',
+//   iv: enc.Hex.parse(''),
+//   data: '56ab36690dcb1e42bc3e69dab30c2e670c2188dfb76cb5a2f12986d18eb069f0f63d3c89ab069f3573ef81ca02936ad4'
+// })
+// console.log('unPackSafeRegisterunPackSafeRegister', unPackSafeRegister)
+
 interface IRenameProps {
   name?: string;
   did: string;

package/src/wifiConfig/ble.ts

@@ -2,15 +2,21 @@ import errorCode from "../errorCode";
 import { IRandomCodesResult, IResult } from "../sdk";
 import { ab2hex, advertisData2PkAndMac, isWXDevicesResult } from '../utils';
 
-import GizLog from "../GizLog";
-import { BleHandle } from "../handler/ble";
-import WifiConfig from "../protocol/WifiConfig";
-import sleep from "../sleep";
 import {
-  getBLEDeviceCharacteristics, getBLEDeviceServices, getBluetoothAdapterState, getBluetoothDevices,
-  notifyBLECharacteristicValueChange, retryConnect, startBluetoothDevicesDiscovery, unpackWriteBLECharacteristicValue
+  getBluetoothAdapterState,
+  startBluetoothDevicesDiscovery,
+  getBluetoothDevices,
+  notifyBLECharacteristicValueChange,
+  unpackWriteBLECharacteristicValue,
+  getBLEDeviceServices,
+  getBLEDeviceCharacteristics,
+  retryConnect,
 } from '../wechatApi';
+import sleep from "../sleep";
 import ConfigBase from "./ConfigBase";
+import WifiConfig from "../protocol/WifiConfig";
+import GizLog from "../GizLog";
+import { BleHandle } from "../handler/ble";
 
 interface IArgs {
   bleDeviceId: string;
@@ -56,10 +62,10 @@ export function sendBLEConfigCmd({
         'GIZ_SDK: createBLEConnection start: ', bleDeviceId
       );
       await bleHandle.disableScan()
-
+      
       const connectData = await retryConnect(bleDeviceId, 10 * 1000);
       bleHandle.enableScan();
-
+      
       GizLog.debug(
         'GIZ_SDK: createBLEConnection end, res:', connectData
       );
@@ -125,9 +131,9 @@ export function sendBLEConfigCmd({
         service.uuid,
         characteristic.uuid
       );
-
+      
       // 这里有个问题，模组好像不一定每次都会回
-      const handleBLECharacteristicValueChange = (res: WechatMiniprogram.OnBLECharacteristicValueChangeListenerResult) => {
+      const handleBLECharacteristicValueChange = (res: WechatMiniprogram.OnBLECharacteristicValueChangeCallbackResult) => {
         const hexString = ab2hex(res.value);
         GizLog.debug('GIZ_SDK: 收到设备返回ack', hexString)
         if (hexString === configAck) {
@@ -147,7 +153,7 @@ export function sendBLEConfigCmd({
       );
 
       if (checkInterrupt()) return;
-
+      
       await unpackWriteBLECharacteristicValue(
         bleDeviceId,
         service.uuid,
@@ -163,7 +169,7 @@ export function sendBLEConfigCmd({
           arrayBuffer
         );
       }, 2000)
-
+      
       // if (res.errCode === 0) {
       //   resolve(true);
       // } else{
@@ -219,7 +225,7 @@ class BLEConfig extends ConfigBase {
       // 无效蓝牙设备或者蓝牙设备广播数据为空，返回失败
       return false;
     }
-
+    
     const {productKey, mac} = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
 
 
@@ -243,7 +249,7 @@ class BLEConfig extends ConfigBase {
     //   await closeBluetoothAdapter();
     //   await openBluetoothAdapter();
     // } catch (error) {
-
+      
     // }
     const stateRes = await getBluetoothAdapterState();
     if (!stateRes.available) {
@@ -374,7 +380,7 @@ class BLEConfig extends ConfigBase {
               bleDevices,
               devices.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix))
             )
-          : wx.offBluetoothDeviceFound();
+          : wx.offBluetoothDeviceFound(handleFoundDevices);
       };
 
       wx.onBluetoothDeviceFound(handleFoundDevices);
@@ -408,7 +414,7 @@ class BLEConfig extends ConfigBase {
 
         // 如果有一个设备发送成功，则不再发现新设备
         GizLog.debug("GIZ_SDK: offBluetoothDeviceFound ready search device")
-        wx.offBluetoothDeviceFound();
+        wx.offBluetoothDeviceFound(handleFoundDevices);
       };
 
       // 开始大循环搜索
@@ -427,4 +433,4 @@ class BLEConfig extends ConfigBase {
   };
 }
 
-export default BLEConfig;
+export default BLEConfig;

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

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

package/src/services/monitor.ts

@@ -1,116 +0,0 @@
-import { version } from '../../package.json';
-import { getGlobalData } from "../globalData";
-import openApiRequest from '../openApiRequest';
-
-interface MobileInfo {
-  brand: string;
-  model: string; // 设备型号。新机型刚推出一段时间会显示unknown，微信会尽快进行适配。
-  pixelRatio: number;
-  systemVersion: string; // 操作系统版本
-  platform: string; // 客户端平台
-}
-
-interface AppInfo {
-  wxSdkVersion: string; // 客户端基础库版本
-  gizwitsSdkVersion: string; // Gizwits SDK 版本
-  appID: string; // gizwitsAppID
-  bluetoothEnabled?: boolean; // 蓝牙是否可用
-  locationEnabled?: boolean; // 定位是否可用
-  wifiEnabled?: boolean; // wifi是否可用
-}
-
-// 统计每天设备活跃数
-// 统计设备失败原因
-// 统计设备连接时长
-// 统计连接每个阶段时长
-
-type EventType = "BleDeviceConnectStart" | "BleDeviceConnectEnd" | "BleDeviceConnectBind" | "BleDeviceConnectLogin" | "BleDeviceConnectFinish";
-type FailureType = Omit<EventType, 'BleDeviceConnectStart' | 'BleDeviceConnectFinish'>
-
-interface Event {
-  origin: "MINI-WX",
-  mobileInfo: MobileInfo,
-  userInfo: null,
-  appInfo: AppInfo,
-  eventID: string,
-  eventType: EventType,
-  monitorTarget: {
-    device: {
-      mac: string;
-      did: string;
-      productKey: string;
-    },
-    success: boolean;
-    failureType?: FailureType
-  },
-  time: Date,
-  timeStamp: Number,
-}
-
-class BaseInfo {
-  mobile: MobileInfo;
-  app: AppInfo;
-  constructor() {
-    wx.getSystemInfoAsync({
-      success: (res) => {
-        this.app = {
-          wxSdkVersion: res.SDKVersion,
-          gizwitsSdkVersion: version,
-          appID: 'unknown',
-          bluetoothEnabled: res.bluetoothEnabled,
-          locationEnabled: res.locationEnabled,
-          wifiEnabled: res.wifiEnabled,
-        };
-
-        this.mobile = {
-          brand: res.brand,
-          model: res.model,
-          pixelRatio: res.pixelRatio,
-          systemVersion: res.system,
-          platform: res.platform,
-        };
-      },
-    });
-  }
-
-  updateAppId(appId: string) {
-    this.app.appID = appId;
-  }
-}
-
-const baseInfo = new BaseInfo();
-
-interface IProps {
-  device: IDevice;
-  eventID: string;
-  eventType: EventType,
-  success: boolean;
-  failureType?: FailureType
-}
-
-export async function reportEvent({ device, eventID, eventType, success, failureType }: IProps) {
-  baseInfo.updateAppId(getGlobalData('appID') || 'unknown');
-  const path = `/v2/products/${device.productKey}/devices/bluetooth-connect-data`;
-  const curDate = new Date();
-
-  const eventData: Event = {
-    origin: "MINI-WX",
-    mobileInfo: baseInfo.mobile,
-    userInfo: null,
-    appInfo: baseInfo.app,
-    eventID,
-    eventType,
-    monitorTarget: {
-      device,
-      success,
-      failureType,
-    },
-    time: curDate,
-    timeStamp: Math.floor(curDate.getTime() / 1000),
-  }
-
-  return openApiRequest<any>(path, {
-    data: eventData,
-    method: 'POST',
-  }, true);
-}