@pisell/core 1.0.30 → 1.1.1

package/es/tasks/type.d.ts

@@ -18,18 +18,6 @@ export interface Task {
         count: number;
         timerId?: any;
     };
-    scheduled?: {
-        executeAt: string | string[];
-        repeat?: boolean;
-        repeatType?: 'daily' | 'weekly' | 'monthly' | 'yearly';
-        repeatInterval?: number;
-        endAt?: string;
-    };
-    scheduledResult?: {
-        count: number;
-        timerId?: any;
-        nextExecuteTime?: string;
-    };
     manual?: boolean;
     destroy?: boolean;
     [key: string]: any;
@@ -43,14 +31,6 @@ declare type TaskStatus = "uncompleted" | "completed";
 export interface TaskQueue {
     status: TaskStatus;
     tasks: Task[];
-    isRunning?: boolean;
-    progress?: {
-        total: number;
-        completed: number;
-        failed: number;
-        inProgress: number;
-    };
-    lastRunAt?: string;
 }
 export interface RunTaskParams {
     module: TaskModuleName;
@@ -67,33 +47,15 @@ export interface AddTaskParams {
     queueId: TaskQueueName;
     tasks: Task[];
 }
-export interface AddTaskDataParams {
-    module: TaskModuleName;
-    queueId: TaskQueueName;
-    [key: string]: any;
-}
 export interface TaskRunResult {
     status: TaskRunStatus;
     [key: string]: any;
 }
-/**
- * 任务模块
- * 注意：'scheduledTasks' 是保留的模块名，专门用于定时任务
- * 在其他模块中，scheduled 配置会被忽略，任务将作为普通任务执行
- */
 export interface TasksModule {
     [key: TaskModuleName]: {
         [key: TaskQueueName]: {
             status: TaskStatus;
             tasks: Task[];
-            isRunning?: boolean;
-            progress?: {
-                total: number;
-                completed: number;
-                failed: number;
-                inProgress: number;
-            };
-            lastRunAt?: string;
         };
     };
 }

package/lib/app/app.d.ts

@@ -8,8 +8,8 @@ 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";
+import CMD from "../cmd";
+import AWS from "../aws";
 declare global {
     interface Window {
         app: App;
@@ -22,9 +22,6 @@ export interface AppOptions {
     history?: HistoryOptions;
     storage?: StorageOptions;
     locales?: LocalesOptions;
-    cmd?: CMDOptions;
-    aws?: AWSOptions;
-    getPisellos?: () => any;
 }
 declare class App {
     private static instance;
@@ -46,7 +43,7 @@ declare class App {
         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;
+        custom: (url: string, config: import("../request").RequestSetting | undefined) => Promise<any>;
         setConfig: (newConfig: Partial<import("../request").RequestConfig>) => void;
         getConfig: () => import("../request").RequestConfig;
     };
@@ -69,7 +66,6 @@ declare class App {
     cmd: CMD;
     aws: AWS;
     tasksManager: TasksManager;
-    getPisellos: any;
     dbManager: IndexDBManager | null;
     constants: {
         channel: string;

package/lib/app/app.js

@@ -92,8 +92,6 @@ var App = class _App {
   aws;
   // 任务管理
   tasksManager;
-  //  getPisellos
-  getPisellos;
   dbManager = null;
   constants = {
     channel: ""
@@ -115,7 +113,6 @@ var App = class _App {
     this.tasksManager = new import_tasks.TasksManager(this);
     this.cmd = new import_cmd.default(this, options == null ? void 0 : options.cmd);
     this.aws = new import_aws.default(this, options == null ? void 0 : options.aws);
-    this.getPisellos = options == null ? void 0 : options.getPisellos;
     if (options == null ? void 0 : options.constants) {
       this.constants = options.constants || {};
     }

package/lib/indexDB/index.d.ts

@@ -72,10 +72,11 @@ declare class IndexDBManager {
      * 添加数据到指定的存储对象
      * @param {string} storeName - 存储对象名称
      * @param {T} data - 要添加的数据
+   * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T>} 添加的数据
      * @template T
      */
-    add<T>(storeName: string, data: T): Promise<T>;
+    add<T>(storeName: string, data: T, log?: boolean): Promise<T>;
     /**
      * 快速检查指定存储对象中的数据是否存在
      * @param {string} storeName - 存储对象名称
@@ -87,18 +88,20 @@ declare class IndexDBManager {
      * 获取指定存储对象中的数据
      * @param {string} storeName - 存储对象名称
      * @param {string|number} key - 数据主键
+     * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T|null>} 获取的数据，不存在则返回 null
      * @template T
      */
-    get<T>(storeName: string, key: string | number): Promise<T | null>;
+    get<T>(storeName: string, key: string | number, log?: boolean): Promise<T | null>;
     /**
      * 更新指定存储对象中的数据
      * @param {string} storeName - 存储对象名称
      * @param {T} data - 要更新的数据
+     * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T>} 更新后的数据
      * @template T
      */
-    update<T>(storeName: string, data: T): Promise<T>;
+    update<T>(storeName: string, data: T, log?: boolean): Promise<T>;
     /**
      * 删除指定存储对象中的数据
      * @param {string} storeName - 存储对象名称

package/lib/indexDB/index.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/indexDB/index.ts
@@ -22,6 +32,7 @@ __export(indexDB_exports, {
   default: () => indexDB_default
 });
 module.exports = __toCommonJS(indexDB_exports);
+var import_dayjs = __toESM(require("dayjs"));
 var IndexDBManager = class _IndexDBManager {
   /**
    * 检查环境是否支持 IndexedDB
@@ -92,29 +103,87 @@ var IndexDBManager = class _IndexDBManager {
     return `${this.dbName}_${storeName}${key ? `_${key}` : ""}`;
   }
   /**
-   * 添加数据到指定的存储对象
-   * @param {string} storeName - 存储对象名称
-   * @param {T} data - 要添加的数据
-   * @returns {Promise<T>} 添加的数据
-   * @template T
-   */
-  async add(storeName, data) {
+    * 添加数据到指定的存储对象
+    * @param {string} storeName - 存储对象名称
+    * @param {T} data - 要添加的数据
+  * * @param {boolean} [log=true] - 是否记录日志
+    * @returns {Promise<T>} 添加的数据
+    * @template T
+    */
+  async add(storeName, data, log) {
     var _a;
     if (!this.useIndexDB) {
       const key = this.getStorageKey(storeName, data[((_a = this.stores.find((s) => s.name === storeName)) == null ? void 0 : _a.keyPath) || "id"]);
       this.app.storage.setStorage(key, JSON.stringify(data));
       return data;
     }
+    const uuid = `[ IndexDB ] ADD: - ${storeName} - ${(0, import_dayjs.default)().valueOf()}`;
     return new Promise((resolve, reject) => {
       if (!this.db) {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "添加数据前", data }
+          });
+        }
         reject(new Error("数据库未连接"));
         return;
       }
       const transaction = this.db.transaction(storeName, "readwrite");
       const store = transaction.objectStore(storeName);
       const request = store.add(data);
-      request.onsuccess = () => resolve(data);
-      request.onerror = () => reject(new Error("添加数据失败"));
+      request.onsuccess = () => {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "添加数据成功" }
+          });
+        }
+        return resolve(data);
+      };
+      request.onerror = () => {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "添加数据失败" }
+          });
+        }
+        return reject(new Error("添加数据失败"));
+      };
+      transaction.oncomplete = () => {
+        console.log("✅ 添加事务完成");
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "事务完成" }
+          });
+        }
+        return;
+      };
+      transaction.onerror = (e) => {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "事务错误" }
+          });
+        }
+        return reject(transaction.error ?? new Error("事务错误"));
+      };
+      transaction.onabort = (e) => {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "事务被中止" }
+          });
+        }
+        return reject(new Error("事务被中止"));
+      };
     });
   }
   /**
@@ -144,10 +213,19 @@ var IndexDBManager = class _IndexDBManager {
    * 获取指定存储对象中的数据
    * @param {string} storeName - 存储对象名称
    * @param {string|number} key - 数据主键
+   * * @param {boolean} [log=true] - 是否记录日志
    * @returns {Promise<T|null>} 获取的数据，不存在则返回 null
    * @template T
    */
-  async get(storeName, key) {
+  async get(storeName, key, log) {
+    const uuid = `[ IndexDB ] GET: - ${storeName} - ${key} - ${(0, import_dayjs.default)().valueOf()}`;
+    if (log) {
+      this.app.logger.addLog({
+        type: "info",
+        title: uuid,
+        metadata: { msg: "获取数据前" }
+      });
+    }
     if (!this.useIndexDB) {
       const storageKey = this.getStorageKey(storeName, key);
       let data = this.app.storage.getStorage(storageKey);
@@ -158,40 +236,159 @@ var IndexDBManager = class _IndexDBManager {
     }
     return new Promise((resolve, reject) => {
       if (!this.db) {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "数据库未连接" }
+          });
+        }
         reject(new Error("数据库未连接"));
         return;
       }
-      const transaction = this.db.transaction(storeName, "readonly");
-      const store = transaction.objectStore(storeName);
-      const request = store.get(key);
-      request.onsuccess = () => resolve(request.result || null);
-      request.onerror = () => reject(new Error("获取数据失败"));
+      let resolved = false;
+      try {
+        const transaction = this.db.transaction(storeName, "readonly");
+        const store = transaction.objectStore(storeName);
+        const request = store.get(key);
+        request.onsuccess = () => {
+          resolved = true;
+          if (log) {
+            this.app.logger.addLog({
+              type: "info",
+              title: uuid,
+              metadata: { msg: "获取成功" }
+            });
+          }
+          resolve(request.result ?? null);
+        };
+        request.onerror = () => {
+          resolved = true;
+          if (log) {
+            this.app.logger.addLog({
+              type: "info",
+              title: uuid,
+              metadata: { msg: "获取失败" }
+            });
+          }
+          reject(request.error ?? new Error("获取数据失败"));
+        };
+        transaction.onabort = () => {
+          if (log) {
+            this.app.logger.addLog({
+              type: "info",
+              title: uuid,
+              metadata: { msg: "事务被中止" }
+            });
+          }
+          if (!resolved) reject(new Error("事务被中止"));
+        };
+        transaction.onerror = (event) => {
+          if (log) {
+            this.app.logger.addLog({
+              type: "info",
+              title: uuid,
+              metadata: { msg: `事务错误: ${event.target.error}` }
+            });
+          }
+          if (!resolved) reject(new Error(`事务错误: ${event.target.error}`));
+        };
+        transaction.oncomplete = () => {
+          if (log) {
+            this.app.logger.addLog({
+              type: "info",
+              title: uuid,
+              metadata: { msg: "事务完成" }
+            });
+          }
+        };
+      } catch (e) {
+        reject(e);
+      }
     });
   }
   /**
    * 更新指定存储对象中的数据
    * @param {string} storeName - 存储对象名称
    * @param {T} data - 要更新的数据
+   * * @param {boolean} [log=true] - 是否记录日志
    * @returns {Promise<T>} 更新后的数据
    * @template T
    */
-  async update(storeName, data) {
+  async update(storeName, data, log) {
     var _a;
     if (!this.useIndexDB) {
       const key = this.getStorageKey(storeName, data[((_a = this.stores.find((s) => s.name === storeName)) == null ? void 0 : _a.keyPath) || "id"]);
       this.app.storage.setStorage(key, JSON.stringify(data));
       return data;
     }
+    const uuid = `[ IndexDB ] UPDATE: - ${storeName} - ${(0, import_dayjs.default)().valueOf()}`;
+    if (log) {
+      this.app.logger.addLog({
+        type: "info",
+        title: uuid,
+        metadata: { msg: "更新数据前", data }
+      });
+    }
     return new Promise((resolve, reject) => {
       if (!this.db) {
+        if (log) {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "数据库未连接" }
+          });
+        }
         reject(new Error("数据库未连接"));
         return;
       }
-      const transaction = this.db.transaction(storeName, "readwrite");
-      const store = transaction.objectStore(storeName);
-      const request = store.put(data);
-      request.onsuccess = () => resolve(data);
-      request.onerror = () => reject(new Error("更新数据失败"));
+      try {
+        const transaction = this.db.transaction(storeName, "readwrite");
+        const store = transaction.objectStore(storeName);
+        const request = store.put(data);
+        request.onsuccess = () => {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "数据更新完成" }
+          });
+          return resolve(data);
+        };
+        request.onerror = () => {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "数据更新失败" }
+          });
+          return reject(request.error ?? new Error("更新数据失败"));
+        };
+        transaction.oncomplete = () => {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "事务完成" }
+          });
+          return console.log("✅ 事务完成");
+        };
+        transaction.onabort = (e) => {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "事务被中止" }
+          });
+          return reject(new Error("事务被中止"));
+        };
+        transaction.onerror = (e) => {
+          this.app.logger.addLog({
+            type: "info",
+            title: uuid,
+            metadata: { msg: "事务错误" }
+          });
+          return reject(transaction.error ?? new Error("事务错误"));
+        };
+      } catch (e) {
+        reject(e);
+      }
     });
   }
   /**

package/lib/request/cache.d.ts

@@ -32,7 +32,7 @@ export declare const getCacheData: (url: string, data: any, cache: CacheProps) =
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const setCacheData: (url: string, data: any, res: any, cache?: CacheProps) => any | null;
+export declare const setCacheData: (url: string, data: any, res: any, cache: CacheProps) => any | null;
 /**
  * @title: 缓存函数包装器
  * @description:

package/lib/request/cache.js

@@ -38,14 +38,12 @@ __export(cache_exports, {
 module.exports = __toCommonJS(cache_exports);
 var import_js_md5 = __toESM(require("js-md5"));
 var import_config = require("./config");
-var import_type = require("./type");
 var import_app = require("../app");
 var CACHES = {};
 var MAX_CACHE_TIME = 7 * 60 * 60 * 1e3;
 var createCacheKey = (url, data, cache) => {
   const { storage } = (0, import_config.getConfig)();
-  let _data = (cache == null ? void 0 : cache.cacheKeyData) || data;
-  return cache.key ? storage.createKey(cache.key) : (0, import_js_md5.default)(`${url}_${JSON.stringify(_data)}`);
+  return cache.key ? storage.createKey(cache.key) : (0, import_js_md5.default)(`${url}_${JSON.stringify(data)}`);
 };
 var setCache = async (key, data, cache) => {
   const { storage } = (0, import_config.getConfig)();
@@ -79,9 +77,6 @@ var getIsEffectiveTime = (time) => {
 var getCache = async (key, cache) => {
   const { storage } = (0, import_config.getConfig)();
   if (cache.type === "memory") {
-    if (!CACHES[key]) {
-      return null;
-    }
     if (getIsEffectiveTime(CACHES[key].time)) {
       return CACHES[key].data;
     }
@@ -127,47 +122,15 @@ var getCacheData = async (url, data, cache) => {
   const res = await getCache(_key, cache);
   return res;
 };
-var setCacheData = (url, data, res, cache = {
-  type: "memory"
-}) => {
+var setCacheData = (url, data, res, cache) => {
   let _key = createCacheKey(url, data, cache);
   setCache(_key, res, cache);
 };
-var getIsCache = (config) => {
-  var _a, _b;
-  if (!(config == null ? void 0 : config.cache) && !(config == null ? void 0 : config.useCache)) {
-    return false;
-  }
-  const cache = (config == null ? void 0 : config.cache) || {};
-  if (cache.mode === import_type.RequestModeENUM.LOCAL) {
-    return true;
-  }
-  if (cache.mode === import_type.RequestModeENUM.REMOTE) {
-    return false;
-  }
-  if (cache.mode === import_type.RequestModeENUM.LOCAL_REMOTE) {
-    return true;
-  }
-  if (cache.mode === import_type.RequestModeENUM.REMOTE_LOCAL) {
-    if ((_b = (_a = (0, import_app.getApp)()) == null ? void 0 : _a.getPlugin("network")) == null ? void 0 : _b.connected) {
-      return false;
-    }
-    return true;
-  }
-  return true;
-};
 var cacheFn = async (props, fn) => {
   var _a;
   const { url, data, config } = props;
-  const isCache = getIsCache(config);
-  if (isCache) {
-    let cache = config.cache;
-    if (config.useCache) {
-      cache = {
-        type: "memory"
-      };
-    }
-    let _data = await getCacheData(url, data, cache);
+  if (config == null ? void 0 : config.cache) {
+    let _data = await getCacheData(url, data, config.cache);
     if (_data) {
       if ((_a = config.cache) == null ? void 0 : _a.updateCache) {
         fn({
@@ -175,7 +138,7 @@ var cacheFn = async (props, fn) => {
           config: {
             ...props.config,
             cache: {
-              ...cache,
+              ...props.config.cache,
               updateCache: false
             }
           }

package/lib/request/index.d.ts

@@ -5,19 +5,19 @@ export declare const createRequest: (props: RequestWrapperProps) => Promise<unkn
  * @param props
  * @returns
  */
-export declare const request: (props: RequestWrapperProps) => any;
+export declare const request: (props: RequestWrapperProps) => Promise<any>;
 export declare const get: (url: RequestWrapperProps["url"], data: RequestWrapperProps["data"], config: RequestWrapperProps["config"]) => Promise<any>;
 export declare const post: (url: RequestWrapperProps["url"], data: RequestWrapperProps["data"], config: RequestWrapperProps["config"]) => Promise<any>;
 export declare const put: (url: RequestWrapperProps["url"], data: RequestWrapperProps["data"], config: RequestWrapperProps["config"]) => Promise<any>;
 export declare const remove: (url: RequestWrapperProps["url"], data: RequestWrapperProps["data"], config: RequestWrapperProps["config"]) => Promise<any>;
-export declare const custom: (url: RequestWrapperProps["url"], config: RequestWrapperProps["config"]) => any;
+export declare const custom: (url: RequestWrapperProps["url"], config: RequestWrapperProps["config"]) => Promise<any>;
 export * from "./type";
 declare const _default: {
     get: (url: string, data: any, config: import("./type").RequestSetting | undefined) => Promise<any>;
     post: (url: string, data: any, config: import("./type").RequestSetting | undefined) => Promise<any>;
     put: (url: string, data: any, config: import("./type").RequestSetting | undefined) => Promise<any>;
     remove: (url: string, data: any, config: import("./type").RequestSetting | undefined) => Promise<any>;
-    custom: (url: string, config: import("./type").RequestSetting | undefined) => any;
+    custom: (url: string, config: import("./type").RequestSetting | undefined) => Promise<any>;
     setConfig: (newConfig: Partial<RequestConfig>) => void;
     getConfig: () => RequestConfig;
 };

package/lib/request/index.js

@@ -46,7 +46,6 @@ var import_cache = require("./cache");
 var import_utils = require("./utils");
 var import_axios = __toESM(require("axios"));
 var import_config = require("./config");
-var import_app = require("../app");
 __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);
@@ -75,19 +74,11 @@ var createRequest = (props) => {
   });
 };
 var request = (props) => {
-  var _a, _b, _c, _d, _e;
-  const { config, url, method } = props;
+  const { config, url } = props;
   if (config == null ? void 0 : config.abort) {
     let signal = (0, import_cancelToken.createSignal)(config.abort, url);
     config.signal = signal;
   }
-  if (config == null ? void 0 : config.osServer) {
-    const app = (0, import_app.getApp)();
-    const pisellos = (_a = app.getPisellos) == null ? void 0 : _a.call(app);
-    if ((pisellos == null ? void 0 : pisellos.server) && ((_c = (_b = pisellos == null ? void 0 : pisellos.server) == null ? void 0 : _b.hasRoute) == null ? void 0 : _c.call(_b, method, url))) {
-      return (_e = (_d = pisellos == null ? void 0 : pisellos.server) == null ? void 0 : _d.handleRoute) == null ? void 0 : _e.call(_d, method, url, props);
-    }
-  }
   return (0, import_cache.cacheFn)(props, createRequest);
 };
 var get = async (url, data, config) => {

package/lib/request/type.d.ts

@@ -19,21 +19,11 @@ export interface RequestConfig {
         [key: string]: any;
     };
 }
-export declare enum RequestModeENUM {
-    LOCAL = "local",
-    REMOTE = "remote",
-    LOCAL_REMOTE = "local_remote",
-    REMOTE_LOCAL = "remote_local",
-    OS_SERVER = "os_server"
-}
-export declare type RequestModeType = RequestModeENUM.LOCAL | RequestModeENUM.REMOTE | RequestModeENUM.LOCAL_REMOTE | RequestModeENUM.REMOTE_LOCAL | RequestModeENUM.OS_SERVER;
 export interface CacheProps {
     key?: string;
     type?: CacheType;
     updateCache?: boolean;
     cacheUpdateChange?: (data: any) => void;
-    mode?: RequestModeType;
-    cacheKeyData?: any;
 }
 export interface RequestSetting {
     abort?: boolean;
@@ -41,7 +31,6 @@ export interface RequestSetting {
     cache?: CacheProps;
     signal?: any;
     token?: string;
-    osServer?: boolean;
     [key: string]: any;
 }
 export interface RequestWrapperProps {