@ray-js/robot-data-stream 0.0.12-beta-7 → 0.0.12-beta-9

package/lib/api/p2pApi.d.ts

@@ -13,7 +13,7 @@ export default class P2pApi {
     /**
      * 设备断开之后的重连
      */
-    reconnectP2p: (successCb?: () => void) => void;
+    reconnectP2p: (successCb?: () => void, source?: string) => void;
     /**
      * 初始化P2P SDK
      * @param id 用户Id

package/lib/api/p2pApi.js

@@ -19,7 +19,7 @@ export default class P2pApi {
   /**
    * 设备断开之后的重连
    */
-  reconnectP2p = successCb => {
+  reconnectP2p = (successCb, source) => {
     /**
      * 监听到断开事件后
      * 连接成功后设置flag为true
@@ -28,11 +28,11 @@ export default class P2pApi {
     this.isConnected = false;
     if (!this.isConnected) {
       logger('info', {
-        msg: `start p2p reconnect ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
+        msg: `${source} start p2p reconnect ==>  ${moment().format('YYYY-MM-DD HH:mm:ss')}`
       }, this.onLogger);
       this.connectDevice(() => {
         logger('info', {
-          msg: `p2p reconnect success ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
+          msg: `${source} p2p reconnect success ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
         }, this.onLogger);
         this.isConnected = true;
         if (this.isConnected) {
@@ -42,15 +42,15 @@ export default class P2pApi {
         //
       }, () => {
         logger('info', {
-          msg: `reconnect complete ==> ${String(this.isConnected)}`
+          msg: `${source} reconnect complete ==> ${String(this.isConnected)}`
         }, this.onLogger);
         if (!this.isConnected) {
           logger('warn', {
-            msg: `p2p reconnect failed ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
+            msg: `${source} p2p reconnect failed ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
           }, this.onLogger);
           setTimeout(() => {
-            this.reconnectP2p(successCb);
-          }, 3000);
+            this.reconnectP2p(successCb, '0000');
+          }, 6000);
         }
       });
     }

package/lib/api/sweeperP2p.js

@@ -216,7 +216,7 @@ export class SweeperP2p extends P2pApi {
           this.reconnectP2p(() => {
             // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
             this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
-          });
+          }, '1111');
         } else {
           logger('warn', {
             msg: 'receive disconnect notice, but connectDevice is connecting'
@@ -277,19 +277,20 @@ export class SweeperP2p extends P2pApi {
               files: exitFiles
             }, this.albumName, () => {
               logger('info', {
-                msg: 'p2p downloadStream success===>'
+                msg: `${downloadType} p2p downloadStream success===>`
               }, this.onLogger);
             }, () => {
               logger('error', {
-                msg: 'p2p downloadStream failed and try reConnect Device===>'
+                msg: `${downloadType} p2p downloadStream failed and try reConnect Device===>`
               }, this.onLogger);
               this.removeP2pDownloadEvent();
-              this.disconnectDevice();
-              this.isConnected = false;
-              this.isConnecting = false;
-              this.reconnectP2p(() => {
-                // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-                this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+              this.disconnectDevice().then(() => {
+                this.isConnected = false;
+                this.isConnecting = false;
+                this.connectDevice(() => {
+                  // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
+                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+                });
               });
             });
           } else if (await this.initFilePath(this.dataFilePath)) {
@@ -308,7 +309,24 @@ export class SweeperP2p extends P2pApi {
             // 开启p2p流传输
             await this.downloadStream({
               files: exitFiles
-            }, this.albumName);
+            }, this.albumName, () => {
+              logger('info', {
+                msg: `${downloadType} p2p downloadStream success===>`
+              }, this.onLogger);
+            }, () => {
+              logger('error', {
+                msg: `${downloadType} p2p downloadStream failed and try reConnect Device===>`
+              }, this.onLogger);
+              this.removeP2pDownloadEvent();
+              this.disconnectDevice().then(() => {
+                this.isConnected = false;
+                this.isConnecting = false;
+                this.connectDevice(() => {
+                  // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
+                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+                });
+              });
+            });
           } else if (await this.initFilePath(this.streamFilePath)) {
             // 每次要下载前都需要先检查文件目录是否存在 防止中间过程被删除掉文件目录
             await this.downloadFile({

package/lib/index.js

@@ -134,7 +134,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
         SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
         // 这里失败重连需要注册断开重连的事件
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
-      });
+      }, '22222');
     });
   };
 

package/package.json

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