@ray-js/robot-data-stream 0.0.10-beta-4 → 0.0.10-beta-5

package/lib/api/sweeperP2p.js

@@ -191,6 +191,7 @@ export class SweeperP2p extends P2pApi {
       } = data;
       if (status < 0) {
         log4js.info('receive disconnect notice ==>', status);
+        this.isConnected = false;
         if (!this.isConnecting) {
           this.reconnectP2p(() => {
             // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
@@ -291,6 +292,7 @@ export class SweeperP2p extends P2pApi {
    * 注册下载有关的监听
    */
   registerP2pDownloadEvent = () => {
+    log4js.info('registerP2pDownloadEvent ==>');
     if (shouldDownloadStream) {
       // p2p数据流监听
       this.offP2pStreamPacketReceive = this.onP2pStreamPacketReceive(this.p2pStreamPacketReceiveCallback);
@@ -311,8 +313,7 @@ export class SweeperP2p extends P2pApi {
    * 移除下载有关的监听
    */
   removeP2pDownloadEvent = () => {
-    this.offFileDownloadComplete && this.offFileDownloadComplete();
-    this.offP2pStreamPacketReceive && this.offP2pStreamPacketReceive();
+    log4js.info('removeP2pDownloadEvent ==>');
     if (shouldDownloadStream) {
       [...this.packetSerialNumberCacheMap.keys()].forEach(key => {
         this.packetSerialNumberCacheMap.set(key, -1);
@@ -326,6 +327,8 @@ export class SweeperP2p extends P2pApi {
     } else {
       this.cacheData = {};
     }
+    this.offFileDownloadComplete && this.offFileDownloadComplete();
+    this.offP2pStreamPacketReceive && this.offP2pStreamPacketReceive();
 
     // this.offDownLoadProgressUpdate && this.offDownLoadProgressUpdate();
     // this.offTotalDownLoadProgressUpdate && this.offTotalDownLoadProgressUpdate();
@@ -363,6 +366,7 @@ export class SweeperP2p extends P2pApi {
     let {
       fileName
     } = data;
+    log4js.info(`p2pStreamPacketReceiveCallback: ${fileName},  ${fileSerialNumber}, ${packetType}`);
 
     // 因为XXXX_YYYYY会被替换为坐标值，所以这里需要替换一下
 
@@ -569,7 +573,8 @@ export class SweeperP2p extends P2pApi {
   stopObserverSweeperDataByP2P = async () => {
     try {
       this.removeP2pDownloadEvent();
-      this.cancelDownloadTask();
+      // 没有必要cancelDownloadTask，只需要调用断连
+      // this.cancelDownloadTask();
 
       // 先销毁断开监听
       typeof this.offSessionStatusChange === 'function' && this.offSessionStatusChange();

package/package.json

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