mini_program_gizwits_sdk 3.6.4 → 3.6.5

package/src/openApiRequest.ts

@@ -1,50 +0,0 @@
-import errorCode from './errorCode';
-import { getGlobalData } from "./globalData";
-import request from './request';
-import { IError, IServiceResult, IWechatApiResult } from './types';
-
-const openApiRequest = 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['X-Gizwits-User-token'] = getGlobalData('token');
-  }
-
-  requestOptions.header = { ...headers, ...options.headers };
-  delete requestOptions.headers;
-  const openApiUrl = getGlobalData('cloudServiceInfo').openAPIInfo;
-  const res = await request<IWechatApiResult<T>>('https://' + openApiUrl + 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 openApiRequest;

package/src/productConfigFileManage.ts

@@ -1,72 +0,0 @@
-import openApiRequest from './openApiRequest';
-import { IProductConfigData, IDataPointConfig } from './types';
-// 管理配置文件
-
-
-class ProductConfigFileManage {
-  data: IProductConfigData = {};
-  key = 'dataPointConfig';
-
-  init = async () => {
-    const data = await wx.getStorageSync(this.key) || '{}';
-    let dataJson = {};
-    try {
-      dataJson = JSON.parse(data);
-    } catch (error) {
-
-    }
-    this.data = dataJson;
-  }
-
-  getConfigFileMap: Record<string, Promise<IDataPointConfig | null>> = {};
-
-  public getConfigFile = (pk: string): Promise<IDataPointConfig | null> => {
-    if (!this.data[pk]) {
-
-      if (this.getConfigFileMap[pk]) {
-        // 正在请求中
-        return this.getConfigFileMap[pk];
-      }
-
-      const promise = new Promise<IDataPointConfig | null>(async (resolve) => {
-        // 不在缓存里，去云端获取
-        const url = `/app/datapoint?product_key=${pk}`;
-        const data = await openApiRequest<IDataPointConfig>(`${url}`, { method: 'GET' });
-        if (data.success && data.data?.entities) {
-          this.data[pk] = data.data as IDataPointConfig;
-          resolve(this.data[pk]);
-          // 更新缓存
-          wx.setStorageSync(this.key, JSON.stringify(this.data))
-        } else {
-          // 请求失败
-          resolve(null);
-        }
-        this.getConfigFileMap[pk] = null;
-      });
-
-      this.getConfigFileMap[pk] = promise;
-      return promise;
-
-    }
-    return Promise.resolve(this.data[pk]);
-  }
-
-  public getAttrItem = async (pk: string, key: string) => {
-    if (!this.data[pk]) {
-      await this.getConfigFile(pk)
-    }
-
-    for (let index in this.data[pk].entities[0].attrs) {
-      const item = this.data[pk].entities[0].attrs[index]
-      if (item.name === key) {
-        return item;
-      }
-    }
-    return null;
-  }
-}
-
-const productConfigFileManage = new ProductConfigFileManage();
-productConfigFileManage.init();
-
-export default productConfigFileManage;

package/src/protocol/Bind.ts

@@ -1,22 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-import { arrayToString } from "./tool";
-
-class Bind extends ProtocolBase {
-  passcode: string = '';
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-    const passcodeLen = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
-    index += 2;
-    let passcodeString = '';
-    this.content.slice(index, index + passcodeLen).map(item => {
-      passcodeString += String.fromCharCode(item);
-    });
-    this.passcode = passcodeString;
-  }
-  static pack = () => {
-    return [0,0,0,3,3,0,0,6];
-  }
-}
-
-export default Bind;

package/src/protocol/DeviceInfo.ts

@@ -1,37 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-import { arrayToASCII, arrayToString } from "./tool";
-
-class DeviceInfo extends ProtocolBase {
-  moduleSoftVersion: string = '';
-  moduleHardVersion: string = '';
-
-  mcuSoftVersion: string = '';
-  mcuHardVersion: string = '';
-  businessVersion: string = ''; //业务版本号
-
-
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-
-    this.moduleHardVersion = arrayToASCII(this.content.slice(index, index + 8))
-    index += 8;
-
-    this.moduleSoftVersion = arrayToASCII(this.content.slice(index, index + 8))
-    index += 8;
-
-    this.mcuHardVersion = arrayToASCII(this.content.slice(index, index + 8))
-    index += 8;
-
-    this.mcuSoftVersion = arrayToASCII(this.content.slice(index, index + 8))
-    index += 8;
-
-    this.businessVersion = arrayToASCII(this.content.slice(index, index + 8))
-    index += 8;
-  }
-  static pack = () => {
-    return [0,0,0,3,3,0,0,0x13];
-  }
-}
-
-export default DeviceInfo;

package/src/protocol/DiscoverUDP.ts

@@ -1,80 +0,0 @@
-import GizLog from "../GizLog";
-import ProtocolBase from "./ProtocolBase";
-import { arrayToString, fillString } from "./tool";
-
-type TDecodeType = 'ASCII' | 'HEX'
-
-class DiscoverUDP extends ProtocolBase {
-
-  did = '';
-  mac = '';
-  productKey = '';
-  deviceType = 0;
-  apiUrl = "";
-  protocolVersion = ""
-  mcuVersion = ""
-  moduleVersion = ""
-
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-    try {
-      index = this.baseParse(index, 'did')
-      index = this.baseParse(index, 'mac', 'HEX')
-      index = this.baseParse(index, 'moduleVersion')
-      index = this.baseParse(index, 'productKey')
-      index += 8
-      index = this.parseEndChat(index, 'apiUrl')
-      index = this.parseEndChat(index, 'protocolVersion')
-      this.mcuVersion = ""
-      this.content.slice(index, this.content.length).map(item => {
-        this.mcuVersion += String.fromCharCode(item);
-      })
-    } catch (error) {
-      GizLog.warn('Parse DiscoverUDP error', error)
-    }
-  }
-
-  parseEndChat = (index, key) => {
-    let string = ''
-    const data = this.content.slice(index, this.content.length);
-    for (let i in data) {
-      const item = data[i];
-      index += 1;
-      if (item === 0){
-        break;
-      }
-      string += String.fromCharCode(item);
-    }
-    this[key] = string
-    return index;
-  }
-
-  baseParse = (index, key, type:TDecodeType = 'ASCII') => {
-    const len = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
-    index += 2;
-    let stringData = '';
-    this.content.slice(index, index + len).map(item => {
-      if (type === 'ASCII') {
-        stringData += String.fromCharCode(item);
-      } else {
-        const hexData = item.toString(16);
-        stringData += fillString(hexData, 2);
-      }
-    });
-    this[key] = stringData;
-    return index + len;
-  }
-
-  static pack = () => {
-    const config = [0,0,0,3,3,0,0,3];
-    const buffer = new ArrayBuffer(config.length);
-    const uint8Array = new Uint8Array(buffer);
-    for (let i = 0; i < buffer.byteLength; i++) {
-      uint8Array[i] = config[i];
-    }
-    return uint8Array;
-  }
-}
-
-export default DiscoverUDP;

package/src/protocol/GetDeviceStatus.ts

@@ -1,61 +0,0 @@
-import productConfigFileManage from "../productConfigFileManage";
-import ProtocolBase from "./ProtocolBase";
-import { fillString, hexStrint2byte, string2Bytes } from "./tool";
-
-class GetDeviceStatus extends ProtocolBase {
-  static pack = async (productKey: string, gwDid?: string, attrNames?: string[], ) => {
-    const configFile = await productConfigFileManage.getConfigFile(productKey);
-    if (configFile) {
-      const isAdaptiveDatapoint = configFile.protocolType === 'var_len';
-      const header = [0,0,0,3];
-      const len = [0];
-      let flag = [0];
-      const cmd = [0,147];
-      let sn = [0,0,0,0];
-      let payload = [2];
-  
-      if (gwDid) {
-        flag = [1];
-        const hexLen = fillString(gwDid.length.toString(16), 4)
-        
-        const didLen = hexStrint2byte(hexLen);
-        const did = string2Bytes(gwDid);
-        sn = sn.concat(didLen).concat(did);
-      }
-  
-      if (isAdaptiveDatapoint) {
-        // 变长action
-        payload = [18];
-        // 根据 attrs 补充flag
-        let flagString = '';
-  
-        if (!attrNames) {
-          // 全部填充
-          configFile.entities[0].attrs.map(() => {
-            flagString = `1${flagString}`;
-          })
-        } else {
-          const attrs = attrNames.reduce((acc, cur) => ({ ...acc, [cur]: 1 }), {});
-          configFile.entities[0].attrs.map((item) => {
-            if (attrs[item.name]) {
-              flagString = `1${flagString}`;
-            } else {
-              flagString = `0${flagString}`;
-            }
-          });
-        }
-  
-        flagString = fillString(flagString, Math.ceil(flagString.length / 8) * 8);
-        payload = payload.concat(hexStrint2byte(parseInt(flagString, 2).toString(16)));
-      }
-  
-      const endData = flag.concat(cmd).concat(sn).concat(payload);
-      len[0] = endData.length;
-      
-      return header.concat(len).concat(endData);
-    }
-    return null;
-  }
-}
-
-export default GetDeviceStatus;

package/src/protocol/Login.ts

@@ -1,43 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-import { arrayToString, fillString, hexStrint2byte, string2Bytes } from "./tool";
-
-
-interface IPackParame {
-  passcode: string;
-}
-class Login extends ProtocolBase {
-  result: boolean = false;
-  didLength: number = 0;
-  did: string = '';
-  constructor(data: number[]) {
-    super(data);
-
-    let index = 0;
-    this.result = this.content[0] === 0;
-    index ++;
-    if (this.flag[0] === 1) {
-      this.didLength = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
-
-      index += 2;
-      let didString = '';
-      this.content.slice(index, this.content.length).map(item => {
-        didString += String.fromCharCode(item);
-      });
-      this.did = didString;
-    }
-  }
-  static pack = ({passcode}: IPackParame) => {
-    const header = [0,0,0,3];
-    let len = [0];
-    const flag = [0];
-    const cmd = [0,8];
-    const passcodeLen = hexStrint2byte(fillString(passcode.length.toString(16), 4));
-    const passcodeArr = string2Bytes(passcode);
-
-    const data = flag.concat(cmd).concat(passcodeLen).concat(passcodeArr);
-    len = hexStrint2byte(data.length.toString(16));
-    return header.concat(len).concat(data);
-  }
-}
-
-export default Login;

package/src/protocol/Ntp.ts

@@ -1,13 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-import { completeBlock, fillString, string2Bytes } from "./tool";
-
-class Ntp extends ProtocolBase {
-  static pack = () => {
-    const time = parseInt(`${Date.now() / 1000}`, 10);
-    const timeString = fillString(time.toString(2), 5 * 8)
-    
-    return [0,0,0,3,8,0,0,89].concat(completeBlock(timeString));
-  }
-}
-
-export default Ntp;

package/src/protocol/OTA/AwaitNoti.ts

@@ -1,14 +0,0 @@
-import ProtocolBase from "../ProtocolBase";
-
-class AwaitNoti extends ProtocolBase {
-  state = 0; // 0继续 1失败
-  constructor(data: number[]) {
-    super(data);
-    this.state = this.content[0]
-  }
-  static pack = (position: number) => {
-    return [0,0,0,3];
-  }
-}
-
-export default AwaitNoti;

package/src/protocol/OTA/CheckCanOTA.ts

@@ -1,23 +0,0 @@
-import { IOTAType } from "../../types";
-import ProtocolBase from "../ProtocolBase";
-
-class CheckCanOTA extends ProtocolBase {
-  type: IOTAType = 'MCU';
-  state: number = 0; // 0可以更新 1 不可以更新
-  version: number = 0; // 当前ota协议版本
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-    this.type = this.content[index] === 1 ? 'MODULE' : 'MCU'
-    index += 1;
-    this.state = this.content[index];
-    index += 1;
-    this.version = this.content[index];
-  }
-  static pack = (type: IOTAType) => {
-    const typeData = type === 'MCU' ? 2 : 1
-    return [0,0,0,3,4,0,0,0x41, typeData];
-  }
-}
-
-export default CheckCanOTA;

package/src/protocol/OTA/OTAPackPackage.ts

@@ -1,37 +0,0 @@
-import { crc16modbus } from '../../crc'
-import { getVariableLength } from "../dataPoint";
-import ProtocolBase from "../ProtocolBase";
-import { bytesToInt, fillString, hexStrint2byte } from "../tool";
-
-class OTAPackPackage extends ProtocolBase {
-
-  packageNum = 0;
-  state = 0;
-
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-    this.packageNum = bytesToInt(this.content.slice(index, index + 2))
-    index += 2;
-    this.state = this.content[index]
-  }
-  static pack = (data: number[], packageNum: number) => {
-    const header = [0,0,0,3]
-    const flag = [0]
-
-    const cmd = [0,0x47]
-    const packageNumBytes = hexStrint2byte(fillString(packageNum.toString(16), 4)) // 包号
-    const packageLenBytes = hexStrint2byte(fillString(data.length.toString(16), 4)) // 包长度
-
-    const crc16Hex = fillString(crc16modbus(new Uint8Array(data)).toString(16), 4);
-    const crc16Bytes = hexStrint2byte(crc16Hex);
-    let content = flag;
-    content = content.concat(cmd, packageNumBytes, packageLenBytes, crc16Bytes, data)
-
-    const len = getVariableLength(content)
-
-    return header.concat(len, content);
-  }
-}
-
-export default OTAPackPackage;

package/src/protocol/OTA/OtaComplete.ts

@@ -1,17 +0,0 @@
-import ProtocolBase from "../ProtocolBase";
-
-type IState = 0 | 1 | 2 | 3 | 4
-
-class OtaComplete extends ProtocolBase {
-  state: IState = 0; // 0x00 成功 0x01 长度不对 0x02 CRC 失败 0x03 取消 0x04 其他
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-    this.state = this.content[index] as any
-  }
-  static pack = (state: IState) => {
-    return [0,0,0,3,4,0,0,0x50, state];
-  }
-}
-
-export default OtaComplete;

package/src/protocol/OTA/PreOTA.ts

@@ -1,48 +0,0 @@
-import { getVariableLength } from "../dataPoint";
-import ProtocolBase from "../ProtocolBase";
-import { bytesToHexString, bytesToInt, fillString, hexStrint2byte, string2Bytes } from "../tool";
-
-type TState = 0 | 1 | 2 | 3 // 0x00 正常升级 0x01 pk不一致 0x02 版本低于当前 0x03 大小超过范围
-class PreOTA extends ProtocolBase {
-
-  state: TState = 0
-  processedLen: number = 0 // 已经接收的长度
-  processedCrc32: string = '';
-  packageMaxLen: number = 20; // 发过去的每一包，最大长度
-
-  constructor(data: number[]) {
-    super(data);
-    let index = 0;
-    this.state = this.content[index] as TState;
-    index += 1;
-
-    this.processedLen = bytesToInt(this.content.slice(index, index + 4));
-    index += 4;
-    this.processedCrc32 = bytesToHexString(this.content.slice(index, index + 4))
-    index += 4;
-
-    this.packageMaxLen = bytesToInt(this.content.slice(index, index + 2));
-  }
-  static pack = (pk: string, softVer: string, md5: string, fileLen: number, crc32: number) => {
-    const header = [0,0,0,3]
-    const cmd = [0,0x43]
-    const flag = [0]
-
-    const pkBytes = string2Bytes(pk)
-    const pkLen = pk.length;
-    const softVerBytes = string2Bytes(fillString(softVer, 8))
-    const md5Bytes = hexStrint2byte(md5)
-    const crc32Bytes = hexStrint2byte(fillString(crc32.toString(16), 8))
-
-    const fileLenBytes = hexStrint2byte(fillString(fileLen.toString(16), 8))
-
-    let content = flag;
-    content = content.concat(cmd, [pkLen], pkBytes, softVerBytes, md5Bytes, fileLenBytes,crc32Bytes)
-
-    const len = getVariableLength(content)
-
-    return header.concat(len, content);
-  }
-}
-
-export default PreOTA;

package/src/protocol/OTA/ResetPosition.ts

@@ -1,14 +0,0 @@
-import ProtocolBase from "../ProtocolBase";
-import { fillString, hexStrint2byte } from "../tool";
-
-class ResetPosition extends ProtocolBase {
-  constructor(data: number[]) {
-    super(data);
-  }
-  static pack = (position: number) => {
-    const positionBytes = hexStrint2byte(fillString(position.toString(16), 8))
-    return [0,0,0,3,7,0,0,0x45, ...positionBytes];
-  }
-}
-
-export default ResetPosition;

package/src/protocol/OffLineData.ts

@@ -1,81 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-import { arrayToString, completeBlock, fillString, hexStrint2byte } from "./tool";
-
-export class RequestSync extends ProtocolBase {
-  state: number = 0; // 0 允许同步 1 没有数据 2其他
-  len: number = 0; // 需要同步的数据长度
-  constructor(data: number[]) {
-    super(data);
-    let index = 0
-    
-    this.len = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
-    index += 2
-
-    this.state = this.content[index];
-  }
-  static pack = () => {
-    return [0,0,0,3,3,0,0,113];
-  }
-}
-
-
-export class SyncPackage extends ProtocolBase {
-  id: number = 0;
-  timestemp: number = 0;
-  payloadLen: number = 0;
-  payload: number[] = []; 
-  constructor(data: number[]) {
-    super(data);
-
-    let index = 0;
-    this.id = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
-    
-    index += 2;
-
-    this.timestemp = parseInt(arrayToString(this.content.slice(index, index + 5)), 16);
-    index += 5;
-
-    this.payloadLen = parseInt(arrayToString(this.content.slice(index, index + 2)), 16);
-    index += 2;
-
-    this.payload = this.content.slice(index, this.content.length)
-  }
-  static pack = (id: number) => {
-    let stringData = id.toString(2)
-    stringData = fillString(stringData, 8 * 2)
-    const packageData = [0,0,0,3, 5].concat([0,0,115]).concat(completeBlock(stringData))
-    return packageData;
-  }
-}
-
-// 删除数据
-export class DeletePackage extends ProtocolBase {
-  static pack = (id: number) => {
-    let stringData = id.toString(2)
-    stringData = fillString(stringData, 8 * 2)
-    const packageData = [0,0,0,3,5].concat([0,0,117]).concat(completeBlock(stringData))
-    return packageData;
-  }
-}
-
-// let time = 1669711410;
-// let timeBytes: any = time.toString(16)
-// timeBytes = fillString(timeBytes, 10)
-// timeBytes = hexStrint2byte(timeBytes)
-// console.log(timeBytes)
-
-// const syncPackage = new SyncPackage([0,0,0,3,15 ,0, 0, 83,1,1,1,1].concat(timeBytes).concat([0, 1, 1]))
-// console.log(syncPackage)
-
-
-export class CancelSync extends ProtocolBase {
-  state: number = 0; // 0 同步完成 01 异常 02 其他
-  constructor(data: number[]) {
-    super(data);
-    this.state = this.content[0];
-  }
-  static pack = () => {
-    const packageData = [0,0,0,3, 3, 0, 0, 119]
-    return packageData;
-  }
-}

package/src/protocol/ProtocolBase.ts

@@ -1,54 +0,0 @@
-import { arrayToString, checkHeader, getProtocolLen } from "./tool";
-
-class ProtocolBase {
-  header: string = '';
-  len:number = 0;
-  flag:number[] = [0];
-  cmd :string = '';
-  content:number[] = [];
-  
-  constructor(data?: number[]) {
-    if (data && data.length > 0) {
-      this.formatP0(data);
-    }
-  }
-
-  static decodeLen = (arr) => {
-    let multiplier = 1;
-    let value=0;
-    let digit = 0;
-    let index = 0;
-    do {
-      digit = arr[index];
-      value += (digit & 127) * multiplier;
-      multiplier *= 128;
-      index += 1;
-    } while ((digit & 128) != 0);
-    return value;
-  }
-
-  formatP0 = (data) => {
-    let pointer = checkHeader(data);
-    
-    if (pointer === false) {
-      // 包头错误
-      throw new Error("Header Error");
-    }
-
-    this.header = arrayToString(data.slice(0, pointer));
-    
-    const nextData = data.slice(pointer, data.length);
-
-    const lengthIndex = getProtocolLen(nextData);
-
-    this.len = ProtocolBase.decodeLen(nextData.slice(0, lengthIndex));
-    pointer += lengthIndex;
-    this.flag = data.slice(pointer, pointer + 1);
-    pointer += 1;
-    this.cmd = arrayToString(data.slice(pointer, pointer + 2));
-    pointer += 2;
-    this.content = data.slice(pointer, data.length)
-  }
-}
-
-export default ProtocolBase;