@pisell/core 1.0.9 → 1.0.11

package/lib/cmd/index.js

@@ -0,0 +1,96 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/cmd/index.ts
+var cmd_exports = {};
+__export(cmd_exports, {
+  CMDCoreEnum: () => import_const.CMDCoreEnum,
+  default: () => cmd_default
+});
+module.exports = __toCommonJS(cmd_exports);
+var import_socket = __toESM(require("../socket"));
+var import_const = require("./const");
+var CMD = class {
+  app;
+  options;
+  constructor(app, options) {
+    this.app = app;
+    this.options = options;
+  }
+  init() {
+    var _a, _b;
+    if (!((_a = this.options) == null ? void 0 : _a.socketUrl)) {
+      return;
+    }
+    const cmdSocket = import_socket.default.create(
+      (_b = this.options) == null ? void 0 : _b.socketUrl,
+      {
+        autoConnect: false,
+        // 自动连接
+        reconnection: true,
+        // 启用断线重连
+        heartbeat: true,
+        // 启用心跳检测
+        heartbeatInterval: 3e4,
+        // 心跳间隔(毫秒)
+        heartbeatTimeout: 5e4
+        // 请求超时时间(毫秒)
+      },
+      "front_cmd"
+      // Socket标识键
+    );
+    cmdSocket.on("connect", (res) => {
+      this.app.pubsub.publish(import_const.CMDCoreEnum.CMD_CONNECT, res);
+      this.app.logger.addLog({ type: "info", title: "cmdSocket连接成功", metadata: res });
+    });
+    cmdSocket.on("disconnect", (res) => {
+      this.app.pubsub.publish(import_const.CMDCoreEnum.CMD_DISCONNECT, res);
+      this.app.logger.addLog({ type: "info", title: "cmdSocket连接断开", metadata: res });
+    });
+    cmdSocket.on("reconnect", (res) => {
+      this.app.pubsub.publish(import_const.CMDCoreEnum.CMD_RECONNECT, res);
+      this.app.logger.addLog({ type: "info", title: "cmdSocket重连", metadata: res });
+    });
+    cmdSocket.on("message", (res) => {
+      this.app.pubsub.publish(import_const.CMDCoreEnum.CMD_MESSAGE, res);
+      this.app.logger.addLog({ type: "info", title: "cmdSocket收到消息", metadata: res });
+    });
+    cmdSocket.on("error", (res) => {
+      this.app.pubsub.publish(import_const.CMDCoreEnum.CMD_ERROR, res);
+      this.app.logger.addLog({ type: "info", title: "cmdSocket连接错误", metadata: res });
+    });
+    cmdSocket.connect().catch((error) => {
+      this.app.logger.addLog({ type: "info", title: "cmdSocket连接失败", metadata: error });
+    });
+  }
+};
+var cmd_default = CMD;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CMDCoreEnum
+});

package/lib/cmd/type.d.ts

@@ -0,0 +1,5 @@
+export interface CDMItem {
+    key: string;
+    code: string;
+    [key: string]: any;
+}

package/lib/cmd/type.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/cmd/type.ts
+var type_exports = {};
+module.exports = __toCommonJS(type_exports);

package/lib/logger/index.d.ts

@@ -4,10 +4,12 @@ export declare type LogConsoleType = "info" | "warning" | "error" | "debug";
  * 日志项接口
  */
 interface LogItem {
+    logId?: string | number;
     type: LogConsoleType;
     title: string;
     date?: string;
     metadata?: any;
+    feishu?: any;
 }
 interface LogFile {
     fileName: string;
@@ -38,6 +40,7 @@ declare class LoggerManager {
     private feishuConfig;
     private retentionDays;
     private metadataFunction;
+    private status;
     /**
      * 构造函数
      * @param prefix 日志前缀
@@ -59,6 +62,8 @@ declare class LoggerManager {
      * 初始化定时器
      */
     initTimer(): void;
+    private setStatus;
+    stop(): void;
     /**
      * 添加日志
      * @param log 日志项
@@ -74,6 +79,12 @@ declare class LoggerManager {
      * @returns 日志文件名
      */
     private createFileName;
+    /**
+     * 创建AWS日志文件名
+     * @param isManual 是否手动上传
+     * @returns 日志文件名
+     */
+    createAWSFileName(isManual?: boolean): Promise<any>;
     /**
      * 创建日志文件
      * @param _fileName 文件名
@@ -83,7 +94,8 @@ declare class LoggerManager {
     /**
      * 存储日志到持久化存储
      */
-    private storeLog;
+    storeLog(): Promise<void>;
+    private storeLogToIndexDB;
     /**
      * 清理旧日志，只保留最近指定天数的日志
      */

package/lib/logger/index.js

@@ -52,6 +52,8 @@ var LoggerManager = class {
   retentionDays;
   // 日志保留天数
   metadataFunction;
+  status = "running";
+  // 日志管理器状态
   /**
    * 构造函数
    * @param prefix 日志前缀
@@ -66,6 +68,7 @@ var LoggerManager = class {
     this.initDB();
   }
   init() {
+    this.setStatus("running");
     this.initTimer();
     this.cleanupOldLogs();
   }
@@ -97,19 +100,34 @@ 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 = {
-      ...log,
+      ...restLog,
       date: log.date || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
-      metadata: JSON.stringify(log.metadata || "{}")
+      metadata: JSON.stringify(log.metadata || {}),
+      // 以时间戳生成logId
+      logId: (0, import_dayjs.default)().valueOf()
     };
     console.log("---- 行为日志", logItem);
     if (log.type === "error") {
-      this.sendFeishuNotification(logItem);
+      this.sendFeishuNotification({ ...logItem || {}, feishu });
     }
     this.logBuffer.push(logItem);
   }
@@ -121,14 +139,19 @@ 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: [
-          { 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) }
-        ],
+        content,
         webhook: this.feishuConfig.webhook
       });
       console.log("-------- 发送飞书通知", log);
@@ -143,6 +166,28 @@ var LoggerManager = class {
     const fileName = `${this.prefix}_${_date}.log`;
     return fileName;
   }
+  /**
+   * 创建AWS日志文件名
+   * @param isManual 是否手动上传
+   * @returns 日志文件名
+   */
+  async createAWSFileName(isManual) {
+    var _a, _b, _c, _d;
+    const _date = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    const _hour = (0, import_dayjs.default)().format("HH:mm");
+    if ((_b = (_a = this.app) == null ? void 0 : _a.getPlugin("aws")) == null ? void 0 : _b.getFileName) {
+      return (_d = (_c = this.app) == null ? void 0 : _c.getPlugin("aws")) == null ? void 0 : _d.getFileName({
+        date: _date,
+        hour: _hour,
+        isManual
+      });
+    }
+    let fileName = `logs/${"pisell"}/${_date}/${_hour}`;
+    if (isManual) {
+      fileName += "-manual";
+    }
+    return `${fileName}.json`;
+  }
   /**
    * 创建日志文件
    * @param _fileName 文件名
@@ -164,26 +209,48 @@ var LoggerManager = class {
    * 存储日志到持久化存储
    */
   async storeLog() {
+    var _a;
     if (this.logBuffer.length === 0 || !this.db) {
       return;
     }
-    const fileName = this.createFileName();
     try {
-      let logFile = await this.db.get("logs", fileName);
+      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));
       if (!logFile) {
         logFile = this.createFile(fileName);
-        await this.db.add("logs", logFile);
+        await ((_b = this.db) == null ? void 0 : _b.add("logs", logFile));
       }
       logFile.fileContent.logs = [...logFile.fileContent.logs, ...this.logBuffer];
-      await this.db.update("logs", logFile);
-      console.log("-------- 存储日志", {
-        fileName,
-        logFile
-      });
+      await ((_c = this.db) == null ? void 0 : _c.update("logs", logFile));
+      console.log("-------- 存储日志到IndexDB", { fileName, logFile });
+      this.logBuffer = [];
     } catch (error) {
-      console.error("存储日志到IndexDB失败:", error);
+      console.log("-------- 存储日志到IndexDB 失败", error);
+      throw error;
     }
-    this.logBuffer = [];
   }
   /**
    * 清理旧日志，只保留最近指定天数的日志

package/lib/socket/monitor.d.ts

@@ -11,7 +11,7 @@ export interface SocketHistoryItem {
     /** 消息方向（发送/接收） */
     direction: 'in' | 'out';
     /** 消息内容 */
-    message: SocketMessage | Partial<SocketMessage>;
+    message: 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,10 +143,7 @@ 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,8 +25,9 @@ export declare class Socket {
     connect(): Promise<void>;
     /**
      * 关闭WebSocket连接
+     * @param isManual 是否手动关闭
      */
-    disconnect(): void;
+    disconnect(isManual?: boolean): void;
     /**
      * 发送消息到服务器
      * @param event 事件名称

package/lib/socket/socket.js

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

package/lib/socket/types.d.ts

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

package/lib/tasks/index.d.ts

@@ -10,6 +10,7 @@ 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;
@@ -31,6 +32,11 @@ 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,6 +44,7 @@ var TasksManager = class _TasksManager {
   useTasks = import_useTasks.default;
   watchTaskCallback = () => {
   };
+  timerIds = [];
   constructor(app) {
     if (!app) {
       throw new Error("app is required");
@@ -52,6 +53,7 @@ var TasksManager = class _TasksManager {
     this.taskFunctions = /* @__PURE__ */ new Map();
     this.tasks = {};
     this.db = app.dbManager;
+    this.timerIds = [];
   }
   // 单例模式
   static getInstance(app) {
@@ -148,16 +150,39 @@ var TasksManager = class _TasksManager {
       }
     } catch (error) {
       this.app.logger.addLog({
-        type: "error",
+        type: "info",
         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: 根据轮询间隔定期执行任务
@@ -190,10 +215,11 @@ var TasksManager = class _TasksManager {
         }
         this.startPolling(newTask);
       } catch (error) {
-        clearTimeout(timerId);
+        this.clearTaskTimer({ timerId });
         console.error("轮询任务异常", error);
       }
     }, task.polling.interval);
+    this.timerIds.push({ taskId: task.id, timerId });
   };
   /**
    * @title: 创建任务数据
@@ -320,7 +346,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) {
-        clearTimeout(task.pollingResult.timerId);
+        this.clearTaskTimer({ timerId: task.pollingResult.timerId });
       }
       return task.id !== taskId;
     });
@@ -413,11 +439,8 @@ var TasksManager = class _TasksManager {
     this.tasks = newState;
   }
   clearAllTaskTimer(tasks) {
-    var _a;
     for (let task of tasks || []) {
-      if ((_a = task.pollingResult) == null ? void 0 : _a.timerId) {
-        clearTimeout(task.pollingResult.timerId);
-      }
+      this.clearTaskTimer({ taskId: task.id });
     }
   }
   // 清空任务
@@ -432,6 +455,12 @@ 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,12 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.9",
+  "version": "1.0.11",
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev",
+    "build:types": "tsc --project tsconfig.types.json",
+    "publish:types": "npm run build:types && cd types && cp ../types-package.json package.json && npm publish"
+  },
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -23,11 +29,12 @@
     "history": "^4.9.0",
     "react-router-dom": "^5.3.4",
     "react-redux": "^9.1.2",
+    "@pisell/utils": "workspace:*",
     "dva": "^2.4.1",
     "dva-core": "^2.0.4",
     "js-md5": "^0.8.3",
     "axios": "^1.7.2",
-    "@pisell/utils": "1.0.51"
+    "@aws-sdk/client-s3": "^3.456.0"
   },
   "files": [
     "es",
@@ -37,11 +44,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev",
-    "build:types": "tsc --project tsconfig.types.json",
-    "publish:types": "npm run build:types && cd types && cp ../types-package.json package.json && npm publish"
   }
 }