@ray-js/robot-data-stream 0.0.10-beta-23 → 0.0.10-beta-25

package/lib/api/p2pApi.d.ts

@@ -9,9 +9,7 @@ export default class P2pApi {
     initTimeStamp: number;
     devId: string;
     traceId: string;
-    constructor(props: {
-        onLogger: (type: 'warn' | 'error' | 'info', data: string) => void;
-    });
+    constructor();
     /**
      * 设备断开之后的重连
      */

package/lib/api/p2pApi.js

@@ -11,12 +11,9 @@ import { trace } from '../trace';
 export default class P2pApi {
   // P2p连接状态
 
-  constructor(props) {
+  constructor() {
     this.isConnected = false;
     this.isConnecting = false;
-    if (props && props.onLogger) {
-      this.onLogger = props === null || props === void 0 ? void 0 : props.onLogger;
-    }
   }
 
   /**

package/lib/api/sweeperP2p.d.ts

@@ -74,9 +74,7 @@ export declare class SweeperP2p extends P2pApi {
     offTotalDownLoadProgressUpdate: () => void;
     onDefineStructuredMode: (isStructured: boolean) => void;
     mapUpdateCount: number;
-    constructor(props: {
-        onLogger: (type: 'warn' | 'error' | 'info', data: string) => void;
-    });
+    constructor(props: any);
     private setStreamFilePath;
     private setDataFilePath;
     /**

package/lib/api/sweeperP2p.js

@@ -51,9 +51,6 @@ const shouldDownloadStream = Boolean(ty.p2p.downloadStream && ty.p2p.onStreamPac
 export class SweeperP2p extends P2pApi {
   constructor(props) {
     super(props);
-    if (props && props.onLogger) {
-      this.onLogger = props.onLogger;
-    }
     this.file = undefined;
     this.downloadType = 1;
     this.fileIndex = -1; // -1 表示所有文件下载完成
@@ -632,6 +629,9 @@ export class SweeperP2p extends P2pApi {
   // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, consistent-return
   stopObserverSweeperDataByP2P = () => {
     try {
+      logger('info', {
+        msg: `isConnected: ${this.isConnected}, devId: ${this.devId}`
+      }, this.onLogger);
       if (this.isConnected) {
         logger('info', {
           msg: `try disconnect device, devId: ${this.devId}`

package/lib/index.js

@@ -2,9 +2,9 @@
 import log4js from '@ray-js/log4js';
 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';
+import { SweeperP2pInstance } from './api';
 export * from './mqtt';
 export * from './mqtt/type/requestType';
 const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
@@ -20,9 +20,6 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   const isAppOnBackground = useRef(false);
   const timer = useRef(null);
   const isIDE = getSystemInfoSync().brand === 'devtools';
-  const SweeperP2pInstance = new SweeperP2p({
-    onLogger
-  });
   const handleAppHide = useCallback(() => {
     logger('info', {
       msg: 'hooks onAppHide'
@@ -79,6 +76,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       }, onLogger);
       return;
     }
+    SweeperP2pInstance.onLogger = onLogger;
     SweeperP2pInstance.initP2pSdk(devId).then(() => {
       connectP2p();
       trace.pointFn('p2p', {
@@ -143,11 +141,11 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       msg: 'hooks has been started unmount'
     }, onLogger);
     isInit.current = false;
+    SweeperP2pInstance.stopObserverSweeperDataByP2P();
     if (offSessionStatusChange.current) {
       offSessionStatusChange.current();
       offSessionStatusChange.current = null;
     }
-    SweeperP2pInstance.stopObserverSweeperDataByP2P();
   };
   return {
     appendDownloadStreamDuringTask: SweeperP2pInstance.appendDownloadStreamDuringTask

package/package.json

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