@ray-js/robot-data-stream 0.0.12-beta-10 → 0.0.12-beta-12

package/lib/api/p2pApi.js

@@ -26,11 +26,16 @@ export default class P2pApi {
      * 并清除定时器
      */
     // this.isConnected = false;
-    if (this.isConnected || this.isConnecting) {
+    if (this.isConnected) {
       return logger('info', {
         msg: 'p2p isConnected or isConnecting'
       }, this.onLogger);
     }
+    if (this.isConnecting) {
+      return logger('info', {
+        msg: 'p2p isConnecting'
+      }, this.onLogger);
+    }
     // if (!this.isConnected) {
     logger('info', {
       msg: `${source} start p2p reconnect ==>  ${moment().format('YYYY-MM-DD HH:mm:ss')}`
@@ -117,6 +122,7 @@ export default class P2pApi {
             logger('warn', {
               msg: `p2p connectDevice failed ==> ${JSON.stringify(params.innerError)}`
             }, this.onLogger);
+            this.isConnecting = false;
             typeof failCb === 'function' && failCb();
             resolve(false);
           },
@@ -126,6 +132,8 @@ export default class P2pApi {
           }
         });
       } catch (e) {
+        this.isConnecting = false;
+        this.isConnected = false;
         logger('error', {
           msg: 'p2p connectDevice occur an error ==>',
           e

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'

package/lib/index.js

@@ -51,9 +51,9 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
           deviceId: devId
         })}`
       }, onLogger);
-      if (!isInit.current || !((_ty$p2p$isP2PActiveSy2 = (_ty$p2p2 = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy2 !== void 0 && _ty$p2p$isP2PActiveSy2.call(_ty$p2p2, {
+      if ((!isInit.current || !((_ty$p2p$isP2PActiveSy2 = (_ty$p2p2 = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy2 !== void 0 && _ty$p2p$isP2PActiveSy2.call(_ty$p2p2, {
         deviceId: devId
-      }))) {
+      }))) && !SweeperP2pInstance.isConnecting) {
         connectP2p();
       }
     }, 500);
@@ -111,7 +111,6 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     logger('info', {
       msg: 'hooks has been started connectP2p'
     }, onLogger);
-    SweeperP2pInstance.isConnecting = true;
     SweeperP2pInstance.connectDevice(() => {
       trace.pointFn('p2p', {
         devId,
@@ -134,7 +133,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-10",
+  "version": "0.0.12-beta-12",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [