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

package/lib/api/p2pApi.js

@@ -74,6 +74,8 @@ 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: () => {
@@ -200,7 +202,7 @@ export default class P2pApi {
               logger('info', {
                 msg: 'p2p downloadStream success'
               }, this.onLogger);
-              trace.pointFn('p2p', {
+              trace.pointFn({
                 devId: this.devId,
                 eventName: 'downloadStream'
               });
@@ -212,7 +214,7 @@ export default class P2pApi {
                 msg: 'p2p downloadStream failed===>',
                 params
               }, this.onLogger);
-              trace.pointFn('p2pFail', {
+              trace.pointFn({
                 devId: this.devId,
                 eventName: 'downloadStream'
               });

package/lib/api/sweeperP2p.js

@@ -251,7 +251,7 @@ export class SweeperP2p extends P2pApi {
     logger('info', {
       msg: 'startObserverSweeperDataByP2P ==>'
     }, this.onLogger);
-    trace.pointFn('p2p', {
+    trace.pointFn({
       devId,
       eventName: 'startObserverSweeperDataByP2P'
     });
@@ -495,7 +495,7 @@ export class SweeperP2p extends P2pApi {
           logger('info', {
             msg: `receive first full package, cost time: ${packageTime} ms, fileName: ${fileName}`
           }, this.onLogger);
-          trace.pointFn('p2p', {
+          trace.pointFn({
             devId: this.devId,
             eventName: 'receiveFirstFullPackage'
           });

package/lib/index.d.ts

@@ -7,6 +7,7 @@ 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

@@ -13,7 +13,8 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     onReceiveAIPicData,
     onReceiveAIPicHDData,
     onLogger,
-    onDefineStructuredMode
+    onDefineStructuredMode,
+    traceId
   } = opt || {};
   const isInit = useRef(false);
   const offSessionStatusChange = useRef(null);
@@ -62,6 +63,9 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     if (logTag) {
       log4js.setTag(logTag);
     }
+    if (traceId) {
+      trace.traceId = traceId;
+    }
     if (isIDE) {
       logger('warn', {
         msg: `You are using the IDE environment. To perform P2P and map debugging, please ensure the 'Robot Vacuum Debugger' plugin is installed.`
@@ -84,14 +88,14 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     SweeperP2pInstance.onLogger = onLogger;
     SweeperP2pInstance.initP2pSdk(devId).then(() => {
       connectP2p();
-      trace.pointFn('p2p', {
+      trace.pointFn({
         devId,
         eventName: 'initP2pSdk'
       });
     }).catch(() => {
-      trace.pointFn('p2pFail', {
+      trace.pointFn({
         devId,
-        eventName: 'initP2pSdk'
+        eventName: 'initP2pSdkFail'
       });
     });
     ty.onAppHide(handleAppHide);
@@ -112,7 +116,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       msg: 'hooks has been started connectP2p'
     }, onLogger);
     SweeperP2pInstance.connectDevice(() => {
-      trace.pointFn('p2p', {
+      trace.pointFn({
         devId,
         eventName: 'connectDevice'
       });
@@ -120,13 +124,13 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onDefineStructuredMode);
       offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
     }, () => {
-      trace.pointFn('p2pFail', {
+      trace.pointFn({
         devId,
-        eventName: 'connectDevice'
+        eventName: 'connectDeviceFail'
       });
       SweeperP2pInstance.reconnectP2p(() => {
         isInit.current = true;
-        trace.pointFn('p2p', {
+        trace.pointFn({
           devId,
           eventName: 'reconnectP2p'
         });

package/lib/mqtt/usePassword.d.ts

@@ -1,5 +1,5 @@
 import { PromiseWithRejection } from './promise';
-type TRequestPassword = () => PromiseWithRejection;
+type TRequestPassword = () => PromiseWithRejection | Promise<void>;
 type TSetPassword = (params: {
     password: string;
     oldPassword?: string;

package/lib/mqtt/usePassword.js

@@ -17,7 +17,7 @@ export const usePassword = devId => {
 
   return {
     requestPassword: () => {
-      if (!useMqtt) return null;
+      if (!useMqtt) return Promise.reject(new Error('useMqtt is not used'));
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: PasswordEnum.query

package/lib/mqtt/useRoomProperty.js

@@ -15,7 +15,7 @@ export const useRoomProperty = devId => {
 
   return {
     requestRoomProperty: () => {
-      if (!useMqtt) return null;
+      if (!useMqtt) return Promise.reject(new Error('useMqtt is not used'));
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: RoomPropertyEnum.query

package/lib/trace/index.d.ts

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

package/lib/trace/index.js

@@ -1,32 +1,32 @@
-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'
+  p2p: 'ty_QEsvYl97I7pGNwUlqR2ARB7F8uqTAtht'
 };
 export class Trace {
   constructor() {
     this.initTimeStamps = Date.now();
-    this.traceId = uniqueId('p2p_trace_');
   }
-  pointFn = (type, options) => {
+  pointFn = options => {
     const {
-        devId
-      } = options,
-      rest = _objectWithoutProperties(options, _excluded);
+      devId,
+      eventName
+    } = options;
     event({
-      eventId: type === 'p2p' ? PointEventConfig.p2p : PointEventConfig.p2pFail,
-      event: _objectSpread({
+      eventId: PointEventConfig.p2p,
+      event: {
+        // 设备id
         devId,
-        timeStamp: Date.now(),
-        traceId: this.traceId,
-        costTime: Date.now() - this.initTimeStamps
-      }, rest)
+        // 时间戳
+        time: Date.now(),
+        // 追踪id
+        traceId: this.traceId || '',
+        // 耗时（当前的时间戳 - initP2PSDK的时间戳）
+        costTime: Date.now() - this.initTimeStamps,
+        // 事件名称
+        eventName
+      }
     });
   };
 }

package/package.json

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