@pisell/core 1.0.43 → 1.0.45

package/es/app/app.d.ts

@@ -43,7 +43,7 @@ declare class App {
     locales: Locales;
     models: {
         getStore: () => import("../models").Store;
-        StoreProvider: typeof import("react-redux").Provider;
+        StoreProvider: any;
         setConfig: (models: any[]) => void;
     };
     request: {

package/es/history/index.d.ts

@@ -1,6 +1,5 @@
 import { LocationDescriptor } from "history";
 import type { History as HistoryType } from "history";
-import { useHistory, useLocation, useParams } from "react-router-dom";
 import App from "../app";
 export interface HistoryOptions {
     basename?: string;
@@ -8,9 +7,9 @@ export interface HistoryOptions {
 }
 export declare class History {
     instance: HistoryType<unknown>;
-    useHistory: typeof useHistory;
-    useLocation: typeof useLocation;
-    useParams: typeof useParams;
+    useHistory: any;
+    useLocation: any;
+    useParams: any;
     app: App;
     interceptor?: (path: LocationDescriptor<unknown>, state: unknown, next: () => void) => void;
     constructor(app: App, options?: HistoryOptions);

package/es/logger/index.js

@@ -73,23 +73,12 @@ var LoggerManager = /*#__PURE__*/function () {
               this.setStatus("running");
               this.initTimer();
               // 定期清理旧日志
-              _context.next = 4;
-              return this.cleanupOldLogs();
-            case 4:
-              _context.prev = 4;
-              _context.next = 7;
-              return this.uploadIndexDBLog();
-            case 7:
-              _context.next = 11;
-              break;
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](4);
-            case 11:
+              this.cleanupOldLogs();
+            case 3:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 9]]);
+        }, _callee, this);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -184,12 +173,12 @@ var LoggerManager = /*#__PURE__*/function () {
       });
       console.log("---- 行为日志", logItem);
       this.logBuffer.push(logItem);
-      if (log.type === "error") {
+      if (log.type === "error" || log.type === "warning") {
         this.sendFeishuNotification(_objectSpread(_objectSpread({}, logItem || {}), {}, {
           feishu: feishu
         }));
         // error 级别日志需要立即存储
-        this.storeLog(true);
+        this.storeLog(log.type === "error");
       }
     }
 
@@ -319,16 +308,18 @@ var LoggerManager = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              // 每次上传日志时，检查下IndexDB是否有日志，如果有则上传到AWS
+              this.uploadIndexDBLog();
               if (!(this.logBuffer.length === 0 || !this.db)) {
-                _context4.next = 2;
+                _context4.next = 3;
                 break;
               }
               return _context4.abrupt("return");
-            case 2:
-              _context4.prev = 2;
-              _context4.next = 5;
+            case 3:
+              _context4.prev = 3;
+              _context4.next = 6;
               return this.createAWSFileName(urgent);
-            case 5:
+            case 6:
               fileName = _context4.sent;
               console.log("-------- 存储日志到AWS 开始", fileName);
 
@@ -341,35 +332,35 @@ var LoggerManager = /*#__PURE__*/function () {
                 return item.logId;
               });
               logs = JSON.stringify(buffer, null, 2);
-              _context4.next = 12;
+              _context4.next = 13;
               return this.app.aws.upload({
                 Bucket: "",
                 Key: fileName,
                 Body: logs
               });
-            case 12:
+            case 13:
               console.log("-------- 存储日志到AWS 成功");
               // 上传成功后需要清空缓冲区，避免重复上传
               this.logBuffer = this.logBuffer.filter(function (item) {
                 return !bufferIds.includes(item.logId);
               });
-              _context4.next = 28;
+              _context4.next = 29;
               break;
-            case 16:
-              _context4.prev = 16;
-              _context4.t0 = _context4["catch"](2);
+            case 17:
+              _context4.prev = 17;
+              _context4.t0 = _context4["catch"](3);
               console.error("存储日志上传AWS失败:", _context4.t0);
 
               // 将日志存储到IndexDB
-              _context4.prev = 19;
-              _context4.next = 22;
+              _context4.prev = 20;
+              _context4.next = 23;
               return this.storeLogToIndexDB();
-            case 22:
-              _context4.next = 28;
+            case 23:
+              _context4.next = 29;
               break;
-            case 24:
-              _context4.prev = 24;
-              _context4.t1 = _context4["catch"](19);
+            case 25:
+              _context4.prev = 25;
+              _context4.t1 = _context4["catch"](20);
               this.sendFeishuNotification({
                 type: "error",
                 title: "存储日志到AWS失败",
@@ -387,11 +378,11 @@ var LoggerManager = /*#__PURE__*/function () {
                 }
               });
               console.error("存储日志到IndexDB也失败:", _context4.t1);
-            case 28:
+            case 29:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[2, 16], [19, 24]]);
+        }, _callee4, this, [[3, 17], [20, 25]]);
       }));
       function storeLog(_x2) {
         return _storeLog.apply(this, arguments);
@@ -591,17 +582,20 @@ var LoggerManager = /*#__PURE__*/function () {
               if (filesToDelete.length > 0) {
                 console.log("-------- \u5171\u6E05\u7406 ".concat(filesToDelete.length, " \u4E2A\u65E7\u65E5\u5FD7\u6587\u4EF6"));
               }
-              _context7.next = 33;
+
+              // 清理完成后，将IndexDB中的日志上传到AWS
+              this.uploadIndexDBLog();
+              _context7.next = 34;
               break;
-            case 30:
-              _context7.prev = 30;
+            case 31:
+              _context7.prev = 31;
               _context7.t1 = _context7["catch"](2);
               console.error("清理旧日志失败:", _context7.t1);
-            case 33:
+            case 34:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[2, 30], [10, 21, 24, 27]]);
+        }, _callee7, this, [[2, 31], [10, 21, 24, 27]]);
       }));
       function cleanupOldLogs() {
         return _cleanupOldLogs.apply(this, arguments);

package/es/models/index.d.ts

@@ -1,5 +1,4 @@
 import hooks from '../hooks';
-import { Provider as StoreProvider } from "react-redux";
 declare const models: import("./global").GlobalModal[];
 declare type ModalsType = (typeof models[number]);
 export interface Store {
@@ -39,7 +38,7 @@ declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T
 declare const setDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key: any, value: any) => void;
 declare const _default: {
     getStore: () => Store;
-    StoreProvider: typeof StoreProvider;
+    StoreProvider: any;
     setConfig: (models: any[]) => void;
 };
 export default _default;

package/es/request/index.js

@@ -25,17 +25,50 @@ axiosInstance.interceptors.response.use(interceptorsResponse, interceptorsRespon
 export var createRequest = function createRequest(props) {
   var data = props.data,
     config = props.config,
-    method = props.method;
+    method = props.method,
+    url = props.url;
   var _getConfig = getConfig(),
     getUrl = _getConfig.getUrl;
+  var startTime = Date.now(); // 记录请求开始时间
+
   return new Promise(function (resolve, reject) {
     var _method = method === "remove" ? "delete" : method;
     var _url = getUrl === null || getUrl === void 0 ? void 0 : getUrl(props);
+
+    // 请求完成处理函数
+    var handleRequestComplete = function handleRequestComplete(result) {
+      var isError = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      try {
+        var endTime = Date.now();
+        var duration = endTime - startTime;
+
+        // 如果请求超过5秒，触发日志报警
+        if (duration > 5000) {
+          var app = getApp();
+          if (app !== null && app !== void 0 && app.logger) {
+            app.logger.addLog({
+              type: 'warning',
+              title: '请求响应超过5秒',
+              metadata: {
+                url: _url || url,
+                data: data,
+                method: _method,
+                duration: "".concat((duration / 1000).toFixed(2), "s"),
+                timestamp: new Date(startTime).toISOString(),
+                isError: isError
+              }
+            });
+          }
+        }
+      } catch (error) {}
+      return result;
+    };
     axiosInstance[_method](_url, ["post", "put"].includes(_method) ? data : _objectSpread({
       params: data
     }, config), _objectSpread({
       params: !["post", "put"].includes(_method) ? data : null
     }, config)).then(function (res) {
+      handleRequestComplete(res, false);
       requestCallback({
         res: res,
         reject: reject,
@@ -43,6 +76,7 @@ export var createRequest = function createRequest(props) {
         props: props
       });
     }).catch(function (err) {
+      handleRequestComplete(err, true);
       requestCallback({
         err: err,
         reject: reject,

package/es/tasks/index.d.ts

@@ -108,7 +108,7 @@ export declare class TasksManager {
      */
     getQueueStatus(module: string, queueId: string): {
         isRunning: boolean;
-        status: "uncompleted" | "completed";
+        status: "completed" | "uncompleted";
         progress: {
             total: number;
             completed: number;

package/lib/app/app.d.ts

@@ -43,7 +43,7 @@ declare class App {
     locales: Locales;
     models: {
         getStore: () => import("../models").Store;
-        StoreProvider: typeof import("react-redux").Provider;
+        StoreProvider: any;
         setConfig: (models: any[]) => void;
     };
     request: {

package/lib/history/index.d.ts

@@ -1,6 +1,5 @@
 import { LocationDescriptor } from "history";
 import type { History as HistoryType } from "history";
-import { useHistory, useLocation, useParams } from "react-router-dom";
 import App from "../app";
 export interface HistoryOptions {
     basename?: string;
@@ -8,9 +7,9 @@ export interface HistoryOptions {
 }
 export declare class History {
     instance: HistoryType<unknown>;
-    useHistory: typeof useHistory;
-    useLocation: typeof useLocation;
-    useParams: typeof useParams;
+    useHistory: any;
+    useLocation: any;
+    useParams: any;
     app: App;
     interceptor?: (path: LocationDescriptor<unknown>, state: unknown, next: () => void) => void;
     constructor(app: App, options?: HistoryOptions);

package/lib/logger/index.js

@@ -70,11 +70,7 @@ var LoggerManager = class {
   async init() {
     this.setStatus("running");
     this.initTimer();
-    await this.cleanupOldLogs();
-    try {
-      await this.uploadIndexDBLog();
-    } catch (error) {
-    }
+    this.cleanupOldLogs();
   }
   /**
    * 初始化 IndexDB
@@ -131,9 +127,9 @@ var LoggerManager = class {
     };
     console.log("---- 行为日志", logItem);
     this.logBuffer.push(logItem);
-    if (log.type === "error") {
+    if (log.type === "error" || log.type === "warning") {
       this.sendFeishuNotification({ ...logItem || {}, feishu });
-      this.storeLog(true);
+      this.storeLog(log.type === "error");
     }
   }
   /**
@@ -215,6 +211,7 @@ var LoggerManager = class {
    */
   async storeLog(urgent) {
     var _a;
+    this.uploadIndexDBLog();
     if (this.logBuffer.length === 0 || !this.db) {
       return;
     }
@@ -327,6 +324,7 @@ var LoggerManager = class {
       if (filesToDelete.length > 0) {
         console.log(`-------- 共清理 ${filesToDelete.length} 个旧日志文件`);
       }
+      this.uploadIndexDBLog();
     } catch (error) {
       console.error("清理旧日志失败:", error);
     }

package/lib/models/index.d.ts

@@ -1,5 +1,4 @@
 import hooks from '../hooks';
-import { Provider as StoreProvider } from "react-redux";
 declare const models: import("./global").GlobalModal[];
 declare type ModalsType = (typeof models[number]);
 export interface Store {
@@ -39,7 +38,7 @@ declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T
 declare const setDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key: any, value: any) => void;
 declare const _default: {
     getStore: () => Store;
-    StoreProvider: typeof StoreProvider;
+    StoreProvider: any;
     setConfig: (models: any[]) => void;
 };
 export default _default;

package/lib/request/index.js

@@ -52,11 +52,37 @@ var axiosInstance = import_axios.default.create(import_constants.axiosConfig);
 axiosInstance.interceptors.request.use(import_utils.interceptorsRequest, import_utils.interceptorsRequestError);
 axiosInstance.interceptors.response.use(import_utils.interceptorsResponse, import_utils.interceptorsResponseError);
 var createRequest = (props) => {
-  const { data, config, method } = props;
+  const { data, config, method, url } = props;
   const { getUrl } = (0, import_config.getConfig)();
+  const startTime = Date.now();
   return new Promise((resolve, reject) => {
     const _method = method === "remove" ? "delete" : method;
     let _url = getUrl == null ? void 0 : getUrl(props);
+    const handleRequestComplete = (result, isError = false) => {
+      try {
+        const endTime = Date.now();
+        const duration = endTime - startTime;
+        if (duration > 5e3) {
+          const app = (0, import_app.getApp)();
+          if (app == null ? void 0 : app.logger) {
+            app.logger.addLog({
+              type: "warning",
+              title: "请求响应超过5秒",
+              metadata: {
+                url: _url || url,
+                data,
+                method: _method,
+                duration: `${(duration / 1e3).toFixed(2)}s`,
+                timestamp: new Date(startTime).toISOString(),
+                isError
+              }
+            });
+          }
+        }
+      } catch (error) {
+      }
+      return result;
+    };
     axiosInstance[_method](
       _url,
       ["post", "put"].includes(_method) ? data : {
@@ -68,8 +94,10 @@ var createRequest = (props) => {
         ...config
       }
     ).then((res) => {
+      handleRequestComplete(res, false);
       (0, import_utils.requestCallback)({ res, reject, resolve, props });
     }).catch((err) => {
+      handleRequestComplete(err, true);
       (0, import_utils.requestCallback)({ err, reject, resolve, props });
     });
   });

package/lib/tasks/index.d.ts

@@ -108,7 +108,7 @@ export declare class TasksManager {
      */
     getQueueStatus(module: string, queueId: string): {
         isRunning: boolean;
-        status: "uncompleted" | "completed";
+        status: "completed" | "uncompleted";
         progress: {
             total: number;
             completed: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",