@pisell/core 1.0.6 → 1.0.7

package/lib/storage/index.js

@@ -23,31 +23,10 @@ __export(storage_exports, {
 });
 module.exports = __toCommonJS(storage_exports);
 var Storage = class {
+  storageKey = "CapacitorStorage.native_";
+  app;
+  options = {};
   constructor(app, options) {
-    this.storageKey = "CapacitorStorage.native_";
-    this.options = {};
-    this.createKey = (key) => {
-      if (key.indexOf(this.storageKey) !== -1) {
-        return key;
-      }
-      return this.storageKey + key;
-    };
-    this.setStorage = (key, value) => {
-      var _a, _b;
-      localStorage.setItem(this.createKey(key), value);
-      (_b = (_a = this.options) == null ? void 0 : _a.setStorageAfter) == null ? void 0 : _b.call(_a, key, value);
-    };
-    this.getStorage = (key) => {
-      return localStorage.getItem(this.createKey(key));
-    };
-    this.removeStorage = (key) => {
-      var _a, _b;
-      localStorage.removeItem(this.createKey(key));
-      (_b = (_a = this.options) == null ? void 0 : _a.removeStorageAfter) == null ? void 0 : _b.call(_a, key);
-    };
-    this.clear = () => {
-      localStorage.clear();
-    };
     this.app = app;
     if (options) {
       this.options = options;
@@ -56,6 +35,28 @@ var Storage = class {
       this.storageKey = options.storageKey;
     }
   }
+  createKey = (key) => {
+    if (key.indexOf(this.storageKey) !== -1) {
+      return key;
+    }
+    return this.storageKey + key;
+  };
+  setStorage = (key, value) => {
+    var _a, _b;
+    localStorage.setItem(this.createKey(key), value);
+    (_b = (_a = this.options) == null ? void 0 : _a.setStorageAfter) == null ? void 0 : _b.call(_a, key, value);
+  };
+  getStorage = (key) => {
+    return localStorage.getItem(this.createKey(key));
+  };
+  removeStorage = (key) => {
+    var _a, _b;
+    localStorage.removeItem(this.createKey(key));
+    (_b = (_a = this.options) == null ? void 0 : _a.removeStorageAfter) == null ? void 0 : _b.call(_a, key);
+  };
+  clear = () => {
+    localStorage.clear();
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/tasks/index.js

@@ -35,161 +35,16 @@ module.exports = __toCommonJS(tasks_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_useTasks = __toESM(require("./useTasks"));
-var TasksManager = class {
+var TasksManager = class _TasksManager {
+  static instance;
+  taskFunctions;
+  tasks;
+  app;
+  db;
+  useTasks = import_useTasks.default;
+  watchTaskCallback = () => {
+  };
   constructor(app) {
-    this.useTasks = import_useTasks.default;
-    this.watchTaskCallback = () => {
-    };
-    // 将任务队列状态同步到 local
-    this.saveTaskQueueToLocal = async (state) => {
-      var _a;
-      console.log("saveTaskQueueToLocal", state);
-      let tasksData = await this.db.get("tasks", "tasks");
-      const newData = { id: "tasks", ...state };
-      if (!tasksData) {
-        await this.db.add("tasks", newData);
-      } else {
-        await this.db.update("tasks", newData);
-      }
-      (_a = this.watchTaskCallback) == null ? void 0 : _a.call(this, this.tasks);
-    };
-    // 从 local 加载任务队列状态
-    this.loadTaskQueueFromLocal = async () => {
-      var _a, _b;
-      try {
-        const tasks = await this.db.get("tasks", "tasks");
-        for (let module2 in tasks) {
-          for (let queueId in tasks[module2]) {
-            for (let task of ((_b = (_a = tasks == null ? void 0 : tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks) || []) {
-              if (task.destroy) {
-                delete tasks[module2][queueId].tasks;
-              }
-            }
-          }
-        }
-        return tasks;
-      } catch (err) {
-        console.log("loadTaskQueueFromLocal", err);
-        return null;
-      }
-    };
-    /**
-     * @title: 执行任务
-     * @description:
-     * @param {Task} task
-     * @return {*}
-     * @Author: zhiwei.Wang
-     * @Date: 2024-09-26 13:53
-     */
-    this.runTask = async (task) => {
-      const beforeAction = this.getTaskFunction(task.beforeAction || "");
-      const afterAction = this.getTaskFunction(task.afterAction || "");
-      const action = this.getTaskFunction(task.action || "");
-      let beforeActionRes;
-      let afterActionRes;
-      let actionRes = { status: "success" };
-      try {
-        if (beforeAction) {
-          beforeActionRes = await beforeAction({ task });
-        }
-        if (action) {
-          actionRes = await action({ task, beforeActionRes });
-        }
-        if (afterAction) {
-          afterActionRes = await afterAction({ task, actionRes, afterActionRes });
-        }
-      } catch (error) {
-        this.app.logger.addLog({
-          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: 启动轮询
-     * @description: 根据轮询间隔定期执行任务
-     * @param {Task} task
-     * @return {*}
-     */
-    this.startPolling = (task) => {
-      if (!task.polling || !task.polling.interval) {
-        console.log("不是轮询任务");
-        return;
-      }
-      const timerId = setTimeout(async () => {
-        var _a;
-        try {
-          await this.runTask(task);
-          console.log("轮询任务", task);
-          let _task = { ...task };
-          _task.pollingResult = {
-            count: (((_a = _task.pollingResult) == null ? void 0 : _a.count) || 0) + 1,
-            timerId
-          };
-          const newTask = this.updateTask({
-            module: task.module,
-            queueId: task.queueId,
-            taskId: task.id,
-            other: _task
-          });
-          if (!newTask) {
-            return;
-          }
-          this.startPolling(newTask);
-        } catch (error) {
-          clearTimeout(timerId);
-          console.error("轮询任务异常", error);
-        }
-      }, task.polling.interval);
-    };
-    /**
-     * @title: 创建任务数据
-     * @description:
-     * @param {Partial} payload
-     * @return {*}
-     * @Author: zhiwei.Wang
-     * @Date: 2024-09-26 13:54
-     */
-    this.createTaskData = (payload) => {
-      return {
-        id: (0, import_utils.getUniqueId)("task_"),
-        create_at: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
-        type: "local",
-        retries: 0,
-        maxRetries: 3,
-        status: "pending",
-        // 执行函数
-        action: "",
-        // 执行参数
-        payload: {},
-        // 执行前的钩子
-        beforeAction: "",
-        // 执行前的参数
-        beforePayload: {},
-        // 执行后的钩子
-        afterAction: "",
-        // 执行后的参数
-        afterPayload: {},
-        destroy: true,
-        ...payload
-      };
-    };
-    this.getTaskQueue = (payload) => {
-      const { queueId, module: module2 } = payload;
-      return this.tasks[module2][queueId].tasks;
-    };
-    this.timeout = (ms) => {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(true);
-        }, ms || 5e3);
-      });
-    };
     if (!app) {
       throw new Error("app is required");
     }
@@ -200,10 +55,10 @@ var TasksManager = class {
   }
   // 单例模式
   static getInstance(app) {
-    if (!TasksManager.instance && app) {
-      TasksManager.instance = new TasksManager(app);
+    if (!_TasksManager.instance && app) {
+      _TasksManager.instance = new _TasksManager(app);
     }
-    return TasksManager.instance;
+    return _TasksManager.instance;
   }
   // 注册任务函数
   addTaskFunction(name, fun) {
@@ -233,6 +88,157 @@ var TasksManager = class {
       console.log("initTasks", tasks);
     }
   }
+  // 将任务队列状态同步到 local
+  saveTaskQueueToLocal = async (state) => {
+    var _a;
+    console.log("saveTaskQueueToLocal", state);
+    let tasksData = await this.db.get("tasks", "tasks");
+    const newData = { id: "tasks", ...state };
+    if (!tasksData) {
+      await this.db.add("tasks", newData);
+    } else {
+      await this.db.update("tasks", newData);
+    }
+    (_a = this.watchTaskCallback) == null ? void 0 : _a.call(this, this.tasks);
+  };
+  // 从 local 加载任务队列状态
+  loadTaskQueueFromLocal = async () => {
+    var _a, _b;
+    try {
+      const tasks = await this.db.get("tasks", "tasks");
+      for (let module2 in tasks) {
+        for (let queueId in tasks[module2]) {
+          for (let task of ((_b = (_a = tasks == null ? void 0 : tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks) || []) {
+            if (task.destroy) {
+              delete tasks[module2][queueId].tasks;
+            }
+          }
+        }
+      }
+      return tasks;
+    } catch (err) {
+      console.log("loadTaskQueueFromLocal", err);
+      return null;
+    }
+  };
+  /**
+   * @title: 执行任务
+   * @description:
+   * @param {Task} task
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-09-26 13:53
+   */
+  runTask = async (task) => {
+    const beforeAction = this.getTaskFunction(task.beforeAction || "");
+    const afterAction = this.getTaskFunction(task.afterAction || "");
+    const action = this.getTaskFunction(task.action || "");
+    let beforeActionRes;
+    let afterActionRes;
+    let actionRes = { status: "success" };
+    try {
+      if (beforeAction) {
+        beforeActionRes = await beforeAction({ task });
+      }
+      if (action) {
+        actionRes = await action({ task, beforeActionRes });
+      }
+      if (afterAction) {
+        afterActionRes = await afterAction({ task, actionRes, afterActionRes });
+      }
+    } catch (error) {
+      this.app.logger.addLog({
+        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: 启动轮询
+   * @description: 根据轮询间隔定期执行任务
+   * @param {Task} task
+   * @return {*}
+   */
+  startPolling = (task) => {
+    if (!task.polling || !task.polling.interval) {
+      console.log("不是轮询任务");
+      return;
+    }
+    const timerId = setTimeout(async () => {
+      var _a;
+      try {
+        await this.runTask(task);
+        console.log("轮询任务", task);
+        let _task = { ...task };
+        _task.pollingResult = {
+          count: (((_a = _task.pollingResult) == null ? void 0 : _a.count) || 0) + 1,
+          timerId
+        };
+        const newTask = this.updateTask({
+          module: task.module,
+          queueId: task.queueId,
+          taskId: task.id,
+          other: _task
+        });
+        if (!newTask) {
+          return;
+        }
+        this.startPolling(newTask);
+      } catch (error) {
+        clearTimeout(timerId);
+        console.error("轮询任务异常", error);
+      }
+    }, task.polling.interval);
+  };
+  /**
+   * @title: 创建任务数据
+   * @description:
+   * @param {Partial} payload
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-09-26 13:54
+   */
+  createTaskData = (payload) => {
+    return {
+      id: (0, import_utils.getUniqueId)("task_"),
+      create_at: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
+      type: "local",
+      retries: 0,
+      maxRetries: 3,
+      status: "pending",
+      // 执行函数
+      action: "",
+      // 执行参数
+      payload: {},
+      // 执行前的钩子
+      beforeAction: "",
+      // 执行前的参数
+      beforePayload: {},
+      // 执行后的钩子
+      afterAction: "",
+      // 执行后的参数
+      afterPayload: {},
+      destroy: true,
+      ...payload
+    };
+  };
+  getTaskQueue = (payload) => {
+    var _a, _b;
+    const { queueId, module: module2 } = payload;
+    return (_b = (_a = this.tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks;
+  };
+  timeout = (ms) => {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(true);
+      }, ms || 5e3);
+    });
+  };
   /**
    * @title: 执行任务队列
    * @description:

package/lib/tasks/type.d.ts

@@ -1,4 +1,4 @@
-export type TaskRunStatus = "pending" | "in-progress" | "success" | "failure";
+export declare type TaskRunStatus = "pending" | "in-progress" | "success" | "failure";
 export interface Task {
     id?: string;
     type?: "local" | "cloud";
@@ -25,9 +25,9 @@ export interface Task {
 export interface TaskConfig {
     tasks: Task[];
 }
-type TaskModuleName = string;
-type TaskQueueName = string;
-type TaskStatus = "uncompleted" | "completed";
+declare type TaskModuleName = string;
+declare type TaskQueueName = string;
+declare type TaskStatus = "uncompleted" | "completed";
 export interface TaskQueue {
     status: TaskStatus;
     tasks: Task[];

package/lib/variables/index.d.ts

@@ -1,6 +1,6 @@
-export type VariableMap = Record<string, string>;
+export declare type VariableMap = Record<string, string>;
 declare const _default: {
-    setConfig: (newConfig: Partial<import("@").VariablesConfig>) => void;
-    getConfig: () => import("@").VariablesConfig;
+    setConfig: (newConfig: Partial<import("./type").VariablesConfig>) => void;
+    getConfig: () => import("./type").VariablesConfig;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -27,7 +27,7 @@
     "dva-core": "^2.0.4",
     "js-md5": "^0.8.3",
     "axios": "^1.7.2",
-    "@pisell/utils": "1.0.42"
+    "@pisell/utils": "3.0.0"
   },
   "files": [
     "es",