@pisell/core 1.0.31 → 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/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 {

package/lib/request/type.js

@@ -2,10 +2,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 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))
@@ -18,19 +14,4 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // src/request/type.ts
 var type_exports = {};
-__export(type_exports, {
-  RequestModeENUM: () => RequestModeENUM
-});
 module.exports = __toCommonJS(type_exports);
-var RequestModeENUM = /* @__PURE__ */ ((RequestModeENUM2) => {
-  RequestModeENUM2["LOCAL"] = "local";
-  RequestModeENUM2["REMOTE"] = "remote";
-  RequestModeENUM2["LOCAL_REMOTE"] = "local_remote";
-  RequestModeENUM2["REMOTE_LOCAL"] = "remote_local";
-  RequestModeENUM2["OS_SERVER"] = "os_server";
-  return RequestModeENUM2;
-})(RequestModeENUM || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RequestModeENUM
-});

package/lib/request/utils.js

@@ -86,7 +86,7 @@ var requestCallback = (resData) => {
     const codeFn = requestCallbacks == null ? void 0 : requestCallbacks[res == null ? void 0 : res.code];
     if (codeFn) {
       if ((res == null ? void 0 : res.code) === 200) {
-        if ((config == null ? void 0 : config.useCache) || (config == null ? void 0 : config.cache)) {
+        if (config == null ? void 0 : config.cache) {
           (0, import_cache.setCacheData)(props.url, props.data, res, config == null ? void 0 : config.cache);
           (_a = config == null ? void 0 : config.cacheUpdateChange) == null ? void 0 : _a.call(config, res);
         }

package/lib/tasks/index.d.ts

@@ -37,20 +37,6 @@ export declare class TasksManager {
      * @param {NodeJS.Timeout} timerId
      */
     private clearTaskTimer;
-    /**
-     * @title: 计算下一次执行时间
-     * @description: 根据定时任务配置计算下一次执行时间
-     * @param {Task} task
-     * @return {string | null} 下一次执行时间
-     */
-    private calculateNextExecuteTime;
-    /**
-     * @title: 启动定时任务
-     * @description: 在特定时间点执行任务（仅在 scheduledTasks 模块中生效）
-     * @param {Task} task
-     * @return {*}
-     */
-    private startScheduledTask;
     /**
      * @title: 启动轮询
      * @description: 根据轮询间隔定期执行任务
@@ -89,40 +75,9 @@ export declare class TasksManager {
     addTask(payload: AddTaskParams): void;
     private updateTask;
     private updateQueueStatus;
-    /**
-     * @title: 更新队列运行状态
-     * @description: 标记队列是否正在执行
-     */
-    private updateQueueRunningState;
-    private setTasksData;
     private setTasks;
     clearAllTaskTimer(tasks: Task[]): void;
     clearTasks(payload: RunTaskParams): void;
     clearAllTasks(): void;
     watchTask(callback: (taskModule: TasksModule) => void): void;
-    /**
-     * @title: 获取队列执行状态
-     * @description: 获取指定队列的执行状态和进度信息
-     * @param {string} module - 模块名
-     * @param {string} queueId - 队列ID
-     * @return {object} 队列状态信息
-     */
-    getQueueStatus(module: string, queueId: string): {
-        isRunning: boolean;
-        status: "completed" | "uncompleted";
-        progress: {
-            total: number;
-            completed: number;
-            failed: number;
-            inProgress: number;
-        };
-        lastRunAt: string | null;
-        tasksCount: number;
-    } | null;
-    /**
-     * @title: 获取所有队列状态
-     * @description: 获取所有任务队列的执行状态概览
-     * @return {object} 所有队列的状态信息
-     */
-    getAllQueuesStatus(): any;
 }