@ray-js/robot-data-stream 0.0.10-beta-18 → 0.0.10-beta-20

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数据流回调
@@ -443,6 +458,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 +470,8 @@ export class SweeperP2p extends P2pApi {
         if (this.cacheData[type] !== hexValue) {
           if (type === 0 || type === 6) {
             this.onReceiveMapData(hexValue);
+            this.mapUpdateCount += 1;
+            this.initStructuredMode(type === 6);
           }
           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/useSpotClean.js

@@ -50,7 +50,6 @@ export const useSpotClean = devId => {
           yMops = new Array(num).fill(-1),
           sweepMopModes = new Array(num).fill('only_sweep')
         } = message;
-        const names = new Array(num).fill('');
         if (suctions && !isArray(suctions)) {
           return Promise.reject(new Error('suctions is illegal'));
         }
@@ -66,10 +65,7 @@ export const useSpotClean = devId => {
         if (sweepMopModes && !isArray(sweepMopModes)) {
           return Promise.reject(new Error('sweepMopModes is illegal'));
         }
-        if (names && !isArray(names)) {
-          return Promise.reject(new Error('names is illegal'));
-        }
-        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length || num !== names.length) {
+        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
           return Promise.reject(new Error('The length of the parameters is inconsistent'));
         }
         const params = createSetCommonParams({
@@ -82,8 +78,7 @@ export const useSpotClean = devId => {
             cisterns,
             cleanCounts,
             yMops,
-            sweepMopModes,
-            names
+            sweepMopModes
           }
         });
         ty.device.sendMqttMessage(params);

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-18",
+  "version": "0.0.10-beta-20",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [