react-terminal-viewer-cicd 2.1.1 → 3.0.0-beta.10

package/README.md

@@ -1,19 +1,19 @@
 <h1 align="center">
-  react-terminal-viewer
+  gitee-terminal-viewer
 </h1>
 
 <p align="center">基于 xterm.js 内核的 React 日志组件</p>
 
 <p align="center">
-  <a href="https://gitee.com/oschina/react-terminal-viewer/gitee_go/pipelines"><img src="https://img.shields.io/badge/codecov-20%25-green" data-canonical-src="https://img.shields.io/badge/codecov-20%25-green"/></a>
-  <a href="https://www.npmjs.com/package/react-terminal-viewer">
-    <img src="https://img.shields.io/npm/v/react-terminal-viewer/latest" 
-    data-canonical-src="https://img.shields.io/npm/v/react-terminal-viewer/latest"/>
+  <a href="https://gitee.com/oschina/gitee-terminal-viewer/gitee_go/pipelines"><img src="https://img.shields.io/badge/codecov-20%25-green" data-canonical-src="https://img.shields.io/badge/codecov-20%25-green"/></a>
+  <a href="https://www.npmjs.com/package/gitee-terminal-viewer">
+    <img src="https://img.shields.io/npm/v/gitee-terminal-viewer/latest" 
+    data-canonical-src="https://img.shields.io/npm/v/gitee-terminal-viewer/latest"/>
   </a>
-  <img src="https://img.shields.io/npm/l/react-terminal-viewer" data-canonical-src="https://img.shields.io/npm/l/react-terminal-viewer"/>
+  <img src="https://img.shields.io/npm/l/gitee-terminal-viewer" data-canonical-src="https://img.shields.io/npm/l/gitee-terminal-viewer"/>
 </p>
 
-![Preview png](https://gitee.com/oschina/react-terminal-viewer/raw/master/docs/preview.png)
+![Preview png](https://gitee.com/oschina/gitee-terminal-viewer/raw/master/docs/preview.png)
 
 ## 功能
 
@@ -41,20 +41,20 @@
 使用 npm 或 yarn 把这个 package 安装到你的项目依赖中:
 
 ```
-npm install react-terminal-viewer
+npm install gitee-terminal-viewer
 ```
 
 或
 
 ```
-yarn add react-terminal-viewer
+yarn add gitee-terminal-viewer
 ```
 
 ## 使用
 
 ```tsx
 import React, { useRef } from 'react';
-import TerminalViewer from 'react-terminal-viewer';
+import TerminalViewer from 'gitee-terminal-viewer';
 export default () => {
   const ref = useRef();
   const data = 'echo success';
@@ -104,7 +104,7 @@ webpack 配置：
   new CopyPlugin({
       patterns: [
         {
-          from: path.resolve(__dirname, 'node_modules/react-terminal-viewer/dist/worker'),
+          from: path.resolve(__dirname, 'node_modules/gitee-terminal-viewer/dist/worker'),
           to: path.resolve(__dirname, 'dist/scripts/worker'),
           filter: (file) => file.includes('worker'),
         },

package/dist/esm/Addon/EventEmiter.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from 'xterm';
+import { IDisposable } from '@xterm/xterm';
 export interface IEvent<T, U = void> {
     (listener: (arg1: T, arg2: U) => any): IDisposable;
 }

package/dist/esm/Addon/HighlightAddon.d.ts

@@ -1,4 +1,4 @@
-import { Terminal, ITerminalAddon } from 'xterm';
+import { ITerminalAddon, Terminal } from '@xterm/xterm';
 export interface IHighlightOptions {
     keyword: string;
     ignoreSensitive?: boolean;

package/dist/esm/Addon/SearchAddon.d.ts

@@ -1,7 +1,7 @@
 /**
  * 从 https://github.com/xtermjs/xterm.js/blob/master/addons/xterm-addon-search/src/SearchAddon.ts 复制以解决部分问题
  */
-import { Terminal, ITerminalAddon } from 'xterm';
+import { ITerminalAddon, Terminal } from '@xterm/xterm';
 export interface ISearchOptions {
     regex?: boolean;
     wholeWord?: boolean;

package/dist/esm/Addon/WorkerLog/LogParser.d.ts

@@ -0,0 +1,22 @@
+export interface FlatLine {
+    type: 'start' | 'end' | 'log';
+    text: string;
+}
+export interface Stage {
+    stepId: string;
+    status: string;
+    startTime: string;
+    name: string;
+    startIndex: number;
+    endIndex?: number;
+    endStatus?: string;
+    endTime?: string;
+    logs: FlatLine[];
+}
+declare class LogParser {
+    stages: Stage[];
+    currentStage: Stage | null;
+    flatLines: FlatLine[];
+    parse(logs: string[]): void;
+}
+export default LogParser;

package/dist/esm/Addon/WorkerLog/LogParser.js

@@ -0,0 +1,136 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/* eslint-disable no-continue */
+/* eslint-disable no-plusplus */
+// 阶段结构
+var LogParser = /*#__PURE__*/function () {
+  function LogParser() {
+    _classCallCheck(this, LogParser);
+    _defineProperty(this, "stages", []);
+    // 所有阶段数据
+    _defineProperty(this, "currentStage", null);
+    // 当前正在解析入的阶段
+    _defineProperty(this, "flatLines", []);
+  }
+  _createClass(LogParser, [{
+    key: "parse",
+    value:
+    // 扁平化行数组（最终给 Virtuoso）
+
+    function parse(logs) {
+      if (!logs || !Array.isArray(logs)) {
+        return;
+      }
+
+      // 重置状态
+      this.stages = [];
+      this.currentStage = null;
+      this.flatLines = [];
+
+      // flatLines 中的实际索引（不包含 START/END 行）
+      var flatLineIndex = 0;
+      for (var i = 0; i < logs.length; i++) {
+        var line = logs[i];
+        // START_stepId_status_startTime_stepName
+        if (line.startsWith('START_')) {
+          // 如果需要解析 stepId 等，可以在这里 split 一次
+          var _line$split = line.split('_'),
+            _line$split2 = _slicedToArray(_line$split, 5),
+            stepId = _line$split2[1],
+            status = _line$split2[2],
+            startTime = _line$split2[3],
+            name = _line$split2[4];
+          this.currentStage = {
+            stepId: stepId,
+            status: status,
+            startTime: startTime,
+            name: name,
+            // startIndex 记录在 flatLines 中的位置（不包含 START 行本身）
+            startIndex: flatLineIndex,
+            endIndex: undefined,
+            logs: []
+          };
+
+          // 不将 START 行加入到 flatLines 中
+          // 但保留在 stage.logs 中用于其他用途
+          this.currentStage.logs.push({
+            type: 'start',
+            text: line
+          });
+          continue;
+        }
+
+        // END_stepId_status_endTime_stepName
+        if (line.startsWith('END_')) {
+          var _line$split3 = line.split('_'),
+            _line$split4 = _slicedToArray(_line$split3, 4),
+            endStatus = _line$split4[2],
+            endTime = _line$split4[3];
+          if (this.currentStage) {
+            // 不将 END 行加入到 flatLines 中
+            // 但保留在 stage.logs 中用于其他用途
+            this.currentStage.logs.push({
+              type: 'end',
+              text: line
+            });
+            this.currentStage.endTime = endTime;
+            this.currentStage.endStatus = endStatus;
+            // endIndex 记录在 flatLines 中的位置（不包含 END 行本身）
+            // 如果当前阶段有日志行，endIndex 是最后一个日志行的索引（flatLineIndex - 1）
+            // 如果当前阶段没有日志行，endIndex 等于 startIndex - 1（表示阶段开始前的位置）
+            // 但如果 startIndex 为 0，则 endIndex 也为 0
+            if (flatLineIndex > this.currentStage.startIndex) {
+              // 阶段有日志行
+              this.currentStage.endIndex = flatLineIndex - 1;
+            } else {
+              // 阶段没有日志行
+              this.currentStage.endIndex = this.currentStage.startIndex > 0 ? this.currentStage.startIndex - 1 : this.currentStage.startIndex;
+            }
+            this.stages.push(this.currentStage);
+            this.currentStage = null;
+          }
+          continue;
+        }
+
+        // 普通日志行
+        this.flatLines.push({
+          type: 'log',
+          text: line
+        });
+        flatLineIndex++;
+        // 普通日志行
+        if (this.currentStage) {
+          this.currentStage.logs.push({
+            type: 'log',
+            text: line
+          });
+        }
+      }
+      if (this.currentStage) {
+        // 处理未结束的阶段
+        if (flatLineIndex > this.currentStage.startIndex) {
+          // 阶段有日志行
+          this.currentStage.endIndex = flatLineIndex - 1;
+        } else {
+          // 阶段没有日志行
+          this.currentStage.endIndex = this.currentStage.startIndex > 0 ? this.currentStage.startIndex - 1 : this.currentStage.startIndex;
+        }
+        this.stages.push(this.currentStage);
+        this.currentStage = null;
+      }
+    }
+  }]);
+  return LogParser;
+}();
+export default LogParser;

package/dist/esm/Addon/WorkerLog/LogWorker.js

@@ -1,7 +1,7 @@
 function LogWorker() {
   var workerPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/worker';
   var worker = null;
-  var version = "2.1.1" || '0.0.0';
+  var version = "3.0.0-beta.10" || '0.0.0';
   var path = workerPath.includes('http') ? "".concat(workerPath, "/log.worker.js") : "".concat(window.location.origin).concat(workerPath, "/log.worker.js");
   var blob = new Blob(["importScripts(\"".concat(path, "?v=").concat(version, "\")")], {
     type: 'application/javascript'

package/dist/esm/Addon/WorkerLog/Logs.d.ts

@@ -1,20 +1,44 @@
 import type { ISearchOptions } from '../SearchAddon';
+import { type FlatLine, type Stage } from './LogParser';
 export default class Logs {
     private id;
     private string;
     private searcher;
-    private logDataMap;
+    private parser;
+    private parserMap;
+    private ansiUp;
     constructor({ id, string }: {
         id: string;
         string: string;
     });
-    convert(): string[];
-    getArrayData(): any;
+    /**
+     * 更新字符串并重新解析
+     */
+    updateString(newString: string): void;
+    /**
+     * 解析原始字符串，识别 START/END 标记，构建 stages 和 flatLines
+     */
+    private parse;
+    /**
+     * 获取 HTML 转换后的数组数据（基于 parse 的结果，不包含 START/END 行）
+     */
+    getArrayData(): string[];
+    /**
+     * 获取解析后的 stages
+     */
+    getStages(): Stage[];
+    /**
+     * 获取解析后的 flatLines（已进行 HTML 转换）
+     */
+    getFlatLines(): FlatLine[];
+    /**
+     * 搜索功能，基于 flatLines 进行搜索
+     */
     mark(keyword: string, hlIndex?: number, options?: ISearchOptions | undefined): {
         count: number;
         map: {
-            [key: string]: string;
-            [key: number]: string;
+            [key: string]: string | Record<string, string>;
+            [key: number]: string | Record<string, string>;
         };
         markedKey: number;
     };

package/dist/esm/Addon/WorkerLog/Logs.js

@@ -1,3 +1,5 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
@@ -5,10 +7,9 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-/* eslint-disable no-plusplus */
-// eslint-disable-next-line import/no-named-default
 import { default as AnsiUp } from 'ansi_up';
 import LimitMap from "./LimitMap";
+import LogParser from "./LogParser";
 import Searcher from "./Searcher";
 var Logs = /*#__PURE__*/function () {
   function Logs(_ref) {
@@ -18,32 +19,136 @@ var Logs = /*#__PURE__*/function () {
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "string", void 0);
     _defineProperty(this, "searcher", void 0);
-    _defineProperty(this, "logDataMap", void 0);
+    _defineProperty(this, "parser", void 0);
+    _defineProperty(this, "parserMap", void 0);
+    _defineProperty(this, "ansiUp", void 0);
     this.id = id;
     this.string = string;
-    this.searcher = new Searcher();
-    this.logDataMap = new LimitMap({
+    this.searcher = new Searcher({
+      calculateSearchText: function calculateSearchText(line) {
+        // 处理 FlatLine 对象，提取 text 字段
+        if (line && _typeof(line) === 'object' && 'text' in line) {
+          return line.text || '';
+        }
+        return '';
+      }
+    });
+    this.parserMap = new LimitMap({
       limit: 1
     });
+    this.parser = new LogParser();
+    this.ansiUp = new AnsiUp();
+    // 初始化时进行解析
+    this.parse();
   }
+
+  /**
+   * 更新字符串并重新解析
+   */
   _createClass(Logs, [{
-    key: "convert",
-    value: function convert() {
+    key: "updateString",
+    value: function updateString(newString) {
+      if (this.string !== newString) {
+        this.string = newString;
+        // 清除缓存，强制重新解析
+        this.parserMap.delete(this.id);
+        this.parse();
+      }
+    }
+
+    /**
+     * 解析原始字符串，识别 START/END 标记，构建 stages 和 flatLines
+     */
+  }, {
+    key: "parse",
+    value: function parse() {
+      var _this = this;
       if (this.string.length === 0) {
-        return [];
+        return;
+      }
+
+      // 如果已经解析过且缓存存在，直接使用缓存的解析结果
+      if (this.parserMap.has(this.id)) {
+        var cachedParser = this.parserMap.get(this.id);
+        if (cachedParser) {
+          this.parser = cachedParser;
+          return;
+        }
       }
-      return this.string.split('\r\n').map(function (content) {
-        return new AnsiUp().ansi_to_html(content);
+
+      // 创建新的解析器实例
+      var newParser = new LogParser();
+
+      // 分割原始字符串为行数组（不进行 HTML 转换）
+      var rawLines = this.string.split('\r\n');
+
+      // 解析日志结构
+      newParser.parse(rawLines);
+
+      // 对 flatLines 中的 text 进行 HTML 转换（用于展示）
+      newParser.flatLines = newParser.flatLines.map(function (line) {
+        // 只对普通日志行进行 HTML 转换，START/END 行已经在 flatLines 中被移除了
+        if (line.type === 'log') {
+          return _objectSpread(_objectSpread({}, line), {}, {
+            text: _this.ansiUp.ansi_to_html(line.text)
+          });
+        }
+        return line;
+      });
+
+      // 对 stages 中的 logs 也进行 HTML 转换（用于其他用途）
+      newParser.stages = newParser.stages.map(function (stage) {
+        return _objectSpread(_objectSpread({}, stage), {}, {
+          logs: stage.logs.map(function (log) {
+            if (log.type === 'log') {
+              return _objectSpread(_objectSpread({}, log), {}, {
+                text: _this.ansiUp.ansi_to_html(log.text)
+              });
+            }
+            return log;
+          })
+        });
       });
+
+      // 保存解析结果
+      this.parser = newParser;
+      // 缓存解析结果
+      this.parserMap.set(this.id, this.parser);
     }
+
+    /**
+     * 获取 HTML 转换后的数组数据（基于 parse 的结果，不包含 START/END 行）
+     */
   }, {
     key: "getArrayData",
     value: function getArrayData() {
-      if (!this.logDataMap.has(this.id)) {
-        this.logDataMap.set(this.id, this.convert());
-      }
-      return this.logDataMap.get(this.id) || [];
+      // 直接使用 parse 的结果，提取 flatLines 中的 text（已进行 HTML 转换）
+      return this.parser.flatLines.map(function (line) {
+        return line.text;
+      });
+    }
+
+    /**
+     * 获取解析后的 stages
+     */
+  }, {
+    key: "getStages",
+    value: function getStages() {
+      return this.parser.stages;
+    }
+
+    /**
+     * 获取解析后的 flatLines（已进行 HTML 转换）
+     */
+  }, {
+    key: "getFlatLines",
+    value: function getFlatLines() {
+      return this.parser.flatLines;
     }
+
+    /**
+     * 搜索功能，基于 flatLines 进行搜索
+     */
   }, {
     key: "mark",
     value: function mark(keyword) {
@@ -52,7 +157,8 @@ var Logs = /*#__PURE__*/function () {
       if (!keyword) {
         return this.searcher.search(keyword, []);
       }
-      return this.searcher.search(keyword, this.getArrayData(), hlIndex, options);
+      // 基于 flatLines 进行搜索（不包含 START/END 行）
+      return this.searcher.search(keyword, this.parser.flatLines, hlIndex, options);
     }
   }]);
   return Logs;

package/dist/esm/Addon/WorkerLog/Searcher.d.ts

@@ -1,15 +1,17 @@
 import { ISearchOptions } from '../SearchAddon';
+export interface IOptions {
+    markClassName?: string;
+    markedClassName?: string;
+    calculateSearchText?: (line: Record<string, string>) => string;
+}
 export default class Searcher {
     private options;
-    constructor(options?: {
-        markClassName: string;
-        markedClassName: string;
-    });
-    search(keyword: string, logs: Array<string>, hlIndex?: number, options?: ISearchOptions | undefined): {
+    constructor(options?: IOptions);
+    search(keyword: string, logs: Array<string | Record<string, string>>, hlIndex?: number, options?: ISearchOptions | undefined): {
         count: number;
         map: {
-            [key: string]: string;
-            [key: number]: string;
+            [key: string]: string | Record<string, string>;
+            [key: number]: string | Record<string, string>;
         };
         markedKey: number;
     };

package/dist/esm/Addon/WorkerLog/Searcher.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -10,14 +12,13 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import Mark from "./Mark";
 var MAX_COUNT = 1000;
 var Searcher = /*#__PURE__*/function () {
-  function Searcher() {
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      markClassName: 'terminal-viewer-hl-mark',
-      markedClassName: 'terminal-viewer-hl-mark terminal-viewer-hl-marked'
-    };
+  function Searcher(options) {
     _classCallCheck(this, Searcher);
     _defineProperty(this, "options", void 0);
-    this.options = options;
+    this.options = _objectSpread({
+      markClassName: 'terminal-viewer-hl-mark',
+      markedClassName: 'terminal-viewer-hl-mark terminal-viewer-hl-marked'
+    }, options || {});
   }
   _createClass(Searcher, [{
     key: "search",
@@ -34,7 +35,8 @@ var Searcher = /*#__PURE__*/function () {
       }
       var _this$options = this.options,
         markClassName = _this$options.markClassName,
-        markedClassName = _this$options.markedClassName;
+        markedClassName = _this$options.markedClassName,
+        calculateSearchText = _this$options.calculateSearchText;
       var style = {
         color: options === null || options === void 0 || (_options$decorations = options.decorations) === null || _options$decorations === void 0 ? void 0 : _options$decorations.matchForegroundColor,
         background: options === null || options === void 0 || (_options$decorations2 = options.decorations) === null || _options$decorations2 === void 0 ? void 0 : _options$decorations2.matchBackground,
@@ -51,7 +53,17 @@ var Searcher = /*#__PURE__*/function () {
         if (count >= MAX_COUNT) {
           break;
         }
-        var text = logs[i] || '';
+        var _line = logs[i];
+        var text = '';
+        // 对象，用 calculateSearchText 取值
+        if (_typeof(_line) === 'object') {
+          text = (calculateSearchText === null || calculateSearchText === void 0 ? void 0 : calculateSearchText(_line)) || '';
+        }
+        // string，直接使用
+        if (typeof _line === 'string') {
+          text = _line;
+        }
+        // 执行匹配查询逻辑
         if (!text.toLowerCase().includes(keyword.toLowerCase())) {
           // eslint-disable-next-line no-continue
           continue;

package/dist/esm/Addon/WorkerLog/log.worker.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-restricted-globals */
-import WebWorkerServer from "./WebWokerServer";
 import LimitMap from "./LimitMap";
 import Logs from "./Logs";
+import WebWorkerServer from "./WebWokerServer";
 var server = new WebWorkerServer(self);
 var logsInstanceMap = new LimitMap({
   limit: 8
@@ -14,11 +14,20 @@ server.on('highlight-log', function (ctx, _ref) {
       id: id,
       string: string
     }));
+  } else {
+    // 如果实例已存在，检查 string 是否变化，如果变化了需要更新并重新解析
+    var existingInstance = logsInstanceMap.get(id);
+    existingInstance.updateString(string);
   }
   var instance = logsInstanceMap.get(id);
+  var logs = (instance === null || instance === void 0 ? void 0 : instance.getArrayData()) || [];
+  var stages = (instance === null || instance === void 0 ? void 0 : instance.getStages()) || [];
+  var flatLines = (instance === null || instance === void 0 ? void 0 : instance.getFlatLines()) || [];
   ctx.send('highlight-log-success', {
     id: id,
-    logs: instance === null || instance === void 0 ? void 0 : instance.getArrayData()
+    logs: logs,
+    stages: stages,
+    flatLines: flatLines
   });
 });
 server.on('search-log', function (ctx, _ref2) {
@@ -42,18 +51,35 @@ server.on('search-log', function (ctx, _ref2) {
     });
     return;
   }
+  // 确保有 Logs 实例
   if (!logsInstanceMap.has(id)) {
     logsInstanceMap.set(id, new Logs({
       id: id,
       string: string
     }));
+  } else {
+    // 如果实例已存在，检查 string 是否变化，如果变化了需要更新并重新解析
+    var existingInstance = logsInstanceMap.get(id);
+    existingInstance.updateString(string);
   }
   var instance = logsInstanceMap.get(id);
   if (instance) {
+    // 使用 Logs 实例的 mark 方法进行搜索（基于 flatLines）
+    var result = instance.mark(keyword, hlIndex, options);
     ctx.send('search-log-success', {
       id: id,
       searchId: searchId,
-      searcherResult: instance.mark(keyword, hlIndex, options) || {
+      searcherResult: result || {
+        map: {},
+        count: 0,
+        markedKey: 0
+      }
+    });
+  } else {
+    ctx.send('search-log-success', {
+      id: id,
+      searchId: searchId,
+      searcherResult: {
         map: {},
         count: 0,
         markedKey: 0

package/dist/esm/Addon/useAddon.d.ts

@@ -1,9 +1,9 @@
-import { Terminal } from 'xterm';
-import { FitAddon } from 'xterm-addon-fit';
-import { CanvasAddon } from 'xterm-addon-canvas';
-import { WebLinksAddon } from 'xterm-addon-web-links';
-import { SearchAddon } from './SearchAddon';
+import { CanvasAddon } from '@xterm/addon-canvas';
+import { FitAddon } from '@xterm/addon-fit';
+import { WebLinksAddon } from '@xterm/addon-web-links';
+import { Terminal } from '@xterm/xterm';
 import { HighlightAddon } from './HighlightAddon';
+import { SearchAddon } from './SearchAddon';
 export type AddonType = FitAddon | WebLinksAddon | SearchAddon | HighlightAddon | CanvasAddon;
 declare const useAddon: (terminal: Terminal | undefined, Addon: new () => AddonType, loadable: boolean, callback?: ((term: Terminal, instance: AddonType) => void) | undefined) => AddonType | undefined;
 export default useAddon;

package/dist/esm/Addon/useAddon.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useEffect, useState, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 var useAddon = function useAddon(terminal, Addon, loadable, callback) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),