mini_program_gizwits_sdk 3.4.6-beta → 3.4.7-FeiSiMan

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/sdk.d.ts

@@ -30,6 +30,10 @@ export interface ISetCommonDeviceOnboardingDeployProps {
 export interface ISetDeviceOnboardingDeployProps extends ISetCommonDeviceOnboardingDeployProps {
     softAPSSIDPrefix: string;
 }
+export interface IConfigResult {
+    mac: string;
+    productKey: string;
+}
 export interface IRandomCodesResult {
     random_code: string;
     product_key: string;
@@ -78,6 +82,7 @@ export interface IResult<T> {
 }
 interface ICloudServiceInfo {
     openAPIInfo: string;
+    aepAPIInfo: string;
 }
 export type TimeoutHandle = ReturnType<typeof setTimeout> | null;
 export type IntervalHandle = ReturnType<typeof setInterval> | null;
@@ -93,6 +98,8 @@ interface GizwitsSdkOption {
     token?: string;
     uid?: string;
     offlineThreshold?: number;
+    accessKey?: string;
+    secretKey?: string;
 }
 declare class GizwitsMiniSDK {
     private listenerMap;
@@ -159,17 +166,14 @@ declare class GizwitsMiniSDK {
     login: (openID: string) => Promise<ISDKResult<ILoginRes>>;
     getDeviceStatus: (device: IDevice, attrNames?: string[]) => Promise<any>;
     subscribe: (device: IDevice, connectType?: TConnectType, _autoGetDeviceStatus?: boolean) => Promise<IResult<any> | {
-        success: boolean;
-        errorCode: IError;
-    } | {
-        success: boolean;
-        errorCode?: undefined;
-    } | {
         success: boolean;
         message: string;
     }>;
     unSubscribe: (device: IDevice) => Promise<{
         success: boolean;
+        err: any;
+    } | {
+        success: boolean;
     }>;
     bindRemoteDevice: ({ mac, productKey, alias, beOwner, }: IBindRemoteDeviceParams) => Promise<ISDKResult<IOpenApiDevice>>;
     checkUpdate: ({ device, type }: {
@@ -193,7 +197,7 @@ declare class GizwitsMiniSDK {
     setDeviceOnboardingDeploy: ({ ssid, bssid, password, mode, timeout, isBind, softAPSSIDPrefix, }: ISetDeviceOnboardingDeployProps) => Promise<ISDKResult<IDevice[]>>;
     private setDomain;
     private deviceSafetyApi;
-    getBindingList: () => Promise<import("./openApiRequest").IServiceResult<IDevice[]>>;
+    getBindingList: () => Promise<{}>;
     getDevices: () => Promise<ISDKResult<IDevice[]>>;
     stopDeviceOnboardingDeploy: () => void;
     setLogLevel: (level: TLogType) => {

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

@@ -1,6 +1,11 @@
-import { IRandomCodesResult, IResult } from "../sdk";
+import { IConfigResult, IResult } from "../sdk";
 import { BleHandle } from "../handler/ble";
 import ConfigBase from "./ConfigBase";
+interface IVerifyOnlineResult {
+    data: {
+        status: number;
+    };
+}
 interface IArgs {
     bleDeviceId: string;
     arrayBuffer: ArrayBuffer;
@@ -31,6 +36,14 @@ declare class BLEConfig extends ConfigBase {
     } | {
         success: true;
     }>;
+    getDeviceLastestOnlineTime: ({ productKey, mac }: {
+        productKey: string;
+        mac: string;
+    }) => Promise<import("../aepApi/aepApiRequest").IServiceResult<IVerifyOnlineResult>>;
+    verifyDeviceOnline: ({ productKey, mac }: {
+        productKey: string;
+        mac: string;
+    }) => Promise<IResult<IVerifyOnlineResult>>;
     enableAndGetBluetoothDevices: (softAPSSIDPrefix?: string) => Promise<{
         success: false;
         err: IError;
@@ -39,6 +52,6 @@ declare class BLEConfig extends ConfigBase {
         bleDevices?: WechatMiniprogram.BlueToothDevice[];
     }>;
     setDeviceOnboardingDeploy: ({ timeout, isBind, softAPSSIDPrefix, }: ISetDeviceOnboardingDeployProps) => Promise<IResult<IDevice[]>>;
-    configBLEDevice: ({ ssid, password, softAPSSIDPrefix, }: configBLEDeviceParams) => Promise<IResult<IRandomCodesResult[]>>;
+    configBLEDevice: ({ ssid, password, softAPSSIDPrefix, }: configBLEDeviceParams) => Promise<IResult<IConfigResult>>;
 }
 export default BLEConfig;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.4.6-beta",
-  "description": "配网包写死时区",
+  "version": "3.4.7-FeiSiMan",
+  "description": "以东八区为例，模组用的是+8，需要反过来",
   "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',
+    'accessKey': getGlobalData('accessKey'),
+    'secretKey': getGlobalData('secretKey'),
+  };
+  if (needToken) {
+    headers['Authorization'] = getGlobalData('token');
+  }
+  requestOptions.header = { ...headers, ...options.headers };
+  delete requestOptions.headers;
+  const aepApiUrl = getGlobalData('cloudServiceInfo').aepAPIInfo;
+  console.log('aepApiRequest', aepApiUrl + url, requestOptions);
+  const res = await request<IResult<T>>(aepApiUrl + url, requestOptions);
+  console.log('aepApiRequest res', res);
+  // 统一封装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

@@ -556,7 +556,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
       if (targetBleDev) {
         // 存在设备，更新ctime 并更新属性
         const newDevice = BTDevice2GDevice(device, this.pks);
-
         if (newDevice.productKey && newDevice.mac) {
           // 广播设备没有 bleWorkStatus
           const isChange = this.checkDeviceIsChange(newDevice, targetBleDev);

package/src/protocol/dataPoint.ts

@@ -1,5 +1,5 @@
 import productConfigFileManage from "../productConfigFileManage";
-import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte, completeBlock} from "./tool";
+import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte, completeBlock } from "./tool";
 
 export interface IDataPointConfig {
   name: string;
@@ -35,7 +35,7 @@ type TDataOptionType = 'status_writable' | 'status_readonly' | 'alert' | 'fault'
 export interface IDataPointAttr {
   display_name: string;
   uint_spec: IUnitSpec;
-  name:string;
+  name: string;
   data_type: TDataType;
   position: IDataPointPosition;
   type: TDataOptionType;
@@ -181,7 +181,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
    */
   const flag = [0];
   const headerCmd = [0, 147]; // cmd
-  const sn = [0,0,0,0];
+  const sn = [0, 0, 0, 0];
 
   // 业务指令命令字 定长上报是4，变长上报是14
   let cmd = [0x1];
@@ -194,7 +194,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
 
   // 找到可写
   if (!isAdaptiveDatapoint) {
-    attrsConfig = attrsConfig.filter(item => item.type ==='status_writable')
+    attrsConfig = attrsConfig.filter(item => item.type === 'status_writable')
   }
 
   attrsConfig.map((item) => {
@@ -265,7 +265,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
   return {
     data: packageData,
     raw: {
-      header: [0,0,0,3],
+      header: [0, 0, 0, 3],
       flag,
       len: lengthArr,
       headerCmd,
@@ -274,7 +274,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
     }
   };
 };
- 
+
 interface IPToDataPointParams {
   config: IDataPointAttr[];
   data: number[];
@@ -316,7 +316,7 @@ function PToDataPoint({ config = [], data }: IPToDataPointParams) {
   let action: number;
   let message = '';
   let messageType: messageType;
-  const rawData: IRawData = { header: arrayToString(data.slice(0, 4)), flag: '', len: '', cmd: '', sn: '',action: '', payload: '' };
+  const rawData: IRawData = { header: arrayToString(data.slice(0, 4)), flag: '', len: '', cmd: '', sn: '', action: '', payload: '' };
   // 获取数据长度 0,0,0,3 到 0 这一段都是长度 校验长度可以忽略
   const attrs = config;
 
@@ -662,7 +662,7 @@ function calculationCmdData({ attrs, flagString, boolEnumLength, cmdData, accumu
 const unpack = async (data: number[], pk: string) => {
   const productConfig = await productConfigFileManage.getConfigFile(pk);
   if (productConfig) {
-    const resData =  PToDataPoint({config: (await productConfig).entities[0].attrs, data})
+    const resData = PToDataPoint({ config: (await productConfig).entities[0].attrs, data })
     if (resData.kvData) {
       // 格式化binary
       resData.kvData = await formatBinary(resData?.kvData, pk, 'object');
@@ -675,16 +675,16 @@ const pack = async (data: object, pk: string) => {
   const productConfig = await productConfigFileManage.getConfigFile(pk);
   if (productConfig) {
     const isAdaptiveDatapoint = productConfig.protocolType === 'var_len';
-    return DataPointToP({data, config: (await productConfig).entities[0].attrs, isAdaptiveDatapoint});
+    return DataPointToP({ data, config: (await productConfig).entities[0].attrs, isAdaptiveDatapoint });
   }
   return null;
 }
 
 const padBoradcastData = (data: number[]) => {
-  const head = [0,0,0,3];
+  const head = [0, 0, 0, 3];
   const flag = [0];
   const headerCmd = [0, 0x93]; // cmd
-  const sn = [0, 0, 0 ,0];
+  const sn = [0, 0, 0, 0];
   const flagToEnd = flag.concat(headerCmd).concat(sn).concat(data);
   const lengthArr: number[] = getVariableLength(flagToEnd);
   return arrayToString(head.concat(lengthArr).concat(flagToEnd));
@@ -692,10 +692,10 @@ const padBoradcastData = (data: number[]) => {
 
 type TargetType = 'int' | 'string';
 // 格式化enum 兼容sdk 和 socket 之间的差异
-const formatEnum = async (attrs: any, pk: string, targetType: TargetType ) => {
-  for(let key in attrs) {
+const formatEnum = async (attrs: any, pk: string, targetType: TargetType) => {
+  for (let key in attrs) {
     const itemData = await productConfigFileManage.getAttrItem(pk, key);
-    if (itemData && itemData.data_type ==='enum') {
+    if (itemData && itemData.data_type === 'enum') {
       if (targetType === 'int' && typeof attrs[key] === 'string') {
         // 转成int 
         const enumIndex = itemData.enum.findIndex(item => item === attrs[key]);
@@ -710,10 +710,10 @@ const formatEnum = async (attrs: any, pk: string, targetType: TargetType ) => {
 }
 
 type BTargetType = 'string' | 'object';
-const formatBinary = async (attrs: any, pk: string, targetType: BTargetType ) => {
-  for(let key in attrs) {
+const formatBinary = async (attrs: any, pk: string, targetType: BTargetType) => {
+  for (let key in attrs) {
     const itemData = await productConfigFileManage.getAttrItem(pk, key);
-    if (itemData && itemData.data_type ==='binary') {
+    if (itemData && itemData.data_type === 'binary') {
       if (targetType === 'object' && typeof attrs[key] === 'string') {
         attrs[key] = hexStrint2byte(attrs[key])
       }
@@ -725,4 +725,4 @@ const formatBinary = async (attrs: any, pk: string, targetType: BTargetType ) =>
   return attrs
 }
 
-export {pack, unpack, padBoradcastData, formatEnum, formatBinary};
+export { pack, unpack, padBoradcastData, formatEnum, formatBinary };

package/src/sdk.ts

@@ -74,6 +74,12 @@ export interface ISetDeviceOnboardingDeployProps
   softAPSSIDPrefix: string;
 }
 
+export interface IConfigResult {
+  mac: string;
+  productKey: string;
+}
+
+
 export interface IRandomCodesResult {
   random_code: string;
   product_key: string;
@@ -132,6 +138,7 @@ export interface IResult<T> {
 
 interface ICloudServiceInfo {
   openAPIInfo: string;
+  aepAPIInfo: string;
 }
 
 export type TimeoutHandle = ReturnType<typeof setTimeout> | null;
@@ -148,6 +155,8 @@ interface GizwitsSdkOption {
   token?: string;
   uid?: string;
   offlineThreshold?: number;
+  accessKey?: string; // 京东平台接口请求参数
+  secretKey?: string;// 京东平台接口请求参数
 }
 
 class GizwitsMiniSDK {
@@ -211,7 +220,8 @@ class GizwitsMiniSDK {
       }
     });
 
-    const connectionMap = this.socketHandle._connections;
+    // const connectionMap = this.socketHandle._connections;
+    const connectionMap = {};
 
     Object.keys(connectionMap).forEach((wsInfo) => {
       const conn = connectionMap[wsInfo];
@@ -298,16 +308,16 @@ class GizwitsMiniSDK {
   }
 
   private get socketHandle() {
-    if (!this._gizSocket) {
-      this._gizSocket = new GizwitsWS({
-        appID: getGlobalData('appID'),
-        token: getGlobalData('token'),
-        uid: getGlobalData('uid'),
-      });
-      this._gizSocket.subscribeDeviceStatus(this.handleSocketDeviceData);
-      this._gizSocket.subscribeBindingChanged(this.getBindingList);
-      this._gizSocket.subscribeSocketStatus(this.handleSocketStatus);
-    }
+    // if (!this._gizSocket) {
+    //   this._gizSocket = new GizwitsWS({
+    //     appID: getGlobalData('appID'),
+    //     token: getGlobalData('token'),
+    //     uid: getGlobalData('uid'),
+    //   });
+    //   this._gizSocket.subscribeDeviceStatus(this.handleSocketDeviceData);
+    //   this._gizSocket.subscribeBindingChanged(this.getBindingList);
+    //   this._gizSocket.subscribeSocketStatus(this.handleSocketStatus);
+    // }
     return this._gizSocket;
   }
 
@@ -320,6 +330,8 @@ class GizwitsMiniSDK {
     token,
     uid,
     offlineThreshold,
+    accessKey,
+    secretKey
   }: GizwitsSdkOption) => {
     this.productInfo = productInfo;
     // 保存相关信息
@@ -327,7 +339,10 @@ class GizwitsMiniSDK {
     setGlobalData('appSecret', appSecret);
     setGlobalData('productInfo', productInfo);
     setGlobalData('token', token);
+    console.log('SDK init', token);
     setGlobalData('uid', uid);
+    setGlobalData('accessKey', accessKey);
+    setGlobalData('secretKey', secretKey);
 
     /**
      * 同时也设置域名信息
@@ -342,7 +357,7 @@ class GizwitsMiniSDK {
      * lan 比较特殊
      * 初始化sdk的时候就要开始扫描设备
      */
-    this.initLan();
+    // this.initLan();
   }
   public reInit(props: GizwitsSdkOption) {
     this.init(props);
@@ -359,7 +374,7 @@ class GizwitsMiniSDK {
         openAPIInfo !== getGlobalData('cloudServiceInfo').openAPIInfo
       ) {
       // 需要重启
-      this.socketHandle.destory();
+      // this.socketHandle.destory();
       this._gizSocket = null;
       // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       this.socketHandle;
@@ -798,7 +813,7 @@ class GizwitsMiniSDK {
         case 'WAN': {
           // 枚举要转换成枚举值
           const newAttrs = await formatEnum(attrs, target.productKey, 'string')
-
+          return;
           return this.socketHandle.writeData(target, newAttrs);
         }
         case 'LAN': {
@@ -839,6 +854,7 @@ class GizwitsMiniSDK {
           }
         }
         case 'WAN': {
+          return { success: false };
           return this.socketHandle.send(target.did, data);
         }
         case 'LAN': {
@@ -990,7 +1006,7 @@ class GizwitsMiniSDK {
     if (data.success) {
       setGlobalData('token', data.data?.token);
       setGlobalData('uid', data.data?.uid);
-      this.socketHandle.updateToken({token: data.data.token, uid: data.data.uid})
+      // this.socketHandle.updateToken({token: data.data.token, uid: data.data.uid})
     }
     return data;
   };
@@ -1011,6 +1027,7 @@ class GizwitsMiniSDK {
         );
       }
       case 'WAN':
+        return { success: false, }
         return this.socketHandle.readStatus(target, attrNames);
       default: {
         return {
@@ -1079,11 +1096,12 @@ class GizwitsMiniSDK {
         // const target = this.deviceList.find((item) =>
         //   isSameDevice(item, device)
         // );
-        const data = this.socketHandle.connectDevice(target);
-        if (data.success) {
-          this.setDeviceMeta(device, 'connectType', 'WAN', true);
-        }
-        return data;
+        // const data = this.socketHandle.connectDevice(target);
+        // if (data.success) {
+        //   this.setDeviceMeta(device, 'connectType', 'WAN', true);
+        // }
+        // return data;
+        return { success: false, }
       }
       case 'LAN': {
         const data = await this.lanHandle.connectDevice(target);
@@ -1119,11 +1137,14 @@ class GizwitsMiniSDK {
         return disconnectRes;
       }
       case 'WAN': {
-        const res = this.socketHandle.disConnectDevice(target);
-        if (res.success) {
-          this.setDeviceMeta(target, 'connectType', 'NONE', true);
-        }
-        return res;
+        // const res = this.socketHandle.disConnectDevice(target);
+        // if (res.success) {
+        //   this.setDeviceMeta(target, 'connectType', 'NONE', true);
+        // }
+        // return res;
+        return {
+          success: false,
+        };
       }
       case 'LAN': {
         const res = this.lanHandle.disConnectDevice(target);
@@ -1405,8 +1426,10 @@ class GizwitsMiniSDK {
   private setDomain = (cloudServiceInfo: ICloudServiceInfo) => {
     const openAPIInfo =
       (cloudServiceInfo && cloudServiceInfo.openAPIInfo) || 'api.gizwits.com';
+    const aepAPIInfo =
+      (cloudServiceInfo && cloudServiceInfo.aepAPIInfo) || 'https://mini-dev.viessmann.cn/';
 
-    const newData = { ...(cloudServiceInfo || {}), openAPIInfo };
+    const newData = { ...(cloudServiceInfo || {}), openAPIInfo, aepAPIInfo };
     setGlobalData('cloudServiceInfo', newData);
   };
 
@@ -1433,11 +1456,12 @@ class GizwitsMiniSDK {
 
   // 内部刷新设备列表的方法
   public getBindingList = async () => {
-    const data = await getBindingList();
-    this.deviceList = data.data || [];
-    // 推送
-    this.notiDeviceList();
-    return data;
+    // const data = await getBindingList();
+    // this.deviceList = data.data || [];
+    // // 推送
+    // this.notiDeviceList();
+    // return data;
+    return {}
   };
 
   /**
@@ -1536,7 +1560,7 @@ class GizwitsMiniSDK {
   public destory = () => {
     this.bleHandle.destory();
     this.lanHandle.destory();
-    this.socketHandle.destory();
+    // this.socketHandle.destory();
     this.keepScanTimer && clearInterval(this.keepScanTimer);
   };
 }

package/src/utils.ts

@@ -136,11 +136,12 @@ const parseAdv = (advertisData: ArrayBuffer, pks: string[]) => {
     }
 
     const tmpBytes = advertisData.slice(index + 1, index + len + 1);
-    if (len >= 6 && len <= 8) {
-      mac = ab2hex(tmpBytes);
-      if (mac.length == 16) {
-        mac = mac.substring(0, 15);
-      }
+    if (len >= 6 && len <= 15) {
+      // 菲斯曼的mac需要转化下
+      const nums = Array.prototype.map.call(new Uint8Array(tmpBytes), function (bit) {
+        return bit;
+      });
+      mac = numberArrToASCIIString(nums);
     }
 
     if (len == 16) {
@@ -157,6 +158,15 @@ const parseAdv = (advertisData: ArrayBuffer, pks: string[]) => {
   return {bleWorkStatus, mac, productKey}
 }
 
+// 数值数组转字符串（按AscII码转化）
+function numberArrToASCIIString(nums: number[]) {
+  // 数值数组转字符串（按AscII码转化）
+  let str = '';
+  for (let i = 0; i < nums.length; i++) {
+    str += String.fromCharCode(nums[i]);
+  }
+  return str;
+}
 
 export const advertisData2PkAndMac = (
   advertisData: ArrayBuffer,

package/src/wifiConfig/ConfigBase.ts

@@ -46,7 +46,8 @@ class ConfigBase {
   // 插入配网扩展信息
   appendExtendData = (key: string) => {
     const cmd = 0 // 小程序默认国内
-    const zone: number = new Date().getTimezoneOffset() / 60; //手机时区
+    // 以东八区为例，模组用的是+8，需要反过来
+    const zone: number = -new Date().getTimezoneOffset() / 60; //手机时区
     let hour: number = Math.floor(zone);
     let m: number = 0; //最终下发的时区精度
     let h: string = ""; //最终下发的时区