@ray-js/robot-data-stream 0.0.17-beta.9 → 0.1.0-beta.0

package/README.md

@@ -76,4 +76,26 @@ export default function Home() {
   );
 }
 
-```
+```
+
+## Custom Commands (extension point for customized firmware)
+
+Commands that only exist on a customized firmware fork do NOT belong in this library's built-in hooks. Declare, send and listen to them in your own repo:
+
+```typescript
+import { useCustomCommand, defineRobotCommand } from '@ray-js/robot-data-stream';
+
+// One-off send (any reqType; must be used within MqttProvider)
+const { sendCustomCommand } = useCustomCommand();
+await sendCustomCommand<Res>('peakValleyChargeQry');
+
+// Declarative: one file per command, returns { useSend, useResponse } shaped like built-in hooks
+export const peakValleyCharge = defineRobotCommand<Req, Res>({
+  reqType: 'peakValleyChargeSet',
+  responseType: 'peakValleyChargeQry',
+});
+```
+
+Key semantics: MQTT + LAN JSON socket channels only (no DP `command_trans`); reqType + taskId response matching (when firmware echoes taskId, concurrent same-reqType requests do not cross-wire; responses without taskId pass through, degrading to first-response matching in that case); `data`-envelope unwrapping and `success`/`errCode` normalization are handled by the library; built-in protocol payload/response types are exported from the package root for type reuse. No runtime validation, no loading/retry — same contract as built-in hooks.
+
+Full reference: `docs/reference/custom-commands.md`.

package/lib/api/index.d.ts

@@ -1,2 +1,3 @@
 import SweeperP2pInstance from './sweeperP2p';
+export type { P2pError, P2pErrorCode } from './p2pApi';
 export { SweeperP2pInstance };

package/lib/api/p2pApi.d.ts

@@ -1,3 +1,9 @@
+export type P2pErrorCode = 'QUERY_ALBUM_TIMEOUT' | 'PACKET_LENGTH_MISMATCH' | 'DOWNLOAD_STREAM_FAILED' | 'FIRST_FRAME_TIMEOUT' | 'NO_ALBUM_FILES' | string;
+export interface P2pError {
+    code: P2pErrorCode;
+    message: string;
+    originalError?: any;
+}
 /**
  * P2P 工具类
  */
@@ -6,10 +12,12 @@ export default class P2pApi {
     isConnecting: boolean;
     offSessionStatusChange: () => void;
     onLogger: (type: 'warn' | 'error' | 'info', v: string) => void;
+    onError?: (error: P2pError) => void;
     initTimeStamp: number;
     devId: string;
     traceId: string;
     constructor();
+    emitError: (error: P2pError) => void;
     /**
      * 设备断开之后的重连
      */
@@ -58,7 +66,9 @@ export default class P2pApi {
      * @param callback
      * @returns
      */
-    onP2pStreamPacketReceive: (callback: (...args: any[]) => void) => () => void;
+    onP2pStreamPacketReceive: (callback: {
+        (...args: any[]): void;
+    }) => () => void;
     /**
      * 开始下载文件
      * files : {"files":["filesname1", "filesname2", "filesname3" ]}
@@ -71,24 +81,32 @@ export default class P2pApi {
      * @param callback
      * @returns
      */
-    onDownloadProgressUpdate: (callback: (...args: any[]) => void) => () => void;
+    onDownloadProgressUpdate: (callback: {
+        (...args: any[]): void;
+    }) => () => void;
     /**
      * 注册多文件下载进度监听
      * @param callback
      * @returns
      */
-    onDownloadTotalProgressUpdate: (callback: (...args: any[]) => void) => () => void;
+    onDownloadTotalProgressUpdate: (callback: {
+        (...args: any[]): void;
+    }) => () => void;
     /**
      * 注册单文件下载进度完成监听
      * @param callback
      * @returns
      */
-    onFileDownloadComplete: (callback: (...args: any[]) => void) => () => void;
+    onFileDownloadComplete: (callback: {
+        (...args: any[]): void;
+    }) => () => void;
     /**
      * 注册设备因为其他异常断开连接的事件
      * @returns
      */
-    onSessionStatusChange: (callback: (...args: any[]) => void) => () => void;
+    onSessionStatusChange: (callback: {
+        (...args: any[]): void;
+    }) => () => void;
     /**
      * 取消进行下载
      * @returns
@@ -96,10 +114,15 @@ export default class P2pApi {
     cancelDownloadTask: () => Promise<unknown>;
     /**
      * 查询设备相册文件列表
-     * @param albumName
+     * @param albumName 相册名
+     * @param retries 失败重试次数，默认 2 次（共至多 3 次）
+     * @param delay 重试延迟，默认 1500ms
      * @returns
      */
-    queryAlbumFileIndexs: (albumName: string) => Promise<unknown>;
+    queryAlbumFileIndexs: (albumName: string, retries?: number, delay?: number) => Promise<{
+        count: number;
+        items: any[];
+    } | null>;
     /**
      * P2p SDK 销毁
      * @returns

package/lib/api/p2pApi.js

@@ -15,6 +15,18 @@ export default class P2pApi {
     this.isConnected = false;
     this.isConnecting = false;
   }
+  emitError = error => {
+    if (typeof this.onError === 'function') {
+      try {
+        this.onError(error);
+      } catch (e) {
+        logger('error', {
+          msg: 'onError callback error ==>',
+          e
+        }, this.onLogger);
+      }
+    }
+  };
 
   /**
    * 设备断开之后的重连
@@ -420,31 +432,55 @@ export default class P2pApi {
 
   /**
    * 查询设备相册文件列表
-   * @param albumName
+   * @param albumName 相册名
+   * @param retries 失败重试次数，默认 2 次（共至多 3 次）
+   * @param delay 重试延迟，默认 1500ms
    * @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 = (() => {
+    var _this = this;
+    return function (albumName) {
+      let retries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+      let delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1500;
+      const doQuery = attempt => {
+        return new Promise(resolve => {
+          p2p.queryAlbumFileIndexs({
+            deviceId: _this.devId,
+            albumName,
+            success: params => {
+              logger('info', {
+                msg: `queryAlbumFileIndexs success (attempt ${attempt}) ==>`,
+                params
+              }, _this.onLogger);
+              resolve(params);
+            },
+            fail: params => {
+              logger('warn', {
+                msg: `queryAlbumFileIndexs failed (attempt ${attempt}) ==>`,
+                params
+              }, _this.onLogger);
+              if (attempt < retries && _this.isConnected) {
+                logger('info', {
+                  msg: `queryAlbumFileIndexs retrying in ${delay}ms (attempt ${attempt + 1}/${retries})...`
+                }, _this.onLogger);
+                setTimeout(() => {
+                  doQuery(attempt + 1).then(resolve);
+                }, delay);
+              } else {
+                _this.emitError({
+                  code: 'QUERY_ALBUM_TIMEOUT',
+                  message: `queryAlbumFileIndexs failed after ${attempt + 1} attempt(s)`,
+                  originalError: params
+                });
+                resolve(null);
+              }
+            }
+          });
+        });
+      };
+      return doQuery(0);
+    };
+  })();
 
   /**
    * P2p SDK 销毁

package/lib/api/sweeperP2p.d.ts

@@ -82,6 +82,9 @@ export declare class SweeperP2p extends P2pApi {
     offTotalDownLoadProgressUpdate: () => void;
     onDefineStructuredMode: (isStructured: boolean) => void;
     enableCustomLog: boolean;
+    mismatchCount: number;
+    reDownloadCount: number;
+    isReDownloading: boolean;
     constructor();
     private setStreamFilePath;
     private setDataFilePath;
@@ -128,12 +131,16 @@ export declare class SweeperP2p extends P2pApi {
         deviceId: string;
         status: number;
     }) => void;
+    /**
+     * 重连设备并重新开启数据观察
+     */
+    private reconnectAndResume;
     /**
      * 开始进行文件下载
      * @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, onReceiveWifiMapData?: ((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, onReceiveAIPicHDData?: (data: string) => void, onReceiveWifiMapData?: (data: string) => void, onDefineStructuredMode?: (isStructured: boolean) => void) => Promise<void>;
     /**
      * 在下载过程中继续添加下载文件
      * @param files
@@ -142,10 +149,20 @@ export declare class SweeperP2p extends P2pApi {
      * @returns
      */
     appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failCb?: () => void) => Promise<boolean> | void;
+    /**
+     * 渐进式平滑自愈：重新拉取数据流
+     * 优先尝试轻量 cancelDownloadTask -> downloadStream，
+     * 若重试超过 2 次，升级为 disconnectDevice -> connectDevice 彻底重连
+     */
+    reDownloadStream: (reason?: string) => Promise<void>;
     /**
      * 注册下载有关的监听
      */
     registerP2pDownloadEvent: () => void;
+    /**
+     * 清空分包缓存与组包进度
+     */
+    clearPacketCache: () => void;
     /**
      * 移除下载有关的监听
      */

package/lib/api/sweeperP2p.js

@@ -69,6 +69,9 @@ export class SweeperP2p extends P2pApi {
     this.exitFiles = [];
     this.firstPackageTime = Date.now();
     this.enableCustomLog = false;
+    this.mismatchCount = 0;
+    this.reDownloadCount = 0;
+    this.isReDownloading = false;
     this.packetTotalMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
     this.packetSerialNumberCacheMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
     this.fileLengthCacheMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
@@ -230,7 +233,7 @@ export class SweeperP2p extends P2pApi {
           this.reconnectP2p(() => {
             logP2PDataIfEnabled(this.enableCustomLog, this.devId, 'session_reconnect_success', 'Reconnected successfully, restarting data observer');
             // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-            this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData);
+            this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData, this.onDefineStructuredMode);
           }, '');
         } else {
           logger('warn', {
@@ -242,6 +245,31 @@ export class SweeperP2p extends P2pApi {
     }
   };
 
+  /**
+   * 重连设备并重新开启数据观察
+   */
+  reconnectAndResume = (() => {
+    var _this = this;
+    return async function () {
+      let reason = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'reconnectAndResume';
+      logger('info', {
+        msg: `reconnectAndResume triggered, reason: ${reason}`
+      }, _this.onLogger);
+      logP2PDataIfEnabled(_this.enableCustomLog, _this.devId, 'reconnect_and_resume', `Reconnecting device and resuming stream, reason: ${reason}`);
+      _this.removeP2pDownloadEvent();
+      try {
+        await _this.disconnectDevice();
+      } catch (e) {
+        // ignore
+      }
+      _this.isConnected = false;
+      _this.isConnecting = false;
+      _this.connectDevice(() => {
+        _this.startObserverSweeperDataByP2P(_this.downloadType, _this.devId, _this.onReceiveMapData, _this.onReceivePathData, _this.onReceiveAIPicData, _this.onReceiveAIPicHDData, _this.onReceiveWifiMapData, _this.onDefineStructuredMode);
+      });
+    };
+  })();
+
   /**
    * 开始进行文件下载
    * @param downloadType
@@ -285,6 +313,21 @@ export class SweeperP2p extends P2pApi {
       this.file = await this.queryAlbumFileIndexs(this.albumName);
       logP2PDataIfEnabled(this.enableCustomLog, devId, 'query_album_files', `Query album files completed, file count: ${((_this$file = this.file) === null || _this$file === void 0 || (_this$file = _this$file.items) === null || _this$file === void 0 ? void 0 : _this$file.length) || 0}`);
     }
+    if (!this.file || !this.file.items || this.file.items.length === 0) {
+      logger('warn', {
+        msg: 'startObserverSweeperDataByP2P: queryAlbumFileIndexs failed or returned empty items'
+      }, this.onLogger);
+      logP2PDataIfEnabled(this.enableCustomLog, devId, 'query_album_files_failed', 'queryAlbumFileIndexs failed or returned empty items');
+      // queryAlbumFileIndexs 底层失败已自动透传 QUERY_ALBUM_TIMEOUT
+      // 若是相册成功返回但列表为空，则透传 NO_ALBUM_FILES
+      if (this.file && (!this.file.items || this.file.items.length === 0)) {
+        this.emitError({
+          code: 'NO_ALBUM_FILES',
+          message: 'queryAlbumFileIndexs returned empty items'
+        });
+      }
+      return;
+    }
     if (this.file && ((_this$file$items = this.file.items) === null || _this$file$items === void 0 ? void 0 : _this$file$items.length) > 0) {
       if (this.downloadType === 0) {
         const exitFiles = this.queryNeedFiles(this.file.items);
@@ -307,16 +350,11 @@ export class SweeperP2p extends P2pApi {
                 msg: `${downloadType} p2p downloadStream failed and try reConnect Device===>`
               }, this.onLogger);
               logP2PDataIfEnabled(this.enableCustomLog, devId, 'download_stream_fail', `Stream download failed, attempting reconnect, downloadType: ${downloadType}`);
-              this.removeP2pDownloadEvent();
-              this.disconnectDevice().then(() => {
-                this.isConnected = false;
-                this.isConnecting = false;
-                logP2PDataIfEnabled(this.enableCustomLog, devId, 'download_stream_reconnect', 'Reconnecting device after stream download failure');
-                this.connectDevice(() => {
-                  // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData);
-                });
+              this.emitError({
+                code: 'DOWNLOAD_STREAM_FAILED',
+                message: `downloadStream failed for downloadType ${downloadType}`
               });
+              this.reconnectAndResume(`download_stream_fail_${downloadType}`);
             });
           } else if (await this.initFilePath(this.dataFilePath)) {
             logP2PDataIfEnabled(this.enableCustomLog, devId, 'download_file_start', `Starting file download, files count: ${exitFiles.length}`);
@@ -350,16 +388,11 @@ export class SweeperP2p extends P2pApi {
                 msg: `${downloadType} p2p downloadStream failed and try reConnect Device===>`
               }, this.onLogger);
               logP2PDataIfEnabled(this.enableCustomLog, devId, 'download_stream_fail', `Stream download failed, attempting reconnect, downloadType: ${downloadType}`);
-              this.removeP2pDownloadEvent();
-              this.disconnectDevice().then(() => {
-                this.isConnected = false;
-                this.isConnecting = false;
-                logP2PDataIfEnabled(this.enableCustomLog, devId, 'download_stream_reconnect', 'Reconnecting device after stream download failure');
-                this.connectDevice(() => {
-                  // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData);
-                });
+              this.emitError({
+                code: 'DOWNLOAD_STREAM_FAILED',
+                message: `downloadStream failed for downloadType ${downloadType}`
               });
+              this.reconnectAndResume(`download_stream_fail_${downloadType}`);
             });
           } else if (await this.initFilePath(this.streamFilePath)) {
             // 每次要下载前都需要先检查文件目录是否存在 防止中间过程被删除掉文件目录
@@ -391,6 +424,88 @@ export class SweeperP2p extends P2pApi {
     }, this.albumName, successCb, failCb);
   };
 
+  /**
+   * 渐进式平滑自愈：重新拉取数据流
+   * 优先尝试轻量 cancelDownloadTask -> downloadStream，
+   * 若重试超过 2 次，升级为 disconnectDevice -> connectDevice 彻底重连
+   */
+  reDownloadStream = (() => {
+    var _this2 = this;
+    return async function () {
+      let reason = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'unknown';
+      if (_this2.isReDownloading || !_this2.isConnected) {
+        return;
+      }
+      _this2.isReDownloading = true;
+      logger('info', {
+        msg: `reDownloadStream triggered, reason: ${reason}, retryCount: ${_this2.reDownloadCount}`
+      }, _this2.onLogger);
+      logP2PDataIfEnabled(_this2.enableCustomLog, _this2.devId, 'redownload_stream_trigger', `reDownloadStream triggered, reason: ${reason}, retryCount: ${_this2.reDownloadCount}`);
+      if (_this2.reDownloadCount >= 2) {
+        logger('warn', {
+          msg: 'reDownloadStream exceeded max retries (2), escalating to full reconnect'
+        }, _this2.onLogger);
+        logP2PDataIfEnabled(_this2.enableCustomLog, _this2.devId, 'redownload_stream_escalate', 'Exceeded max retries, escalating to full reconnect');
+        _this2.reDownloadCount = 0;
+        _this2.mismatchCount = 0;
+        _this2.isReDownloading = false;
+        await _this2.reconnectAndResume('redownload_stream_escalate');
+        return;
+      }
+      _this2.reDownloadCount += 1;
+      _this2.clearPacketCache();
+      try {
+        await _this2.cancelDownloadTask();
+      } catch (e) {
+        // ignore
+      }
+      if (!_this2.isConnected) {
+        _this2.isReDownloading = false;
+        return;
+      }
+      if (!_this2.exitFiles || _this2.exitFiles.length === 0) {
+        var _this2$file;
+        if (!_this2.file || !_this2.file.items || _this2.file.items.length === 0) {
+          // @ts-ignore
+          _this2.file = await _this2.queryAlbumFileIndexs(_this2.albumName);
+        }
+        if ((_this2$file = _this2.file) !== null && _this2$file !== void 0 && (_this2$file = _this2$file.items) !== null && _this2$file !== void 0 && _this2$file.length) {
+          _this2.exitFiles = _this2.queryNeedFiles(_this2.file.items);
+        }
+      }
+      if (!_this2.exitFiles || _this2.exitFiles.length === 0) {
+        logger('warn', {
+          msg: 'reDownloadStream: no exitFiles found to download'
+        }, _this2.onLogger);
+        _this2.isReDownloading = false;
+        return;
+      }
+      try {
+        await _this2.downloadStream({
+          files: _this2.exitFiles
+        }, _this2.albumName, () => {
+          logger('info', {
+            msg: `reDownloadStream downloadStream success (retry ${_this2.reDownloadCount})`
+          }, _this2.onLogger);
+          logP2PDataIfEnabled(_this2.enableCustomLog, _this2.devId, 'redownload_stream_success', `reDownloadStream success on retry ${_this2.reDownloadCount}`);
+          _this2.isReDownloading = false;
+        }, () => {
+          logger('warn', {
+            msg: `reDownloadStream downloadStream failed (retry ${_this2.reDownloadCount})`
+          }, _this2.onLogger);
+          logP2PDataIfEnabled(_this2.enableCustomLog, _this2.devId, 'redownload_stream_fail', `reDownloadStream failed on retry ${_this2.reDownloadCount}`);
+          _this2.isReDownloading = false;
+        });
+      } catch (e) {
+        logger('error', {
+          msg: 'reDownloadStream error ==>',
+          e
+        }, _this2.onLogger);
+        _this2.isReDownloading = false;
+      }
+    };
+  })();
+
   /**
    * 注册下载有关的监听
    */
@@ -416,13 +531,9 @@ export class SweeperP2p extends P2pApi {
   };
 
   /**
-   * 移除下载有关的监听
+   * 清空分包缓存与组包进度
    */
-  removeP2pDownloadEvent = () => {
-    logger('info', {
-      msg: 'removeP2pDownloadEvent ==>'
-    }, this.onLogger);
-    logP2PDataIfEnabled(this.enableCustomLog, this.devId, 'remove_download_event', 'Removing download events');
+  clearPacketCache = () => {
     if (shouldDownloadStream) {
       [...this.packetSerialNumberCacheMap.keys()].forEach(key => {
         this.packetSerialNumberCacheMap.set(key, -1);
@@ -438,6 +549,17 @@ export class SweeperP2p extends P2pApi {
       });
     }
     this.cacheData = {};
+  };
+
+  /**
+   * 移除下载有关的监听
+   */
+  removeP2pDownloadEvent = () => {
+    logger('info', {
+      msg: 'removeP2pDownloadEvent ==>'
+    }, this.onLogger);
+    logP2PDataIfEnabled(this.enableCustomLog, this.devId, 'remove_download_event', 'Removing download events');
+    this.clearPacketCache();
     this.offFileDownloadComplete && this.offFileDownloadComplete();
     this.offP2pStreamPacketReceive && this.offP2pStreamPacketReceive();
 
@@ -544,8 +666,34 @@ export class SweeperP2p extends P2pApi {
             msg: `p2pStreamPacketReceiveCallback: fileName : ${fileName} length mismatch, expected: ${cacheFileLength * 2}, received: ${hexValue.length}`
           }, this.onLogger);
           logP2PDataIfEnabled(this.enableCustomLog, this.devId, 'packet_length_mismatch', `Packet length mismatch, fileName: ${fileName}, expected: ${cacheFileLength * 2}, received: ${hexValue.length}`);
+
+          // 清理受损文件的组包缓存，防止污染后续数据
+          cachePacketMap.clear();
+          this.packetTotalMap.set(fileName, -1);
+          this.mismatchCount += 1;
+          this.emitError({
+            code: 'PACKET_LENGTH_MISMATCH',
+            message: `Packet length mismatch for ${fileName}: expected ${cacheFileLength * 2}, received ${hexValue.length}`,
+            originalError: {
+              fileName,
+              expected: cacheFileLength * 2,
+              received: hexValue.length,
+              mismatchCount: this.mismatchCount
+            }
+          });
+          if (this.mismatchCount >= 2) {
+            logger('warn', {
+              msg: `consecutive length mismatch reached ${this.mismatchCount}, triggering reDownloadStream`
+            }, this.onLogger);
+            this.mismatchCount = 0;
+            this.reDownloadStream('consecutive_length_mismatch');
+          }
           return;
         }
+
+        // 校验通过，重置 mismatchCount 和 reDownloadCount
+        this.mismatchCount = 0;
+        this.reDownloadCount = 0;
         if (this.firstPackageTime > 0 && fileName.indexOf('map') !== -1) {
           const packageTime = Date.now() - this.firstPackageTime;
           logger('info', {
@@ -735,6 +883,10 @@ export class SweeperP2p extends P2pApi {
         this.disconnectDevice();
       }
       this.removeP2pDownloadEvent();
+      this.mismatchCount = 0;
+      this.reDownloadCount = 0;
+      this.isReDownloading = false;
+      this.file = undefined;
       // 没有必要cancelDownloadTask，只需要调用断连
       // this.cancelDownloadTask();
 

package/lib/index.d.ts

@@ -1,16 +1,22 @@
+import { P2pError, P2pErrorCode } from './api';
 export * from './mqtt';
 export * from './mqtt/type/requestType';
+export { pointsToString, pickWaterFields } from './utils';
 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;
-    enableCustomLog?: boolean | undefined;
-    onReceiveAIPicData?: ((data: string) => void) | undefined;
-    onReceiveAIPicHDData?: ((data: string) => void) | undefined;
-    onReceiveWifiMapData?: ((data: string) => void) | undefined;
-    onLogger?: TOnLogger | undefined;
-    onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined;
-} | undefined) => {
+export interface P2PDataStreamOptions {
+    logTag?: string;
+    enableCustomLog?: boolean;
+    onReceiveAIPicData?: (data: string) => void;
+    onReceiveAIPicHDData?: (data: string) => void;
+    onReceiveWifiMapData?: (data: string) => void;
+    onLogger?: TOnLogger;
+    onDefineStructuredMode?: (isStructured: boolean) => void;
+    onError?: (error: P2pError) => void;
+    firstFrameTimeout?: number;
+}
+declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, opt?: P2PDataStreamOptions) => {
     appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | void;
 };
 declare const StreamDataNotificationCenter: import("mitt").Emitter<Record<import("mitt").EventType, unknown>>;
+export type { P2PDataStreamOptions, P2pError, P2pErrorCode };
 export { StreamDataNotificationCenter, useP2PDataStream };