@ray-js/robot-data-stream 0.0.10-beta-19 → 0.0.10-beta-21

package/lib/api/p2pApi.d.ts

@@ -6,7 +6,9 @@ export default class P2pApi {
     isConnecting: boolean;
     offSessionStatusChange: () => void;
     onLogger: (type: 'warn' | 'error' | 'info', v: string) => void;
+    initTimeStamp: number;
     devId: string;
+    traceId: string;
     constructor(props: {
         onLogger: (type: 'warn' | 'error' | 'info', data: string) => void;
     });

package/lib/api/p2pApi.js

@@ -4,6 +4,7 @@
 import { p2p } from '@ray-js/ray';
 import moment from 'moment';
 import { logger } from '../utils';
+import { trace } from '../trace';
 /**
  * P2P 工具类
  */
@@ -184,6 +185,10 @@ export default class P2pApi {
               logger('info', {
                 msg: 'p2p downloadStream success'
               }, this.onLogger);
+              trace.pointFn('p2p', {
+                devId: this.devId,
+                eventName: 'downloadStream'
+              });
               typeof successCb === 'function' && successCb();
               resolve(true);
             },
@@ -192,6 +197,10 @@ export default class P2pApi {
                 msg: 'p2p downloadStream failed===>',
                 params
               }, this.onLogger);
+              trace.pointFn('p2pFail', {
+                devId: this.devId,
+                eventName: 'downloadStream'
+              });
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();
               }, 500);

package/lib/api/sweeperP2p.d.ts

@@ -72,6 +72,8 @@ export declare class SweeperP2p extends P2pApi {
     offP2pStreamPacketReceive: () => void;
     offDownLoadProgressUpdate: () => void;
     offTotalDownLoadProgressUpdate: () => void;
+    onDefineStructuredMode: (isStructured: boolean) => void;
+    mapUpdateCount: number;
     constructor(props: {
         onLogger: (type: 'warn' | 'error' | 'info', data: string) => void;
     });
@@ -125,7 +127,7 @@ export declare class SweeperP2p extends P2pApi {
      * @param downloadType
      * 0: 下载断开 1: 持续下载
      */
-    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined) => Promise<void>;
+    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined, onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined) => Promise<void>;
     /**
      * 在下载过程中继续添加下载文件
      * @param files
@@ -147,6 +149,7 @@ export declare class SweeperP2p extends P2pApi {
      * @param downloadComplete
      */
     private fileDownloadCompleteCallback;
+    private initStructuredMode;
     /**
      * p2p数据流回调
      * @param downloadComplete

package/lib/api/sweeperP2p.js

@@ -6,14 +6,17 @@ import P2pApi from './p2pApi';
 import Base64 from 'base64-js';
 import { padStart, join, map } from 'lodash-es';
 import { logger } from '../utils';
+import { trace } from '../trace';
 /**
  * 基于P2p工具类的扫地机扩展实现
  */
 
 const FILE_NAME_MAP = {
+  // raw类型地图点数据
   'map.bin': {
     type: 0
   },
+  // 结构化点数据
   'map_structured.bin': {
     type: 6
   },
@@ -61,6 +64,7 @@ export class SweeperP2p extends P2pApi {
     this.cacheData = {};
     this.exitFiles = [];
     this.firstPackageTime = Date.now();
+    this.mapUpdateCount = 0;
     this.packetTotalMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
     this.packetSerialNumberCacheMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
     this.packetDataCacheMap = new Map([['map.bin', new Map()], ['map_structured.bin', new Map()], ['cleanPath.bin', new Map()], ['ai.bin', new Map()], ['aiHD_XXXX_YYYY.bin', new Map()], ['map.bin.stream', new Map()], ['map_structured.bin.stream', new Map()], ['cleanPath.bin.stream', new Map()], ['ai.bin.stream', new Map()], ['aiHD_XXXX_YYYY.bin.stream', new Map()]]);
@@ -231,7 +235,7 @@ export class SweeperP2p extends P2pApi {
    * @param downloadType
    * 0: 下载断开 1: 持续下载
    */
-  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData) => {
+  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onDefineStructuredMode) => {
     var _this$file$items;
     if (![0, 1].some(item => item === downloadType)) {
       logger('warn', {
@@ -241,6 +245,7 @@ export class SweeperP2p extends P2pApi {
     }
     this.onReceiveMapData = onReceiveMapData;
     this.onReceivePathData = onReceivePathData;
+    this.onDefineStructuredMode = onDefineStructuredMode;
     this.onReceiveAIPicData = onReceiveAIPicData || (() => {
       // do nothing
     });
@@ -250,6 +255,10 @@ export class SweeperP2p extends P2pApi {
     logger('info', {
       msg: 'startObserverSweeperDataByP2P ==>'
     }, this.onLogger);
+    trace.pointFn('p2p', {
+      devId,
+      eventName: 'startObserverSweeperDataByP2P'
+    });
     this.downloadType = downloadType;
     this.setDataFilePath(devId);
     this.setStreamFilePath(devId);
@@ -380,6 +389,12 @@ export class SweeperP2p extends P2pApi {
       }
     }
   };
+  initStructuredMode = v => {
+    if (this.mapUpdateCount > 1) return;
+    if (this.onDefineStructuredMode) {
+      this.onDefineStructuredMode(v);
+    }
+  };
 
   /**
    * p2p数据流回调
@@ -395,6 +410,10 @@ export class SweeperP2p extends P2pApi {
     let {
       fileName
     } = data;
+    if (fileName.startsWith('map')) {
+      var _FILE_NAME_MAP$fileNa;
+      this.initStructuredMode(((_FILE_NAME_MAP$fileNa = FILE_NAME_MAP[fileName]) === null || _FILE_NAME_MAP$fileNa === void 0 ? void 0 : _FILE_NAME_MAP$fileNa.type) === 6);
+    }
 
     // 因为XXXX_YYYYY会被替换为坐标值，所以这里需要替换一下
 
@@ -443,6 +462,10 @@ export class SweeperP2p extends P2pApi {
           logger('info', {
             msg: `receive first full package, cost time: ${packageTime} ms, fileName: ${fileName}`
           }, this.onLogger);
+          trace.pointFn('p2p', {
+            devId: this.devId,
+            eventName: 'receiveFirstFullPackage'
+          });
           this.firstPackageTime = 0;
         }
         const {
@@ -451,6 +474,7 @@ export class SweeperP2p extends P2pApi {
         if (this.cacheData[type] !== hexValue) {
           if (type === 0 || type === 6) {
             this.onReceiveMapData(hexValue);
+            this.mapUpdateCount += 1;
           }
           if (type === 1) {
             this.onReceivePathData(hexValue);

package/lib/index.d.ts

@@ -6,8 +6,9 @@ declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string)
     onReceiveAIPicData?: ((data: string) => void) | undefined;
     onReceiveAIPicHDData?: ((data: string) => void) | undefined;
     onLogger?: TOnLogger | undefined;
+    onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined;
 } | undefined) => {
     appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | void;
 };
 declare const StreamDataNotificationCenter: import("mitt").Emitter<Record<import("mitt").EventType, unknown>>;
-export { useP2PDataStream, StreamDataNotificationCenter };
+export { StreamDataNotificationCenter, useP2PDataStream };

package/lib/index.js

@@ -1,8 +1,9 @@
 /* eslint-disable consistent-return */
-import { useEffect, useRef, useCallback } from 'react';
 import log4js from '@ray-js/log4js';
-import { SweeperP2p } from './api/sweeperP2p';
 import { getSystemInfoSync, usePageEvent } from '@ray-js/ray';
+import { useCallback, useEffect, useRef } from 'react';
+import { SweeperP2p } from './api/sweeperP2p';
+import { trace } from './trace';
 import { emitter, logger } from './utils';
 export * from './mqtt';
 export * from './mqtt/type/requestType';
@@ -11,7 +12,8 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     logTag,
     onReceiveAIPicData,
     onReceiveAIPicHDData,
-    onLogger
+    onLogger,
+    onDefineStructuredMode
   } = opt || {};
   const isInit = useRef(false);
   const offSessionStatusChange = useRef(null);
@@ -64,6 +66,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       }, onLogger);
       SweeperP2pInstance.onReceiveMapData = onReceiveMapData;
       SweeperP2pInstance.onReceivePathData = onReceivePathData;
+      SweeperP2pInstance.onDefineStructuredMode = onDefineStructuredMode;
       SweeperP2pInstance.registerP2pDownloadEvent();
       SweeperP2pInstance.onLogger = onLogger;
       return () => {
@@ -78,6 +81,15 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     }
     SweeperP2pInstance.initP2pSdk(devId).then(() => {
       connectP2p();
+      trace.pointFn('p2p', {
+        devId,
+        eventName: 'initP2pSdk'
+      });
+    }).catch(() => {
+      trace.pointFn('p2pFail', {
+        devId,
+        eventName: 'initP2pSdk'
+      });
     });
     ty.onAppHide(handleAppHide);
     ty.onAppShow(handleAppShow);
@@ -99,12 +111,24 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     }, onLogger);
     SweeperP2pInstance.isConnecting = true;
     SweeperP2pInstance.connectDevice(() => {
+      trace.pointFn('p2p', {
+        devId,
+        eventName: 'connectDevice'
+      });
       isInit.current = true;
-      SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+      SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onDefineStructuredMode);
       offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
     }, () => {
+      trace.pointFn('p2pFail', {
+        devId,
+        eventName: 'connectDevice'
+      });
       SweeperP2pInstance.reconnectP2p(() => {
         isInit.current = true;
+        trace.pointFn('p2p', {
+          devId,
+          eventName: 'reconnectP2p'
+        });
         SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
         // 这里失败重连需要注册断开重连的事件
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
@@ -131,4 +155,4 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   };
 };
 const StreamDataNotificationCenter = emitter;
-export { useP2PDataStream, StreamDataNotificationCenter };
+export { StreamDataNotificationCenter, useP2PDataStream };

package/lib/mqtt/mqttProvider.d.ts

@@ -1,21 +1,21 @@
 import React from 'react';
 export declare const SingletonContext: React.Context<{
-    useStructuredMode: boolean;
+    useMqtt: boolean;
     commandVersion: '0' | '1';
     devices: {
         common: any;
     };
 }>;
 export declare function useMqtt(): {
-    useStructuredMode: boolean;
+    useMqtt: boolean;
     commandVersion: "0" | "1";
     devices: {
         common: any;
     };
 };
-export declare function MqttProvider({ children, useStructuredMode, commandVersion, devices }: {
+export declare function MqttProvider({ children, useMqtt, commandVersion, devices }: {
     children: any;
-    useStructuredMode: any;
+    useMqtt: any;
     commandVersion: any;
     devices: any;
 }): React.JSX.Element;

package/lib/mqtt/mqttProvider.js

@@ -17,7 +17,7 @@ export function useMqtt() {
 export function MqttProvider(_ref) {
   let {
     children,
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = _ref;
@@ -54,8 +54,8 @@ export function MqttProvider(_ref) {
       }
     });
     instanceRef.current = {
-      // 是否结构化数据(mqtt)
-      useStructuredMode,
+      // 是否走mqtt64/65通道
+      useMqtt,
       // 指令协议版本(1byte or 4bytes)
       commandVersion,
       // sdm

package/lib/mqtt/useDevInfo.js

@@ -10,12 +10,12 @@ var DevInfoEnum = /*#__PURE__*/function (DevInfoEnum) {
 // 请求设备信息
 export const useDevInfo = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices
   } = useContext(SingletonContext);
   return {
     requestDevInfo: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: DevInfoEnum.query,

package/lib/mqtt/useHistoryMap.js

@@ -17,7 +17,7 @@ import { encodeDeleteMap0x2c, encodeSaveMap0x2a, encodeUseMap0x2e } from '@ray-j
  */
 export const useHistoryMap = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices
   } = useContext(SingletonContext);
   /**
@@ -45,7 +45,7 @@ export const useHistoryMap = devId => {
           return Promise.reject(new Error('mapId is required'));
         }
         await deleteMultipleMapFile(mapId, devId);
-        if (useStructuredMode) {
+        if (useMqtt) {
           const params = createSetCommonParams({
             deviceId: devId,
             reqType: DeleteMapEnum.set,
@@ -70,7 +70,7 @@ export const useHistoryMap = devId => {
     },
     changeCurrentMap: async (mapId, url) => {
       try {
-        if (useStructuredMode) {
+        if (useMqtt) {
           const sendData = {
             reqType: UseMapEnum.set,
             mapId,
@@ -99,7 +99,7 @@ export const useHistoryMap = devId => {
       }
     },
     saveMap: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: SaveCurrentMapEnum.set,

package/lib/mqtt/usePartDivision.js

@@ -16,7 +16,7 @@ import { encodePartitionDivision0x1c } from '@ray-js/robot-protocol';
  */
 export const usePartDivision = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -31,7 +31,7 @@ export const usePartDivision = devId => {
 
   return {
     setPartDivision: (points, roomId, origin) => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const pointStr = pointsToString(points, origin);
         const params = createSetCommonParams({
           deviceId: devId,

package/lib/mqtt/usePartMerge.js

@@ -17,7 +17,7 @@ import { encodePartitionMerge0x1e } from '@ray-js/robot-protocol';
  */
 export const usePartMerge = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -35,7 +35,7 @@ export const usePartMerge = devId => {
       if (ids.some(id => typeof id !== 'number')) {
         return Promise.reject(new Error('ids must be an array of numbers'));
       }
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: PartMergeEnum.set,

package/lib/mqtt/usePassword.js

@@ -6,7 +6,7 @@ import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 export const usePassword = devId => {
   const {
-    useStructuredMode
+    useMqtt
   } = useContext(SingletonContext);
 
   // 请求密码状态
@@ -17,7 +17,7 @@ export const usePassword = devId => {
 
   return {
     requestPassword: () => {
-      if (!useStructuredMode) return null;
+      if (!useMqtt) return null;
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: PasswordEnum.query

package/lib/mqtt/useQuiteHours.js

@@ -18,7 +18,7 @@ import { encodeDoNotDisturb0x32 } from '@ray-js/robot-protocol';
  */
 export const useQuiteHours = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -40,7 +40,7 @@ export const useQuiteHours = devId => {
           endTime
         } = message,
         others = _objectWithoutProperties(message, _excluded);
-      if (useStructuredMode) {
+      if (useMqtt) {
         if (!startTime || !endTime) {
           throw new Error('Invalid time');
         }

package/lib/mqtt/useResetMap.js

@@ -6,7 +6,7 @@ import { SingletonContext } from './mqttProvider';
 import { encodeResetMap0x42 } from '@ray-js/robot-protocol';
 export const useResetMap = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -14,7 +14,7 @@ export const useResetMap = devId => {
 
   return {
     setResetMap: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: ResetCurrMapEnum.set

package/lib/mqtt/useRoomProperty.js

@@ -6,7 +6,7 @@ import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 export const useRoomProperty = devId => {
   const {
-    useStructuredMode
+    useMqtt
   } = useContext(SingletonContext);
 
   // 请求房间属性
@@ -15,7 +15,7 @@ export const useRoomProperty = devId => {
 
   return {
     requestRoomProperty: () => {
-      if (!useStructuredMode) return null;
+      if (!useMqtt) return null;
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: RoomPropertyEnum.query

package/lib/mqtt/useSchedule.js

@@ -12,7 +12,7 @@ import { CISTERN_MAP, CLEAN_MODE_MAP, SUCTION_MAP } from '../constant';
 
 export const useSchedule = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -33,7 +33,7 @@ export const useSchedule = devId => {
       return normalResolve(ScheduleEnum.query, taskId);
     },
     setSchedule: message => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: ScheduleEnum.set,

package/lib/mqtt/useSelectRoomClean.js

@@ -10,7 +10,7 @@ import { SingletonContext } from './mqttProvider';
 import { encodeRoomClean0x14, requestRoomClean0x15 } from '@ray-js/robot-protocol';
 export const useSelectRoomClean = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -22,7 +22,7 @@ export const useSelectRoomClean = devId => {
 
   return {
     requestSelectRoomClean: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: RoomCleanSetEnum.query
@@ -36,7 +36,7 @@ export const useSelectRoomClean = devId => {
     },
     setRoomClean: rooms => {
       var _rooms$0$cleanTimes, _rooms$;
-      if (useStructuredMode) {
+      if (useMqtt) {
         const ids = [];
         const suctions = [];
         const cisterns = [];

package/lib/mqtt/useSpotClean.js

@@ -14,7 +14,7 @@ import { pointsToString } from '../utils';
  */
 export const useSpotClean = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -38,7 +38,7 @@ export const useSpotClean = devId => {
         spots,
         origin
       } = message;
-      if (useStructuredMode) {
+      if (useMqtt) {
         if (!isArray(spots) || isArray(spots) && spots.length === 0) {
           return Promise.reject(new Error('message is required'));
         }

package/lib/mqtt/useVirtualArea.js

@@ -12,7 +12,7 @@ import { pointsToString } from '../utils';
 
 export const useVirtualArea = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -34,7 +34,7 @@ export const useVirtualArea = devId => {
 
   return {
     requestVirtualArea: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: VirtualAreaEnum.query
@@ -51,7 +51,7 @@ export const useVirtualArea = devId => {
         data,
         origin
       } = _ref;
-      if (useStructuredMode) {
+      if (useMqtt) {
         const names = [];
         const modes = [];
         const polygons = [];

package/lib/mqtt/useVirtualWall.js

@@ -10,7 +10,7 @@ import { encodeVirtualWall0x12, requestVirtualWall0x13 } from '@ray-js/robot-pro
 import { pointsToString } from '../utils';
 export const useVirtualWall = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -28,7 +28,7 @@ export const useVirtualWall = devId => {
 
   return {
     requestVirtualWall: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: VirtualWallEnum.query
@@ -45,7 +45,7 @@ export const useVirtualWall = devId => {
         data,
         origin
       } = _ref;
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: VirtualWallEnum.set,

package/lib/mqtt/useVoice.js

@@ -18,7 +18,7 @@ import { encodeVoice0x34 } from '@ray-js/robot-protocol';
  */
 export const useVoice = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices
   } = useContext(SingletonContext);
   /**
@@ -58,7 +58,7 @@ export const useVoice = devId => {
       return normalResolve(VoiceLanguageEnum.query, taskId);
     },
     setVoice: message => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const sendData = _objectSpread(_objectSpread({}, message), {}, {
           urlLen: message.url.length
         });

package/lib/mqtt/useZoneClean.js

@@ -16,7 +16,7 @@ import { pointsToString } from '../utils';
  */
 export const useZoneClean = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -27,7 +27,7 @@ export const useZoneClean = devId => {
 
   return {
     requestZoneClean: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: ZoneCleanEnum.query
@@ -44,7 +44,7 @@ export const useZoneClean = devId => {
         zones,
         origin
       } = message;
-      if (useStructuredMode) {
+      if (useMqtt) {
         if (!isArray(zones) || isArray(zones) && zones.length === 0) {
           return Promise.reject(new Error('message is required'));
         }

package/lib/trace/index.d.ts

@@ -0,0 +1,14 @@
+export declare const PointEventConfig: {
+    p2p: string;
+    p2pFail: string;
+};
+export declare class Trace {
+    initTimeStamps: number;
+    traceId: string;
+    constructor();
+    pointFn: (type: 'p2p' | 'p2pFail', options: {
+        devId: string;
+        eventName: string;
+    }) => void;
+}
+export declare const trace: Trace;

package/lib/trace/index.js

@@ -0,0 +1,33 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["devId"];
+import { event } from '@ray-js/ray';
+import { uniqueId } from 'lodash-es';
+
+// 事件埋点编码
+export const PointEventConfig = {
+  p2p: 'ty_QEsvYl97I7pGNwUlqR2ARB7F8uqTAtht',
+  p2pFail: 'ty_YB0xgyLYCy3LDCCUh8zykbDDxMMCGWU5'
+};
+export class Trace {
+  constructor() {
+    this.initTimeStamps = Date.now();
+    this.traceId = uniqueId('p2p_trace_');
+  }
+  pointFn = (type, options) => {
+    const {
+        devId
+      } = options,
+      rest = _objectWithoutProperties(options, _excluded);
+    event({
+      eventId: type === 'p2p' ? PointEventConfig.p2p : PointEventConfig.p2pFail,
+      event: _objectSpread({
+        devId,
+        timeStamp: Date.now(),
+        traceId: this.traceId,
+        costTime: Date.now() - this.initTimeStamps
+      }, rest)
+    });
+  };
+}
+export const trace = new Trace();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.10-beta-19",
+  "version": "0.0.10-beta-21",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [