mini_program_gizwits_sdk 3.2.20-beta → 3.2.20

package/src/sdk.ts

@@ -9,6 +9,7 @@ import { errorCode } from '..';
 import { AnonymousLogin, ILoginRes } from './services/login';
 import {
   bindMac,
+  editBindInfo,
   getBindingList,
   IOpenApiDevice,
   ISafeRegisterReturn,
@@ -26,13 +27,29 @@ import {
 } from './utils';
 import productConfigFileManage from './productConfigFileManage';
 import { formatEnum, IDataPointConfig, pack, unpack } from './protocol/DataPoint';
-import { hexStrint2byte } from './protocol/tool';
+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';
+
+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
+
 
 // 接口返回格式
-interface ISDKResult<T> {
+export interface ISDKResult<T> {
   data?: T;
   err?: IError;
+  message?: string;
   success: boolean;
 }
 export interface ISetCommonDeviceOnboardingDeployProps {
@@ -182,7 +199,7 @@ class GizwitsMiniSDK {
       const index = newDevices.findIndex(
         (device) => device.bleDeviceID === item.deviceId
       );
-      if (index !== -1 && item.isLogin) {
+      if (index !== -1) {
         newDevices[index].connectType = 'BLE';
       }
     });
@@ -240,6 +257,15 @@ class GizwitsMiniSDK {
   private _gizSocket: GizwitsWS;
   private offlineThreshold?: number;
 
+  // 离线同步
+  private syncDataCallBack?: SyncCallBack = null
+  private syncDataLengthCallback?: any;
+  private syncTotalNum: number = 0
+  private syncCurrnetNum: number = 0
+  private syncDataTimoutTimer: any = null;
+  private SYNC_TIMEOUT: number = 4 * 60 * 1000
+  private syncDevice?: IDevice;
+
   constructor({
     appID,
     appSecret,
@@ -271,6 +297,7 @@ class GizwitsMiniSDK {
      * 初始化sdk的时候就要开始扫描设备
      */
     this.initLan();
+    
   }
 
   private get bleHandle() {
@@ -324,7 +351,6 @@ class GizwitsMiniSDK {
   };
 
   private handleBleDevices = (devices: IDevice[]) => {
-    GizLog.log('handleBleDevices', devices);
     this.bleDevices = devices;
     // this.notiDeviceList();
   };
@@ -358,15 +384,157 @@ class GizwitsMiniSDK {
       (item) => item.bleDeviceID === curDevice.deviceId
     );
     if (target) {
-      const data = await unpack(hexStrint2byte(hexString), target.productKey);
-      // 如果有kydata 则上报
-      if (data?.kvData && this.listenerMap['GizDeviceAttrsNotifications']) {
-        this.listenerMap['GizDeviceAttrsNotifications'].map((item) => {
-          item({
-            device: target,
-            data: data?.kvData,
-          });
-        });
+      const bleBytesData = hexStrint2byte(hexString)
+      const parseData = new ProtocolBase(bleBytesData);
+      switch (parseData.cmd) {
+        case '0093':
+        case '0094':
+        case '0090':
+        case '0091': {
+          // 设备上报的指令，上传给后台
+          console.debug('handleBleDeviceData', hexString, target)
+          if (target.passcode) {
+            const productConfig = this.productInfo.find(item => item.productKey === target.productKey)
+            if (productConfig) {
+              const uploadTime = parseInt(`${Date.now() / 1000}`, 10)
+              uploadP0({
+                device: target, 
+                data: [
+                  {
+                    raw: hexString,
+                    created_at: uploadTime
+                  }
+                ],
+                productSecret: productConfig.productSecret,
+              }).then(data => {
+                GizLog.debug("设备上报数据:timestemp", new Date(uploadTime * 1000).toLocaleString(), data)
+              })
+            }
+            
+          }
+          const data = await unpack(hexStrint2byte(hexString), target.productKey);
+          // 如果有kydata 则上报
+          if (data?.kvData && this.listenerMap['GizDeviceAttrsNotifications']) {
+            this.listenerMap['GizDeviceAttrsNotifications'].map((item) => {
+              item({
+                device: target,
+                data: data?.kvData,
+              });
+            });
+          }
+          break
+        }
+        case '0052': {
+          // 设备回复是否允许同步数据
+          const requestSyncData = new RequestSync(bleBytesData)
+          GizLog.debug("设备回复是否允许同步， state:" , requestSyncData.state)
+
+          this.syncDataLengthCallback && this.syncDataLengthCallback({success: requestSyncData.state == 0, data: requestSyncData.len})
+
+          if (!this.syncDataCallBack) break;
+          if (requestSyncData.state === 0) {
+            // 开始同步
+            this.syncCurrnetNum = 0;
+            this.syncTotalNum = requestSyncData.len;
+            this.syncDataCallBack({
+              event: 'SYNC_START',
+              totalNum: this.syncTotalNum,
+              currentNum: this.syncCurrnetNum
+            })
+            // 读取第0条
+            GizLog.debug("查询第一条离线数据")
+            await this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(SyncPackage.pack(0)).buffer)
+          } else {
+            GizLog.debug("设备返回状态为1，同步失败")
+
+            // 同步失败
+            this.syncDataCallBack({
+              event: 'SYNC_FAIL',
+            })
+          }
+          break
+        }
+        case '0054': {
+          if (!this.syncDataCallBack) break;
+          // 设备上报需要同步的数据
+          GizLog.debug("设备上报离线数据")
+
+          const syncPackageData = new SyncPackage(bleBytesData)
+          const deletePackageCmd = DeletePackage.pack(syncPackageData.id)
+          GizLog.debug("设备上报离线数据:payload", syncPackageData.payload)
+          try {
+            GizLog.debug("设备上报离线数据:timestemp", new Date(syncPackageData.timestemp * 1000).toLocaleString())
+          } catch (error) {
+            
+          }
+
+          const productConfig = this.productInfo.find(item => item.productKey === this.syncDevice.productKey)
+          if(productConfig) {
+            const uploadRes = await uploadP0({
+              device: this.syncDevice,
+              data: [
+                {
+                  raw: arrayToString(syncPackageData.payload),
+                  created_at: syncPackageData.timestemp
+                }
+              ],
+              productSecret: productConfig.productSecret
+            })
+            GizLog.debug("上传离线数据结果", uploadRes)
+          }
+          
+          this.syncCurrnetNum += 1;
+          // 通知设备删除
+          this.syncDataCallBack({
+            event: "SYNC_PROGRESS",
+            totalNum: this.syncTotalNum,
+            currentNum: this.syncCurrnetNum
+          })
+
+          GizLog.debug("通知设备删除：", syncPackageData.id)
+          await this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(deletePackageCmd).buffer)
+          await sleep(100)
+          // 查询新数据
+          if (syncPackageData.id < this.syncTotalNum - 1) {
+            GizLog.debug("查询新数据：", syncPackageData.id + 1)
+            await this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(SyncPackage.pack(syncPackageData.id + 1)).buffer)
+          } else {
+            // 结束同步
+            GizLog.debug("send cancel sync to device")
+            this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(CancelSync.pack()).buffer) 
+            this.syncDataCallBack({
+              event: "SYNC_END",
+            })
+            // 清除相关数据
+            this.cleanSyncDeviceData();
+          }
+          break
+        }
+        case '0058': {
+          if (!this.syncDataCallBack) break;
+          // 设备上报停止同步
+
+          const cancelData = new CancelSync(bleBytesData)
+          GizLog.debug("设备上报停止同步 state:", cancelData.state )
+
+          if (cancelData.state === 0) {
+            // 同步完成
+            this.syncDataCallBack({
+              event: "SYNC_END",
+            })
+          } else {
+            this.syncDataCallBack({
+              event: "SYNC_FAIL",
+            })
+          }
+          // 清除相关数据
+          this.cleanSyncDeviceData();
+          break
+        }
+        case '0060': {
+          // NTP回复
+          break
+        }
       }
     }
   };
@@ -402,7 +570,7 @@ class GizwitsMiniSDK {
     );
     GizLog.log('handleSocketStatus', dids, enabled);
     devices.forEach((item) => {
-      this.setDeviceMeta(item, 'connectType', enabled ? 'NONE' : 'WAN');
+      this.setDeviceMeta(item, 'connectType', enabled ? 'WAN' : 'NONE');
     });
   };
 
@@ -433,7 +601,7 @@ class GizwitsMiniSDK {
   /**
    * @description 开启后台自动扫描
    */
-  public startAutoScan = () => {
+  public startAutoScan = (services?: string[]) => {
     // 保持autoscan 运行 因为一些蓝牙的操作会导致搜索终止
     const autoTime = 9000;
 
@@ -451,11 +619,11 @@ class GizwitsMiniSDK {
       // }
       this.bleHandle.startScan((deviceList) => {
         this.bleDevices = deviceList;
-      }, -1);
+      }, -1, services);
     }, autoTime);
     this.bleHandle.startScan((deviceList) => {
       this.bleDevices = deviceList;
-    }, -1);
+    }, -1, services);
   };
 
   /**
@@ -523,12 +691,13 @@ class GizwitsMiniSDK {
    * @returns {success:boolean,data:IDevice[]}
    */
   public scanBleDevice = async (
-    delay: number
+    delay: number,
+    services?: string[]
   ): Promise<ISDKResult<IDevice[]>> => {
     this.bleHandle.scanList = [];
     const data = await this.bleHandle.startScan((deviceList) => {
       this.bleDevices = deviceList;
-    }, delay);
+    }, delay, services);
     return {
       success: true,
       data: data.scanList,
@@ -618,6 +787,120 @@ class GizwitsMiniSDK {
     };
   };
 
+  // 设置设备的时间戳
+  setDeviceTimeStamp = async (device: IDevice) => {
+    const target = this.allDevices.find((item) => isSameDevice(item, device));
+    if (!target) {
+      return { success: false, message: 'target is undefind' };
+    }
+
+    const data = Ntp.pack()
+
+    switch (target.connectType) {
+      case 'BLE': {
+        return this.bleHandle.write(device.bleDeviceID, numberArray2Uint8Array(data).buffer)
+      }
+    }
+    return {
+      success: false,
+      message: 'the connectType not support set timestamp'
+    }
+  }
+
+  // 同步蓝牙设备的离线数据
+  syncDeviceData =async (device: IDevice, callback: SyncCallBack = () => {}) => {
+    const target = this.allDevices.find((item) => isSameDevice(item, device));
+    if (!target) {
+      return { success: false, message: 'target is undefind' };
+    }
+    if (!target.isBind) {
+      return { success: false, message: 'Only the bound devices are supported' };
+    }
+
+    if (this.syncDevice) {
+      return {
+        success: false,
+        message: 'Synchronizing'
+      }
+    }
+
+    this.syncDevice = {...target}
+
+    switch (target.connectType) {
+      case 'BLE': {
+        GizLog.debug("start syncDeviceData", device);
+        this.syncDataCallBack = callback;
+        this.syncDataTimoutTimer = setTimeout(() => {
+          this.syncDataCallBack({
+            event: 'SYNC_FAIL',
+            message: 'sync timeout'
+          })
+          this.cleanSyncDeviceData();
+        }, this.SYNC_TIMEOUT)
+        // 设置超时
+        const data = RequestSync.pack();
+        // 发送开始同步的指令
+        GizLog.debug("sent RequestSync data");
+        return this.bleHandle.write(device.bleDeviceID, numberArray2Uint8Array(data).buffer)
+      }
+    }
+    return {
+      success: false,
+      message: 'the connectType not support sync data'
+    }
+  }
+
+  // 查询设备里面还有多少数据需要同步
+  queryNeedSyncDataLength = async(device: IDevice): Promise<ISDKResult<number>> => {
+    const target = this.allDevices.find((item) => isSameDevice(item, device));
+    if (!target) {
+      return { success: false, message: 'target is undefind' };
+    }
+    if (!target.isBind) {
+      return { success: false, message: 'Only the bound devices are supported' };
+    }
+    switch (target.connectType) {
+      case 'BLE': {
+        const data = RequestSync.pack();
+        // 发送开始同步的指令
+        this.syncDevice = {...target}
+        GizLog.debug("sent RequestSync data len");
+        this.bleHandle.write(device.bleDeviceID, numberArray2Uint8Array(data).buffer)
+        return new Promise((res) => {
+          this.syncDataLengthCallback = res;
+          setTimeout(() => {
+            try {
+              res({success: false, message: 'timeout'})
+            } catch (error) {
+              
+            }
+          }, 3000)
+        })
+      }
+    }
+    return {
+      success: false,
+      message: 'the connectType not support sync data'
+    }
+  }
+
+  public cancelSyncDeviceData =async () => {
+    this.cleanSyncDeviceData();
+  }
+
+  private cleanSyncDeviceData = () => {
+    if (this.syncDataCallBack) {
+      this.syncDataCallBack({
+        event: 'SYNC_CANCEL'
+      })
+      this.syncDataCallBack = null;
+    }
+    this.syncCurrnetNum = 0;
+    this.syncTotalNum = 0;
+    this.syncDevice = null;
+    this.syncDataTimoutTimer && clearTimeout(this.syncDataTimoutTimer)
+  }
+
   getProductConfig = async (
     pk: string
   ): Promise<ISDKResult<IDataPointConfig>> => {
@@ -713,8 +996,13 @@ class GizwitsMiniSDK {
         // 连接BLE
         const data = await this.bleHandle.connectDevice(target.bleDeviceID);
         if (data.success) {
+          
           // 蓝牙设备比较特殊，在get 里面从bleHandle里找到连接的设备，再把connectType 设置成BLE，所以这里更新metaData 要强制更新并推送
           this.setDeviceMeta(target, 'connectType', 'BLE', true);
+          setTimeout(() => {
+            // 蓝牙设备连接成功之后默认设置一次ntp
+            this.setDeviceTimeStamp(target)
+          }, 250)
           setTimeout(() => {
             this.getDeviceStatus(target);
           }, 500);
@@ -988,6 +1276,25 @@ class GizwitsMiniSDK {
     return GizLog.setLogLevel(level);
   }
 
+  public renameDevice =async (device:IDevice, name: string) => {
+    if (!name) {
+      return {
+        success: false,
+        message: "please input device name"
+      }
+    }
+    if (device.isBind) {
+      return await editBindInfo({
+        did: device.did,
+        name: name,
+      })
+    }
+    return {
+      success: false,
+      message: "device not bind"
+    }
+  }
+
   /**
    * 移除事件监听
    * @param type 事件监听名称，详见下表
@@ -1038,5 +1345,4 @@ class GizwitsMiniSDK {
     this.keepScanTimer && clearInterval(this.keepScanTimer);
   };
 }
-
-export default GizwitsMiniSDK;
+export default GizwitsMiniSDK;

package/src/services/devices.ts

@@ -45,6 +45,7 @@ export const getBindingList = async (): Promise<IServiceResult<IDevice[]>> => {
         port: item.port,
         ws_port: item.ws_port,
         wss_port: item.wss_port,
+        passcode: item.passcode,
         isBleOnline: false,
         isLanOnline: false,
         connectType: 'NONE',
@@ -208,3 +209,35 @@ export async function safeRegister({
     err: data.err,
   };
 }
+
+interface IRenameProps {
+  name?: string;
+  did: string;
+  remark?: string;
+}
+export interface IRenamePropsReturn {
+  remark: string;
+  dev_alias: string;
+}
+export async function editBindInfo({
+  name,
+  remark,
+  did,
+}: IRenameProps): Promise<IServiceResult<IRenamePropsReturn>> {
+  const body: any = {};
+  if (name) {
+    body.dev_alias = name;
+  }
+  if (remark) {
+    body.remark = remark;
+  }
+  const data = await openApiRequest<IRenamePropsReturn>(
+    `/app/bindings/${did}`,
+    {
+      method: 'PUT',
+      data: body,
+    },
+    true
+  );
+  return data;
+}

package/src/services/uploadP0.ts

@@ -0,0 +1,56 @@
+import openApiRequest from "../openApiRequest";
+import {  enc, AES, mode, pad } from 'crypto-js';
+
+export interface IUploadRes {
+}
+
+interface IData {
+  raw: string;
+  created_at: number;
+} 
+
+interface IProps {
+  device: IDevice;
+  data: IData[];
+  productSecret: string;
+}
+export async function uploadP0 ({device, data, productSecret}: IProps) {
+  const path = `/v2/products/${device.productKey}/devices/offline-data`;
+
+  let passCode = device.passcode
+
+  const key = enc.Hex.parse(productSecret);
+  const iv = enc.Hex.parse('');
+  const srcs = enc.Utf8.parse(passCode);
+  const encrypted = AES.encrypt(srcs, key, { iv: iv, mode: mode.ECB, padding: pad.Pkcs7 });
+  passCode = encrypted.ciphertext.toString().toUpperCase();
+
+  return openApiRequest<IUploadRes>(path, {
+    data: {
+      data,
+      encoding: 'hex',
+    },
+    method: 'POST',
+    headers: {
+      'X-Gizwits-Device-Id': device.did,
+      'X-Gizwits-Device-passcode': passCode,
+    },
+  }, false)
+}
+
+// setTimeout(() => {
+//   uploadP0({
+//     device: {
+//       productKey: "8da73e49a9c74d6e9321b4383b44e4e9",
+//       did: "SlJJzMGa0MDOmhUTt0PIul",
+//       passcode: "1234567890",
+//     },
+//      data: [
+//       {
+//         raw: "00000003",
+//         created_at: parseInt(`${Date.now() / 1000}`, 10)
+//       }
+//     ],
+//     productSecret: "bf5df28e904b455f85fa5be1805945ad"
+//   })
+// }, 3000)

package/src/utils.ts

@@ -180,6 +180,11 @@ export const merageBleLocalDevices = (
   mainDevice: IDevice[],
   localDevice: IDevice[]
 ) => {
+  mainDevice.map(device=> {
+    // 重置成离线
+    device.isBleOnline = false;
+    device.bleWorkStatus = 0;
+  })
   localDevice.map((localD) => {
     const target = mainDevice.find((device) => isSameDevice(device, localD));
     if (!target) {
@@ -200,6 +205,10 @@ export const merageLanLocalDevices = (
   mainDevice: IDevice[],
   localDevice: IDevice[]
 ) => {
+  mainDevice.map(device=> {
+    // 重置成离线
+    device.isLanOnline = false;
+  })
   localDevice.map((localD) => {
     const target = mainDevice.find((device) => isSameDevice(device, localD));
     if (!target) {

package/src/wechatApi.ts

@@ -67,7 +67,7 @@ export function startBluetoothDevicesDiscovery(allowDuplicatesKey = true) {
       fail: rej,
       allowDuplicatesKey,
       powerLevel: 'high',
-      interval: 0
+      interval: 200
     })
   })
 }