@ray-js/robot-data-stream 0.0.10 → 0.0.12-beta-1

package/lib/api/sweeperP2p.d.ts

@@ -73,8 +73,7 @@ export declare class SweeperP2p extends P2pApi {
     offDownLoadProgressUpdate: () => void;
     offTotalDownLoadProgressUpdate: () => void;
     onDefineStructuredMode: (isStructured: boolean) => void;
-    mapUpdateCount: number;
-    constructor(props: any);
+    constructor();
     private setStreamFilePath;
     private setDataFilePath;
     /**
@@ -153,16 +152,6 @@ export declare class SweeperP2p extends P2pApi {
      * @param downloadComplete
      */
     private p2pStreamPacketReceiveCallback;
-    /**
-     * 单文件下载完成回调
-     * @param data
-     */
-    private fileDownloadProgressCallback;
-    /**
-     * 多文件下载进度监听
-     * @param data
-     */
-    private fileTotalDownloadProgressCallback;
     /**
      * 从指定的文件路径获取文件
      * @param fileName

package/lib/api/sweeperP2p.js

@@ -4,7 +4,7 @@ import "core-js/modules/esnext.iterator.map.js";
 /* eslint-disable no-shadow */
 import P2pApi from './p2pApi';
 import Base64 from 'base64-js';
-import { padStart, join, map } from 'lodash-es';
+import { padStart, join, map, once } from 'lodash-es';
 import { logger } from '../utils';
 import { trace } from '../trace';
 /**
@@ -49,8 +49,8 @@ const FILE_NAME_MAP = {
 // 走p2p流传输(新) or 读取bin文件(旧)
 const shouldDownloadStream = Boolean(ty.p2p.downloadStream && ty.p2p.onStreamPacketReceive);
 export class SweeperP2p extends P2pApi {
-  constructor(props) {
-    super(props);
+  constructor() {
+    super();
     this.file = undefined;
     this.downloadType = 1;
     this.fileIndex = -1; // -1 表示所有文件下载完成
@@ -61,7 +61,6 @@ 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()]]);
@@ -359,9 +358,8 @@ export class SweeperP2p extends P2pApi {
       [...this.packetDataCacheMap.keys()].forEach(key => {
         this.packetDataCacheMap.set(key, new Map());
       });
-    } else {
-      this.cacheData = {};
     }
+    this.cacheData = {};
     this.offFileDownloadComplete && this.offFileDownloadComplete();
     this.offP2pStreamPacketReceive && this.offP2pStreamPacketReceive();
 
@@ -386,12 +384,11 @@ export class SweeperP2p extends P2pApi {
       }
     }
   };
-  initStructuredMode = v => {
-    if (this.mapUpdateCount > 1) return;
+  initStructuredMode = (() => once(isStructured => {
     if (this.onDefineStructuredMode) {
-      this.onDefineStructuredMode(v);
+      this.onDefineStructuredMode(isStructured);
     }
-  };
+  }))();
 
   /**
    * p2p数据流回调
@@ -427,6 +424,11 @@ export class SweeperP2p extends P2pApi {
       return;
     }
     const cacheSerialNumber = this.packetSerialNumberCacheMap.get(fileName);
+    if (fileName.includes('cleanPath')) {
+      logger('info', {
+        msg: `receive a path package, ${fileSerialNumber}, ${packetIndex}, ${packetType}, ${cacheSerialNumber}}`
+      }, this.onLogger);
+    }
 
     // 说明收到了过时包的数据
     if (fileSerialNumber < cacheSerialNumber) return;
@@ -471,9 +473,11 @@ export class SweeperP2p extends P2pApi {
         if (this.cacheData[type] !== hexValue) {
           if (type === 0 || type === 6) {
             this.onReceiveMapData(hexValue);
-            this.mapUpdateCount += 1;
           }
           if (type === 1) {
+            logger('info', {
+              msg: `push new path data`
+            }, this.onLogger);
             this.onReceivePathData(hexValue);
           }
           if (type === 4) {
@@ -488,22 +492,6 @@ export class SweeperP2p extends P2pApi {
     }
   };
 
-  /**
-   * 单文件下载完成回调
-   * @param data
-   */
-  fileDownloadProgressCallback = () => {
-    // console.log('fileDownloadProgressCallback', data);
-  };
-
-  /**
-   * 多文件下载进度监听
-   * @param data
-   */
-  fileTotalDownloadProgressCallback = () => {
-    // console.log('fileTotalDownloadProgressCallback', data );
-  };
-
   /**
    * 从指定的文件路径获取文件
    * @param fileName

package/package.json

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