@pisell/core 1.0.45 → 1.0.47

package/es/history/index.d.ts

@@ -1,5 +1,6 @@
 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;
@@ -7,9 +8,9 @@ export interface HistoryOptions {
 }
 export declare class History {
     instance: HistoryType<unknown>;
-    useHistory: any;
-    useLocation: any;
-    useParams: any;
+    useHistory: typeof useHistory;
+    useLocation: typeof useLocation;
+    useParams: typeof useParams;
     app: App;
     interceptor?: (path: LocationDescriptor<unknown>, state: unknown, next: () => void) => void;
     constructor(app: App, options?: HistoryOptions);

package/es/indexDB/index.js

@@ -326,17 +326,15 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 10:
                       _context3.prev = 10;
                       _context3.t0 = _context3["catch"](3);
-                      if (log) {
-                        _this4.app.logger.addLog({
-                          type: 'error',
-                          title: uuid,
-                          metadata: {
-                            msg: '添加数据失败',
-                            error: _context3.t0.message
-                          }
-                        });
-                      }
-                      throw new Error('添加数据失败');
+                      _this4.app.logger.addLog({
+                        type: 'error',
+                        title: uuid,
+                        metadata: {
+                          msg: '添加数据失败',
+                          error: _context3.t0.message
+                        }
+                      });
+                      throw new Error(_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message);
                     case 14:
                     case "end":
                       return _context3.stop();
@@ -611,17 +609,15 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 10:
                       _context9.prev = 10;
                       _context9.t0 = _context9["catch"](3);
-                      if (log) {
-                        _this7.app.logger.addLog({
-                          type: 'error',
-                          title: uuid,
-                          metadata: {
-                            msg: '数据更新失败',
-                            error: _context9.t0.message
-                          }
-                        });
-                      }
-                      throw new Error('更新数据失败');
+                      _this7.app.logger.addLog({
+                        type: 'error',
+                        title: uuid,
+                        metadata: {
+                          msg: '数据更新失败',
+                          error: _context9.t0.message
+                        }
+                      });
+                      throw new Error(_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message);
                     case 14:
                     case "end":
                       return _context9.stop();
@@ -1110,8 +1106,16 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 9:
                       _context23.prev = 9;
                       _context23.t0 = _context23["catch"](2);
-                      throw new Error('获取所有数据失败');
-                    case 12:
+                      _this14.app.logger.addLog({
+                        type: 'error',
+                        title: "[ IndexDB ] ERROR: - getAll(".concat(storeName, ")"),
+                        metadata: {
+                          msg: '获取所有数据失败',
+                          error: _context23.t0.message
+                        }
+                      });
+                      throw new Error(_context23.t0 === null || _context23.t0 === void 0 ? void 0 : _context23.t0.message);
+                    case 13:
                     case "end":
                       return _context23.stop();
                   }

package/es/logger/index.js

@@ -325,8 +325,9 @@ var LoggerManager = /*#__PURE__*/function () {
 
               // 将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;
+                return _objectSpread(_objectSpread({}, item || {}), {}, {
+                  metadata: JSON.parse(item.metadata || "{}")
+                });
               });
               bufferIds = buffer.map(function (item) {
                 return item.logId;

package/es/models/index.d.ts

@@ -1,4 +1,5 @@
 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 {
@@ -38,7 +39,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: any;
+    StoreProvider: typeof StoreProvider;
     setConfig: (models: any[]) => void;
 };
 export default _default;

package/es/request/config.js

@@ -10,6 +10,11 @@ import { mergeWith } from 'lodash';
 var defaultConfig = {
   axiosConfig: axiosConfig,
   storage: new Storage(),
+  logger: {
+    maxRequestCount: 6,
+    maxRequestTime: 5000,
+    filterUrls: []
+  },
   requestCallbacks: {
     200: function _(resData) {
       var res = resData.res,

package/es/request/index.js

@@ -11,6 +11,8 @@ import { createSignal } from "./cancelToken";
 import { axiosConfig } from "./constants";
 import { cacheFn } from "./cache";
 import { interceptorsRequest, interceptorsResponse, interceptorsRequestError, interceptorsResponseError, requestCallback } from "./utils";
+// @ts-ignore
+import { getUniqueId } from "@pisell/utils";
 import axios from "axios";
 import { getConfig, setConfig } from "./config";
 import { getApp } from "../app";
@@ -22,44 +24,84 @@ axiosInstance.interceptors.request.use(interceptorsRequest, interceptorsRequestE
 
 // 响应拦截器
 axiosInstance.interceptors.response.use(interceptorsResponse, interceptorsResponseError);
+
+// 请求计数
+var requestCount = 0;
+var isFilterUrl = function isFilterUrl(url) {
+  var _logger$filterUrls;
+  var _getConfig = getConfig(),
+    logger = _getConfig.logger;
+  return logger === null || logger === void 0 || (_logger$filterUrls = logger.filterUrls) === null || _logger$filterUrls === void 0 ? void 0 : _logger$filterUrls.some(function (filterUrl) {
+    return url.includes(filterUrl);
+  });
+};
 export var createRequest = function createRequest(props) {
   var data = props.data,
     config = props.config,
     method = props.method,
     url = props.url;
-  var _getConfig = getConfig(),
-    getUrl = _getConfig.getUrl;
+  var _getConfig2 = getConfig(),
+    getUrl = _getConfig2.getUrl,
+    logger = _getConfig2.logger;
   var startTime = Date.now(); // 记录请求开始时间
+  var app = getApp();
+  var requestId = getUniqueId();
+
+  // 请求计数增加
+  requestCount++;
+
+  // 记录请求开始日志
+  app.logger.addLog({
+    type: 'info',
+    title: "[ Request ]: Start - ".concat(requestId),
+    metadata: {
+      url: url,
+      data: data,
+      method: method
+    }
+  });
 
+  // 如果请求计数超过最大请求数，则记录为警告日志
+  if (requestCount > ((logger === null || logger === void 0 ? void 0 : logger.maxRequestCount) || 6)) {
+    app.logger.addLog({
+      type: 'warning',
+      title: "[ Request ]: Max Request Count - ".concat(requestCount),
+      metadata: {
+        requestCount: requestCount
+      }
+    });
+  }
   return new Promise(function (resolve, reject) {
     var _method = method === "remove" ? "delete" : method;
-    var _url = getUrl === null || getUrl === void 0 ? void 0 : getUrl(props);
+    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;
+    var handleRequestComplete = function handleRequestComplete(url, result) {
+      var isError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var requestId = arguments.length > 3 ? arguments[3] : undefined;
       try {
         var endTime = Date.now();
         var duration = endTime - startTime;
+        var maxRequestTime = (logger === null || logger === void 0 ? void 0 : logger.maxRequestTime) || 5000;
 
-        // 如果请求超过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
-              }
-            });
-          }
+        // 如果请求URL在过滤列表中，则不判断超时时间
+        if (isFilterUrl(url)) {
+          maxRequestTime = 99999999;
+        }
+
+        // 如果请求错误或者请求超过5秒，则记录为错误日志
+        var type = duration > maxRequestTime ? 'warning' : 'info';
+        if (isError) {
+          type = 'error';
         }
+        app.logger.addLog({
+          type: type,
+          title: "[ Request ]: Complete - ".concat(requestId),
+          metadata: {
+            error: isError ? JSON.stringify(result) : '',
+            duration: "".concat((duration / 1000).toFixed(2), "s")
+          }
+        });
       } catch (error) {}
       return result;
     };
@@ -68,7 +110,7 @@ export var createRequest = function createRequest(props) {
     }, config), _objectSpread({
       params: !["post", "put"].includes(_method) ? data : null
     }, config)).then(function (res) {
-      handleRequestComplete(res, false);
+      handleRequestComplete(_url, res, false, requestId);
       requestCallback({
         res: res,
         reject: reject,
@@ -76,13 +118,15 @@ export var createRequest = function createRequest(props) {
         props: props
       });
     }).catch(function (err) {
-      handleRequestComplete(err, true);
+      handleRequestComplete(_url, err, true, requestId);
       requestCallback({
         err: err,
         reject: reject,
         resolve: resolve,
         props: props
       });
+    }).finally(function () {
+      requestCount--;
     });
   });
 };

package/es/routes/index.d.ts

@@ -20,7 +20,7 @@ export declare class RouterManager {
     get(name: string): RouteType;
     has(name: string): boolean;
     remove(name: string): void;
-    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null | undefined;
+    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;

package/lib/history/index.d.ts

@@ -1,5 +1,6 @@
 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;
@@ -7,9 +8,9 @@ export interface HistoryOptions {
 }
 export declare class History {
     instance: HistoryType<unknown>;
-    useHistory: any;
-    useLocation: any;
-    useParams: any;
+    useHistory: typeof useHistory;
+    useLocation: typeof useLocation;
+    useParams: typeof useParams;
     app: App;
     interceptor?: (path: LocationDescriptor<unknown>, state: unknown, next: () => void) => void;
     constructor(app: App, options?: HistoryOptions);

package/lib/indexDB/index.js

@@ -220,14 +220,12 @@ var IndexDBManager = class _IndexDBManager {
           }
           return data;
         } catch (error) {
-          if (log) {
-            this.app.logger.addLog({
-              type: "error",
-              title: uuid,
-              metadata: { msg: "添加数据失败", error: error.message }
-            });
-          }
-          throw new Error("添加数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: uuid,
+            metadata: { msg: "添加数据失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `add(${storeName})`
@@ -344,14 +342,12 @@ var IndexDBManager = class _IndexDBManager {
           }
           return data;
         } catch (error) {
-          if (log) {
-            this.app.logger.addLog({
-              type: "error",
-              title: uuid,
-              metadata: { msg: "数据更新失败", error: error.message }
-            });
-          }
-          throw new Error("更新数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: uuid,
+            metadata: { msg: "数据更新失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `update(${storeName})`
@@ -550,7 +546,12 @@ var IndexDBManager = class _IndexDBManager {
           const results = await this.db.table(storeName).toArray();
           return results;
         } catch (error) {
-          throw new Error("获取所有数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: `[ IndexDB ] ERROR: - getAll(${storeName})`,
+            metadata: { msg: "获取所有数据失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `getAll(${storeName})`

package/lib/logger/index.js

@@ -219,8 +219,10 @@ var LoggerManager = class {
       const fileName = await this.createAWSFileName(urgent);
       console.log("-------- 存储日志到AWS 开始", fileName);
       const buffer = (_a = this.logBuffer) == null ? void 0 : _a.map((item) => {
-        item.metadata = JSON.parse(item.metadata || "{}");
-        return item;
+        return {
+          ...item || {},
+          metadata: JSON.parse(item.metadata || "{}")
+        };
       });
       const bufferIds = buffer.map((item) => item.logId);
       const logs = JSON.stringify(buffer, null, 2);

package/lib/models/index.d.ts

@@ -1,4 +1,5 @@
 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 {
@@ -38,7 +39,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: any;
+    StoreProvider: typeof StoreProvider;
     setConfig: (models: any[]) => void;
 };
 export default _default;

package/lib/request/config.js

@@ -29,6 +29,11 @@ var import_lodash = require("lodash");
 var defaultConfig = {
   axiosConfig: import_constants.axiosConfig,
   storage: new import_storage.Storage(),
+  logger: {
+    maxRequestCount: 6,
+    maxRequestTime: 5e3,
+    filterUrls: []
+  },
   requestCallbacks: {
     200: (resData) => {
       const { res, props, resolve, reject, err } = resData;

package/lib/request/index.js

@@ -44,6 +44,7 @@ var import_cancelToken = require("./cancelToken");
 var import_constants = require("./constants");
 var import_cache = require("./cache");
 var import_utils = require("./utils");
+var import_utils2 = require("@pisell/utils");
 var import_axios = __toESM(require("axios"));
 var import_config = require("./config");
 var import_app = require("../app");
@@ -51,34 +52,60 @@ __reExport(request_exports, require("./type"), module.exports);
 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 requestCount = 0;
+var isFilterUrl = (url) => {
+  var _a;
+  const { logger } = (0, import_config.getConfig)();
+  return (_a = logger == null ? void 0 : logger.filterUrls) == null ? void 0 : _a.some((filterUrl) => url.includes(filterUrl));
+};
 var createRequest = (props) => {
   const { data, config, method, url } = props;
-  const { getUrl } = (0, import_config.getConfig)();
+  const { getUrl, logger } = (0, import_config.getConfig)();
   const startTime = Date.now();
+  const app = (0, import_app.getApp)();
+  const requestId = (0, import_utils2.getUniqueId)();
+  requestCount++;
+  app.logger.addLog({
+    type: "info",
+    title: `[ Request ]: Start - ${requestId}`,
+    metadata: {
+      url,
+      data,
+      method
+    }
+  });
+  if (requestCount > ((logger == null ? void 0 : logger.maxRequestCount) || 6)) {
+    app.logger.addLog({
+      type: "warning",
+      title: `[ Request ]: Max Request Count - ${requestCount}`,
+      metadata: {
+        requestCount
+      }
+    });
+  }
   return new Promise((resolve, reject) => {
     const _method = method === "remove" ? "delete" : method;
-    let _url = getUrl == null ? void 0 : getUrl(props);
-    const handleRequestComplete = (result, isError = false) => {
+    let _url = (getUrl == null ? void 0 : getUrl(props)) || "";
+    const handleRequestComplete = (url2, result, isError = false, requestId2) => {
       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
-              }
-            });
-          }
+        let maxRequestTime = (logger == null ? void 0 : logger.maxRequestTime) || 5e3;
+        if (isFilterUrl(url2)) {
+          maxRequestTime = 99999999;
         }
+        let type = duration > maxRequestTime ? "warning" : "info";
+        if (isError) {
+          type = "error";
+        }
+        app.logger.addLog({
+          type,
+          title: `[ Request ]: Complete - ${requestId2}`,
+          metadata: {
+            error: isError ? JSON.stringify(result) : "",
+            duration: `${(duration / 1e3).toFixed(2)}s`
+          }
+        });
       } catch (error) {
       }
       return result;
@@ -94,11 +121,13 @@ var createRequest = (props) => {
         ...config
       }
     ).then((res) => {
-      handleRequestComplete(res, false);
+      handleRequestComplete(_url, res, false, requestId);
       (0, import_utils.requestCallback)({ res, reject, resolve, props });
     }).catch((err) => {
-      handleRequestComplete(err, true);
+      handleRequestComplete(_url, err, true, requestId);
       (0, import_utils.requestCallback)({ err, reject, resolve, props });
+    }).finally(() => {
+      requestCount--;
     });
   });
 };

package/lib/routes/index.d.ts

@@ -20,7 +20,7 @@ export declare class RouterManager {
     get(name: string): RouteType;
     has(name: string): boolean;
     remove(name: string): void;
-    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null | undefined;
+    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;

package/package.json

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

package/es/app/app.d.ts

@@ -1,99 +0,0 @@
-import { RouterManager } from '../routes';
-import { ApplicationManager } from '../applicationManager';
-import { History, HistoryOptions } from '../history';
-import { Data } from '../data';
-import { Locales, LocalesOptions } from '../locales';
-import { Storage, StorageOptions } from '../storage';
-import { MenuManager } from '../menuManager';
-import LoggerManager, { LoggerOptions } from '../logger';
-import { TasksManager } from '../tasks';
-import IndexDBManager, { DBOptions } from '../indexDB';
-import CMD, { CMDOptions } from "../cmd";
-import AWS, { AWSOptions } from "../aws";
-declare global {
-    interface Window {
-        app: App;
-    }
-}
-export interface Bootstrap {
-    hooks: {
-        [key: string]: () => Promise<void>;
-    };
-}
-export interface AppOptions {
-    logger?: LoggerOptions;
-    db?: DBOptions;
-    constants?: any;
-    history?: HistoryOptions;
-    storage?: StorageOptions;
-    locales?: LocalesOptions;
-    cmd?: CMDOptions;
-    aws?: AWSOptions;
-    getPisellos?: () => any;
-}
-declare class App {
-    private static instance;
-    private plugins;
-    globalData: any;
-    router: RouterManager;
-    applicationManager: ApplicationManager;
-    history: History;
-    data: Data;
-    hooks: import("../hooks").HooksExport;
-    locales: Locales;
-    models: {
-        getStore: () => import("../models").Store;
-        StoreProvider: any;
-        setConfig: (models: any[]) => void;
-    };
-    request: {
-        get: (url: string, data: any, config: import("../request").RequestSetting | undefined) => Promise<any>;
-        post: (url: string, data: any, config: import("../request").RequestSetting | undefined) => Promise<any>;
-        put: (url: string, data: any, config: import("../request").RequestSetting | undefined) => Promise<any>;
-        remove: (url: string, data: any, config: import("../request").RequestSetting | undefined) => Promise<any>;
-        custom: (url: string, config: import("../request").RequestSetting | undefined) => any;
-        setConfig: (newConfig: Partial<import("../request").RequestConfig>) => void;
-        getConfig: () => import("../request").RequestConfig;
-    };
-    storage: Storage;
-    menuManager: MenuManager;
-    cookie: {
-        setCookie: (name: string, value: string, domain?: string | undefined) => void;
-        getCookie: (name: string) => string | null;
-        deleteCookie: (name: string, domain?: string | undefined) => void;
-        checkCookie: (name: string) => boolean;
-        updateCookie: (name: string, value: string, domain?: string | undefined) => void;
-    };
-    website: {
-        setTitle: (title: string) => void;
-        setIcon: (paramsIcon: string) => void;
-        setAppleWebAppTitle: (title: string) => void;
-    };
-    logger: LoggerManager;
-    pubsub: import("../pubsub").PubSub;
-    cmd: CMD;
-    aws: AWS;
-    tasksManager: TasksManager;
-    getPisellos: any;
-    bootstrap?: Bootstrap;
-    dbManager: IndexDBManager | null;
-    constants: {
-        channel: string;
-        [key: string]: string;
-    };
-    private constructor();
-    static getInstance(options?: AppOptions): App;
-    setGlobalData(globalData: any): void;
-    usePlugin(name: string, plugin: any): void;
-    usePlugins(plugins: {
-        name: string;
-        plugin: any;
-    }[]): void;
-    getPlugin(name: string): any;
-    getGlobalData(): any;
-    install(): void;
-    unInstall(): void;
-    setBootstrap(bootstrap: Bootstrap): void;
-    getBootstrap(): Bootstrap | undefined;
-}
-export default App;