@ray-js/robot-data-stream 0.0.13-beta-5 → 0.0.13-beta-7

package/lib/api/p2pApi.js

@@ -1,10 +1,9 @@
-/* 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 dayjs from 'dayjs';
-import { logger } from '../utils';
 import { trace } from '../trace';
+import { apis } from '../ttt';
+import { createLogger } from '../utils';
+
 /**
  * P2P 工具类
  */
@@ -16,6 +15,14 @@ export default class P2pApi {
     this.isConnecting = false;
   }
 
+  /**
+   * 便捷的日志记录方法
+   * 使用 getter 确保每次访问时都使用最新的 onLogger
+   */
+  get log() {
+    return createLogger(this.onLogger);
+  }
+
   /**
    * 设备断开之后的重连
    */
@@ -27,23 +34,23 @@ export default class P2pApi {
      */
     // this.isConnected = false;
     if (this.isConnected) {
-      return logger('info', {
+      return this.log.info({
         msg: 'p2p isConnected or isConnecting'
-      }, this.onLogger);
+      });
     }
     if (this.isConnecting) {
-      return logger('info', {
+      return this.log.info({
         msg: 'p2p isConnecting'
-      }, this.onLogger);
+      });
     }
     // if (!this.isConnected) {
-    logger('info', {
+    this.log.info({
       msg: `${source} start p2p reconnect ==>  ${dayjs().format('YYYY-MM-DD HH:mm:ss')}`
-    }, this.onLogger);
+    });
     this.connectDevice(() => {
-      logger('info', {
+      this.log.info({
         msg: `${source} p2p reconnect success ==> ${dayjs().format('YYYY-MM-DD HH:mm:ss')}`
-      }, this.onLogger);
+      });
       this.isConnected = true;
       if (this.isConnected) {
         typeof successCb === 'function' && successCb();
@@ -51,13 +58,13 @@ export default class P2pApi {
     }, () => {
       //
     }, () => {
-      logger('info', {
+      this.log.info({
         msg: `${source} reconnect complete ==> ${String(this.isConnected)}`
-      }, this.onLogger);
+      });
       if (!this.isConnected) {
-        logger('warn', {
+        this.log.warn({
           msg: `${source} p2p reconnect failed ==> ${dayjs().format('YYYY-MM-DD HH:mm:ss')}`
-        }, this.onLogger);
+        });
         setTimeout(() => {
           this.reconnectP2p(successCb, '0000');
         }, 6000);
@@ -72,111 +79,82 @@ export default class P2pApi {
    * @returns
    */
   initP2pSdk = async devId => {
-    return new Promise((resolve, reject) => {
-      try {
-        this.devId = devId;
-        p2p.P2PSDKInit({
-          success: () => {
-            logger('info', {
-              msg: 'P2PSDKInit success'
-            }, this.onLogger);
-            resolve(true);
-          },
-          fail: params => {
-            logger('warn', {
-              msg: 'P2PSDKInit success',
-              params
-            }, this.onLogger);
-            resolve(false);
-          }
-        });
-      } catch (e) {
-        reject(false);
-      }
-    });
+    try {
+      this.devId = devId;
+      const result = await apis.initP2pSdk(this.onLogger);
+      return result;
+    } catch (e) {
+      this.log.error({
+        msg: 'P2PSDKInit occur an error',
+        e
+      });
+      return {
+        success: false,
+        error: e
+      };
+    }
   };
 
   /**
    * 连接设备
    * @returns
    */
-  connectDevice = (successCb, failCb, completeCb) => {
-    return new Promise((resolve, reject) => {
-      try {
-        this.isConnecting = true;
-        this.isConnected = false;
-        p2p.connectDevice({
-          deviceId: this.devId,
-          timeout: 5000,
-          mode: 0,
-          success: () => {
-            logger('info', {
-              msg: 'p2p connectDevice success'
-            }, this.onLogger);
-            this.isConnected = true;
-            this.isConnecting = false;
-            typeof successCb === 'function' && successCb();
-            resolve(true);
-          },
-          fail: params => {
-            logger('warn', {
-              msg: `p2p connectDevice failed ==> ${JSON.stringify(params.innerError)}`
-            }, this.onLogger);
-            this.isConnecting = false;
-            typeof failCb === 'function' && failCb();
-            resolve(false);
-          },
-          complete: () => {
-            this.isConnecting = false;
-            typeof completeCb === 'function' && completeCb();
-          }
-        });
-      } catch (e) {
+  connectDevice = async (successCb, failCb, completeCb) => {
+    try {
+      this.isConnecting = true;
+      this.isConnected = false;
+      const result = await apis.connectDevice(this.devId, this.onLogger);
+      if (result.success) {
+        this.isConnected = true;
         this.isConnecting = false;
-        this.isConnected = false;
-        logger('error', {
-          msg: 'p2p connectDevice occur an error ==>',
-          e
-        }, this.onLogger);
-        reject(false);
+        typeof successCb === 'function' && successCb();
+        typeof completeCb === 'function' && completeCb();
+        return true;
+      } else {
+        result.params || result.error;
+        this.isConnecting = false;
+        typeof failCb === 'function' && failCb();
+        typeof completeCb === 'function' && completeCb();
+        return false;
       }
-    });
+    } catch (e) {
+      this.isConnecting = false;
+      this.isConnected = false;
+      this.log.error({
+        msg: 'p2p connectDevice occur an error ==>',
+        e
+      });
+      typeof failCb === 'function' && failCb();
+      typeof completeCb === 'function' && completeCb();
+      return false;
+    }
   };
 
   /**
    * 断开P2P设备连接
    * @returns
    */
-  disconnectDevice = () => {
-    return new Promise((resolve, reject) => {
-      try {
-        p2p.disconnectDevice({
-          deviceId: this.devId,
-          success: () => {
-            this.isConnected = false;
-            logger('info', {
-              msg: 'p2p disconnectDevice success'
-            }, this.onLogger);
-            resolve(true);
-          },
-          fail: () => {
-            logger('warn', {
-              msg: 'p2p disconnectDevice failed'
-            }, this.onLogger);
-            resolve(false);
-          },
-          complete: () => {
-            this.isConnecting = false;
-          }
-        });
-      } catch (e) {
-        logger('warn', {
-          msg: 'p2p disconnectDevice occur an error ==>',
-          e
-        }, this.onLogger);
-        reject(false);
+  disconnectDevice = async () => {
+    try {
+      const result = await apis.disconnectDevice(this.devId, this.onLogger);
+      if (result.success) {
+        this.isConnected = false;
+        this.isConnecting = false;
+      } else {
+        this.isConnecting = false;
       }
-    });
+      return result;
+    } catch (e) {
+      this.isConnecting = false;
+      this.log.warn({
+        msg: 'p2p disconnectDevice occur an error ==>',
+        e
+      });
+      return {
+        success: false,
+        error: e
+      };
+    }
   };
 
   /**
@@ -188,50 +166,33 @@ export default class P2pApi {
    * @param failedCb
    * @returns
    */
-  downloadStream = (files, albumName, successCb, failedCb) => {
+  downloadStream = async (files, albumName, successCb, failedCb) => {
     try {
       if (this.isConnected) {
-        return new Promise(resolve => {
-          p2p.downloadStream({
-            deviceId: this.devId,
-            albumName: albumName,
-            jsonfiles: JSON.stringify(files),
-            success: () => {
-              logger('info', {
-                msg: 'p2p downloadStream success'
-              }, this.onLogger);
-              trace.pointFn({
-                devId: this.devId,
-                eventName: 'downloadStream'
-              });
-              typeof successCb === 'function' && successCb();
-              resolve(true);
-            },
-            fail: params => {
-              logger('warn', {
-                msg: 'p2p downloadStream failed===>',
-                params
-              }, this.onLogger);
-              trace.pointFn({
-                devId: this.devId,
-                eventName: 'downloadStreamFailed'
-              });
-              setTimeout(() => {
-                typeof failedCb === 'function' && failedCb();
-              }, 500);
-              resolve(false);
-            },
-            complete: () => {
-              //
-            }
+        const result = await apis.downloadStream(this.devId, albumName, files.files, this.onLogger);
+        if (result.success) {
+          trace.pointFn({
+            devId: this.devId,
+            eventName: 'downloadStream'
           });
-        });
+          typeof successCb === 'function' && successCb();
+        } else {
+          trace.pointFn({
+            devId: this.devId,
+            eventName: 'downloadStreamFailed'
+          });
+          setTimeout(() => {
+            typeof failedCb === 'function' && failedCb();
+          }, 500);
+        }
+        return result.success;
       }
     } catch (e) {
-      logger('warn', {
+      this.log.warn({
         msg: 'p2p downloadStream occur an error ==>',
         e
-      }, this.onLogger);
+      });
+      return false;
     }
   };
 
@@ -243,42 +204,27 @@ export default class P2pApi {
    * @param failedCb
    * @returns
    */
-  appendDownloadStream = (files, albumName, successCb, failedCb) => {
+  appendDownloadStream = async (files, albumName, successCb, failedCb) => {
     try {
       if (this.isConnected) {
-        return new Promise(resolve => {
-          p2p.appendDownloadStream({
-            deviceId: this.devId,
-            albumName: albumName,
-            jsonfiles: JSON.stringify(files),
-            success: () => {
-              logger('info', {
-                msg: 'p2p appendDownloadStream success'
-              }, this.onLogger);
-              typeof successCb === 'function' && successCb();
-              resolve(true);
-            },
-            fail: params => {
-              logger('warn', {
-                msg: 'p2p appendDownloadStream failed===>',
-                params
-              }, this.onLogger);
-              setTimeout(() => {
-                typeof failedCb === 'function' && failedCb();
-              }, 500);
-              resolve(false);
-            },
-            complete: () => {
-              //
-            }
-          });
-        });
+        const {
+          success
+        } = await apis.appendDownloadStream(this.devId, albumName, files.files, this.onLogger);
+        if (success) {
+          typeof successCb === 'function' && successCb();
+        } else {
+          setTimeout(() => {
+            typeof failedCb === 'function' && failedCb();
+          }, 500);
+        }
+        return success;
       }
     } catch (e) {
-      logger('warn', {
+      this.log.warn({
         msg: 'p2p appendDownloadStream failed===>',
         e
-      }, this.onLogger);
+      });
+      return false;
     }
   };
 
@@ -299,43 +245,25 @@ export default class P2pApi {
    * 开始下载文件
    * files : {"files":["filesname1", "filesname2", "filesname3" ]}
    */
-  downloadFile = (files, albumName, filePath, successCb, failedCb) => {
+  downloadFile = async (files, albumName, filePath, successCb, failedCb) => {
     try {
       if (this.isConnected) {
-        return new Promise(resolve => {
-          p2p.downloadFile({
-            deviceId: this.devId,
-            albumName: albumName,
-            filePath: filePath,
-            jsonfiles: JSON.stringify(files),
-            success: () => {
-              logger('info', {
-                msg: 'p2p downloadFile success'
-              }, this.onLogger);
-              typeof successCb === 'function' && successCb();
-              resolve(true);
-            },
-            fail: params => {
-              logger('warn', {
-                msg: 'p2p downloadFile success',
-                params
-              }, this.onLogger);
-              setTimeout(() => {
-                typeof failedCb === 'function' && failedCb();
-              }, 500);
-              resolve(false);
-            },
-            complete: () => {
-              //
-            }
-          });
-        });
+        const result = await apis.downloadFile(this.devId, albumName, filePath, files.files, this.onLogger);
+        if (result.success) {
+          typeof successCb === 'function' && successCb();
+          return true;
+        } else {
+          setTimeout(() => {
+            typeof failedCb === 'function' && failedCb();
+          }, 500);
+          return false;
+        }
       }
     } catch (e) {
-      logger('error', {
+      this.log.error({
         msg: 'p2p downloadFile occur an error ==>',
         e
-      }, this.onLogger);
+      });
     }
     return null;
   };
@@ -396,26 +324,20 @@ export default class P2pApi {
    * 取消进行下载
    * @returns
    */
-  cancelDownloadTask = () => {
-    return new Promise((resolve, reject) => {
-      try {
-        p2p.cancelDownloadTask({
-          deviceId: this.devId,
-          success: () => {
-            resolve(true);
-          },
-          fail: () => {
-            reject(false);
-          }
-        });
-      } catch (e) {
-        logger('info', {
-          msg: 'cancelDownloadTask occur an error',
-          e
-        }, this.onLogger);
-        reject(false);
-      }
-    });
+  cancelDownloadTask = async () => {
+    try {
+      const result = await apis.cancelDownloadTask(this.devId, this.onLogger);
+      return result;
+    } catch (e) {
+      this.log.error({
+        msg: 'cancelDownloadTask occur an error',
+        e
+      });
+      return {
+        success: false,
+        error: e
+      };
+    }
   };
 
   /**
@@ -423,27 +345,17 @@ export default class P2pApi {
    * @param albumName
    * @returns
    */
-  queryAlbumFileIndexs = albumName => {
-    return new Promise(resolve => {
-      p2p.queryAlbumFileIndexs({
-        deviceId: this.devId,
-        albumName,
-        success: params => {
-          logger('info', {
-            msg: 'queryAlbumFileIndexs ==>',
-            params
-          }, this.onLogger);
-          resolve(params);
-        },
-        fail: params => {
-          logger('warn', {
-            msg: 'queryAlbumFileIndexs failed ==>',
-            params
-          }, this.onLogger);
-          resolve(null);
-        }
+  queryAlbumFileIndexs = async albumName => {
+    try {
+      const result = await apis.queryAlbumFileIndexs(this.devId, albumName, this.onLogger);
+      return result;
+    } catch (e) {
+      this.log.error({
+        msg: 'queryAlbumFileIndexs occur an error',
+        e
       });
-    });
+      return null;
+    }
   };
 
   /**
@@ -451,32 +363,18 @@ export default class P2pApi {
    * @returns
    */
   deInitP2PSDK = async () => {
-    return new Promise((resolve, reject) => {
-      try {
-        p2p.deInitSDK({
-          success: () => {
-            logger('info', {
-              msg: 'deInitP2pSDK success'
-            }, this.onLogger);
-            resolve(true);
-          },
-          fail: () => {
-            logger('info', {
-              msg: 'deInitP2pSDK failed'
-            }, this.onLogger);
-            resolve(false);
-          },
-          complete: () => {
-            resolve(true);
-          }
-        });
-      } catch (e) {
-        logger('error', {
-          msg: 'deInitP2pSDK occur an error ==>',
-          e
-        }, this.onLogger);
-        reject(false);
-      }
-    });
+    try {
+      const result = await apis.deInitP2pSdk(this.onLogger);
+      return result;
+    } catch (e) {
+      this.log.error({
+        msg: 'deInitP2pSDK occur an error ==>',
+        e
+      });
+      return {
+        success: false,
+        error: e
+      };
+    }
   };
 }

package/lib/api/sweeperP2p.d.ts

@@ -1,3 +1,4 @@
+import { FileNameEnum } from '../constant';
 import P2pApi from './p2pApi';
 /**
  * 基于P2p工具类的扫地机扩展实现
@@ -11,38 +12,6 @@ interface FileInfo {
     idx: number;
     type: number;
 }
-declare const FILE_NAME_MAP: {
-    readonly 'map.bin': {
-        readonly type: 0;
-    };
-    readonly 'map_structured.bin': {
-        readonly type: 6;
-    };
-    readonly 'cleanPath.bin': {
-        readonly type: 1;
-    };
-    readonly 'map.bin.stream': {
-        readonly type: 0;
-    };
-    readonly 'map_structured.bin.stream': {
-        readonly type: 6;
-    };
-    readonly 'cleanPath.bin.stream': {
-        readonly type: 1;
-    };
-    readonly 'ai.bin': {
-        readonly type: 4;
-    };
-    readonly 'ai.bin.stream': {
-        readonly type: 4;
-    };
-    readonly 'aiHD_XXXX_YYYY.bin': {
-        readonly type: 5;
-    };
-    readonly 'aiHD_XXXX_YYYY.bin.stream': {
-        readonly type: 5;
-    };
-};
 export declare class SweeperP2p extends P2pApi {
     file: {
         items: Array<FileInfo>;
@@ -60,15 +29,16 @@ export declare class SweeperP2p extends P2pApi {
     fileIndex: number;
     cacheData: any;
     exitFiles: Array<string>;
-    packetDataCacheMap: Map<keyof typeof FILE_NAME_MAP, Map<number, string>>;
-    packetSerialNumberCacheMap: Map<keyof typeof FILE_NAME_MAP, number>;
-    fileLengthCacheMap: Map<keyof typeof FILE_NAME_MAP, number>;
-    packetTotalMap: Map<keyof typeof FILE_NAME_MAP, number>;
+    packetDataCacheMap: Map<FileNameEnum, Map<number, string>>;
+    packetSerialNumberCacheMap: Map<FileNameEnum, number>;
+    fileLengthCacheMap: Map<FileNameEnum, number>;
+    packetTotalMap: Map<FileNameEnum, number>;
     firstPackageTime: number;
     onReceiveMapData: (data: string) => void;
     onReceivePathData: (data: string) => void;
     onReceiveAIPicData: (data: string) => void;
     onReceiveAIPicHDData: (data: string) => void;
+    onReceiveWifiMapData: (data: string) => void;
     offFileDownloadComplete: () => void;
     offP2pStreamPacketReceive: () => void;
     offDownLoadProgressUpdate: () => void;
@@ -89,18 +59,6 @@ export declare class SweeperP2p extends P2pApi {
      * @returns
      */
     private getDataFilePath;
-    /**
-     * 创建文件路径文件夹
-     * @param filePath
-     * @returns
-     */
-    private createFilePath;
-    /**
-     * 检查当前文件目录是否存在
-     * @param filePath
-     * @returns
-     */
-    private checkIfDirIsExist;
     /**
      * 初始化文件目录
      * @param filePath
@@ -112,6 +70,10 @@ export declare class SweeperP2p extends P2pApi {
      * @param filename
      */
     private getFileType;
+    /**
+     * 根据文件类型处理数据并调用相应的回调函数
+     */
+    private handleDataByType;
     /**
      * 设备连接状态发生改变
      * @param data
@@ -120,12 +82,20 @@ export declare class SweeperP2p extends P2pApi {
         deviceId: string;
         status: number;
     }) => void;
+    /**
+     * 创建下载失败时的重连回调函数
+     */
+    private createReconnectCallback;
+    /**
+     * 执行文件下载逻辑
+     */
+    private executeDownload;
     /**
      * 开始进行文件下载
      * @param downloadType
      * 0: 下载断开 1: 持续下载
      */
-    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined, onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined) => Promise<void>;
+    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined, onReceiveWifiMapData?: ((data: string) => void) | undefined, onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined) => Promise<void>;
     /**
      * 在下载过程中继续添加下载文件
      * @param files
@@ -159,6 +129,10 @@ export declare class SweeperP2p extends P2pApi {
      * @param filePath
      */
     private readFileFromPath;
+    /**
+     * 根据文件名获取对应的 reading 状态标志
+     */
+    private getReadingFlag;
     private setReading;
     private resetReading;
     /**