@ray-js/robot-data-stream 0.0.1 → 0.0.2

package/lib/api/p2pApi.d.ts

@@ -3,6 +3,7 @@
  */
 export default class P2pApi {
     isConnected: boolean;
+    isConnecting: boolean;
     offSessionStatusChange: () => void;
     devId: string;
     constructor();

package/lib/api/p2pApi.js

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-promise-reject-errors */
 import { p2p } from '@ray-js/ray';
 import moment from 'moment';
-import { Logger } from '../utils';
+import log4js from '@ray-js/log4js';
 /**
  * P2P 工具类
  */
@@ -10,6 +10,7 @@ export default class P2pApi {
 
   constructor() {
     this.isConnected = false;
+    this.isConnecting = false;
   }
 
   /**
@@ -23,17 +24,17 @@ export default class P2pApi {
      */
     this.isConnected = false;
     if (!this.isConnected) {
-      Logger.info('start p2p reconnect ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
+      log4js.info('start p2p reconnect ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
       this.connectDevice(() => {
-        Logger.info('p2p reconnect success ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
+        log4js.info('p2p reconnect success ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
         this.isConnected = true;
         if (this.isConnected) {
           typeof successCb === 'function' && successCb();
         }
       }, () => {}, () => {
-        Logger.log('reconnect complete ==>', String(this.isConnected));
+        log4js.info('reconnect complete ==>', String(this.isConnected));
         if (!this.isConnected) {
-          Logger.warn('p2p reconnect failed ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
+          log4js.warn('p2p reconnect failed ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
           this.reconnectP2p(successCb);
         }
       });
@@ -51,11 +52,11 @@ export default class P2pApi {
         this.devId = devId;
         p2p.P2PSDKInit({
           success: () => {
-            Logger.info('P2PSDKInit success');
+            log4js.info('P2PSDKInit success');
             resolve(true);
           },
           fail: params => {
-            Logger.warn('P2PSDKInit fail', params);
+            log4js.warn('P2PSDKInit fail', params);
             resolve(false);
           }
         });
@@ -77,13 +78,14 @@ export default class P2pApi {
           timeout: 5000,
           mode: 0,
           success: () => {
-            Logger.info('p2p connectDevice success');
+            log4js.info('p2p connectDevice success');
             this.isConnected = true;
+            this.isConnecting = false;
             typeof successCb === 'function' && successCb();
             resolve(true);
           },
           fail: params => {
-            Logger.warn('p2p connectDevice failed ==>', params);
+            log4js.warn('p2p connectDevice failed ==>', params);
             typeof failCb === 'function' && failCb();
             resolve(false);
           },
@@ -92,7 +94,7 @@ export default class P2pApi {
           }
         });
       } catch (e) {
-        Logger.error('p2p connectDevice occur an error ==>', e);
+        log4js.error('p2p connectDevice occur an error ==>', e);
         reject(false);
       }
     });
@@ -109,16 +111,16 @@ export default class P2pApi {
           deviceId: this.devId,
           success: () => {
             this.isConnected = false;
-            Logger.info('p2p disconnectDevice success');
+            log4js.info('p2p disconnectDevice success');
             resolve(true);
           },
           fail: () => {
-            Logger.warn('p2p disconnectDevice failed');
+            log4js.warn('p2p disconnectDevice failed');
             resolve(false);
           }
         });
       } catch (e) {
-        Logger.warn('p2p disconnectDevice occur an error ==>', e);
+        log4js.warn('p2p disconnectDevice occur an error ==>', e);
         reject(false);
       }
     });
@@ -142,12 +144,12 @@ export default class P2pApi {
             albumName: albumName,
             jsonfiles: JSON.stringify(files),
             success: () => {
-              Logger.info('p2p downloadStream success');
+              log4js.info('p2p downloadStream success');
               typeof successCb === 'function' && successCb();
               resolve(true);
             },
             fail: params => {
-              Logger.warn('p2p downloadStream failed ==>', params);
+              log4js.warn('p2p downloadStream failed ==>', params);
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();
               }, 500);
@@ -158,7 +160,7 @@ export default class P2pApi {
         });
       }
     } catch (e) {
-      Logger.warn('p2p downloadStream occur an error ==>', e);
+      log4js.warn('p2p downloadStream occur an error ==>', e);
     }
   };
 
@@ -189,12 +191,12 @@ export default class P2pApi {
             filePath: filePath,
             jsonfiles: JSON.stringify(files),
             success: () => {
-              Logger.info('p2p downloadFile success');
+              log4js.info('p2p downloadFile success');
               typeof successCb === 'function' && successCb();
               resolve(true);
             },
             fail: params => {
-              Logger.warn('p2p downloadFile failed ==>', params);
+              log4js.warn('p2p downloadFile failed ==>', params);
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();
               }, 500);
@@ -205,7 +207,7 @@ export default class P2pApi {
         });
       }
     } catch (e) {
-      Logger.error('p2p downloadFile occur an error ==>', e);
+      log4js.error('p2p downloadFile occur an error ==>', e);
     }
     return null;
   };
@@ -279,7 +281,7 @@ export default class P2pApi {
           }
         });
       } catch (e) {
-        Logger.info('cancelDownloadTask occur an error', e);
+        log4js.info('cancelDownloadTask occur an error', e);
         reject(false);
       }
     });
@@ -296,11 +298,11 @@ export default class P2pApi {
         deviceId: this.devId,
         albumName,
         success: params => {
-          Logger.info('queryAlbumFileIndexs ==>', params);
+          log4js.info('queryAlbumFileIndexs ==>', params);
           resolve(params);
         },
         fail: params => {
-          Logger.warn('queryAlbumFileIndexs failed ==>', params);
+          log4js.warn('queryAlbumFileIndexs failed ==>', params);
           resolve(null);
         }
       });
@@ -322,11 +324,11 @@ export default class P2pApi {
       try {
         p2p.deInitSDK({
           success: () => {
-            Logger.info('deInitP2pSDK success');
+            log4js.info('deInitP2pSDK success');
             resolve(true);
           },
           fail: () => {
-            Logger.info('deInitP2pSDK failed');
+            log4js.info('deInitP2pSDK failed');
             resolve(false);
           },
           complete: () => {
@@ -334,7 +336,7 @@ export default class P2pApi {
           }
         });
       } catch (e) {
-        Logger.error('deInitP2pSDK occur an error ==>', e);
+        log4js.error('deInitP2pSDK occur an error ==>', e);
         reject(false);
       }
     });

package/lib/api/sweeperP2p.js

@@ -2,7 +2,7 @@
 import P2pApi from './p2pApi';
 import Base64 from 'base64-js';
 import { padStart } from 'lodash-es';
-import { Logger } from '../utils';
+import log4js from '@ray-js/log4js';
 /**
  * 基于P2p工具类的扫地机扩展实现
  */
@@ -161,17 +161,21 @@ export class SweeperP2p extends P2pApi {
    * @param data
    */
   sessionStatusCallback = data => {
-    Logger.info('sessionStatusCallback ==>', data);
+    log4js.info('sessionStatusCallback ==>', data);
     if (data) {
       const {
         status
       } = data;
       if (status < 0) {
-        Logger.info('receive disconnect notice ==>', status);
-        this.reconnectP2p(() => {
-          // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-          this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData);
-        });
+        log4js.info('receive disconnect notice ==>', status);
+        if (!this.isConnecting) {
+          this.reconnectP2p(() => {
+            // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
+            this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData);
+          });
+        } else {
+          log4js.warn('receive disconnect notice, but connectDevice is connecting');
+        }
       }
     }
   };
@@ -184,12 +188,12 @@ export class SweeperP2p extends P2pApi {
   startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData) => {
     var _this$file$items;
     if (![0, 1].some(item => item === downloadType)) {
-      Logger.warn('download type must be 0 or 1');
+      log4js.warn('download type must be 0 or 1');
       return;
     }
     this.onReceiveMapData = onReceiveMapData;
     this.onReceivePathData = onReceivePathData;
-    Logger.info('startObserverSweeperDataByP2P ==>');
+    log4js.info('startObserverSweeperDataByP2P ==>');
     this.downloadType = downloadType;
     this.setDataFilePath(devId);
     this.setStreamFilePath(devId);
@@ -388,7 +392,7 @@ export class SweeperP2p extends P2pApi {
           const type = this.getFileType(fileName);
           if (this.cacheData[type] !== hexValue) {
             if (hexValue.length === 0) {
-              Logger.warn('receive empty data');
+              log4js.warn('receive empty data');
               return;
             }
             if (type === 0) {
@@ -401,13 +405,13 @@ export class SweeperP2p extends P2pApi {
           }
         },
         fail: e => {
-          Logger.warn('readFileFromPath failed ==>', e);
+          log4js.warn('readFileFromPath failed ==>', e);
           this.resetReading(fileName);
         }
       });
     } catch (e) {
       this.resetReading(fileName);
-      Logger.error('readFileFromPath ==>', e);
+      log4js.error('readFileFromPath ==>', e);
     }
   };
   setReading = fileName => {
@@ -467,10 +471,10 @@ export class SweeperP2p extends P2pApi {
     try {
       this.removeP2pDownloadEvent();
       const isCancel = await this.cancelDownloadTask();
-      Logger.info('cancelDownloadTask ==>', isCancel);
+      log4js.info('cancelDownloadTask ==>', isCancel);
       return isCancel;
     } catch (e) {
-      Logger.error('stopObserverSweeperDataByP2P occur error ==>', e);
+      log4js.error('stopObserverSweeperDataByP2P occur error ==>', e);
       return false;
     }
   };

package/lib/index.js

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 import mitt from 'mitt';
 import { SweeperP2pInstance } from './api';
-import { Logger } from './utils';
+import log4js from '@ray-js/log4js';
 const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData) => {
   const isInit = useRef(null);
   const offSessionStatusChange = useRef(null);
@@ -9,7 +9,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData) => {
   const timer = useRef(null);
   useEffect(() => {
     if (devId.startsWith('vdevo')) {
-      Logger.warn('virtual device cannot use p2p');
+      log4js.warn('virtual device cannot use p2p');
       return;
     }
     isInitP2p();
@@ -25,9 +25,10 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData) => {
    * p2p连接
    */
   const isInitP2p = async () => {
-    Logger.info('hooks has been started initP2p');
+    log4js.info('hooks has been started initP2p');
     isInit.current = await SweeperP2pInstance.initP2pSdk(devId);
     if (isInit.current) {
+      SweeperP2pInstance.isConnecting = true;
       SweeperP2pInstance.connectDevice(() => {
         SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData);
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
@@ -46,12 +47,12 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData) => {
    */
   const onEnterBackground = () => {
     ty.onAppHide(() => {
-      Logger.info('hooks onAppHide');
+      log4js.info('hooks onAppHide');
       isAppOnBackground.current = true;
       if (isInit.current) {
         // 判断进入后台之后，维持定时器，如果进入后台超过2分钟, 则断开P2P
         timer.current = setTimeout(() => {
-          Logger.info('background timer has been exe');
+          log4js.info('background timer has been exe');
           if (isAppOnBackground.current) {
             unmount();
           }
@@ -66,7 +67,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData) => {
    * p2p断开
    */
   const unmount = async () => {
-    Logger.info('hooks has been started unmount');
+    log4js.info('hooks has been started unmount');
     isInit.current = false;
     if (offSessionStatusChange.current) {
       offSessionStatusChange.current();
@@ -81,7 +82,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData) => {
    */
   const onEnterForeground = () => {
     ty.onAppShow(() => {
-      Logger.info('hooks onAppShow');
+      log4js.info('hooks onAppShow');
       isAppOnBackground.current = false;
       if (!isInit.current) {
         isInitP2p();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [
@@ -34,10 +34,11 @@
     "@ray-js/ray": "^1.5.0"
   },
   "dependencies": {
+    "@ray-js/log4js": "^0.0.2",
     "clsx": "^1.2.1",
     "lodash-es": "^4.17.21",
-    "moment": "^2.30.1",
-    "mitt": "^3.0.1"
+    "mitt": "^3.0.1",
+    "moment": "^2.30.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",

package/lib/utils/index.d.ts

@@ -1,2 +0,0 @@
-import Logger from './logger';
-export { Logger };

package/lib/utils/index.js

@@ -1,2 +0,0 @@
-import Logger from './logger';
-export { Logger };

package/lib/utils/logger.d.ts

@@ -1,15 +0,0 @@
-declare class Logger {
-    options: {
-        performance: string;
-        error: string;
-        info: string;
-        warn: string;
-    };
-    log(color: string, title: string, ...args: any): void;
-    performance(title: string, ...args: any): void;
-    warn(title: string, ...args: any): void;
-    error(title: string, ...args: any): void;
-    info(title: string, ...args: any): void;
-}
-declare const logger: Logger;
-export default logger;

package/lib/utils/logger.js

@@ -1,44 +0,0 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-class Logger {
-  options = {
-    performance: '#00cca3',
-    error: '#f81c1c',
-    info: '#5091f3',
-    warn: '#ffaa00'
-  };
-  log(color, title) {
-    for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-      args[_key - 2] = arguments[_key];
-    }
-    console.log(`%c 【Robot Data Stream Log】: ${title}`, `background: ${color}; color: #FFFFFF; font-size: 20px`, ...args);
-  }
-  performance(title) {
-    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-      args[_key2 - 1] = arguments[_key2];
-    }
-    this.log(this.options.performance, title, ...args);
-  }
-  warn(title) {
-    for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      args[_key3 - 1] = arguments[_key3];
-    }
-    this.log(this.options.warn, title, ...args);
-  }
-  error(title) {
-    if (title === 'system error') {
-      debugger;
-    }
-    for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-      args[_key4 - 1] = arguments[_key4];
-    }
-    this.log(this.options.error, title, ...args);
-  }
-  info(title) {
-    for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
-      args[_key5 - 1] = arguments[_key5];
-    }
-    this.log(this.options.info, title, ...args);
-  }
-}
-const logger = new Logger();
-export default logger;