@pisell/core 1.0.30 → 1.1.1

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, { 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/es/app/app.js

@@ -67,8 +67,6 @@ var App = /*#__PURE__*/function () {
     _defineProperty(this, "aws", void 0);
     // 任务管理
     _defineProperty(this, "tasksManager", void 0);
-    //  getPisellos
-    _defineProperty(this, "getPisellos", void 0);
     _defineProperty(this, "dbManager", null);
     _defineProperty(this, "constants", {
       channel: ""
@@ -89,7 +87,6 @@ var App = /*#__PURE__*/function () {
     this.tasksManager = new TasksManager(this);
     this.cmd = new CMD(this, options === null || options === void 0 ? void 0 : options.cmd);
     this.aws = new AWS(this, options === null || options === void 0 ? void 0 : options.aws);
-    this.getPisellos = options === null || options === void 0 ? void 0 : options.getPisellos;
     if (options !== null && options !== void 0 && options.constants) {
       this.constants = options.constants || {};
     }

package/es/indexDB/index.d.ts

@@ -72,10 +72,11 @@ declare class IndexDBManager {
      * 添加数据到指定的存储对象
      * @param {string} storeName - 存储对象名称
      * @param {T} data - 要添加的数据
+   * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T>} 添加的数据
      * @template T
      */
-    add<T>(storeName: string, data: T): Promise<T>;
+    add<T>(storeName: string, data: T, log?: boolean): Promise<T>;
     /**
      * 快速检查指定存储对象中的数据是否存在
      * @param {string} storeName - 存储对象名称
@@ -87,18 +88,20 @@ declare class IndexDBManager {
      * 获取指定存储对象中的数据
      * @param {string} storeName - 存储对象名称
      * @param {string|number} key - 数据主键
+     * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T|null>} 获取的数据，不存在则返回 null
      * @template T
      */
-    get<T>(storeName: string, key: string | number): Promise<T | null>;
+    get<T>(storeName: string, key: string | number, log?: boolean): Promise<T | null>;
     /**
      * 更新指定存储对象中的数据
      * @param {string} storeName - 存储对象名称
      * @param {T} data - 要更新的数据
+     * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T>} 更新后的数据
      * @template T
      */
-    update<T>(storeName: string, data: T): Promise<T>;
+    update<T>(storeName: string, data: T, log?: boolean): Promise<T>;
     /**
      * 删除指定存储对象中的数据
      * @param {string} storeName - 存储对象名称

package/es/indexDB/index.js

@@ -8,12 +8,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
 /**
  * IndexDB 管理器模块
  * 
  * 这个模块提供了对浏览器 IndexedDB 的简单封装，并在不支持 IndexedDB 的环境中
  * 自动降级使用 localStorage 作为备选存储方案。
  */
+
 /**
  * 数据库配置选项接口
  * @interface DBOptions
@@ -125,15 +127,16 @@ var IndexDBManager = /*#__PURE__*/function () {
      * 添加数据到指定的存储对象
      * @param {string} storeName - 存储对象名称
      * @param {T} data - 要添加的数据
+    * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T>} 添加的数据
      * @template T
      */
   }, {
     key: "add",
     value: (function () {
-      var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(storeName, data) {
+      var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(storeName, data, log) {
         var _this2 = this;
-        var _this$stores$find, key;
+        var _this$stores$find, key, uuid;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -147,8 +150,19 @@ var IndexDBManager = /*#__PURE__*/function () {
               this.app.storage.setStorage(key, JSON.stringify(data));
               return _context2.abrupt("return", data);
             case 4:
+              uuid = "[ IndexDB ] ADD: - ".concat(storeName, " - ").concat(dayjs().valueOf());
               return _context2.abrupt("return", new Promise(function (resolve, reject) {
                 if (!_this2.db) {
+                  if (log) {
+                    _this2.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '添加数据前',
+                        data: data
+                      }
+                    });
+                  }
                   reject(new Error('数据库未连接'));
                   return;
                 }
@@ -156,19 +170,75 @@ var IndexDBManager = /*#__PURE__*/function () {
                 var store = transaction.objectStore(storeName);
                 var request = store.add(data);
                 request.onsuccess = function () {
+                  if (log) {
+                    _this2.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '添加数据成功'
+                      }
+                    });
+                  }
                   return resolve(data);
                 };
                 request.onerror = function () {
+                  if (log) {
+                    _this2.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '添加数据失败'
+                      }
+                    });
+                  }
                   return reject(new Error('添加数据失败'));
                 };
+                transaction.oncomplete = function () {
+                  console.log('✅ 添加事务完成');
+                  if (log) {
+                    _this2.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '事务完成'
+                      }
+                    });
+                  }
+                  return;
+                };
+                transaction.onerror = function (e) {
+                  var _transaction$error;
+                  if (log) {
+                    _this2.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '事务错误'
+                      }
+                    });
+                  }
+                  return reject((_transaction$error = transaction.error) !== null && _transaction$error !== void 0 ? _transaction$error : new Error('事务错误'));
+                };
+                transaction.onabort = function (e) {
+                  if (log) {
+                    _this2.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '事务被中止'
+                      }
+                    });
+                  }
+                  return reject(new Error('事务被中止'));
+                };
               }));
-            case 5:
+            case 6:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
-      function add(_x, _x2) {
+      function add(_x, _x2, _x3) {
         return _add.apply(this, arguments);
       }
       return add;
@@ -217,7 +287,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function exists(_x3, _x4) {
+      function exists(_x4, _x5) {
         return _exists.apply(this, arguments);
       }
       return exists;
@@ -226,6 +296,7 @@ var IndexDBManager = /*#__PURE__*/function () {
      * 获取指定存储对象中的数据
      * @param {string} storeName - 存储对象名称
      * @param {string|number} key - 数据主键
+     * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T|null>} 获取的数据，不存在则返回 null
      * @template T
      */
@@ -233,14 +304,24 @@ var IndexDBManager = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: (function () {
-      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(storeName, key) {
+      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(storeName, key, log) {
         var _this4 = this;
-        var storageKey, data;
+        var uuid, storageKey, data;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              uuid = "[ IndexDB ] GET: - ".concat(storeName, " - ").concat(key, " - ").concat(dayjs().valueOf());
+              if (log) {
+                this.app.logger.addLog({
+                  type: 'info',
+                  title: uuid,
+                  metadata: {
+                    msg: '获取数据前'
+                  }
+                });
+              }
               if (this.useIndexDB) {
-                _context4.next = 5;
+                _context4.next = 7;
                 break;
               }
               storageKey = this.getStorageKey(storeName, key);
@@ -249,29 +330,101 @@ var IndexDBManager = /*#__PURE__*/function () {
                 data = JSON.parse(data);
               }
               return _context4.abrupt("return", data);
-            case 5:
+            case 7:
               return _context4.abrupt("return", new Promise(function (resolve, reject) {
                 if (!_this4.db) {
+                  if (log) {
+                    _this4.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '数据库未连接'
+                      }
+                    });
+                  }
                   reject(new Error('数据库未连接'));
                   return;
                 }
-                var transaction = _this4.db.transaction(storeName, 'readonly');
-                var store = transaction.objectStore(storeName);
-                var request = store.get(key);
-                request.onsuccess = function () {
-                  return resolve(request.result || null);
-                };
-                request.onerror = function () {
-                  return reject(new Error('获取数据失败'));
-                };
+                var resolved = false;
+                try {
+                  var transaction = _this4.db.transaction(storeName, 'readonly');
+                  var store = transaction.objectStore(storeName);
+                  var request = store.get(key);
+                  request.onsuccess = function () {
+                    var _request$result;
+                    resolved = true;
+                    if (log) {
+                      _this4.app.logger.addLog({
+                        type: 'info',
+                        title: uuid,
+                        metadata: {
+                          msg: '获取成功'
+                        }
+                      });
+                    }
+                    resolve((_request$result = request.result) !== null && _request$result !== void 0 ? _request$result : null);
+                  };
+                  request.onerror = function () {
+                    var _request$error;
+                    resolved = true;
+                    if (log) {
+                      _this4.app.logger.addLog({
+                        type: 'info',
+                        title: uuid,
+                        metadata: {
+                          msg: '获取失败'
+                        }
+                      });
+                    }
+                    reject((_request$error = request.error) !== null && _request$error !== void 0 ? _request$error : new Error('获取数据失败'));
+                  };
+                  transaction.onabort = function () {
+                    if (log) {
+                      _this4.app.logger.addLog({
+                        type: 'info',
+                        title: uuid,
+                        metadata: {
+                          msg: '事务被中止'
+                        }
+                      });
+                    }
+                    if (!resolved) reject(new Error('事务被中止'));
+                  };
+                  transaction.onerror = function (event) {
+                    if (log) {
+                      _this4.app.logger.addLog({
+                        type: 'info',
+                        title: uuid,
+                        metadata: {
+                          msg: "\u4E8B\u52A1\u9519\u8BEF: ".concat(event.target.error)
+                        }
+                      });
+                    }
+                    if (!resolved) reject(new Error("\u4E8B\u52A1\u9519\u8BEF: ".concat(event.target.error)));
+                  };
+                  transaction.oncomplete = function () {
+                    if (log) {
+                      _this4.app.logger.addLog({
+                        type: 'info',
+                        title: uuid,
+                        metadata: {
+                          msg: '事务完成'
+                        }
+                      });
+                    }
+                    // ✅ 事务顺利结束
+                  };
+                } catch (e) {
+                  reject(e);
+                }
               }));
-            case 6:
+            case 8:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function get(_x5, _x6) {
+      function get(_x6, _x7, _x8) {
         return _get.apply(this, arguments);
       }
       return get;
@@ -280,6 +433,7 @@ var IndexDBManager = /*#__PURE__*/function () {
      * 更新指定存储对象中的数据
      * @param {string} storeName - 存储对象名称
      * @param {T} data - 要更新的数据
+     * * @param {boolean} [log=true] - 是否记录日志
      * @returns {Promise<T>} 更新后的数据
      * @template T
      */
@@ -287,9 +441,9 @@ var IndexDBManager = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: (function () {
-      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(storeName, data) {
+      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(storeName, data, log) {
         var _this5 = this;
-        var _this$stores$find2, key;
+        var _this$stores$find2, key, uuid;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -303,28 +457,98 @@ var IndexDBManager = /*#__PURE__*/function () {
               this.app.storage.setStorage(key, JSON.stringify(data));
               return _context5.abrupt("return", data);
             case 4:
+              uuid = "[ IndexDB ] UPDATE: - ".concat(storeName, " - ").concat(dayjs().valueOf());
+              if (log) {
+                this.app.logger.addLog({
+                  type: 'info',
+                  title: uuid,
+                  metadata: {
+                    msg: '更新数据前',
+                    data: data
+                  }
+                });
+              }
               return _context5.abrupt("return", new Promise(function (resolve, reject) {
                 if (!_this5.db) {
+                  if (log) {
+                    _this5.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '数据库未连接'
+                      }
+                    });
+                  }
                   reject(new Error('数据库未连接'));
                   return;
                 }
-                var transaction = _this5.db.transaction(storeName, 'readwrite');
-                var store = transaction.objectStore(storeName);
-                var request = store.put(data);
-                request.onsuccess = function () {
-                  return resolve(data);
-                };
-                request.onerror = function () {
-                  return reject(new Error('更新数据失败'));
-                };
+                try {
+                  var transaction = _this5.db.transaction(storeName, 'readwrite');
+                  var store = transaction.objectStore(storeName);
+                  var request = store.put(data);
+                  request.onsuccess = function () {
+                    _this5.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '数据更新完成'
+                      }
+                    });
+                    return resolve(data);
+                  };
+                  request.onerror = function () {
+                    var _request$error2;
+                    _this5.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '数据更新失败'
+                      }
+                    });
+                    return reject((_request$error2 = request.error) !== null && _request$error2 !== void 0 ? _request$error2 : new Error('更新数据失败'));
+                  };
+                  transaction.oncomplete = function () {
+                    _this5.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '事务完成'
+                      }
+                    });
+                    return console.log('✅ 事务完成');
+                  };
+                  transaction.onabort = function (e) {
+                    _this5.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '事务被中止'
+                      }
+                    });
+                    return reject(new Error('事务被中止'));
+                  };
+                  transaction.onerror = function (e) {
+                    var _transaction$error2;
+                    _this5.app.logger.addLog({
+                      type: 'info',
+                      title: uuid,
+                      metadata: {
+                        msg: '事务错误'
+                      }
+                    });
+                    return reject((_transaction$error2 = transaction.error) !== null && _transaction$error2 !== void 0 ? _transaction$error2 : new Error('事务错误'));
+                  };
+                } catch (e) {
+                  reject(e);
+                }
               }));
-            case 5:
+            case 7:
             case "end":
               return _context5.stop();
           }
         }, _callee5, this);
       }));
-      function update(_x7, _x8) {
+      function update(_x9, _x10, _x11) {
         return _update.apply(this, arguments);
       }
       return update;
@@ -374,7 +598,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function _delete(_x9, _x10) {
+      function _delete(_x12, _x13) {
         return _delete2.apply(this, arguments);
       }
       return _delete;
@@ -443,7 +667,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee7, this);
       }));
-      function getByIndex(_x11, _x12, _x13) {
+      function getByIndex(_x14, _x15, _x16) {
         return _getByIndex.apply(this, arguments);
       }
       return getByIndex;
@@ -511,7 +735,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee8, this);
       }));
-      function existsByIndex(_x14, _x15, _x16) {
+      function existsByIndex(_x17, _x18, _x19) {
         return _existsByIndex.apply(this, arguments);
       }
       return existsByIndex;
@@ -580,7 +804,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function getAllByIndex(_x17, _x18, _x19) {
+      function getAllByIndex(_x20, _x21, _x22) {
         return _getAllByIndex.apply(this, arguments);
       }
       return getAllByIndex;
@@ -631,7 +855,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function count(_x20) {
+      function count(_x23) {
         return _count.apply(this, arguments);
       }
       return count;
@@ -685,7 +909,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function countByIndex(_x21, _x22, _x23) {
+      function countByIndex(_x24, _x25, _x26) {
         return _countByIndex.apply(this, arguments);
       }
       return countByIndex;
@@ -747,7 +971,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function getAll(_x24) {
+      function getAll(_x27) {
         return _getAll.apply(this, arguments);
       }
       return getAll;
@@ -805,7 +1029,7 @@ var IndexDBManager = /*#__PURE__*/function () {
           }
         }, _callee13, this);
       }));
-      function clear(_x25) {
+      function clear(_x28) {
         return _clear.apply(this, arguments);
       }
       return clear;

package/es/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: