@ray-js/robot-data-stream 0.0.12 → 0.0.13-beta-2

package/lib/api/sweeperP2p.d.ts

@@ -62,6 +62,7 @@ export declare class SweeperP2p extends P2pApi {
     exitFiles: Array<string>;
     packetDataCacheMap: Map<keyof typeof FILE_NAME_MAP, Map<number, string>>;
     packetSerialNumberCacheMap: Map<keyof typeof FILE_NAME_MAP, number>;
+    fileLengthCacheMap: Map<keyof typeof FILE_NAME_MAP, number>;
     packetTotalMap: Map<keyof typeof FILE_NAME_MAP, number>;
     firstPackageTime: number;
     onReceiveMapData: (data: string) => void;

package/lib/api/sweeperP2p.js

@@ -63,6 +63,7 @@ export class SweeperP2p extends P2pApi {
     this.firstPackageTime = Date.now();
     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.fileLengthCacheMap = 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()]]);
   }
   setStreamFilePath = () => {
@@ -386,6 +387,9 @@ export class SweeperP2p extends P2pApi {
       [...this.packetSerialNumberCacheMap.keys()].forEach(key => {
         this.packetSerialNumberCacheMap.set(key, -1);
       });
+      [...this.fileLengthCacheMap.keys()].forEach(key => {
+        this.fileLengthCacheMap.set(key, -1);
+      });
       [...this.packetTotalMap.keys()].forEach(key => {
         this.packetTotalMap.set(key, -1);
       });
@@ -431,6 +435,7 @@ export class SweeperP2p extends P2pApi {
   p2pStreamPacketReceiveCallback = data => {
     const {
       packetData,
+      fileLength,
       fileSerialNumber,
       packetIndex,
       packetType
@@ -465,6 +470,7 @@ export class SweeperP2p extends P2pApi {
     // 说明收到了新的整包数据
     if (fileSerialNumber > cacheSerialNumber) {
       this.packetSerialNumberCacheMap.set(fileName, fileSerialNumber);
+      this.fileLengthCacheMap.set(fileName, fileLength);
       this.packetTotalMap.set(fileName, -1);
       cachePacketMap.clear();
     }
@@ -485,6 +491,13 @@ export class SweeperP2p extends P2pApi {
           let [index, data] = _ref;
           return data;
         }).join('');
+        const cacheFileLength = this.fileLengthCacheMap.get(fileName);
+        if (cacheFileLength > 0 && hexValue.length !== cacheFileLength * 2) {
+          logger('warn', {
+            msg: `p2pStreamPacketReceiveCallback: fileName : ${fileName} length mismatch, expected: ${cacheFileLength * 2}, received: ${hexValue.length}`
+          }, this.onLogger);
+          return;
+        }
         if (this.firstPackageTime > 0 && fileName.indexOf('map') !== -1) {
           const packageTime = Date.now() - this.firstPackageTime;
           logger('info', {

package/lib/index.js

@@ -28,7 +28,6 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     }, onLogger);
     isAppOnBackground.current = true;
     if (isInit.current) {
-      // 判断进入后台之后，维持定时器，如果进入后台超过2分钟, 则断开P2P
       timer.current = setTimeout(() => {
         logger('info', {
           msg: `background timer has been exe,isAppOnBackground: ${isAppOnBackground.current}`
@@ -45,6 +44,10 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     logger('info', {
       msg: 'hooks onAppShow'
     }, onLogger);
+    logger('info', {
+      msg: `clear timer ${timer.current}`
+    }, onLogger);
+    isAppOnBackground.current = false;
     timer.current && clearTimeout(timer.current);
     setTimeout(() => {
       var _ty$p2p$isP2PActiveSy, _ty$p2p, _ty$p2p$isP2PActiveSy2, _ty$p2p2;

package/package.json

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