@pisell/core 1.0.9 → 1.0.11

package/es/logger/index.js

@@ -1,3 +1,4 @@
+var _excluded = ["feishu"];
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -8,6 +9,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -27,6 +30,7 @@ import { sendWarningLog } from "./feishu";
  * 日志管理器类
  */
 var LoggerManager = /*#__PURE__*/function () {
+  // 日志管理器状态
   /**
    * 构造函数
    * @param prefix 日志前缀
@@ -51,6 +55,7 @@ var LoggerManager = /*#__PURE__*/function () {
     _defineProperty(this, "retentionDays", void 0);
     // 日志保留天数
     _defineProperty(this, "metadataFunction", void 0);
+    _defineProperty(this, "status", "running");
     this.prefix = (options === null || options === void 0 ? void 0 : options.prefix) || "app";
     this.checkInterval = (options === null || options === void 0 ? void 0 : options.checkInterval) || 5 * 60 * 1000;
     this.app = app;
@@ -61,6 +66,7 @@ var LoggerManager = /*#__PURE__*/function () {
   _createClass(LoggerManager, [{
     key: "init",
     value: function init() {
+      this.setStatus("running");
       this.initTimer();
       // 定期清理旧日志
       this.cleanupOldLogs();
@@ -119,6 +125,19 @@ var LoggerManager = /*#__PURE__*/function () {
         }
       }, this.checkInterval);
     }
+  }, {
+    key: "setStatus",
+    value: function setStatus(status) {
+      this.status = status;
+    }
+  }, {
+    key: "stop",
+    value: function stop() {
+      this.setStatus("stop");
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+    }
 
     /**
      * 添加日志
@@ -127,13 +146,23 @@ var LoggerManager = /*#__PURE__*/function () {
   }, {
     key: "addLog",
     value: function addLog(log) {
-      var logItem = _objectSpread(_objectSpread({}, log), {}, {
+      if (this.status === "stop") {
+        return;
+      }
+      var _ref = log || {},
+        feishu = _ref.feishu,
+        restLog = _objectWithoutProperties(_ref, _excluded);
+      var logItem = _objectSpread(_objectSpread({}, restLog), {}, {
         date: log.date || dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        metadata: JSON.stringify(log.metadata || "{}")
+        metadata: JSON.stringify(log.metadata || {}),
+        // 以时间戳生成logId
+        logId: dayjs().valueOf()
       });
       console.log("---- 行为日志", logItem);
       if (log.type === "error") {
-        this.sendFeishuNotification(logItem);
+        this.sendFeishuNotification(_objectSpread(_objectSpread({}, logItem || {}), {}, {
+          feishu: feishu
+        }));
       }
       this.logBuffer.push(logItem);
     }
@@ -148,21 +177,30 @@ var LoggerManager = /*#__PURE__*/function () {
       if (this.feishuConfig) {
         var _this$metadataFunctio;
         var _metadata = ((_this$metadataFunctio = this.metadataFunction) === null || _this$metadataFunctio === void 0 ? void 0 : _this$metadataFunctio.call(this)) || {};
+        var content = [{
+          key: "日志类型",
+          value: log.type
+        }, {
+          key: "日志时间",
+          value: log.date || dayjs().format("YYYY-MM-DD HH:mm:ss")
+        }, {
+          key: "日志来源",
+          value: JSON.stringify(_objectSpread(_objectSpread({}, this.metadata || {}), _metadata))
+        }];
+        if (log.feishu) {
+          content.push({
+            key: "日志内容",
+            value: JSON.stringify(log.feishu || {})
+          });
+        } else {
+          content.push({
+            key: "日志内容",
+            value: JSON.stringify(log.metadata || {})
+          });
+        }
         sendWarningLog({
           title: log.title,
-          content: [{
-            key: "日志类型",
-            value: log.type
-          }, {
-            key: "日志时间",
-            value: log.date || dayjs().format("YYYY-MM-DD HH:mm:ss")
-          }, {
-            key: "日志来源",
-            value: JSON.stringify(_objectSpread(_objectSpread({}, this.metadata || {}), _metadata))
-          }, {
-            key: "日志内容",
-            value: JSON.stringify(log.metadata)
-          }],
+          content: content,
           webhook: this.feishuConfig.webhook
         });
         console.log("-------- 发送飞书通知", log);
@@ -181,11 +219,54 @@ var LoggerManager = /*#__PURE__*/function () {
       return fileName;
     }
 
+    /**
+     * 创建AWS日志文件名
+     * @param isManual 是否手动上传
+     * @returns 日志文件名
+     */
+  }, {
+    key: "createAWSFileName",
+    value: (function () {
+      var _createAWSFileName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(isManual) {
+        var _this$app;
+        var _date, _hour, _this$app2, fileName;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _date = dayjs().format("YYYY-MM-DD");
+              _hour = dayjs().format("HH:mm"); // 自定义上传名称
+              if (!((_this$app = this.app) !== null && _this$app !== void 0 && (_this$app = _this$app.getPlugin("aws")) !== null && _this$app !== void 0 && _this$app.getFileName)) {
+                _context2.next = 4;
+                break;
+              }
+              return _context2.abrupt("return", (_this$app2 = this.app) === null || _this$app2 === void 0 || (_this$app2 = _this$app2.getPlugin("aws")) === null || _this$app2 === void 0 ? void 0 : _this$app2.getFileName({
+                date: _date,
+                hour: _hour,
+                isManual: isManual
+              }));
+            case 4:
+              fileName = "logs/".concat("pisell", "/", _date, "/").concat(_hour);
+              if (isManual) {
+                fileName += "-manual";
+              }
+              return _context2.abrupt("return", "".concat(fileName, ".json"));
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function createAWSFileName(_x) {
+        return _createAWSFileName.apply(this, arguments);
+      }
+      return createAWSFileName;
+    }()
     /**
      * 创建日志文件
      * @param _fileName 文件名
      * @returns 日志文件对象
      */
+    )
   }, {
     key: "createFile",
     value: function createFile(_fileName) {
@@ -207,85 +288,149 @@ var LoggerManager = /*#__PURE__*/function () {
   }, {
     key: "storeLog",
     value: (function () {
-      var _storeLog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var fileName, logFile;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _storeLog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$logBuffer, fileName, buffer, logs;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!(this.logBuffer.length === 0 || !this.db)) {
-                _context2.next = 2;
+                _context3.next = 2;
                 break;
               }
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 2:
+              _context3.prev = 2;
+              _context3.next = 5;
+              return this.createAWSFileName();
+            case 5:
+              fileName = _context3.sent;
+              console.log("-------- 存储日志到AWS 开始", fileName);
+
+              // 将buffer中的metadata转换为对象
+              buffer = (_this$logBuffer = this.logBuffer) === null || _this$logBuffer === void 0 ? void 0 : _this$logBuffer.map(function (item) {
+                item.metadata = JSON.parse(item.metadata || "{}");
+                return item;
+              });
+              logs = JSON.stringify(buffer, null, 2);
+              _context3.next = 11;
+              return this.app.aws.upload({
+                Bucket: "",
+                Key: fileName,
+                Body: logs
+              });
+            case 11:
+              console.log("-------- 存储日志到AWS 成功");
+              // 上传成功后需要清空缓冲区，避免重复上传
+              this.logBuffer = [];
+              _context3.next = 26;
+              break;
+            case 15:
+              _context3.prev = 15;
+              _context3.t0 = _context3["catch"](2);
+              console.error("存储日志上传AWS失败:", _context3.t0);
+
+              // 将日志存储到IndexDB
+              _context3.prev = 18;
+              _context3.next = 21;
+              return this.storeLogToIndexDB();
+            case 21:
+              _context3.next = 26;
+              break;
+            case 23:
+              _context3.prev = 23;
+              _context3.t1 = _context3["catch"](18);
+              console.error("存储日志到IndexDB也失败:", _context3.t1);
+            case 26:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this, [[2, 15], [18, 23]]);
+      }));
+      function storeLog() {
+        return _storeLog.apply(this, arguments);
+      }
+      return storeLog;
+    }())
+  }, {
+    key: "storeLogToIndexDB",
+    value: function () {
+      var _storeLogToIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$db, _this$db3, fileName, logFile, _this$db2;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.prev = 0;
               fileName = this.createFileName();
-              _context2.prev = 3;
-              _context2.next = 6;
-              return this.db.get("logs", fileName);
-            case 6:
-              logFile = _context2.sent;
+              console.log("storeLog", fileName);
+
+              // 获取现有日志文件
+              _context4.next = 5;
+              return (_this$db = this.db) === null || _this$db === void 0 ? void 0 : _this$db.get("logs", fileName);
+            case 5:
+              logFile = _context4.sent;
               if (logFile) {
-                _context2.next = 11;
+                _context4.next = 10;
                 break;
               }
               logFile = this.createFile(fileName);
-              _context2.next = 11;
-              return this.db.add("logs", logFile);
-            case 11:
+              _context4.next = 10;
+              return (_this$db2 = this.db) === null || _this$db2 === void 0 ? void 0 : _this$db2.add("logs", logFile);
+            case 10:
               // 添加日志到文件内容
               logFile.fileContent.logs = [].concat(_toConsumableArray(logFile.fileContent.logs), _toConsumableArray(this.logBuffer));
 
               // 更新日志文件
-              _context2.next = 14;
-              return this.db.update("logs", logFile);
-            case 14:
-              console.log("-------- 存储日志", {
+              _context4.next = 13;
+              return (_this$db3 = this.db) === null || _this$db3 === void 0 ? void 0 : _this$db3.update("logs", logFile);
+            case 13:
+              console.log("-------- 存储日志到IndexDB", {
                 fileName: fileName,
                 logFile: logFile
               });
-              _context2.next = 20;
+
+              // 存储成功后需要清空缓冲区，避免重复存储
+              this.logBuffer = [];
+              _context4.next = 21;
               break;
             case 17:
-              _context2.prev = 17;
-              _context2.t0 = _context2["catch"](3);
-              console.error("存储日志到IndexDB失败:", _context2.t0);
-            case 20:
-              // 清空缓冲区
-              this.logBuffer = [];
+              _context4.prev = 17;
+              _context4.t0 = _context4["catch"](0);
+              console.log("-------- 存储日志到IndexDB 失败", _context4.t0);
+              // 重新抛出错误，让外层 catch 能够捕获
+              throw _context4.t0;
             case 21:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2, this, [[3, 17]]);
+        }, _callee4, this, [[0, 17]]);
       }));
-      function storeLog() {
-        return _storeLog.apply(this, arguments);
+      function storeLogToIndexDB() {
+        return _storeLogToIndexDB.apply(this, arguments);
       }
-      return storeLog;
+      return storeLogToIndexDB;
     }()
     /**
      * 清理旧日志，只保留最近指定天数的日志
      */
-    )
   }, {
     key: "cleanupOldLogs",
     value: (function () {
-      var _cleanupOldLogs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _cleanupOldLogs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var logFiles, cutoffDate, filesToDelete, _iterator, _step, file;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (this.db) {
-                _context3.next = 2;
+                _context5.next = 2;
                 break;
               }
-              return _context3.abrupt("return");
+              return _context5.abrupt("return");
             case 2:
-              _context3.prev = 2;
-              _context3.next = 5;
+              _context5.prev = 2;
+              _context5.next = 5;
               return this.getLogFiles();
             case 5:
-              logFiles = _context3.sent;
+              logFiles = _context5.sent;
               // 计算保留日志的截止日期
               cutoffDate = dayjs().subtract(this.retentionDays, "day").format("YYYY-MM-DD"); // 筛选出需要删除的日志文件
               filesToDelete = logFiles.filter(function (file) {
@@ -295,47 +440,47 @@ var LoggerManager = /*#__PURE__*/function () {
 
               // 删除旧日志文件
               _iterator = _createForOfIteratorHelper(filesToDelete);
-              _context3.prev = 10;
+              _context5.prev = 10;
               _iterator.s();
             case 12:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 19;
+                _context5.next = 19;
                 break;
               }
               file = _step.value;
-              _context3.next = 16;
+              _context5.next = 16;
               return this.db.delete("logs", file.fileName);
             case 16:
               console.log("-------- \u5220\u9664\u65E7\u65E5\u5FD7\u6587\u4EF6: ".concat(file.fileName, ", \u65E5\u671F: ").concat(file.date));
             case 17:
-              _context3.next = 12;
+              _context5.next = 12;
               break;
             case 19:
-              _context3.next = 24;
+              _context5.next = 24;
               break;
             case 21:
-              _context3.prev = 21;
-              _context3.t0 = _context3["catch"](10);
-              _iterator.e(_context3.t0);
+              _context5.prev = 21;
+              _context5.t0 = _context5["catch"](10);
+              _iterator.e(_context5.t0);
             case 24:
-              _context3.prev = 24;
+              _context5.prev = 24;
               _iterator.f();
-              return _context3.finish(24);
+              return _context5.finish(24);
             case 27:
               if (filesToDelete.length > 0) {
                 console.log("-------- \u5171\u6E05\u7406 ".concat(filesToDelete.length, " \u4E2A\u65E7\u65E5\u5FD7\u6587\u4EF6"));
               }
-              _context3.next = 33;
+              _context5.next = 33;
               break;
             case 30:
-              _context3.prev = 30;
-              _context3.t1 = _context3["catch"](2);
-              console.error("清理旧日志失败:", _context3.t1);
+              _context5.prev = 30;
+              _context5.t1 = _context5["catch"](2);
+              console.error("清理旧日志失败:", _context5.t1);
             case 33:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this, [[2, 30], [10, 21, 24, 27]]);
+        }, _callee5, this, [[2, 30], [10, 21, 24, 27]]);
       }));
       function cleanupOldLogs() {
         return _cleanupOldLogs.apply(this, arguments);
@@ -350,31 +495,31 @@ var LoggerManager = /*#__PURE__*/function () {
   }, {
     key: "getLogFiles",
     value: (function () {
-      var _getLogFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _getLogFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (this.db) {
-                _context4.next = 2;
+                _context6.next = 2;
                 break;
               }
-              return _context4.abrupt("return", []);
+              return _context6.abrupt("return", []);
             case 2:
-              _context4.prev = 2;
-              _context4.next = 5;
+              _context6.prev = 2;
+              _context6.next = 5;
               return this.db.getAll("logs");
             case 5:
-              return _context4.abrupt("return", _context4.sent);
+              return _context6.abrupt("return", _context6.sent);
             case 8:
-              _context4.prev = 8;
-              _context4.t0 = _context4["catch"](2);
-              console.error("获取日志文件列表失败:", _context4.t0);
-              return _context4.abrupt("return", []);
+              _context6.prev = 8;
+              _context6.t0 = _context6["catch"](2);
+              console.error("获取日志文件列表失败:", _context6.t0);
+              return _context6.abrupt("return", []);
             case 12:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this, [[2, 8]]);
+        }, _callee6, this, [[2, 8]]);
       }));
       function getLogFiles() {
         return _getLogFiles.apply(this, arguments);
@@ -390,33 +535,33 @@ var LoggerManager = /*#__PURE__*/function () {
   }, {
     key: "getLogFile",
     value: (function () {
-      var _getLogFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(fileName) {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _getLogFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(fileName) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (this.db) {
-                _context5.next = 2;
+                _context7.next = 2;
                 break;
               }
-              return _context5.abrupt("return", null);
+              return _context7.abrupt("return", null);
             case 2:
-              _context5.prev = 2;
-              _context5.next = 5;
+              _context7.prev = 2;
+              _context7.next = 5;
               return this.db.get("logs", fileName);
             case 5:
-              return _context5.abrupt("return", _context5.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](2);
-              console.error("获取日志文件内容失败:", _context5.t0);
-              return _context5.abrupt("return", null);
+              _context7.prev = 8;
+              _context7.t0 = _context7["catch"](2);
+              console.error("获取日志文件内容失败:", _context7.t0);
+              return _context7.abrupt("return", null);
             case 12:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this, [[2, 8]]);
+        }, _callee7, this, [[2, 8]]);
       }));
-      function getLogFile(_x) {
+      function getLogFile(_x2) {
         return _getLogFile.apply(this, arguments);
       }
       return getLogFile;
@@ -430,43 +575,43 @@ var LoggerManager = /*#__PURE__*/function () {
   }, {
     key: "clearLogs",
     value: (function () {
-      var _clearLogs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(fileName) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _clearLogs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fileName) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (this.db) {
-                _context6.next = 2;
+                _context8.next = 2;
                 break;
               }
-              return _context6.abrupt("return", false);
+              return _context8.abrupt("return", false);
             case 2:
-              _context6.prev = 2;
+              _context8.prev = 2;
               if (!fileName) {
-                _context6.next = 8;
+                _context8.next = 8;
                 break;
               }
-              _context6.next = 6;
+              _context8.next = 6;
               return this.db.delete("logs", fileName);
             case 6:
-              _context6.next = 10;
+              _context8.next = 10;
               break;
             case 8:
-              _context6.next = 10;
+              _context8.next = 10;
               return this.db.clear("logs");
             case 10:
-              return _context6.abrupt("return", true);
+              return _context8.abrupt("return", true);
             case 13:
-              _context6.prev = 13;
-              _context6.t0 = _context6["catch"](2);
-              console.error("清空日志失败:", _context6.t0);
-              return _context6.abrupt("return", false);
+              _context8.prev = 13;
+              _context8.t0 = _context8["catch"](2);
+              console.error("清空日志失败:", _context8.t0);
+              return _context8.abrupt("return", false);
             case 17:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this, [[2, 13]]);
+        }, _callee8, this, [[2, 13]]);
       }));
-      function clearLogs(_x2) {
+      function clearLogs(_x3) {
         return _clearLogs.apply(this, arguments);
       }
       return clearLogs;
@@ -493,17 +638,17 @@ var LoggerManager = /*#__PURE__*/function () {
   }, {
     key: "manualCleanup",
     value: (function () {
-      var _manualCleanup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _manualCleanup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context7.next = 2;
+              _context9.next = 2;
               return this.cleanupOldLogs();
             case 2:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee9, this);
       }));
       function manualCleanup() {
         return _manualCleanup.apply(this, arguments);

package/es/socket/monitor.d.ts

@@ -11,7 +11,7 @@ export interface SocketHistoryItem {
     /** 消息方向（发送/接收） */
     direction: 'in' | 'out';
     /** 消息内容 */
-    message: SocketMessage | Partial<SocketMessage>;
+    message: SocketMessage;
     /** 消息大小（字节） */
     size?: number;
 }

package/es/socket/monitor.js

@@ -291,7 +291,6 @@ export var SocketMonitor = /*#__PURE__*/function () {
   }, {
     key: "removeEventListeners",
     value: function removeEventListeners() {
-      // @ts-ignore
       var _iterator = _createForOfIteratorHelper(this.eventHandlers.entries()),
         _step;
       try {

package/es/socket/reconnect.d.ts

@@ -1,4 +1,4 @@
-import { ReconnectOptions } from './types';
+import { ReconnectOptions } from "./types";
 /**
  * Socket重连管理器
  * 处理断线重连逻辑