@ray-js/robot-data-stream 0.0.10-beta-16 → 0.0.10-beta-18

package/lib/api/p2pApi.d.ts

@@ -5,8 +5,11 @@ export default class P2pApi {
     isConnected: boolean;
     isConnecting: boolean;
     offSessionStatusChange: () => void;
+    onLogger: (type: 'warn' | 'error' | 'info', v: string) => void;
     devId: string;
-    constructor();
+    constructor(props: {
+        onLogger: (type: 'warn' | 'error' | 'info', data: string) => void;
+    });
     /**
      * 设备断开之后的重连
      */

package/lib/api/p2pApi.js

@@ -3,16 +3,19 @@
 /* eslint-disable prefer-promise-reject-errors */
 import { p2p } from '@ray-js/ray';
 import moment from 'moment';
-import log4js from '@ray-js/log4js';
+import { logger } from '../utils';
 /**
  * P2P 工具类
  */
 export default class P2pApi {
   // P2p连接状态
 
-  constructor() {
+  constructor(props) {
     this.isConnected = false;
     this.isConnecting = false;
+    if (props && props.onLogger) {
+      this.onLogger = props === null || props === void 0 ? void 0 : props.onLogger;
+    }
   }
 
   /**
@@ -26,9 +29,13 @@ export default class P2pApi {
      */
     this.isConnected = false;
     if (!this.isConnected) {
-      log4js.info('start p2p reconnect ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
+      logger('info', {
+        msg: `start p2p reconnect ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
+      }, this.onLogger);
       this.connectDevice(() => {
-        log4js.info('p2p reconnect success ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
+        logger('info', {
+          msg: `p2p reconnect success ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
+        }, this.onLogger);
         this.isConnected = true;
         if (this.isConnected) {
           typeof successCb === 'function' && successCb();
@@ -36,9 +43,13 @@ export default class P2pApi {
       }, () => {
         //
       }, () => {
-        log4js.info('reconnect complete ==>', String(this.isConnected));
+        logger('info', {
+          msg: `reconnect complete ==> ${String(this.isConnected)}`
+        }, this.onLogger);
         if (!this.isConnected) {
-          log4js.warn('p2p reconnect failed ==>', moment().format('YYYY-MM-DD HH:mm:ss'));
+          logger('warn', {
+            msg: `p2p reconnect failed ==> ${moment().format('YYYY-MM-DD HH:mm:ss')}`
+          }, this.onLogger);
           setTimeout(() => {
             this.reconnectP2p(successCb);
           }, 3000);
@@ -58,11 +69,16 @@ export default class P2pApi {
         this.devId = devId;
         p2p.P2PSDKInit({
           success: () => {
-            log4js.info('P2PSDKInit success');
+            logger('info', {
+              msg: 'P2PSDKInit success'
+            }, this.onLogger);
             resolve(true);
           },
           fail: params => {
-            log4js.warn('P2PSDKInit fail', params);
+            logger('warn', {
+              msg: 'P2PSDKInit success',
+              params
+            }, this.onLogger);
             resolve(false);
           }
         });
@@ -84,14 +100,19 @@ export default class P2pApi {
           timeout: 5000,
           mode: 0,
           success: () => {
-            log4js.info('p2p connectDevice success');
+            logger('info', {
+              msg: 'p2p connectDevice success'
+            }, this.onLogger);
             this.isConnected = true;
             this.isConnecting = false;
             typeof successCb === 'function' && successCb();
             resolve(true);
           },
           fail: params => {
-            log4js.warn('p2p connectDevice failed ==>', params);
+            logger('warn', {
+              msg: 'p2p connectDevice failed ==>',
+              params
+            }, this.onLogger);
             typeof failCb === 'function' && failCb();
             resolve(false);
           },
@@ -100,7 +121,10 @@ export default class P2pApi {
           }
         });
       } catch (e) {
-        log4js.error('p2p connectDevice occur an error ==>', e);
+        logger('error', {
+          msg: 'p2p connectDevice occur an error ==>',
+          e
+        }, this.onLogger);
         reject(false);
       }
     });
@@ -117,16 +141,23 @@ export default class P2pApi {
           deviceId: this.devId,
           success: () => {
             this.isConnected = false;
-            log4js.info('p2p disconnectDevice success');
+            logger('info', {
+              msg: 'p2p disconnectDevice success'
+            }, this.onLogger);
             resolve(true);
           },
           fail: () => {
-            log4js.warn('p2p disconnectDevice failed');
+            logger('warn', {
+              msg: 'p2p disconnectDevice failed'
+            }, this.onLogger);
             resolve(false);
           }
         });
       } catch (e) {
-        log4js.warn('p2p disconnectDevice occur an error ==>', e);
+        logger('warn', {
+          msg: 'p2p disconnectDevice occur an error ==>',
+          e
+        }, this.onLogger);
         reject(false);
       }
     });
@@ -150,12 +181,17 @@ export default class P2pApi {
             albumName: albumName,
             jsonfiles: JSON.stringify(files),
             success: () => {
-              log4js.info('p2p downloadStream success');
+              logger('info', {
+                msg: 'p2p downloadStream success'
+              }, this.onLogger);
               typeof successCb === 'function' && successCb();
               resolve(true);
             },
             fail: params => {
-              log4js.warn('p2p downloadStream failed ==>', params);
+              logger('warn', {
+                msg: 'p2p downloadStream failed===>',
+                params
+              }, this.onLogger);
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();
               }, 500);
@@ -168,7 +204,10 @@ export default class P2pApi {
         });
       }
     } catch (e) {
-      log4js.warn('p2p downloadStream occur an error ==>', e);
+      logger('warn', {
+        msg: 'p2p downloadStream occur an error ==>',
+        e
+      }, this.onLogger);
     }
   };
 
@@ -189,12 +228,17 @@ export default class P2pApi {
             albumName: albumName,
             jsonfiles: JSON.stringify(files),
             success: () => {
-              log4js.info('p2p appendDownloadStream success');
+              logger('info', {
+                msg: 'p2p appendDownloadStream success'
+              }, this.onLogger);
               typeof successCb === 'function' && successCb();
               resolve(true);
             },
             fail: params => {
-              log4js.warn('p2p appendDownloadStream failed ==>', params);
+              logger('warn', {
+                msg: 'p2p appendDownloadStream failed===>',
+                params
+              }, this.onLogger);
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();
               }, 500);
@@ -207,7 +251,10 @@ export default class P2pApi {
         });
       }
     } catch (e) {
-      log4js.warn('p2p appendDownloadStream occur an error ==>', e);
+      logger('warn', {
+        msg: 'p2p appendDownloadStream failed===>',
+        e
+      }, this.onLogger);
     }
   };
 
@@ -238,12 +285,17 @@ export default class P2pApi {
             filePath: filePath,
             jsonfiles: JSON.stringify(files),
             success: () => {
-              log4js.info('p2p downloadFile success');
+              logger('info', {
+                msg: 'p2p downloadFile success'
+              }, this.onLogger);
               typeof successCb === 'function' && successCb();
               resolve(true);
             },
             fail: params => {
-              log4js.warn('p2p downloadFile failed ==>', params);
+              logger('warn', {
+                msg: 'p2p downloadFile success',
+                params
+              }, this.onLogger);
               setTimeout(() => {
                 typeof failedCb === 'function' && failedCb();
               }, 500);
@@ -256,7 +308,10 @@ export default class P2pApi {
         });
       }
     } catch (e) {
-      log4js.error('p2p downloadFile occur an error ==>', e);
+      logger('error', {
+        msg: 'p2p downloadFile occur an error ==>',
+        e
+      }, this.onLogger);
     }
     return null;
   };
@@ -330,7 +385,10 @@ export default class P2pApi {
           }
         });
       } catch (e) {
-        log4js.info('cancelDownloadTask occur an error', e);
+        logger('info', {
+          msg: 'cancelDownloadTask occur an error',
+          e
+        }, this.onLogger);
         reject(false);
       }
     });
@@ -347,11 +405,17 @@ export default class P2pApi {
         deviceId: this.devId,
         albumName,
         success: params => {
-          log4js.info('queryAlbumFileIndexs ==>', params);
+          logger('info', {
+            msg: 'queryAlbumFileIndexs ==>',
+            params
+          }, this.onLogger);
           resolve(params);
         },
         fail: params => {
-          log4js.warn('queryAlbumFileIndexs failed ==>', params);
+          logger('warn', {
+            msg: 'queryAlbumFileIndexs failed ==>',
+            params
+          }, this.onLogger);
           resolve(null);
         }
       });
@@ -367,11 +431,15 @@ export default class P2pApi {
       try {
         p2p.deInitSDK({
           success: () => {
-            log4js.info('deInitP2pSDK success');
+            logger('info', {
+              msg: 'deInitP2pSDK success'
+            }, this.onLogger);
             resolve(true);
           },
           fail: () => {
-            log4js.info('deInitP2pSDK failed');
+            logger('info', {
+              msg: 'deInitP2pSDK failed'
+            }, this.onLogger);
             resolve(false);
           },
           complete: () => {
@@ -379,7 +447,10 @@ export default class P2pApi {
           }
         });
       } catch (e) {
-        log4js.error('deInitP2pSDK occur an error ==>', e);
+        logger('error', {
+          msg: 'deInitP2pSDK occur an error ==>',
+          e
+        }, this.onLogger);
         reject(false);
       }
     });

package/lib/api/sweeperP2p.d.ts

@@ -72,7 +72,9 @@ export declare class SweeperP2p extends P2pApi {
     offP2pStreamPacketReceive: () => void;
     offDownLoadProgressUpdate: () => void;
     offTotalDownLoadProgressUpdate: () => void;
-    constructor();
+    constructor(props: {
+        onLogger: (type: 'warn' | 'error' | 'info', data: string) => void;
+    });
     private setStreamFilePath;
     private setDataFilePath;
     /**

package/lib/api/sweeperP2p.js

@@ -5,7 +5,7 @@ import "core-js/modules/esnext.iterator.map.js";
 import P2pApi from './p2pApi';
 import Base64 from 'base64-js';
 import { padStart, join, map } from 'lodash-es';
-import log4js from '@ray-js/log4js';
+import { logger } from '../utils';
 /**
  * 基于P2p工具类的扫地机扩展实现
  */
@@ -46,8 +46,11 @@ const FILE_NAME_MAP = {
 // 走p2p流传输(新) or 读取bin文件(旧)
 const shouldDownloadStream = Boolean(ty.p2p.downloadStream && ty.p2p.onStreamPacketReceive);
 export class SweeperP2p extends P2pApi {
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
+    if (props && props.onLogger) {
+      this.onLogger = props.onLogger;
+    }
     this.file = undefined;
     this.downloadType = 1;
     this.fileIndex = -1; // -1 表示所有文件下载完成
@@ -112,10 +115,16 @@ export class SweeperP2p extends P2pApi {
         dirPath: filePath,
         recursive: true
       });
-      log4js.info('mkdirSync success: filePath ==>', filePath);
+      logger('info', {
+        msg: 'mkdirSync success: filePath ==>',
+        filePath
+      }, this.onLogger);
       return true;
     } catch (e) {
-      log4js.error('mkdirSync error ==>', e);
+      logger('error', {
+        msg: 'mkdirSync error ==>',
+        e
+      }, this.onLogger);
       return false;
     }
   };
@@ -130,11 +139,17 @@ export class SweeperP2p extends P2pApi {
       ty.getFileSystemManager().access({
         path: filePath,
         success(params) {
-          log4js.info('file access success ==>', params);
+          logger('info', {
+            msg: 'file access success ==>',
+            params
+          }, this.onLogger);
           resolve(true);
         },
         fail(params) {
-          log4js.warn('file access fail ==>', params);
+          logger('warn', {
+            msg: 'file access fail ==>',
+            params
+          }, this.onLogger);
           resolve(false);
         }
       });
@@ -183,13 +198,19 @@ export class SweeperP2p extends P2pApi {
    * @param data
    */
   sessionStatusCallback = data => {
-    log4js.info('sessionStatusCallback ==>', data);
+    logger('info', {
+      msg: 'sessionStatusCallback ==>',
+      data
+    }, this.onLogger);
     if (data) {
       const {
         status
       } = data;
       if (status < 0) {
-        log4js.info('receive disconnect notice ==>', status);
+        logger('info', {
+          msg: 'receive disconnect notice ==>',
+          status
+        }, this.onLogger);
         this.isConnected = false;
         if (!this.isConnecting) {
           this.reconnectP2p(() => {
@@ -197,7 +218,9 @@ export class SweeperP2p extends P2pApi {
             this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
           });
         } else {
-          log4js.warn('receive disconnect notice, but connectDevice is connecting');
+          logger('warn', {
+            msg: 'receive disconnect notice, but connectDevice is connecting'
+          }, this.onLogger);
         }
       }
     }
@@ -211,7 +234,9 @@ export class SweeperP2p extends P2pApi {
   startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData) => {
     var _this$file$items;
     if (![0, 1].some(item => item === downloadType)) {
-      log4js.warn('download type must be 0 or 1');
+      logger('warn', {
+        msg: 'download type must be 0 or 1'
+      }, this.onLogger);
       return;
     }
     this.onReceiveMapData = onReceiveMapData;
@@ -222,7 +247,9 @@ export class SweeperP2p extends P2pApi {
     this.onReceiveAIPicHDData = onReceiveAIPicHDData || (() => {
       // do nothing
     });
-    log4js.info('startObserverSweeperDataByP2P ==>');
+    logger('info', {
+      msg: 'startObserverSweeperDataByP2P ==>'
+    }, this.onLogger);
     this.downloadType = downloadType;
     this.setDataFilePath(devId);
     this.setStreamFilePath(devId);
@@ -290,7 +317,9 @@ export class SweeperP2p extends P2pApi {
    * 注册下载有关的监听
    */
   registerP2pDownloadEvent = () => {
-    log4js.info('registerP2pDownloadEvent ==>');
+    logger('info', {
+      msg: 'registerP2pDownloadEvent ==>'
+    }, this.onLogger);
     if (shouldDownloadStream) {
       // p2p数据流监听
       this.offP2pStreamPacketReceive = this.onP2pStreamPacketReceive(this.p2pStreamPacketReceiveCallback);
@@ -311,7 +340,9 @@ export class SweeperP2p extends P2pApi {
    * 移除下载有关的监听
    */
   removeP2pDownloadEvent = () => {
-    log4js.info('removeP2pDownloadEvent ==>');
+    logger('info', {
+      msg: 'removeP2pDownloadEvent ==>'
+    }, this.onLogger);
     if (shouldDownloadStream) {
       [...this.packetSerialNumberCacheMap.keys()].forEach(key => {
         this.packetSerialNumberCacheMap.set(key, -1);
@@ -374,7 +405,9 @@ export class SweeperP2p extends P2pApi {
     }
     const cachePacketMap = this.packetDataCacheMap.get(fileName);
     if (!cachePacketMap) {
-      log4js.warn(`p2pStreamPacketReceiveCallback: fileName : ${fileName} is not support`);
+      logger('warn', {
+        msg: `p2pStreamPacketReceiveCallback: fileName : ${fileName} is not support`
+      }, this.onLogger);
       return;
     }
     const cacheSerialNumber = this.packetSerialNumberCacheMap.get(fileName);
@@ -407,7 +440,9 @@ export class SweeperP2p extends P2pApi {
         }).join('');
         if (this.firstPackageTime > 0 && fileName.indexOf('map') !== -1) {
           const packageTime = Date.now() - this.firstPackageTime;
-          log4js.info(`receive first full package, cost time: ${packageTime} ms, fileName: ${fileName}`);
+          logger('info', {
+            msg: `receive first full package, cost time: ${packageTime} ms, fileName: ${fileName}`
+          }, this.onLogger);
           this.firstPackageTime = 0;
         }
         const {
@@ -467,7 +502,9 @@ export class SweeperP2p extends P2pApi {
           const type = this.getFileType(fileName);
           if (this.cacheData[type] !== hexValue) {
             if (hexValue.length === 0) {
-              log4js.warn('receive empty data');
+              logger('warn', {
+                msg: 'receive empty data'
+              }, this.onLogger);
               return;
             }
             if (type === 0 || type === 6) {
@@ -486,13 +523,19 @@ export class SweeperP2p extends P2pApi {
           }
         },
         fail: e => {
-          log4js.warn('readFileFromPath failed ==>', e);
+          logger('warn', {
+            msg: 'readFileFromPath failed ==>',
+            e
+          }, this.onLogger);
           this.resetReading(fileName);
         }
       });
     } catch (e) {
       this.resetReading(fileName);
-      log4js.error('readFileFromPath ==>', e);
+      logger('error', {
+        msg: 'readFileFromPath ==>',
+        e
+      }, this.onLogger);
     }
   };
   setReading = fileName => {
@@ -577,7 +620,10 @@ export class SweeperP2p extends P2pApi {
         this.disconnectDevice();
       }
     } catch (e) {
-      log4js.error('stopObserverSweeperDataByP2P occur error ==>', e);
+      logger('error', {
+        msg: 'stopObserverSweeperDataByP2P occur error ==>',
+        e
+      }, this.onLogger);
       return false;
     }
   };

package/lib/index.d.ts

@@ -1,9 +1,11 @@
 export * from './mqtt';
 export * from './mqtt/type/requestType';
+type TOnLogger = (type: 'warn' | 'error' | 'info', data: string) => void;
 declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, opt?: {
     logTag?: string | undefined;
     onReceiveAIPicData?: ((data: string) => void) | undefined;
     onReceiveAIPicHDData?: ((data: string) => void) | undefined;
+    onLogger?: TOnLogger | undefined;
 } | undefined) => {
     appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | void;
 };

package/lib/index.js

@@ -1,30 +1,37 @@
 /* eslint-disable consistent-return */
 import { useEffect, useRef, useCallback } from 'react';
 import log4js from '@ray-js/log4js';
-import { SweeperP2pInstance } from './api';
-import sweeperP2pInstance from './api/sweeperP2p';
+import { SweeperP2p } from './api/sweeperP2p';
 import { getSystemInfoSync, usePageEvent } from '@ray-js/ray';
-import { emitter } from './utils';
+import { emitter, logger } from './utils';
 export * from './mqtt';
 export * from './mqtt/type/requestType';
 const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   const {
     logTag,
     onReceiveAIPicData,
-    onReceiveAIPicHDData
+    onReceiveAIPicHDData,
+    onLogger
   } = opt || {};
   const isInit = useRef(false);
   const offSessionStatusChange = useRef(null);
   const isAppOnBackground = useRef(false);
   const timer = useRef(null);
   const isIDE = getSystemInfoSync().brand === 'devtools';
+  const SweeperP2pInstance = new SweeperP2p({
+    onLogger
+  });
   const handleAppHide = useCallback(() => {
-    log4js.info('hooks onAppHide');
+    logger('info', {
+      msg: 'hooks onAppHide'
+    }, onLogger);
     isAppOnBackground.current = true;
     if (isInit.current) {
       // 判断进入后台之后，维持定时器，如果进入后台超过2分钟, 则断开P2P
       timer.current = setTimeout(() => {
-        log4js.info('background timer has been exe');
+        logger('info', {
+          msg: 'background timer has been exe'
+        }, onLogger);
         if (isAppOnBackground.current) {
           unmount();
         }
@@ -34,7 +41,9 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     }
   }, []);
   const handleAppShow = useCallback(() => {
-    log4js.info('hooks onAppShow');
+    logger('info', {
+      msg: 'hooks onAppShow'
+    }, onLogger);
     timer.current && clearTimeout(timer.current);
     setTimeout(() => {
       var _ty$p2p$isP2PActiveSy, _ty$p2p;
@@ -50,16 +59,21 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       log4js.setTag(logTag);
     }
     if (isIDE) {
-      log4js.warn(`You are using the IDE environment. To perform P2P and map debugging, please ensure the 'Robot Vacuum Debugger' plugin is installed.`);
+      logger('warn', {
+        msg: `You are using the IDE environment. To perform P2P and map debugging, please ensure the 'Robot Vacuum Debugger' plugin is installed.`
+      }, onLogger);
       SweeperP2pInstance.onReceiveMapData = onReceiveMapData;
       SweeperP2pInstance.onReceivePathData = onReceivePathData;
       SweeperP2pInstance.registerP2pDownloadEvent();
+      SweeperP2pInstance.onLogger = onLogger;
       return () => {
         SweeperP2pInstance.removeP2pDownloadEvent();
       };
     }
     if (devId.startsWith('vdevo')) {
-      log4js.warn('virtual device cannot use p2p');
+      logger('warn', {
+        msg: 'virtual device cannot use p2p'
+      }, onLogger);
       return;
     }
     SweeperP2pInstance.initP2pSdk(devId).then(() => {
@@ -80,7 +94,9 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
    * p2p连接
    */
   const connectP2p = async () => {
-    log4js.info('hooks has been started connectP2p');
+    logger('info', {
+      msg: 'hooks has been started connectP2p'
+    }, onLogger);
     SweeperP2pInstance.isConnecting = true;
     SweeperP2pInstance.connectDevice(() => {
       isInit.current = true;
@@ -100,7 +116,9 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
    * p2p断开
    */
   const unmount = async () => {
-    log4js.info('hooks has been started unmount');
+    logger('info', {
+      msg: 'hooks has been started unmount'
+    }, onLogger);
     isInit.current = false;
     if (offSessionStatusChange.current) {
       offSessionStatusChange.current();
@@ -109,7 +127,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     SweeperP2pInstance.stopObserverSweeperDataByP2P();
   };
   return {
-    appendDownloadStreamDuringTask: sweeperP2pInstance.appendDownloadStreamDuringTask
+    appendDownloadStreamDuringTask: SweeperP2pInstance.appendDownloadStreamDuringTask
   };
 };
 const StreamDataNotificationCenter = emitter;

package/lib/mqtt/promise.js

@@ -22,19 +22,16 @@ export function normalResolve(reqType, taskId) {
   return new Promise((resolve, reject) => {
     // 设置超时定时器
     const timer = setTimeout(() => {
-      reject(new MyError('Request timed out', {
+      reject(new MyError(`${taskId} Request timed out `, {
         errCode: -1,
         reqType
       }));
-    }, 5 * 1000);
-
-    // 监听指定类型的消息
-    emitter.on(reqType, message => {
+    }, 10 * 1000);
+    const handle = message => {
       if (`${message.taskId}` !== `${taskId}`) {
         return;
       }
       clearTimeout(timer);
-      emitter.off(reqType);
       if (message.errCode === 0) {
         resolve(message);
       } else {
@@ -43,6 +40,10 @@ export function normalResolve(reqType, taskId) {
           reqType
         }));
       }
-    });
+      emitter.off(reqType, handle);
+    };
+
+    // 监听指定类型的消息
+    emitter.on(reqType, handle);
   });
 }

package/lib/mqtt/useZoneClean.js

@@ -82,7 +82,7 @@ export const useZoneClean = devId => {
             name
           } = _ref;
           polygons.push(pointsToString(points, origin));
-          names.push(name);
+          names.push(name || '');
         });
         const params = createSetCommonParams({
           deviceId: devId,

package/lib/utils/index.d.ts

@@ -6,3 +6,7 @@ export declare const emitter: import("mitt").Emitter<Record<import("mitt").Event
 export declare const pointsToString: (points: Point[], origin: Point) => string;
 export declare const isJSONString: (str: any) => boolean;
 export declare const parseJSON: (str: any) => any;
+export declare const logger: (type: 'warn' | 'error' | 'info', params: {
+    [key: string]: any;
+    msg: string;
+}, onLogger: (type: 'warn' | 'error' | 'info', v: string) => void) => void;

package/lib/utils/index.js

@@ -1,5 +1,8 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["msg"];
 import mitt from 'mitt';
 import { floor, join, map } from 'lodash-es';
+import log4js from '@ray-js/log4js';
 export const emitter = mitt();
 const pointToString = point => {
   return `${point.x},${point.y}`;
@@ -44,4 +47,14 @@ export const parseJSON = str => {
     rst = typeof str === 'undefined' ? {} : str;
   }
   return rst;
+};
+export const logger = (type, params, onLogger) => {
+  const {
+      msg
+    } = params,
+    others = _objectWithoutProperties(params, _excluded);
+  log4js[type](msg, others);
+  if (onLogger) {
+    onLogger(type, msg);
+  }
 };

package/package.json

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