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

package/lib/api/p2pApi.js

@@ -108,8 +108,7 @@ export default class P2pApi {
           },
           fail: params => {
             logger('warn', {
-              msg: 'p2p connectDevice failed ==>',
-              params
+              msg: `p2p connectDevice failed ==> ${JSON.stringify(params.innerError)}`
             }, this.onLogger);
             typeof failCb === 'function' && failCb();
             resolve(false);

package/lib/api/sweeperP2p.js

@@ -2,11 +2,11 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 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, once } from 'lodash-es';
-import { logger } from '../utils';
+import { join, map, padStart } from 'lodash-es';
 import { trace } from '../trace';
+import { logger } from '../utils';
+import P2pApi from './p2pApi';
 /**
  * 基于P2p工具类的扫地机扩展实现
  */
@@ -275,7 +275,23 @@ export class SweeperP2p extends P2pApi {
             // 开启p2p流传输
             await this.downloadStream({
               files: exitFiles
-            }, this.albumName);
+            }, this.albumName, () => {
+              logger('info', {
+                msg: 'p2p downloadStream success===>'
+              }, this.onLogger);
+            }, () => {
+              logger('error', {
+                msg: '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);
+              });
+            });
           } else if (await this.initFilePath(this.dataFilePath)) {
             await this.downloadFile({
               files: exitFiles

package/lib/mqtt/promise.js

@@ -22,7 +22,7 @@ export function normalResolve(reqType, taskId) {
   return new Promise((resolve, reject) => {
     // 设置超时定时器
     const timer = setTimeout(() => {
-      reject(new MyError(`${taskId} Request timed out `, {
+      reject(new MyError(`${taskId} ${reqType} Request timed out `, {
         errCode: -1,
         reqType
       }));

package/package.json

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