@pisell/core 1.0.30 → 1.1.1

package/es/request/cache.js

@@ -10,7 +10,6 @@ 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 = {};
@@ -28,9 +27,8 @@ var MAX_CACHE_TIME = 7 * 60 * 60 * 1000;
 var createCacheKey = function createCacheKey(url, data, cache) {
   var _getConfig = getConfig(),
     storage = _getConfig.storage;
-  var _data = (cache === null || cache === void 0 ? void 0 : cache.cacheKeyData) || data;
   // @ts-ignore
-  return cache.key ? storage.createKey(cache.key) : md5("".concat(url, "_").concat(JSON.stringify(_data)));
+  return cache.key ? storage.createKey(cache.key) : md5("".concat(url, "_").concat(JSON.stringify(data)));
 };
 
 /**
@@ -126,26 +124,20 @@ var getCache = /*#__PURE__*/function () {
         case 0:
           _getConfig3 = getConfig(), storage = _getConfig3.storage; // 如果 当前时间 - 数据缓存时间 小于 超时时间, 则数据正常.
           if (!(cache.type === 'memory')) {
-            _context2.next = 8;
-            break;
-          }
-          if (CACHES[key]) {
-            _context2.next = 4;
+            _context2.next = 6;
             break;
           }
-          return _context2.abrupt("return", null);
-        case 4:
           if (!getIsEffectiveTime(CACHES[key].time)) {
-            _context2.next = 6;
+            _context2.next = 4;
             break;
           }
           return _context2.abrupt("return", CACHES[key].data);
-        case 6:
-          _context2.next = 23;
+        case 4:
+          _context2.next = 21;
           break;
-        case 8:
+        case 6:
           if (!(cache.type === 'storage')) {
-            _context2.next = 15;
+            _context2.next = 13;
             break;
           }
           storageDetail = storage.getStorage(key) || "";
@@ -153,35 +145,35 @@ var getCache = /*#__PURE__*/function () {
             storageDetail = JSON.parse(storageDetail);
           }
           if (!getIsEffectiveTime(storageDetail.time)) {
-            _context2.next = 13;
+            _context2.next = 11;
             break;
           }
           return _context2.abrupt("return", (_storageDetail = storageDetail) === null || _storageDetail === void 0 ? void 0 : _storageDetail.data);
-        case 13:
-          _context2.next = 23;
+        case 11:
+          _context2.next = 21;
           break;
-        case 15:
+        case 13:
           if (!(cache.type === 'indexDB')) {
-            _context2.next = 23;
+            _context2.next = 21;
             break;
           }
           app = getApp();
           if (!app.dbManager) {
-            _context2.next = 23;
+            _context2.next = 21;
             break;
           }
-          _context2.next = 20;
+          _context2.next = 18;
           return app.dbManager.get('requests', key);
-        case 20:
+        case 18:
           indexDBDetail = _context2.sent;
           if (!indexDBDetail) {
-            _context2.next = 23;
+            _context2.next = 21;
             break;
           }
           return _context2.abrupt("return", indexDBDetail === null || indexDBDetail === void 0 ? void 0 : indexDBDetail.data);
-        case 23:
+        case 21:
           return _context2.abrupt("return", null);
-        case 24:
+        case 22:
         case "end":
           return _context2.stop();
       }
@@ -259,47 +251,11 @@ export var getCacheData = /*#__PURE__*/function () {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var setCacheData = function setCacheData(url, data, res) {
-  var cache = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
-    type: 'memory'
-  };
+export var setCacheData = function setCacheData(url, data, res, cache) {
   // 创建缓存key
   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: 缓存函数包装器
@@ -313,45 +269,37 @@ var getIsCache = function getIsCache(config) {
  */
 export var cacheFn = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(props, fn) {
-    var url, data, config, isCache, cache, _data, _config$cache;
+    var url, data, config, _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;
-          isCache = getIsCache(config);
-          if (!isCache) {
-            _context4.next = 11;
+          if (!(config !== null && config !== void 0 && config.cache)) {
+            _context4.next = 8;
             break;
           }
-          cache = config.cache;
-          if (config.useCache) {
-            cache = {
-              type: 'memory'
-            };
-          }
-          // 获取缓存数据
-          _context4.next = 7;
-          return getCacheData(url, data, cache);
-        case 7:
+          _context4.next = 4;
+          return getCacheData(url, data, config.cache);
+        case 4:
           _data = _context4.sent;
           if (!_data) {
-            _context4.next = 11;
+            _context4.next = 8;
             break;
           }
           // 如果开启更新缓存执行函数
           if ((_config$cache = config.cache) !== null && _config$cache !== void 0 && _config$cache.updateCache) {
             fn(_objectSpread(_objectSpread({}, props), {}, {
               config: _objectSpread(_objectSpread({}, props.config), {}, {
-                cache: _objectSpread(_objectSpread({}, cache), {}, {
+                cache: _objectSpread(_objectSpread({}, props.config.cache), {}, {
                   updateCache: false
                 })
               })
             }));
           }
           return _context4.abrupt("return", _data);
-        case 11:
+        case 8:
           return _context4.abrupt("return", fn(props));
-        case 12:
+        case 9:
         case "end":
           return _context4.stop();
       }

package/es/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/es/request/index.js

@@ -13,7 +13,6 @@ import { cacheFn } from "./cache";
 import { interceptorsRequest, interceptorsResponse, interceptorsRequestError, interceptorsResponseError, requestCallback } from "./utils";
 import axios from "axios";
 import { getConfig, setConfig } from "./config";
-import { getApp } from "../app";
 // 实例
 var axiosInstance = axios.create(axiosConfig);
 
@@ -60,25 +59,13 @@ export var createRequest = function createRequest(props) {
  */
 export var request = function request(props) {
   var config = props.config,
-    url = props.url,
-    method = props.method;
+    url = props.url;
   // 请求防抖
   if (config !== null && config !== void 0 && config.abort) {
     var signal = createSignal(config.abort, url);
     config.signal = signal;
   }
 
-  // 使用os服务层
-  if (config !== null && config !== void 0 && config.osServer) {
-    var _app$getPisellos, _pisellos$server, _pisellos$server$hasR;
-    var app = getApp();
-    var pisellos = (_app$getPisellos = app.getPisellos) === null || _app$getPisellos === void 0 ? void 0 : _app$getPisellos.call(app);
-    if (pisellos !== null && pisellos !== void 0 && pisellos.server && pisellos !== null && pisellos !== void 0 && (_pisellos$server = pisellos.server) !== null && _pisellos$server !== void 0 && (_pisellos$server$hasR = _pisellos$server.hasRoute) !== null && _pisellos$server$hasR !== void 0 && _pisellos$server$hasR.call(_pisellos$server, method, url)) {
-      var _pisellos$server2, _pisellos$server2$han;
-      return pisellos === null || pisellos === void 0 || (_pisellos$server2 = pisellos.server) === null || _pisellos$server2 === void 0 || (_pisellos$server2$han = _pisellos$server2.handleRoute) === null || _pisellos$server2$han === void 0 ? void 0 : _pisellos$server2$han.call(_pisellos$server2, method, url, props);
-    }
-  }
-
   // 缓存函数
   return cacheFn(props, createRequest);
 };

package/es/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/es/request/type.js

@@ -1,10 +1 @@
-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;
-}({});
-
-// 请求模式
+export {};

package/es/request/utils.js

@@ -128,7 +128,7 @@ export var requestCallback = function requestCallback(resData) {
     if (codeFn) {
       if ((res === null || res === void 0 ? void 0 : res.code) === 200) {
         // 需要缓存的进行缓存数据
-        if (config !== null && config !== void 0 && config.useCache || config !== null && config !== void 0 && config.cache) {
+        if (config !== null && config !== void 0 && config.cache) {
           var _config$cacheUpdateCh;
           setCacheData(props.url, props.data, res, config === null || config === void 0 ? void 0 : config.cache);
           config === null || config === void 0 || (_config$cacheUpdateCh = config.cacheUpdateChange) === null || _config$cacheUpdateCh === void 0 || _config$cacheUpdateCh.call(config, res);

package/es/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: "uncompleted" | "completed";
-        progress: {
-            total: number;
-            completed: number;
-            failed: number;
-            inProgress: number;
-        };
-        lastRunAt: string | null;
-        tasksCount: number;
-    } | null;
-    /**
-     * @title: 获取所有队列状态
-     * @description: 获取所有任务队列的执行状态概览
-     * @return {object} 所有队列的状态信息
-     */
-    getAllQueuesStatus(): any;
 }