@pisell/core 1.0.8 → 1.0.10

package/lib/logger/index.js

@@ -52,8 +52,6 @@ var LoggerManager = class {
   retentionDays;
   // 日志保留天数
   metadataFunction;
-  status = "running";
-  // 日志管理器状态
   /**
    * 构造函数
    * @param prefix 日志前缀
@@ -68,7 +66,6 @@ var LoggerManager = class {
     this.initDB();
   }
   init() {
-    this.setStatus("running");
     this.initTimer();
     this.cleanupOldLogs();
   }
@@ -100,34 +97,19 @@ var LoggerManager = class {
       }
     }, this.checkInterval);
   }
-  setStatus(status) {
-    this.status = status;
-  }
-  stop() {
-    this.setStatus("stop");
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
-  }
   /**
    * 添加日志
    * @param log 日志项
    */
   addLog(log) {
-    if (this.status === "stop") {
-      return;
-    }
-    const { feishu, ...restLog } = log || {};
     const logItem = {
-      ...restLog,
+      ...log,
       date: log.date || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
-      metadata: JSON.stringify(log.metadata || {}),
-      // 以时间戳生成logId
-      logId: (0, import_dayjs.default)().valueOf()
+      metadata: JSON.stringify(log.metadata || "{}")
     };
     console.log("---- 行为日志", logItem);
     if (log.type === "error") {
-      this.sendFeishuNotification({ ...logItem || {}, feishu });
+      this.sendFeishuNotification(logItem);
     }
     this.logBuffer.push(logItem);
   }
@@ -139,19 +121,14 @@ var LoggerManager = class {
     var _a;
     if (this.feishuConfig) {
       const _metadata = ((_a = this.metadataFunction) == null ? void 0 : _a.call(this)) || {};
-      const content = [
-        { key: "日志类型", value: log.type },
-        { key: "日志时间", value: log.date || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss") },
-        { key: "日志来源", value: JSON.stringify({ ...this.metadata || {}, ..._metadata }) }
-      ];
-      if (log.feishu) {
-        content.push({ key: "日志内容", value: JSON.stringify(log.feishu || {}) });
-      } else {
-        content.push({ key: "日志内容", value: JSON.stringify(log.metadata || {}) });
-      }
       (0, import_feishu.sendWarningLog)({
         title: log.title,
-        content,
+        content: [
+          { key: "日志类型", value: log.type },
+          { key: "日志时间", value: log.date || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss") },
+          { key: "日志来源", value: JSON.stringify({ ...this.metadata || {}, ..._metadata }) },
+          { key: "日志内容", value: JSON.stringify(log.metadata) }
+        ],
         webhook: this.feishuConfig.webhook
       });
       console.log("-------- 发送飞书通知", log);
@@ -166,29 +143,6 @@ var LoggerManager = class {
     const fileName = `${this.prefix}_${_date}.log`;
     return fileName;
   }
-  /**
-   * 创建AWS日志文件名
-   * @param isManual 是否手动上传
-   * @returns 日志文件名
-   */
-  async createAWSFileName(isManual) {
-    var _a, _b, _c, _d, _e;
-    const _date = (0, import_dayjs.default)().format("YYYY-MM-DD");
-    const _hour = (0, import_dayjs.default)().format("HH:mm");
-    const shopId = (_b = (_a = JSON.parse(this.app.storage.getStorage("shopInfo") || "{}")) == null ? void 0 : _a.shop) == null ? void 0 : _b.id;
-    let deviceId = "";
-    if (!shopId) {
-      const language = ((_d = (_c = this.app) == null ? void 0 : _c.locales) == null ? void 0 : _d.getLocale()) || "en";
-      const deviceRes = await ((_e = this.app) == null ? void 0 : _e.getPlugin("device").getDeviceInfo({ language }));
-      const device = (deviceRes == null ? void 0 : deviceRes.data) || null;
-      deviceId = (device == null ? void 0 : device.number) || "";
-    }
-    let fileName = `logs/kds/${shopId || deviceId || "pisell"}/${_date}/${_hour}`;
-    if (isManual) {
-      fileName += "-manual";
-    }
-    return `${fileName}.json`;
-  }
   /**
    * 创建日志文件
    * @param _fileName 文件名
@@ -210,48 +164,26 @@ var LoggerManager = class {
    * 存储日志到持久化存储
    */
   async storeLog() {
-    var _a;
     if (this.logBuffer.length === 0 || !this.db) {
       return;
     }
+    const fileName = this.createFileName();
     try {
-      const fileName = await this.createAWSFileName();
-      console.log("-------- 存储日志到AWS 开始", fileName);
-      const buffer = (_a = this.logBuffer) == null ? void 0 : _a.map((item) => {
-        item.metadata = JSON.parse(item.metadata || "{}");
-        return item;
-      });
-      const logs = JSON.stringify(buffer, null, 2);
-      await this.app.aws.upload({ Bucket: "", Key: fileName, Body: logs });
-      console.log("-------- 存储日志到AWS 成功");
-      this.logBuffer = [];
-    } catch (error) {
-      console.error("存储日志上传AWS失败:", error);
-      try {
-        await this.storeLogToIndexDB();
-      } catch (indexDBError) {
-        console.error("存储日志到IndexDB也失败:", indexDBError);
-      }
-    }
-  }
-  async storeLogToIndexDB() {
-    var _a, _b, _c;
-    try {
-      const fileName = this.createFileName();
-      console.log("storeLog", fileName);
-      let logFile = await ((_a = this.db) == null ? void 0 : _a.get("logs", fileName));
+      let logFile = await this.db.get("logs", fileName);
       if (!logFile) {
         logFile = this.createFile(fileName);
-        await ((_b = this.db) == null ? void 0 : _b.add("logs", logFile));
+        await this.db.add("logs", logFile);
       }
       logFile.fileContent.logs = [...logFile.fileContent.logs, ...this.logBuffer];
-      await ((_c = this.db) == null ? void 0 : _c.update("logs", logFile));
-      console.log("-------- 存储日志到IndexDB", { fileName, logFile });
-      this.logBuffer = [];
+      await this.db.update("logs", logFile);
+      console.log("-------- 存储日志", {
+        fileName,
+        logFile
+      });
     } catch (error) {
-      console.log("-------- 存储日志到IndexDB 失败", error);
-      throw error;
+      console.error("存储日志到IndexDB失败:", error);
     }
+    this.logBuffer = [];
   }
   /**
    * 清理旧日志，只保留最近指定天数的日志

package/lib/socket/monitor.d.ts

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

package/lib/socket/reconnect.d.ts

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

package/lib/socket/reconnect.js

@@ -143,7 +143,10 @@ var ReconnectManager = class {
     const { delay, delayMax, jitter } = this.options;
     let calculatedDelay = delay;
     if (this.attempts > 0) {
-      calculatedDelay = Math.min(delayMax || Infinity, delay * Math.pow(1.5, this.attempts - 1));
+      calculatedDelay = Math.min(
+        delayMax || Infinity,
+        delay * Math.pow(1.5, this.attempts - 1)
+      );
     }
     if (jitter) {
       calculatedDelay = Math.random() * calculatedDelay;

package/lib/socket/socket.d.ts

@@ -25,9 +25,8 @@ export declare class Socket {
     connect(): Promise<void>;
     /**
      * 关闭WebSocket连接
-     * @param isManual 是否手动关闭
      */
-    disconnect(isManual?: boolean): void;
+    disconnect(): void;
     /**
      * 发送消息到服务器
      * @param event 事件名称

package/lib/socket/socket.js

@@ -28,7 +28,6 @@ var import_events = require("./events");
 var import_heartbeat = require("./heartbeat");
 var import_reconnect = require("./reconnect");
 var import_monitor = require("./monitor");
-var import_app = require("../app");
 var Socket = class {
   ws = null;
   url;
@@ -53,26 +52,14 @@ var Socket = class {
       ...options
     };
     if (this.options.autoConnect) {
-      this.connect().catch((error) => {
-        console.warn("Socket connection failed:", error);
-      });
+      this.connect();
     }
   }
   /**
    * 建立WebSocket连接
    */
   async connect() {
-    const app = (0, import_app.getApp)();
-    const isConnected = this.isConnected();
-    if (isConnected || this.status === import_types.SocketStatus.CONNECTING) {
-      app.logger.addLog({
-        type: "info",
-        title: "socket已连接或连接中",
-        metadata: {
-          isConnected,
-          status: this.status
-        }
-      });
+    if (this.isConnected() || this.status === import_types.SocketStatus.CONNECTING) {
       return;
     }
     this.setStatus(import_types.SocketStatus.CONNECTING);
@@ -107,9 +94,8 @@ var Socket = class {
   }
   /**
    * 关闭WebSocket连接
-   * @param isManual 是否手动关闭
    */
-  disconnect(isManual = false) {
+  disconnect() {
     if (!this.ws || this.status === import_types.SocketStatus.CLOSED || this.status === import_types.SocketStatus.CLOSING) {
       return;
     }
@@ -127,7 +113,7 @@ var Socket = class {
     }
     this.setStatus(import_types.SocketStatus.CLOSED);
     this.ws = null;
-    this.emit(import_events.SocketEvents.DISCONNECT, { isManual });
+    this.emit(import_events.SocketEvents.DISCONNECT);
   }
   /**
    * 发送消息到服务器
@@ -336,7 +322,7 @@ var Socket = class {
       attempts: this.options.reconnectionAttempts,
       delay: this.options.reconnectionDelay,
       delayMax: this.options.reconnectionDelayMax,
-      jitter: false
+      jitter: true
     };
     this.reconnectManager = new import_reconnect.ReconnectManager(
       reconnectOptions,
@@ -410,7 +396,7 @@ var Socket = class {
    * 释放资源
    */
   destroy() {
-    this.disconnect(true);
+    this.disconnect();
     if (this.monitor) {
       this.monitor.destroy();
       this.monitor = null;

package/lib/socket/types.d.ts

@@ -45,6 +45,7 @@ export interface SocketMessage<T = any> {
     data?: T;
     /** 消息ID */
     id?: string;
+    event?: any;
 }
 /**
  * 心跳配置选项

package/lib/tasks/index.d.ts

@@ -10,7 +10,6 @@ export declare class TasksManager {
         tasks: TasksModule;
     };
     watchTaskCallback: (taskModule: TasksModule) => void;
-    private timerIds;
     constructor(app: App);
     static getInstance(app?: App): TasksManager;
     addTaskFunction<T>(name: string, fun: T): void;
@@ -32,11 +31,6 @@ export declare class TasksManager {
      * @Date: 2024-09-26 13:53
      */
     private runTask;
-    /**
-     * @title: 清除任务定时器
-     * @param {NodeJS.Timeout} timerId
-     */
-    private clearTaskTimer;
     /**
      * @title: 启动轮询
      * @description: 根据轮询间隔定期执行任务

package/lib/tasks/index.js

@@ -44,7 +44,6 @@ var TasksManager = class _TasksManager {
   useTasks = import_useTasks.default;
   watchTaskCallback = () => {
   };
-  timerIds = [];
   constructor(app) {
     if (!app) {
       throw new Error("app is required");
@@ -53,7 +52,6 @@ var TasksManager = class _TasksManager {
     this.taskFunctions = /* @__PURE__ */ new Map();
     this.tasks = {};
     this.db = app.dbManager;
-    this.timerIds = [];
   }
   // 单例模式
   static getInstance(app) {
@@ -150,39 +148,16 @@ var TasksManager = class _TasksManager {
       }
     } catch (error) {
       this.app.logger.addLog({
-        type: "info",
+        type: "error",
         title: `任务执行失败-${task.id}`,
         metadata: { error, taskPayload: task == null ? void 0 : task.payload }
       });
+      console.log("任务执行失败", error);
       actionRes = { status: "failure" };
     }
     console.log("Tasks--->", `任务执行成功: ${task.id}`);
     return actionRes;
   };
-  /**
-   * @title: 清除任务定时器
-   * @param {NodeJS.Timeout} timerId
-   */
-  clearTaskTimer = (params) => {
-    const { timerId, taskId } = params;
-    const _timerIds = [];
-    const needClearTimerIds = [];
-    this.timerIds.forEach((id) => {
-      const taskIdRult = taskId ? (id == null ? void 0 : id.taskId) === taskId : true;
-      const timerIdRult = timerId ? (id == null ? void 0 : id.timerId) === timerId : true;
-      if (taskIdRult && timerIdRult) {
-        needClearTimerIds.push(id);
-      } else {
-        _timerIds.push(id);
-      }
-    });
-    if (needClearTimerIds.length) {
-      for (let id of needClearTimerIds) {
-        clearTimeout(id.timerId);
-      }
-    }
-    this.timerIds = [..._timerIds || []];
-  };
   /**
    * @title: 启动轮询
    * @description: 根据轮询间隔定期执行任务
@@ -215,11 +190,10 @@ var TasksManager = class _TasksManager {
         }
         this.startPolling(newTask);
       } catch (error) {
-        this.clearTaskTimer({ timerId });
+        clearTimeout(timerId);
         console.error("轮询任务异常", error);
       }
     }, task.polling.interval);
-    this.timerIds.push({ taskId: task.id, timerId });
   };
   /**
    * @title: 创建任务数据
@@ -346,7 +320,7 @@ var TasksManager = class _TasksManager {
     this.tasks[module2][queueId].tasks = (_d = (_c = (_b = (_a = this.tasks) == null ? void 0 : _a[module2]) == null ? void 0 : _b[queueId]) == null ? void 0 : _c.tasks) == null ? void 0 : _d.filter((task) => {
       var _a2;
       if ((_a2 = task.pollingResult) == null ? void 0 : _a2.timerId) {
-        this.clearTaskTimer({ timerId: task.pollingResult.timerId });
+        clearTimeout(task.pollingResult.timerId);
       }
       return task.id !== taskId;
     });
@@ -439,8 +413,11 @@ var TasksManager = class _TasksManager {
     this.tasks = newState;
   }
   clearAllTaskTimer(tasks) {
+    var _a;
     for (let task of tasks || []) {
-      this.clearTaskTimer({ taskId: task.id });
+      if ((_a = task.pollingResult) == null ? void 0 : _a.timerId) {
+        clearTimeout(task.pollingResult.timerId);
+      }
     }
   }
   // 清空任务
@@ -455,12 +432,6 @@ var TasksManager = class _TasksManager {
   clearAllTasks() {
     this.tasks = {};
     this.saveTaskQueueToLocal(this.tasks);
-    if (this.timerIds.length) {
-      for (let timerId of this.timerIds) {
-        clearTimeout(timerId);
-      }
-      this.timerIds = [];
-    }
     console.log("Tasks--->", "清空全部任务");
   }
   watchTask(callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -27,8 +27,7 @@
     "dva-core": "^2.0.4",
     "js-md5": "^0.8.3",
     "axios": "^1.7.2",
-    "@aws-sdk/client-s3": "^3.456.0",
-    "@pisell/utils": "1.0.42"
+    "@pisell/utils": "1.0.52"
   },
   "files": [
     "es",

package/es/aws/index.d.ts

@@ -1,16 +0,0 @@
-import { S3ClientConfig, PutObjectCommandInput } from '@aws-sdk/client-s3';
-import App from '../app';
-export interface AWSOptions extends S3ClientConfig {
-    s3Config: S3ClientConfig;
-    bucketName?: string;
-}
-export interface UploadParams extends PutObjectCommandInput {
-}
-declare class AWS {
-    private s3Client?;
-    private app;
-    private config?;
-    constructor(app: App, options?: AWSOptions);
-    upload(params: UploadParams): Promise<any>;
-}
-export default AWS;

package/es/aws/index.js

@@ -1,76 +0,0 @@
-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 _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); }); }; }
-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; }
-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); }
-import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
-;
-var defaultUploadParams = {
-  Bucket: '',
-  Key: '',
-  ContentType: 'application/json',
-  ContentDisposition: 'inline',
-  ACL: 'public-read' // 设置ACL权限为公共读取
-};
-var AWS = /*#__PURE__*/function () {
-  function AWS(app, options) {
-    _classCallCheck(this, AWS);
-    _defineProperty(this, "s3Client", void 0);
-    _defineProperty(this, "app", void 0);
-    _defineProperty(this, "config", void 0);
-    this.app = app;
-    if (options) {
-      // 配置S3客户端，支持自定义上传地址和CORS
-      var clientConfig = _objectSpread({}, options.s3Config);
-      this.s3Client = new S3Client(clientConfig);
-      this.config = options;
-    }
-  }
-  _createClass(AWS, [{
-    key: "upload",
-    value: function () {
-      var _upload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-        var _this$config, _this$s3Client, _params, command, response;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              // Key: "logs/kds/9/2025-01-01/00:01.json",
-              _params = _objectSpread(_objectSpread(_objectSpread({}, defaultUploadParams), params), {}, {
-                Bucket: params.Bucket || ((_this$config = this.config) === null || _this$config === void 0 ? void 0 : _this$config.bucketName)
-              });
-              console.log("\u4E0A\u4F20\u53C2\u6570", _params);
-              command = new PutObjectCommand(_params);
-              _context.next = 6;
-              return (_this$s3Client = this.s3Client) === null || _this$s3Client === void 0 ? void 0 : _this$s3Client.send(command);
-            case 6:
-              response = _context.sent;
-              console.log("\u4E0A\u4F20\u6210\u529F");
-              return _context.abrupt("return", response);
-            case 11:
-              _context.prev = 11;
-              _context.t0 = _context["catch"](0);
-              console.error("\u4E0A\u4F20\u5931\u8D25", _context.t0);
-              throw _context.t0;
-            case 15:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this, [[0, 11]]);
-      }));
-      function upload(_x) {
-        return _upload.apply(this, arguments);
-      }
-      return upload;
-    }()
-  }]);
-  return AWS;
-}();
-export default AWS;

package/es/cmd/const.d.ts

@@ -1,11 +0,0 @@
-export declare enum CMDCoreEnum {
-    CMD_CONNECT,
-    CMD_DISCONNECT,
-    CMD_RECONNECT,
-    CMD_MESSAGE,
-    CMD_ERROR
-}
-declare const _default: {
-    CMDCoreEnum: typeof CMDCoreEnum;
-};
-export default _default;

package/es/cmd/const.js

@@ -1,13 +0,0 @@
-var prefix = 'cmd'; // 前缀
-// 定义枚举
-export var CMDCoreEnum = /*#__PURE__*/function (CMDCoreEnum) {
-  CMDCoreEnum["CMD_CONNECT"] = "cmd.connect";
-  CMDCoreEnum["CMD_DISCONNECT"] = "cmd.disconnect";
-  CMDCoreEnum["CMD_RECONNECT"] = "cmd.reconnect";
-  CMDCoreEnum["CMD_MESSAGE"] = "cmd.message";
-  CMDCoreEnum["CMD_ERROR"] = "cmd.error";
-  return CMDCoreEnum;
-}({});
-export default {
-  CMDCoreEnum: CMDCoreEnum
-};

package/es/cmd/index.d.ts

@@ -1,13 +0,0 @@
-import App from "../app";
-import { CMDCoreEnum } from "./const";
-export interface CMDOptions {
-    socketUrl?: string;
-}
-declare class CMD {
-    private app;
-    private options?;
-    constructor(app: App, options?: CMDOptions);
-    init(): void;
-}
-export { CMDCoreEnum };
-export default CMD;