rxtutils 1.0.5 → 1.0.7

package/dist/cjs/cache/index.cjs

@@ -1,31 +1,126 @@
-import { IndexedDBStorage } from './indexDB.cjs';
+'use strict';
 
-type StorageType = 'sessionStorage' | 'localStorage' | 'indexedDB';
-interface ICache<Param, Data> {
-    params: Param;
-    data: Data;
-    expireTime: string;
-}
-interface ICacheOptions<Param> {
-    storageType?: StorageType;
-    cacheKey?: string;
-    cacheTime?: number;
-    cacheKeyEquals: (prev: Param, next: Param) => boolean;
-    indexDBName?: string;
-}
-declare const StorageMap: Record<StorageType | string, Storage>;
-declare class Cache<Param, Data> {
-    cache: ICache<Param, Data>[];
-    private cacheOptions;
-    storage?: Storage | IndexedDBStorage;
-    constructor(cacheType?: StorageType, cacheKey?: string, cacheTime?: number, indexDBName?: string, cacheKeyEquals?: (prev: Param, next: Param) => boolean);
-    private _init;
-    private _filterExpired;
-    private _saveToStorage;
-    setCache(params: Param, data: Data, cacheOptions?: Omit<ICacheOptions<Param>, 'storageType' | 'cacheKey' | 'cacheKeyEquals'>): void;
-    getCache(params: Param): Data;
-    clear(): void;
-}
+Object.defineProperty(exports, '__esModule', { value: true });
 
-export { StorageMap, Cache as default };
-export type { ICache, ICacheOptions, StorageType };
+var tslib_es6_js = require('C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js');
+var moment = require('moment');
+var indexDB = require('./indexDB.cjs');
+var defaultEquals = require('../defaultEquals.cjs');
+
+var StorageMap = {
+    localStorage: localStorage,
+    sessionStorage: sessionStorage,
+};
+var Cache = /** @class */ (function () {
+    function Cache(cacheType, cacheKey, cacheTime, indexDBName, cacheKeyEquals) {
+        if (indexDBName === void 0) { indexDBName = '__apiCacheDatabase__'; }
+        if (cacheKeyEquals === void 0) { cacheKeyEquals = defaultEquals; }
+        this.cache = [];
+        this.cacheOptions = {
+            storageType: cacheType,
+            cacheKey: cacheKey,
+            cacheTime: cacheTime,
+            indexDBName: indexDBName,
+            cacheKeyEquals: cacheKeyEquals,
+        };
+        if (cacheType === 'indexedDB') {
+            this.storage = new indexDB.IndexedDBStorage(indexDBName, 'cacheStore');
+        }
+        else if (typeof cacheType === 'string') {
+            this.storage = StorageMap[cacheType];
+        }
+        this._init();
+    }
+    Cache.prototype._init = function () {
+        return tslib_es6_js.__awaiter(this, void 0, void 0, function () {
+            var _a, cacheType, cacheKey, _b, _c, _d;
+            return tslib_es6_js.__generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        _a = this.cacheOptions, cacheType = _a.storageType, cacheKey = _a.cacheKey;
+                        if (!(this.storage instanceof indexDB.IndexedDBStorage)) return [3 /*break*/, 2];
+                        _b = this;
+                        _d = (_c = JSON).parse;
+                        return [4 /*yield*/, this.storage.getItem(cacheKey)];
+                    case 1:
+                        _b.cache = _d.apply(_c, [(_e.sent()) || '[]']);
+                        return [3 /*break*/, 3];
+                    case 2:
+                        if (this.storage instanceof Storage) {
+                            this.storage = StorageMap[cacheType];
+                            if (this.storage) {
+                                if (typeof cacheKey === 'string') {
+                                    try {
+                                        this.cache = JSON.parse(this.storage.getItem(cacheKey) || '[]');
+                                    }
+                                    catch (e) {
+                                        this.cache = [];
+                                        console.error("\u7F13\u5B58\u6570\u636E\u89E3\u6790\u5931\u8D25\uFF0Ckey:".concat(cacheKey));
+                                    }
+                                }
+                            }
+                        }
+                        _e.label = 3;
+                    case 3:
+                        this._filterExpired();
+                        this._saveToStorage();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Cache.prototype._filterExpired = function () {
+        var newCache = this.cache.filter(function (item) {
+            return moment(item.expireTime).isAfter(moment());
+        });
+        this.cache = newCache;
+    };
+    Cache.prototype._saveToStorage = function () {
+        if (this.storage) {
+            if (typeof this.cacheOptions.cacheKey === 'string') {
+                this.storage.setItem(this.cacheOptions.cacheKey, JSON.stringify(this.cache));
+            }
+        }
+    };
+    Cache.prototype.setCache = function (params, data, cacheOptions) {
+        var _a = tslib_es6_js.__assign(tslib_es6_js.__assign({}, this.cacheOptions), cacheOptions), cacheTime = _a.cacheTime, _b = _a.cacheKeyEquals, cacheKeyEquals = _b === void 0 ? defaultEquals : _b;
+        var cacheItemIndex = this.cache.findIndex(function (item) {
+            return cacheKeyEquals(item.params, params);
+        });
+        if (cacheItemIndex > -1) {
+            this.cache.splice(cacheItemIndex, 1);
+        }
+        this.cache.push({
+            params: params,
+            data: data,
+            expireTime: moment().add(cacheTime, 'seconds').toJSON(),
+        });
+        this._saveToStorage();
+    };
+    Cache.prototype.getCache = function (params) {
+        var _this = this;
+        // debugger;
+        var itemIndex = this.cache.findIndex(function (item) {
+            return _this.cacheOptions.cacheKeyEquals(item.params, params);
+        });
+        var item = this.cache[itemIndex];
+        if (item) {
+            if (moment(item.expireTime).isAfter(moment())) {
+                return item.data;
+            }
+            else {
+                this.cache.splice(itemIndex, 1);
+                this._saveToStorage();
+            }
+        }
+        return null;
+    };
+    Cache.prototype.clear = function () {
+        this.cache = [];
+        this._saveToStorage();
+    };
+    return Cache;
+}());
+
+exports.StorageMap = StorageMap;
+exports.default = Cache;

package/dist/cjs/cache/indexDB.cjs

@@ -1,12 +1,67 @@
-declare class IndexedDBStorage {
-    private dbName;
-    private storeName;
-    private db;
-    constructor(dbName: string, storeName: string);
-    private _open;
-    private _getStore;
-    setItem<T>(key: string, value: T): Promise<void>;
-    getItem<T = any>(key: string): Promise<T>;
-}
+'use strict';
 
-export { IndexedDBStorage };
+// IndexedDB的简易封装类
+var IndexedDBStorage = /** @class */ (function () {
+    function IndexedDBStorage(dbName, storeName) {
+        this.db = null;
+        this.dbName = dbName;
+        this.storeName = storeName;
+    }
+    // 打开数据库连接
+    IndexedDBStorage.prototype._open = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            if (_this.db) {
+                resolve(_this.db);
+                return;
+            }
+            var request = indexedDB.open(_this.dbName);
+            request.onupgradeneeded = function (event) {
+                var db = event.target.result;
+                db.createObjectStore(_this.storeName, { keyPath: 'key' });
+            };
+            request.onerror = function () {
+                var _a;
+                reject("IndexedDB open request error: ".concat((_a = request.error) === null || _a === void 0 ? void 0 : _a.message));
+            };
+            request.onsuccess = function (event) {
+                _this.db = event.target.result;
+                resolve(_this.db);
+            };
+        });
+    };
+    // 获取存储对象
+    IndexedDBStorage.prototype._getStore = function (mode) {
+        var _this = this;
+        if (mode === void 0) { mode = 'readonly'; }
+        return this._open().then(function (db) {
+            var transaction = db.transaction(_this.storeName, mode);
+            return transaction.objectStore(_this.storeName);
+        });
+    };
+    // 设置键值对
+    IndexedDBStorage.prototype.setItem = function (key, value) {
+        return this._getStore('readwrite').then(function (store) {
+            return new Promise(function (resolve, reject) {
+                var request = store.put({ key: key, value: value });
+                request.onsuccess = function () { return resolve(); };
+                request.onerror = function () { var _a; return reject("Could not set the item: ".concat((_a = request.error) === null || _a === void 0 ? void 0 : _a.message)); };
+            });
+        });
+    };
+    // 获取键对应的值
+    IndexedDBStorage.prototype.getItem = function (key) {
+        return this._getStore().then(function (store) {
+            return new Promise(function (resolve, reject) {
+                var request = store.get(key);
+                request.onsuccess = function () {
+                    return resolve(request.result ? request.result.value : undefined);
+                };
+                request.onerror = function () { var _a; return reject("Could not get the item: ".concat((_a = request.error) === null || _a === void 0 ? void 0 : _a.message)); };
+            });
+        });
+    };
+    return IndexedDBStorage;
+}());
+
+exports.IndexedDBStorage = IndexedDBStorage;

package/dist/cjs/createStateStore/index.cjs

@@ -1,14 +1,61 @@
-type IHookStateInitialSetter<S> = () => S;
-type IHookStateInitAction<S> = S | IHookStateInitialSetter<S>;
-type IHookStateSetter<S> = ((prevState: S) => S) | (() => S);
-type IHookStateSetAction<S> = S | IHookStateSetter<S>;
-type IHookStateResolvable<S> = S | IHookStateInitialSetter<S> | IHookStateSetter<S>;
-declare function createStateStore<S>(initialState?: S): {
-    use: () => [S, (state: IHookStateSetAction<S>) => void];
-    get: () => S;
-    set: (state: IHookStateSetAction<S>) => void;
-    watch: (callback: (state: S) => S | void) => () => void;
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var react = require('react');
+
+function resolveHookState(nextState, currentState) {
+    if (typeof nextState === 'function') {
+        return nextState.length
+            ? nextState(currentState)
+            : nextState();
+    }
+    return nextState;
+}
+var isBrowser = typeof window !== 'undefined';
+var useEffectOnce = function (effect) {
+    react.useEffect(effect, []);
 };
+var useIsomorphicLayoutEffect = isBrowser ? react.useLayoutEffect : react.useEffect;
+function createStateStore(initialState) {
+    var store = {
+        state: initialState instanceof Function ? initialState() : initialState,
+        setState: function (nextState) {
+            store.state = resolveHookState(nextState, store.state);
+            store.setters.forEach(function (setter) { return setter(store.state); });
+            store.watchers.forEach(function (watcher) { return watcher(store.state); });
+        },
+        setters: [],
+        watchers: [],
+    };
+    var use = function () {
+        var _a = react.useState(store.state), globalState = _a[0], stateSetter = _a[1];
+        useEffectOnce(function () { return function () {
+            store.setters = store.setters.filter(function (setter) { return setter !== stateSetter; });
+        }; });
+        useIsomorphicLayoutEffect(function () {
+            if (!store.setters.includes(stateSetter)) {
+                store.setters.push(stateSetter);
+            }
+        });
+        return [globalState, store.setState];
+    };
+    var get = function () { return store.state; };
+    var set = store.setState;
+    var watch = function (callback) {
+        store.watchers.push(callback);
+        var close = function () {
+            store.watchers = store.watchers.filter(function (watcher) { return watcher !== callback; });
+        };
+        return close;
+    };
+    return {
+        use: use,
+        get: get,
+        set: set,
+        watch: watch,
+    };
+}
 
-export { createStateStore as default };
-export type { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter };
+exports.default = createStateStore;
+exports.resolveHookState = resolveHookState;

package/dist/cjs/defaultEquals.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+function defaultEquals(prev, next) {
+    return JSON.stringify(prev) === JSON.stringify(next);
+}
+
+module.exports = defaultEquals;

package/dist/cjs/index.cjs

@@ -1,3 +1,11 @@
-export { default as Cache, ICache, ICacheOptions, StorageMap, StorageType } from './cache/index.cjs';
-export { ErrorHandlerReturnType, Options, RequestOptions, default as createBaseRequest } from './request/index.cjs';
-export { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter, default as createStateStore } from './createStateStore/index.cjs';
+'use strict';
+
+var index = require('./cache/index.cjs');
+var index$1 = require('./request/index.cjs');
+var index$2 = require('./createStateStore/index.cjs');
+
+
+
+exports.Cache = index.default;
+exports.createBaseRequest = index$1;
+exports.createStateStore = index$2.default;

package/dist/cjs/request/defaultHandlers.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+function _defaultErrorCodeHandler(defaultMessageShower, code) {
+    defaultMessageShower("\u8BF7\u6C42\u51FA\u9519\uFF0C\u9519\u8BEF\u7801\uFF1A".concat(code, "\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5"));
+}
+function _defaultHttpErrorCodeHandler(defaultMessageShower, code) {
+    defaultMessageShower("\u670D\u52A1\u7AEF\u8BF7\u6C42\u51FA\u9519\uFF0CHttp\u9519\u8BEF\u7801\uFF1A".concat(String(code), "\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5"));
+}
+function _defaultOtherErrorCodeHandler(defaultMessageShower, error) {
+    defaultMessageShower("\u672A\u77E5\u8BF7\u6C42\u51FA\u9519\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5");
+}
+
+exports._defaultErrorCodeHandler = _defaultErrorCodeHandler;
+exports._defaultHttpErrorCodeHandler = _defaultHttpErrorCodeHandler;
+exports._defaultOtherErrorCodeHandler = _defaultOtherErrorCodeHandler;

package/dist/cjs/request/error.cjs

@@ -0,0 +1,17 @@
+'use strict';
+
+var tslib_es6_js = require('C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js');
+
+var RequestError = /** @class */ (function (_super) {
+    tslib_es6_js.__extends(RequestError, _super);
+    function RequestError(message, type, data) {
+        var _this = _super.call(this, message) || this;
+        _this.name = 'RequestError';
+        _this.type = type;
+        _this.data = data;
+        return _this;
+    }
+    return RequestError;
+}(Error));
+
+module.exports = RequestError;

package/dist/cjs/request/index.cjs

@@ -1,40 +1,112 @@
-import { AxiosResponse, Method, AxiosRequestConfig } from 'axios';
-import { StorageType } from '../cache/index.cjs';
+'use strict';
 
-type ErrorHandlerReturnType<D> = {
-    replaceResData?: D;
-    throwError?: boolean | 'default';
-};
-interface Options<Params = any, Data = any> {
-    baseURL?: string;
-    throwError?: boolean;
-    defaultMessageShower?: (message: string) => void;
-    enableCache?: boolean;
-    cacheKeyEquals?: (prev: Params, next: Params) => boolean;
-    cacheData?: boolean;
-    cacheTime?: number;
-    cacheDataInStorage?: StorageType;
-    cacheDataKey?: string;
-    indexDBName?: string;
-    errorCodePath?: string;
-    errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
-    defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => ErrorHandlerReturnType<Data> | void;
-    successCodes?: string[];
-    httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
-    defaultHttpErrorCodeHandler?: (code: number, error: any) => ErrorHandlerReturnType<Data> | void;
-    otherErrorHandler?: (error: any) => ErrorHandlerReturnType<Data> | void;
-    axiosOptions?: Omit<AxiosRequestConfig<Params>, 'method' | 'url' | 'params' | 'data'>;
-}
-interface RequestOptions<Param> {
-    method: Method;
-    url: string;
-    data?: Param;
-    params?: Param;
+var tslib_es6_js = require('C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js');
+var axios = require('axios');
+var lodash = require('lodash');
+var defaultHandlers = require('./defaultHandlers.cjs');
+var defaultEquals = require('../defaultEquals.cjs');
+var index = require('../cache/index.cjs');
+var error = require('./error.cjs');
+
+function createBaseRequest(baseOptions) {
+    var baseURL = Object(baseOptions).baseURL;
+    // 创建新的 Axios 实例
+    var instance = axios.create({
+        baseURL: baseURL,
+        withCredentials: true,
+    });
+    return function createRequest(requestOptions, createOptions) {
+        var _a = tslib_es6_js.__assign({}, requestOptions), method = _a.method, url = _a.url;
+        var _b = tslib_es6_js.__assign(tslib_es6_js.__assign({}, baseOptions), createOptions), baseURL = _b.baseURL, _c = _b.cacheDataKey, cacheDataKey = _c === void 0 ? "".concat(method, ":").concat(baseURL).concat(url) : _c, cacheDataInStorage = _b.cacheDataInStorage, _d = _b.cacheKeyEquals, cacheKeyEquals = _d === void 0 ? defaultEquals : _d, cacheTime = _b.cacheTime, _e = _b.indexDBName, indexDBName = _e === void 0 ? '__apiCacheDatabase__' : _e;
+        var cache = new index.default(cacheDataInStorage, cacheDataKey, cacheTime, indexDBName, cacheKeyEquals);
+        function request(requestParam, options) {
+            var _a = tslib_es6_js.__assign(tslib_es6_js.__assign({}, requestOptions), requestParam), method = _a.method, url = _a.url, _b = _a.data, data = _b === void 0 ? {} : _b, _c = _a.params, params = _c === void 0 ? {} : _c;
+            var _d = tslib_es6_js.__assign(tslib_es6_js.__assign(tslib_es6_js.__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _d === void 0 ? alert : _d;
+            var _e = tslib_es6_js.__assign(tslib_es6_js.__assign(tslib_es6_js.__assign({}, baseOptions), createOptions), options), baseURL = _e.baseURL, _f = _e.enableCache, enableCache = _f === void 0 ? false : _f, _g = _e.cacheData, cacheData = _g === void 0 ? false : _g, _h = _e.defaultErrorCodeHandler, defaultErrorCodeHandler = _h === void 0 ? defaultHandlers._defaultErrorCodeHandler.bind(null, defaultMessageShower) : _h, _j = _e.defaultHttpErrorCodeHandler, defaultHttpErrorCodeHandler = _j === void 0 ? defaultHandlers._defaultHttpErrorCodeHandler.bind(null, defaultMessageShower) : _j, _k = _e.otherErrorHandler, otherErrorHandler = _k === void 0 ? defaultHandlers._defaultOtherErrorCodeHandler.bind(null, defaultMessageShower) : _k, _l = _e.errorCodePath, errorCodePath = _l === void 0 ? 'code' : _l, _m = _e.cacheTime, cacheTime = _m === void 0 ? 60 : _m, _o = _e.errorCodeMap, errorCodeMap = _o === void 0 ? {} : _o, _p = _e.successCodes, successCodes = _p === void 0 ? ['0', '200'] : _p, _q = _e.httpErrorCodeMap, httpErrorCodeMap = _q === void 0 ? {} : _q, _r = _e.axiosOptions, axiosOptions = _r === void 0 ? {} : _r, _s = _e.throwError, throwError = _s === void 0 ? true : _s;
+            if (enableCache) {
+                var cacheItem = cache.getCache(params);
+                if (cacheItem) {
+                    return Promise.resolve(cacheItem);
+                }
+            }
+            return instance
+                .request(tslib_es6_js.__assign({ method: method, url: url, data: data, params: params, baseURL: baseURL }, axiosOptions))
+                .then(function (res) {
+                var errorCode = String(lodash.at(res.data, errorCodePath));
+                if (successCodes.includes(errorCode)) {
+                    if (cacheData) {
+                        cache.setCache(params, res.data, { cacheTime: cacheTime });
+                    }
+                    return res.data;
+                }
+                var _a = errorCodeMap, _b = errorCode, _c = _a[_b], customHandler = _c === void 0 ? defaultErrorCodeHandler : _c;
+                var err = new error('服务端错误', 'server', res);
+                if (typeof customHandler === 'string') {
+                    defaultMessageShower(customHandler);
+                }
+                else {
+                    var _d = (Object(customHandler(errorCode, res.data, res, tslib_es6_js.__assign(tslib_es6_js.__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? res.data : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
+                    res.data = replaceResData;
+                    switch (handlerThrowError) {
+                        case true:
+                            throw err;
+                        case false:
+                            return res.data;
+                    }
+                }
+                if (throwError) {
+                    throw err;
+                }
+                return res.data;
+            }, function (error$1) {
+                if (error$1.response) {
+                    // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
+                    var resData = error$1;
+                    var _a = httpErrorCodeMap, _b = error$1.response.status, _c = _a[_b], customHandler = _c === void 0 ? defaultHttpErrorCodeHandler : _c;
+                    var err = new error('服务端错误', 'http', error$1);
+                    if (typeof customHandler === 'string') {
+                        defaultMessageShower(customHandler);
+                    }
+                    else {
+                        var _d = (Object(customHandler(error$1.response.status, error$1, tslib_es6_js.__assign(tslib_es6_js.__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? error$1 : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
+                        resData = replaceResData;
+                        switch (handlerThrowError) {
+                            case true:
+                                throw err;
+                            case false:
+                                return resData;
+                        }
+                    }
+                    if (throwError) {
+                        throw err;
+                    }
+                    return resData;
+                }
+                else {
+                    var resData = error$1;
+                    var err = new error('服务端错误', 'http', error$1);
+                    err.type = 'http';
+                    err.data = error$1;
+                    var _g = (Object(otherErrorHandler(error$1))), _h = _g.replaceResData, replaceResData = _h === void 0 ? error$1 : _h, _j = _g.throwError, handlerThrowError = _j === void 0 ? 'default' : _j;
+                    resData = replaceResData;
+                    switch (handlerThrowError) {
+                        case true:
+                            throw err;
+                        case false:
+                            return resData;
+                    }
+                    if (throwError) {
+                        throw err;
+                    }
+                    return resData;
+                }
+            });
+        }
+        request.clearCache = function () {
+            cache.clear();
+        };
+        return request;
+    };
 }
-declare function createBaseRequest(baseOptions?: Options): <Param, Data extends Record<any, any>>(requestOptions: RequestOptions<Param>, createOptions?: Omit<Options<Param, Data>, "baseURL">) => {
-    (requestParam?: Omit<RequestOptions<Param>, "url" | "method">, options?: Omit<Options<Param, Data>, "baseURL" | "cacheDataKey" | "cacheDataInStorage" | "cacheKeyEquals">): Promise<Data>;
-    clearCache(): void;
-};
 
-export { createBaseRequest as default };
-export type { ErrorHandlerReturnType, Options, RequestOptions };
+module.exports = createBaseRequest;

package/dist/es/cache/index.mjs

@@ -1,31 +1,121 @@
+import { __awaiter, __generator, __assign } from 'C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js';
+import moment from 'moment';
 import { IndexedDBStorage } from './indexDB.mjs';
+import defaultEquals from '../defaultEquals.mjs';
 
-type StorageType = 'sessionStorage' | 'localStorage' | 'indexedDB';
-interface ICache<Param, Data> {
-    params: Param;
-    data: Data;
-    expireTime: string;
-}
-interface ICacheOptions<Param> {
-    storageType?: StorageType;
-    cacheKey?: string;
-    cacheTime?: number;
-    cacheKeyEquals: (prev: Param, next: Param) => boolean;
-    indexDBName?: string;
-}
-declare const StorageMap: Record<StorageType | string, Storage>;
-declare class Cache<Param, Data> {
-    cache: ICache<Param, Data>[];
-    private cacheOptions;
-    storage?: Storage | IndexedDBStorage;
-    constructor(cacheType?: StorageType, cacheKey?: string, cacheTime?: number, indexDBName?: string, cacheKeyEquals?: (prev: Param, next: Param) => boolean);
-    private _init;
-    private _filterExpired;
-    private _saveToStorage;
-    setCache(params: Param, data: Data, cacheOptions?: Omit<ICacheOptions<Param>, 'storageType' | 'cacheKey' | 'cacheKeyEquals'>): void;
-    getCache(params: Param): Data;
-    clear(): void;
-}
+var StorageMap = {
+    localStorage: localStorage,
+    sessionStorage: sessionStorage,
+};
+var Cache = /** @class */ (function () {
+    function Cache(cacheType, cacheKey, cacheTime, indexDBName, cacheKeyEquals) {
+        if (indexDBName === void 0) { indexDBName = '__apiCacheDatabase__'; }
+        if (cacheKeyEquals === void 0) { cacheKeyEquals = defaultEquals; }
+        this.cache = [];
+        this.cacheOptions = {
+            storageType: cacheType,
+            cacheKey: cacheKey,
+            cacheTime: cacheTime,
+            indexDBName: indexDBName,
+            cacheKeyEquals: cacheKeyEquals,
+        };
+        if (cacheType === 'indexedDB') {
+            this.storage = new IndexedDBStorage(indexDBName, 'cacheStore');
+        }
+        else if (typeof cacheType === 'string') {
+            this.storage = StorageMap[cacheType];
+        }
+        this._init();
+    }
+    Cache.prototype._init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, cacheType, cacheKey, _b, _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        _a = this.cacheOptions, cacheType = _a.storageType, cacheKey = _a.cacheKey;
+                        if (!(this.storage instanceof IndexedDBStorage)) return [3 /*break*/, 2];
+                        _b = this;
+                        _d = (_c = JSON).parse;
+                        return [4 /*yield*/, this.storage.getItem(cacheKey)];
+                    case 1:
+                        _b.cache = _d.apply(_c, [(_e.sent()) || '[]']);
+                        return [3 /*break*/, 3];
+                    case 2:
+                        if (this.storage instanceof Storage) {
+                            this.storage = StorageMap[cacheType];
+                            if (this.storage) {
+                                if (typeof cacheKey === 'string') {
+                                    try {
+                                        this.cache = JSON.parse(this.storage.getItem(cacheKey) || '[]');
+                                    }
+                                    catch (e) {
+                                        this.cache = [];
+                                        console.error("\u7F13\u5B58\u6570\u636E\u89E3\u6790\u5931\u8D25\uFF0Ckey:".concat(cacheKey));
+                                    }
+                                }
+                            }
+                        }
+                        _e.label = 3;
+                    case 3:
+                        this._filterExpired();
+                        this._saveToStorage();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Cache.prototype._filterExpired = function () {
+        var newCache = this.cache.filter(function (item) {
+            return moment(item.expireTime).isAfter(moment());
+        });
+        this.cache = newCache;
+    };
+    Cache.prototype._saveToStorage = function () {
+        if (this.storage) {
+            if (typeof this.cacheOptions.cacheKey === 'string') {
+                this.storage.setItem(this.cacheOptions.cacheKey, JSON.stringify(this.cache));
+            }
+        }
+    };
+    Cache.prototype.setCache = function (params, data, cacheOptions) {
+        var _a = __assign(__assign({}, this.cacheOptions), cacheOptions), cacheTime = _a.cacheTime, _b = _a.cacheKeyEquals, cacheKeyEquals = _b === void 0 ? defaultEquals : _b;
+        var cacheItemIndex = this.cache.findIndex(function (item) {
+            return cacheKeyEquals(item.params, params);
+        });
+        if (cacheItemIndex > -1) {
+            this.cache.splice(cacheItemIndex, 1);
+        }
+        this.cache.push({
+            params: params,
+            data: data,
+            expireTime: moment().add(cacheTime, 'seconds').toJSON(),
+        });
+        this._saveToStorage();
+    };
+    Cache.prototype.getCache = function (params) {
+        var _this = this;
+        // debugger;
+        var itemIndex = this.cache.findIndex(function (item) {
+            return _this.cacheOptions.cacheKeyEquals(item.params, params);
+        });
+        var item = this.cache[itemIndex];
+        if (item) {
+            if (moment(item.expireTime).isAfter(moment())) {
+                return item.data;
+            }
+            else {
+                this.cache.splice(itemIndex, 1);
+                this._saveToStorage();
+            }
+        }
+        return null;
+    };
+    Cache.prototype.clear = function () {
+        this.cache = [];
+        this._saveToStorage();
+    };
+    return Cache;
+}());
 
 export { StorageMap, Cache as default };
-export type { ICache, ICacheOptions, StorageType };

package/dist/es/cache/indexDB.mjs

@@ -1,12 +1,65 @@
-declare class IndexedDBStorage {
-    private dbName;
-    private storeName;
-    private db;
-    constructor(dbName: string, storeName: string);
-    private _open;
-    private _getStore;
-    setItem<T>(key: string, value: T): Promise<void>;
-    getItem<T = any>(key: string): Promise<T>;
-}
+// IndexedDB的简易封装类
+var IndexedDBStorage = /** @class */ (function () {
+    function IndexedDBStorage(dbName, storeName) {
+        this.db = null;
+        this.dbName = dbName;
+        this.storeName = storeName;
+    }
+    // 打开数据库连接
+    IndexedDBStorage.prototype._open = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            if (_this.db) {
+                resolve(_this.db);
+                return;
+            }
+            var request = indexedDB.open(_this.dbName);
+            request.onupgradeneeded = function (event) {
+                var db = event.target.result;
+                db.createObjectStore(_this.storeName, { keyPath: 'key' });
+            };
+            request.onerror = function () {
+                var _a;
+                reject("IndexedDB open request error: ".concat((_a = request.error) === null || _a === void 0 ? void 0 : _a.message));
+            };
+            request.onsuccess = function (event) {
+                _this.db = event.target.result;
+                resolve(_this.db);
+            };
+        });
+    };
+    // 获取存储对象
+    IndexedDBStorage.prototype._getStore = function (mode) {
+        var _this = this;
+        if (mode === void 0) { mode = 'readonly'; }
+        return this._open().then(function (db) {
+            var transaction = db.transaction(_this.storeName, mode);
+            return transaction.objectStore(_this.storeName);
+        });
+    };
+    // 设置键值对
+    IndexedDBStorage.prototype.setItem = function (key, value) {
+        return this._getStore('readwrite').then(function (store) {
+            return new Promise(function (resolve, reject) {
+                var request = store.put({ key: key, value: value });
+                request.onsuccess = function () { return resolve(); };
+                request.onerror = function () { var _a; return reject("Could not set the item: ".concat((_a = request.error) === null || _a === void 0 ? void 0 : _a.message)); };
+            });
+        });
+    };
+    // 获取键对应的值
+    IndexedDBStorage.prototype.getItem = function (key) {
+        return this._getStore().then(function (store) {
+            return new Promise(function (resolve, reject) {
+                var request = store.get(key);
+                request.onsuccess = function () {
+                    return resolve(request.result ? request.result.value : undefined);
+                };
+                request.onerror = function () { var _a; return reject("Could not get the item: ".concat((_a = request.error) === null || _a === void 0 ? void 0 : _a.message)); };
+            });
+        });
+    };
+    return IndexedDBStorage;
+}());
 
 export { IndexedDBStorage };

package/dist/es/createStateStore/index.mjs

@@ -1,14 +1,56 @@
-type IHookStateInitialSetter<S> = () => S;
-type IHookStateInitAction<S> = S | IHookStateInitialSetter<S>;
-type IHookStateSetter<S> = ((prevState: S) => S) | (() => S);
-type IHookStateSetAction<S> = S | IHookStateSetter<S>;
-type IHookStateResolvable<S> = S | IHookStateInitialSetter<S> | IHookStateSetter<S>;
-declare function createStateStore<S>(initialState?: S): {
-    use: () => [S, (state: IHookStateSetAction<S>) => void];
-    get: () => S;
-    set: (state: IHookStateSetAction<S>) => void;
-    watch: (callback: (state: S) => S | void) => () => void;
+import { useState, useLayoutEffect, useEffect } from 'react';
+
+function resolveHookState(nextState, currentState) {
+    if (typeof nextState === 'function') {
+        return nextState.length
+            ? nextState(currentState)
+            : nextState();
+    }
+    return nextState;
+}
+var isBrowser = typeof window !== 'undefined';
+var useEffectOnce = function (effect) {
+    useEffect(effect, []);
 };
+var useIsomorphicLayoutEffect = isBrowser ? useLayoutEffect : useEffect;
+function createStateStore(initialState) {
+    var store = {
+        state: initialState instanceof Function ? initialState() : initialState,
+        setState: function (nextState) {
+            store.state = resolveHookState(nextState, store.state);
+            store.setters.forEach(function (setter) { return setter(store.state); });
+            store.watchers.forEach(function (watcher) { return watcher(store.state); });
+        },
+        setters: [],
+        watchers: [],
+    };
+    var use = function () {
+        var _a = useState(store.state), globalState = _a[0], stateSetter = _a[1];
+        useEffectOnce(function () { return function () {
+            store.setters = store.setters.filter(function (setter) { return setter !== stateSetter; });
+        }; });
+        useIsomorphicLayoutEffect(function () {
+            if (!store.setters.includes(stateSetter)) {
+                store.setters.push(stateSetter);
+            }
+        });
+        return [globalState, store.setState];
+    };
+    var get = function () { return store.state; };
+    var set = store.setState;
+    var watch = function (callback) {
+        store.watchers.push(callback);
+        var close = function () {
+            store.watchers = store.watchers.filter(function (watcher) { return watcher !== callback; });
+        };
+        return close;
+    };
+    return {
+        use: use,
+        get: get,
+        set: set,
+        watch: watch,
+    };
+}
 
-export { createStateStore as default };
-export type { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter };
+export { createStateStore as default, resolveHookState };

package/dist/es/defaultEquals.mjs

@@ -0,0 +1,5 @@
+function defaultEquals(prev, next) {
+    return JSON.stringify(prev) === JSON.stringify(next);
+}
+
+export { defaultEquals as default };

package/dist/es/index.mjs

@@ -1,3 +1,3 @@
-export { default as Cache, ICache, ICacheOptions, StorageMap, StorageType } from './cache/index.mjs';
-export { ErrorHandlerReturnType, Options, RequestOptions, default as createBaseRequest } from './request/index.mjs';
-export { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter, default as createStateStore } from './createStateStore/index.mjs';
+export { default as Cache } from './cache/index.mjs';
+export { default as createBaseRequest } from './request/index.mjs';
+export { default as createStateStore } from './createStateStore/index.mjs';

package/dist/es/request/defaultHandlers.mjs

@@ -0,0 +1,11 @@
+function _defaultErrorCodeHandler(defaultMessageShower, code) {
+    defaultMessageShower("\u8BF7\u6C42\u51FA\u9519\uFF0C\u9519\u8BEF\u7801\uFF1A".concat(code, "\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5"));
+}
+function _defaultHttpErrorCodeHandler(defaultMessageShower, code) {
+    defaultMessageShower("\u670D\u52A1\u7AEF\u8BF7\u6C42\u51FA\u9519\uFF0CHttp\u9519\u8BEF\u7801\uFF1A".concat(String(code), "\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5"));
+}
+function _defaultOtherErrorCodeHandler(defaultMessageShower, error) {
+    defaultMessageShower("\u672A\u77E5\u8BF7\u6C42\u51FA\u9519\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5");
+}
+
+export { _defaultErrorCodeHandler, _defaultHttpErrorCodeHandler, _defaultOtherErrorCodeHandler };

package/dist/es/request/error.mjs

@@ -0,0 +1,15 @@
+import { __extends } from 'C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js';
+
+var RequestError = /** @class */ (function (_super) {
+    __extends(RequestError, _super);
+    function RequestError(message, type, data) {
+        var _this = _super.call(this, message) || this;
+        _this.name = 'RequestError';
+        _this.type = type;
+        _this.data = data;
+        return _this;
+    }
+    return RequestError;
+}(Error));
+
+export { RequestError as default };

package/dist/es/request/index.mjs

@@ -1,40 +1,110 @@
-import { AxiosResponse, Method, AxiosRequestConfig } from 'axios';
-import { StorageType } from '../cache/index.mjs';
+import { __assign } from 'C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js';
+import axios from 'axios';
+import { at } from 'lodash';
+import { _defaultErrorCodeHandler, _defaultHttpErrorCodeHandler, _defaultOtherErrorCodeHandler } from './defaultHandlers.mjs';
+import defaultEquals from '../defaultEquals.mjs';
+import Cache from '../cache/index.mjs';
+import RequestError from './error.mjs';
 
-type ErrorHandlerReturnType<D> = {
-    replaceResData?: D;
-    throwError?: boolean | 'default';
-};
-interface Options<Params = any, Data = any> {
-    baseURL?: string;
-    throwError?: boolean;
-    defaultMessageShower?: (message: string) => void;
-    enableCache?: boolean;
-    cacheKeyEquals?: (prev: Params, next: Params) => boolean;
-    cacheData?: boolean;
-    cacheTime?: number;
-    cacheDataInStorage?: StorageType;
-    cacheDataKey?: string;
-    indexDBName?: string;
-    errorCodePath?: string;
-    errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
-    defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => ErrorHandlerReturnType<Data> | void;
-    successCodes?: string[];
-    httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
-    defaultHttpErrorCodeHandler?: (code: number, error: any) => ErrorHandlerReturnType<Data> | void;
-    otherErrorHandler?: (error: any) => ErrorHandlerReturnType<Data> | void;
-    axiosOptions?: Omit<AxiosRequestConfig<Params>, 'method' | 'url' | 'params' | 'data'>;
+function createBaseRequest(baseOptions) {
+    var baseURL = Object(baseOptions).baseURL;
+    // 创建新的 Axios 实例
+    var instance = axios.create({
+        baseURL: baseURL,
+        withCredentials: true,
+    });
+    return function createRequest(requestOptions, createOptions) {
+        var _a = __assign({}, requestOptions), method = _a.method, url = _a.url;
+        var _b = __assign(__assign({}, baseOptions), createOptions), baseURL = _b.baseURL, _c = _b.cacheDataKey, cacheDataKey = _c === void 0 ? "".concat(method, ":").concat(baseURL).concat(url) : _c, cacheDataInStorage = _b.cacheDataInStorage, _d = _b.cacheKeyEquals, cacheKeyEquals = _d === void 0 ? defaultEquals : _d, cacheTime = _b.cacheTime, _e = _b.indexDBName, indexDBName = _e === void 0 ? '__apiCacheDatabase__' : _e;
+        var cache = new Cache(cacheDataInStorage, cacheDataKey, cacheTime, indexDBName, cacheKeyEquals);
+        function request(requestParam, options) {
+            var _a = __assign(__assign({}, requestOptions), requestParam), method = _a.method, url = _a.url, _b = _a.data, data = _b === void 0 ? {} : _b, _c = _a.params, params = _c === void 0 ? {} : _c;
+            var _d = __assign(__assign(__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _d === void 0 ? alert : _d;
+            var _e = __assign(__assign(__assign({}, baseOptions), createOptions), options), baseURL = _e.baseURL, _f = _e.enableCache, enableCache = _f === void 0 ? false : _f, _g = _e.cacheData, cacheData = _g === void 0 ? false : _g, _h = _e.defaultErrorCodeHandler, defaultErrorCodeHandler = _h === void 0 ? _defaultErrorCodeHandler.bind(null, defaultMessageShower) : _h, _j = _e.defaultHttpErrorCodeHandler, defaultHttpErrorCodeHandler = _j === void 0 ? _defaultHttpErrorCodeHandler.bind(null, defaultMessageShower) : _j, _k = _e.otherErrorHandler, otherErrorHandler = _k === void 0 ? _defaultOtherErrorCodeHandler.bind(null, defaultMessageShower) : _k, _l = _e.errorCodePath, errorCodePath = _l === void 0 ? 'code' : _l, _m = _e.cacheTime, cacheTime = _m === void 0 ? 60 : _m, _o = _e.errorCodeMap, errorCodeMap = _o === void 0 ? {} : _o, _p = _e.successCodes, successCodes = _p === void 0 ? ['0', '200'] : _p, _q = _e.httpErrorCodeMap, httpErrorCodeMap = _q === void 0 ? {} : _q, _r = _e.axiosOptions, axiosOptions = _r === void 0 ? {} : _r, _s = _e.throwError, throwError = _s === void 0 ? true : _s;
+            if (enableCache) {
+                var cacheItem = cache.getCache(params);
+                if (cacheItem) {
+                    return Promise.resolve(cacheItem);
+                }
+            }
+            return instance
+                .request(__assign({ method: method, url: url, data: data, params: params, baseURL: baseURL }, axiosOptions))
+                .then(function (res) {
+                var errorCode = String(at(res.data, errorCodePath));
+                if (successCodes.includes(errorCode)) {
+                    if (cacheData) {
+                        cache.setCache(params, res.data, { cacheTime: cacheTime });
+                    }
+                    return res.data;
+                }
+                var _a = errorCodeMap, _b = errorCode, _c = _a[_b], customHandler = _c === void 0 ? defaultErrorCodeHandler : _c;
+                var err = new RequestError('服务端错误', 'server', res);
+                if (typeof customHandler === 'string') {
+                    defaultMessageShower(customHandler);
+                }
+                else {
+                    var _d = (Object(customHandler(errorCode, res.data, res, __assign(__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? res.data : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
+                    res.data = replaceResData;
+                    switch (handlerThrowError) {
+                        case true:
+                            throw err;
+                        case false:
+                            return res.data;
+                    }
+                }
+                if (throwError) {
+                    throw err;
+                }
+                return res.data;
+            }, function (error) {
+                if (error.response) {
+                    // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
+                    var resData = error;
+                    var _a = httpErrorCodeMap, _b = error.response.status, _c = _a[_b], customHandler = _c === void 0 ? defaultHttpErrorCodeHandler : _c;
+                    var err = new RequestError('服务端错误', 'http', error);
+                    if (typeof customHandler === 'string') {
+                        defaultMessageShower(customHandler);
+                    }
+                    else {
+                        var _d = (Object(customHandler(error.response.status, error, __assign(__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? error : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
+                        resData = replaceResData;
+                        switch (handlerThrowError) {
+                            case true:
+                                throw err;
+                            case false:
+                                return resData;
+                        }
+                    }
+                    if (throwError) {
+                        throw err;
+                    }
+                    return resData;
+                }
+                else {
+                    var resData = error;
+                    var err = new RequestError('服务端错误', 'http', error);
+                    err.type = 'http';
+                    err.data = error;
+                    var _g = (Object(otherErrorHandler(error))), _h = _g.replaceResData, replaceResData = _h === void 0 ? error : _h, _j = _g.throwError, handlerThrowError = _j === void 0 ? 'default' : _j;
+                    resData = replaceResData;
+                    switch (handlerThrowError) {
+                        case true:
+                            throw err;
+                        case false:
+                            return resData;
+                    }
+                    if (throwError) {
+                        throw err;
+                    }
+                    return resData;
+                }
+            });
+        }
+        request.clearCache = function () {
+            cache.clear();
+        };
+        return request;
+    };
 }
-interface RequestOptions<Param> {
-    method: Method;
-    url: string;
-    data?: Param;
-    params?: Param;
-}
-declare function createBaseRequest(baseOptions?: Options): <Param, Data extends Record<any, any>>(requestOptions: RequestOptions<Param>, createOptions?: Omit<Options<Param, Data>, "baseURL">) => {
-    (requestParam?: Omit<RequestOptions<Param>, "url" | "method">, options?: Omit<Options<Param, Data>, "baseURL" | "cacheDataKey" | "cacheDataInStorage" | "cacheKeyEquals">): Promise<Data>;
-    clearCache(): void;
-};
 
 export { createBaseRequest as default };
-export type { ErrorHandlerReturnType, Options, RequestOptions };

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export { default as Cache, ICache, ICacheOptions, StorageMap, StorageType } from './cache/index.js';
 export { ErrorHandlerReturnType, Options, RequestOptions, default as createBaseRequest } from './request/index.js';
 export { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter, default as createStateStore } from './createStateStore/index.js';
+export { default as RequestError, RequestErrorType } from './request/error.js';

package/dist/types/request/error.d.ts

@@ -0,0 +1,10 @@
+type RequestErrorType = 'server' | 'http';
+declare class RequestError<Data = any> extends Error {
+    code: string;
+    type: RequestErrorType;
+    data?: Data;
+    constructor(message: string, type: RequestErrorType, data?: Data);
+}
+
+export { RequestError as default };
+export type { RequestErrorType };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxtutils",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "dist/cjs/index.cjs",
   "module": "dist/es/index.mjs",
   "types": "dist/types/index.d.ts",
@@ -13,9 +13,11 @@
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^12.1.2",
+    "@types/lodash": "^4.17.17",
     "@types/node": "^22.15.29",
     "rollup": "^4.41.1",
     "rollup-plugin-dts": "^6.2.1",
+    "tslib": "^2.8.1",
     "typescript": "^5.8.3",
     "vite": "^5.4.19"
   },