@pisell/core 1.0.27 → 1.0.29

package/es/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 from "../cmd";
-import AWS from "../aws";
+import CMD, { CMDOptions } from "../cmd";
+import AWS, { AWSOptions } from "../aws";
 declare global {
     interface Window {
         app: App;
@@ -22,6 +22,8 @@ export interface AppOptions {
     history?: HistoryOptions;
     storage?: StorageOptions;
     locales?: LocalesOptions;
+    cmd?: CMDOptions;
+    aws?: AWSOptions;
     getPisellos?: () => any;
 }
 declare class App {

package/es/request/cache.js

@@ -10,6 +10,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 //@ts-ignore
 import md5 from 'js-md5';
 import { getConfig } from "./config";
+import { RequestModeENUM } from "./type";
 import { getApp } from "../app";
 // 缓存池
 var CACHES = {};
@@ -265,6 +266,39 @@ export var setCacheData = function setCacheData(url, data, res) {
   var _key = createCacheKey(url, data, cache);
   setCache(_key, res, cache);
 };
+var getIsCache = function getIsCache(config) {
+  // 没有传递缓存参数, 则不缓存
+  if (!(config !== null && config !== void 0 && config.cache) && !(config !== null && config !== void 0 && config.useCache)) {
+    return false;
+  }
+  var cache = (config === null || config === void 0 ? void 0 : config.cache) || {};
+
+  // 强制本地走缓存
+  if (cache.mode === RequestModeENUM.LOCAL) {
+    return true;
+  }
+
+  // 强制云端不走缓存
+  if (cache.mode === RequestModeENUM.REMOTE) {
+    return false;
+  }
+
+  // 优先本地缓存
+  if (cache.mode === RequestModeENUM.LOCAL_REMOTE) {
+    return true;
+  }
+
+  // 优先使用云端, 没网使用本地
+  if (cache.mode === RequestModeENUM.REMOTE_LOCAL) {
+    var _getApp;
+    // 判断是否有网络, 有网络就使用接口
+    if ((_getApp = getApp()) !== null && _getApp !== void 0 && (_getApp = _getApp.getPlugin("network")) !== null && _getApp !== void 0 && _getApp.connected) {
+      return false;
+    }
+    return true;
+  }
+  return true;
+};
 
 /**
  * @title: 缓存函数包装器
@@ -278,13 +312,14 @@ export var setCacheData = function setCacheData(url, data, res) {
  */
 export var cacheFn = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(props, fn) {
-    var url, data, config, cache, _data, _config$cache;
+    var url, data, config, isCache, cache, _data, _config$cache;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           url = props.url, data = props.data, config = props.config;
-          if (!(config !== null && config !== void 0 && config.cache || config !== null && config !== void 0 && config.useCache)) {
-            _context4.next = 10;
+          isCache = getIsCache(config);
+          if (!isCache) {
+            _context4.next = 11;
             break;
           }
           cache = config.cache;
@@ -294,12 +329,12 @@ export var cacheFn = /*#__PURE__*/function () {
             };
           }
           // 获取缓存数据
-          _context4.next = 6;
+          _context4.next = 7;
           return getCacheData(url, data, cache);
-        case 6:
+        case 7:
           _data = _context4.sent;
           if (!_data) {
-            _context4.next = 10;
+            _context4.next = 11;
             break;
           }
           // 如果开启更新缓存执行函数
@@ -313,9 +348,9 @@ export var cacheFn = /*#__PURE__*/function () {
             }));
           }
           return _context4.abrupt("return", _data);
-        case 10:
-          return _context4.abrupt("return", fn(props));
         case 11:
+          return _context4.abrupt("return", fn(props));
+        case 12:
         case "end":
           return _context4.stop();
       }

package/es/request/type.d.ts

@@ -19,11 +19,20 @@ 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;
 }
 export interface RequestSetting {
     abort?: boolean;

package/es/request/type.js

@@ -1 +1,10 @@
-export {};
+export var RequestModeENUM = /*#__PURE__*/function (RequestModeENUM) {
+  RequestModeENUM["LOCAL"] = "local";
+  RequestModeENUM["REMOTE"] = "remote";
+  RequestModeENUM["LOCAL_REMOTE"] = "local_remote";
+  RequestModeENUM["REMOTE_LOCAL"] = "remote_local";
+  RequestModeENUM["OS_SERVER"] = "os_server";
+  return RequestModeENUM;
+}({});
+
+// 请求模式

package/es/tasks/index.d.ts

@@ -37,6 +37,20 @@ 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: 根据轮询间隔定期执行任务
@@ -75,9 +89,40 @@ 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;
 }