@ray-js/robot-data-stream 0.0.12-beta-14 → 0.0.12-beta-15

package/lib/api/p2pApi.js

@@ -74,8 +74,6 @@ export default class P2pApi {
   initP2pSdk = async devId => {
     return new Promise((resolve, reject) => {
       try {
-        // 初始化p2pSDK时，将trace的开始时间戳记录下来
-        trace.initTimeStamps = Date.now();
         this.devId = devId;
         p2p.P2PSDKInit({
           success: () => {
@@ -216,7 +214,7 @@ export default class P2pApi {
               }, this.onLogger);
               trace.pointFn({
                 devId: this.devId,
-                eventName: 'downloadStream'
+                eventName: 'downloadStreamFailed'
               });
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();

package/lib/index.d.ts

@@ -7,7 +7,6 @@ declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string)
     onReceiveAIPicHDData?: ((data: string) => void) | undefined;
     onLogger?: TOnLogger | undefined;
     onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined;
-    traceId?: string | undefined;
 } | undefined) => {
     appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | void;
 };

package/lib/index.js

@@ -8,13 +8,14 @@ import { SweeperP2pInstance } from './api';
 export * from './mqtt';
 export * from './mqtt/type/requestType';
 const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
+  const traceId = `${devId}_${Date.now()}`;
+  global.robotPanelTraceId = traceId;
   const {
     logTag,
     onReceiveAIPicData,
     onReceiveAIPicHDData,
     onLogger,
-    onDefineStructuredMode,
-    traceId
+    onDefineStructuredMode
   } = opt || {};
   const isInit = useRef(false);
   const offSessionStatusChange = useRef(null);
@@ -115,10 +116,12 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     logger('info', {
       msg: 'hooks has been started connectP2p'
     }, onLogger);
+    // 开始进行连接时作为整个p2p连接的开始，将trace的开始时间戳记录下来
+    trace.initTimeStamps = Date.now();
     SweeperP2pInstance.connectDevice(() => {
       trace.pointFn({
         devId,
-        eventName: 'connectDevice'
+        eventName: 'connectDeviceSuccess'
       });
       isInit.current = true;
       SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onDefineStructuredMode);

package/lib/trace/index.d.ts

@@ -4,6 +4,7 @@ export declare const PointEventConfig: {
 export declare class Trace {
     initTimeStamps: number;
     traceId: string;
+    devId: string;
     constructor();
     pointFn: (options: {
         devId: string;

package/lib/trace/index.js

@@ -2,7 +2,7 @@ import { event } from '@ray-js/ray';
 
 // 事件埋点编码
 export const PointEventConfig = {
-  p2p: 'ty_QEsvYl97I7pGNwUlqR2ARB7F8uqTAtht'
+  p2p: 'ty_MItWO0xACjJhXAxxXuhFLc6QAIzYsL8c'
 };
 export class Trace {
   constructor() {
@@ -13,19 +13,20 @@ export class Trace {
       devId,
       eventName
     } = options;
+    console.log('==trace pointFn==', options);
     event({
       eventId: PointEventConfig.p2p,
       event: {
         // 设备id
-        devId,
+        devId: devId,
+        // 事件名称
+        eventName,
         // 时间戳
-        time: Date.now(),
-        // 追踪id
-        traceId: this.traceId || '',
+        timeStamp: Date.now(),
         // 耗时（当前的时间戳 - initP2PSDK的时间戳）
         costTime: Date.now() - this.initTimeStamps,
-        // 事件名称
-        eventName
+        // 追踪id
+        traceId: this.traceId || ''
       }
     });
   };

package/package.json

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