@ray-js/robot-data-stream 0.0.6 → 0.0.7

package/lib/api/p2pApi.js

@@ -1,3 +1,5 @@
+/* eslint-disable consistent-return */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable prefer-promise-reject-errors */
 import { p2p } from '@ray-js/ray';
 import moment from 'moment';
@@ -31,11 +33,15 @@ export default class P2pApi {
         if (this.isConnected) {
           typeof successCb === 'function' && successCb();
         }
-      }, () => {}, () => {
+      }, () => {
+        //
+      }, () => {
         log4js.info('reconnect complete ==>', String(this.isConnected));
         if (!this.isConnected) {
           log4js.warn('p2p reconnect failed ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
-          this.reconnectP2p(successCb);
+          setTimeout(() => {
+            this.reconnectP2p(successCb);
+          }, 3000);
         }
       });
     }
@@ -155,7 +161,9 @@ export default class P2pApi {
               }, 500);
               resolve(false);
             },
-            complete: () => {}
+            complete: () => {
+              //
+            }
           });
         });
       }
@@ -192,7 +200,9 @@ export default class P2pApi {
               }, 500);
               resolve(false);
             },
-            complete: () => {}
+            complete: () => {
+              //
+            }
           });
         });
       }
@@ -239,7 +249,9 @@ export default class P2pApi {
               }, 500);
               resolve(false);
             },
-            complete: () => {}
+            complete: () => {
+              //
+            }
           });
         });
       }
@@ -351,12 +363,6 @@ export default class P2pApi {
    * @returns
    */
   deInitP2PSDK = async () => {
-    // 先销毁断开监听
-    typeof this.offSessionStatusChange === 'function' && this.offSessionStatusChange();
-    // 销毁初始化时,先进行断连操作
-    if (this.isConnected) {
-      await this.disconnectDevice();
-    }
     return new Promise((resolve, reject) => {
       try {
         p2p.deInitSDK({

package/lib/api/sweeperP2p.d.ts

@@ -169,7 +169,7 @@ export declare class SweeperP2p extends P2pApi {
     /**
      * 停止文件下载
      */
-    stopObserverSweeperDataByP2P: () => Promise<unknown>;
+    stopObserverSweeperDataByP2P: () => Promise<false | undefined>;
 }
 declare const sweeperP2pInstance: SweeperP2p;
 export default sweeperP2pInstance;

package/lib/api/sweeperP2p.js

@@ -535,12 +535,18 @@ export class SweeperP2p extends P2pApi {
   /**
    * 停止文件下载
    */
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, consistent-return
   stopObserverSweeperDataByP2P = async () => {
     try {
       this.removeP2pDownloadEvent();
-      const isCancel = await this.cancelDownloadTask();
-      log4js.info('cancelDownloadTask ==>', isCancel);
-      return isCancel;
+      await this.cancelDownloadTask();
+
+      // 先销毁断开监听
+      typeof this.offSessionStatusChange === 'function' && this.offSessionStatusChange();
+      // 销毁初始化时,先进行断连操作
+      if (this.isConnected) {
+        this.disconnectDevice();
+      }
     } catch (e) {
       log4js.error('stopObserverSweeperDataByP2P occur error ==>', e);
       return false;

package/lib/index.js

@@ -11,7 +11,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     onReceiveAIPicData,
     onReceiveAIPicHDData
   } = opt || {};
-  const isInit = useRef(null);
+  const isInit = useRef(false);
   const offSessionStatusChange = useRef(null);
   const isAppOnBackground = useRef(false);
   const timer = useRef(null);
@@ -33,11 +33,14 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
         SweeperP2pInstance.removeP2pDownloadEvent();
       };
     }
-    isInitP2p();
+    SweeperP2pInstance.initP2pSdk(devId).then(() => {
+      connectP2p();
+    });
     onEnterBackground();
     onEnterForeground();
     return () => {
       unmount();
+      SweeperP2pInstance.deInitP2PSDK();
       timer && clearInterval(timer);
     };
   }, []);
@@ -45,22 +48,21 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   /**
    * p2p连接
    */
-  const isInitP2p = async () => {
-    log4js.info('hooks has been started initP2p');
-    isInit.current = await SweeperP2pInstance.initP2pSdk(devId);
-    if (isInit.current) {
-      SweeperP2pInstance.isConnecting = true;
-      SweeperP2pInstance.connectDevice(() => {
+  const connectP2p = async () => {
+    log4js.info('hooks has been started connectP2p');
+    SweeperP2pInstance.isConnecting = true;
+    SweeperP2pInstance.connectDevice(() => {
+      isInit.current = true;
+      SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+      offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
+    }, () => {
+      SweeperP2pInstance.reconnectP2p(() => {
+        isInit.current = true;
         SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+        // 这里失败重连需要注册断开重连的事件
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
-      }, () => {
-        SweeperP2pInstance.reconnectP2p(() => {
-          SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
-          // 这里失败重连需要注册断开重连的事件
-          offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
-        });
       });
-    }
+    });
   };
 
   /**
@@ -79,7 +81,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
           }
           clearTimeout(timer.current);
           timer.current = null;
-        }, 2 * 60 * 1000);
+        }, 10 * 1000);
       }
     });
   };
@@ -94,8 +96,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       offSessionStatusChange.current();
       offSessionStatusChange.current = null;
     }
-    await SweeperP2pInstance.stopObserverSweeperDataByP2P();
-    await SweeperP2pInstance.deInitP2PSDK();
+    SweeperP2pInstance.stopObserverSweeperDataByP2P();
   };
 
   /**
@@ -104,10 +105,14 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   const onEnterForeground = () => {
     ty.onAppShow(() => {
       log4js.info('hooks onAppShow');
-      isAppOnBackground.current = false;
-      if (!isInit.current) {
-        isInitP2p();
-      }
+      setTimeout(() => {
+        var _ty$p2p$isP2PActiveSy, _ty$p2p;
+        if (!isInit.current || !((_ty$p2p$isP2PActiveSy = (_ty$p2p = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy !== void 0 && _ty$p2p$isP2PActiveSy.call(_ty$p2p, {
+          deviceId: devId
+        }))) {
+          connectP2p();
+        }
+      }, 500);
     });
   };
   return {

package/package.json

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