@pisell/core 1.0.46 → 1.0.48

package/es/indexDB/index.js

@@ -326,17 +326,15 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 10:
                       _context3.prev = 10;
                       _context3.t0 = _context3["catch"](3);
-                      if (log) {
-                        _this4.app.logger.addLog({
-                          type: 'error',
-                          title: uuid,
-                          metadata: {
-                            msg: '添加数据失败',
-                            error: _context3.t0.message
-                          }
-                        });
-                      }
-                      throw new Error('添加数据失败');
+                      _this4.app.logger.addLog({
+                        type: 'error',
+                        title: uuid,
+                        metadata: {
+                          msg: '添加数据失败',
+                          error: _context3.t0.message
+                        }
+                      });
+                      throw new Error(_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message);
                     case 14:
                     case "end":
                       return _context3.stop();
@@ -611,17 +609,15 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 10:
                       _context9.prev = 10;
                       _context9.t0 = _context9["catch"](3);
-                      if (log) {
-                        _this7.app.logger.addLog({
-                          type: 'error',
-                          title: uuid,
-                          metadata: {
-                            msg: '数据更新失败',
-                            error: _context9.t0.message
-                          }
-                        });
-                      }
-                      throw new Error('更新数据失败');
+                      _this7.app.logger.addLog({
+                        type: 'error',
+                        title: uuid,
+                        metadata: {
+                          msg: '数据更新失败',
+                          error: _context9.t0.message
+                        }
+                      });
+                      throw new Error(_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message);
                     case 14:
                     case "end":
                       return _context9.stop();
@@ -1110,8 +1106,16 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 9:
                       _context23.prev = 9;
                       _context23.t0 = _context23["catch"](2);
-                      throw new Error('获取所有数据失败');
-                    case 12:
+                      _this14.app.logger.addLog({
+                        type: 'error',
+                        title: "[ IndexDB ] ERROR: - getAll(".concat(storeName, ")"),
+                        metadata: {
+                          msg: '获取所有数据失败',
+                          error: _context23.t0.message
+                        }
+                      });
+                      throw new Error(_context23.t0 === null || _context23.t0 === void 0 ? void 0 : _context23.t0.message);
+                    case 13:
                     case "end":
                       return _context23.stop();
                   }

package/es/logger/index.js

@@ -325,8 +325,9 @@ var LoggerManager = /*#__PURE__*/function () {
 
               // 将buffer中的metadata转换为对象
               buffer = (_this$logBuffer = this.logBuffer) === null || _this$logBuffer === void 0 ? void 0 : _this$logBuffer.map(function (item) {
-                item.metadata = JSON.parse(item.metadata || "{}");
-                return item;
+                return _objectSpread(_objectSpread({}, item || {}), {}, {
+                  metadata: JSON.parse(item.metadata || "{}")
+                });
               });
               bufferIds = buffer.map(function (item) {
                 return item.logId;
@@ -339,37 +340,54 @@ var LoggerManager = /*#__PURE__*/function () {
                 Body: logs
               });
             case 13:
+              this.addLog({
+                type: "info",
+                title: "存储日志到AWS 成功",
+                metadata: {
+                  fileName: fileName,
+                  '本地上传的ids': bufferIds,
+                  '实例下的ids': this.logBuffer.map(function (item) {
+                    return item.logId;
+                  })
+                }
+              });
               console.log("-------- 存储日志到AWS 成功");
               // 上传成功后需要清空缓冲区，避免重复上传
               this.logBuffer = this.logBuffer.filter(function (item) {
                 return !bufferIds.includes(item.logId);
               });
-              _context4.next = 29;
+              _context4.next = 31;
               break;
-            case 17:
-              _context4.prev = 17;
+            case 18:
+              _context4.prev = 18;
               _context4.t0 = _context4["catch"](3);
               console.error("存储日志上传AWS失败:", _context4.t0);
+              this.addLog({
+                type: "info",
+                title: "存储日志到AWS失败",
+                metadata: {
+                  error: {
+                    name: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.name,
+                    message: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message,
+                    stack: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.stack
+                  }
+                }
+              });
 
               // 将日志存储到IndexDB
-              _context4.prev = 20;
-              _context4.next = 23;
+              _context4.prev = 22;
+              _context4.next = 25;
               return this.storeLogToIndexDB();
-            case 23:
-              _context4.next = 29;
-              break;
             case 25:
-              _context4.prev = 25;
-              _context4.t1 = _context4["catch"](20);
+              _context4.next = 31;
+              break;
+            case 27:
+              _context4.prev = 27;
+              _context4.t1 = _context4["catch"](22);
               this.sendFeishuNotification({
                 type: "error",
-                title: "存储日志到AWS失败",
+                title: "将日志存储到IndexDB失败",
                 metadata: {
-                  error: {
-                    name: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.name,
-                    message: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message,
-                    stack: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.stack
-                  },
                   indexDBError: {
                     name: _context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.name,
                     message: _context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message,
@@ -378,11 +396,11 @@ var LoggerManager = /*#__PURE__*/function () {
                 }
               });
               console.error("存储日志到IndexDB也失败:", _context4.t1);
-            case 29:
+            case 31:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[3, 17], [20, 25]]);
+        }, _callee4, this, [[3, 18], [22, 27]]);
       }));
       function storeLog(_x2) {
         return _storeLog.apply(this, arguments);

package/es/request/cache.js

@@ -59,7 +59,7 @@ export var setCache = /*#__PURE__*/function () {
           }
           // 将数据存储至缓存池
           CACHES[key] = cacheData;
-          _context.next = 20;
+          _context.next = 23;
           break;
         case 6:
           if (!(cache.type === 'storage')) {
@@ -68,17 +68,17 @@ export var setCache = /*#__PURE__*/function () {
           }
           // 设置缓存
           storage.setStorage(key, JSON.stringify(cacheData));
-          _context.next = 20;
+          _context.next = 23;
           break;
         case 10:
           if (!(cache.type === 'indexDB')) {
-            _context.next = 20;
+            _context.next = 23;
             break;
           }
           // 设置缓存
           app = getApp();
           if (!app.dbManager) {
-            _context.next = 20;
+            _context.next = 23;
             break;
           }
           _context.next = 15;
@@ -86,16 +86,20 @@ export var setCache = /*#__PURE__*/function () {
         case 15:
           tasksData = _context.sent;
           if (tasksData) {
-            _context.next = 19;
+            _context.next = 21;
             break;
           }
           _context.next = 19;
           return app.dbManager.add('requests', cacheData);
         case 19:
-          app.dbManager.update('requests', cacheData);
-        case 20:
-          console.log('设置缓存成功', CACHES);
+          _context.next = 23;
+          break;
         case 21:
+          _context.next = 23;
+          return app.dbManager.update('requests', cacheData);
+        case 23:
+          console.log('设置缓存成功', CACHES);
+        case 24:
         case "end":
           return _context.stop();
       }

package/es/request/index.js

@@ -99,7 +99,8 @@ export var createRequest = function createRequest(props) {
           title: "[ Request ]: Complete - ".concat(requestId),
           metadata: {
             error: isError ? JSON.stringify(result) : '',
-            duration: "".concat((duration / 1000).toFixed(2), "s")
+            duration: "".concat((duration / 1000).toFixed(2), "s"),
+            url: url
           }
         });
       } catch (error) {}

package/es/tasks/index.d.ts

@@ -108,7 +108,7 @@ export declare class TasksManager {
      */
     getQueueStatus(module: string, queueId: string): {
         isRunning: boolean;
-        status: "completed" | "uncompleted";
+        status: "uncompleted" | "completed";
         progress: {
             total: number;
             completed: number;

package/lib/indexDB/index.js

@@ -220,14 +220,12 @@ var IndexDBManager = class _IndexDBManager {
           }
           return data;
         } catch (error) {
-          if (log) {
-            this.app.logger.addLog({
-              type: "error",
-              title: uuid,
-              metadata: { msg: "添加数据失败", error: error.message }
-            });
-          }
-          throw new Error("添加数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: uuid,
+            metadata: { msg: "添加数据失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `add(${storeName})`
@@ -344,14 +342,12 @@ var IndexDBManager = class _IndexDBManager {
           }
           return data;
         } catch (error) {
-          if (log) {
-            this.app.logger.addLog({
-              type: "error",
-              title: uuid,
-              metadata: { msg: "数据更新失败", error: error.message }
-            });
-          }
-          throw new Error("更新数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: uuid,
+            metadata: { msg: "数据更新失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `update(${storeName})`
@@ -550,7 +546,12 @@ var IndexDBManager = class _IndexDBManager {
           const results = await this.db.table(storeName).toArray();
           return results;
         } catch (error) {
-          throw new Error("获取所有数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: `[ IndexDB ] ERROR: - getAll(${storeName})`,
+            metadata: { msg: "获取所有数据失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `getAll(${storeName})`

package/lib/logger/index.js

@@ -219,28 +219,45 @@ var LoggerManager = class {
       const fileName = await this.createAWSFileName(urgent);
       console.log("-------- 存储日志到AWS 开始", fileName);
       const buffer = (_a = this.logBuffer) == null ? void 0 : _a.map((item) => {
-        item.metadata = JSON.parse(item.metadata || "{}");
-        return item;
+        return {
+          ...item || {},
+          metadata: JSON.parse(item.metadata || "{}")
+        };
       });
       const bufferIds = buffer.map((item) => item.logId);
       const logs = JSON.stringify(buffer, null, 2);
       await this.app.aws.upload({ Bucket: "", Key: fileName, Body: logs });
+      this.addLog({
+        type: "info",
+        title: "存储日志到AWS 成功",
+        metadata: {
+          fileName,
+          "本地上传的ids": bufferIds,
+          "实例下的ids": this.logBuffer.map((item) => item.logId)
+        }
+      });
       console.log("-------- 存储日志到AWS 成功");
       this.logBuffer = this.logBuffer.filter((item) => !bufferIds.includes(item.logId));
     } catch (error) {
       console.error("存储日志上传AWS失败:", error);
+      this.addLog({
+        type: "info",
+        title: "存储日志到AWS失败",
+        metadata: {
+          error: {
+            name: error == null ? void 0 : error.name,
+            message: error == null ? void 0 : error.message,
+            stack: error == null ? void 0 : error.stack
+          }
+        }
+      });
       try {
         await this.storeLogToIndexDB();
       } catch (indexDBError) {
         this.sendFeishuNotification({
           type: "error",
-          title: "存储日志到AWS失败",
+          title: "将日志存储到IndexDB失败",
           metadata: {
-            error: {
-              name: error == null ? void 0 : error.name,
-              message: error == null ? void 0 : error.message,
-              stack: error == null ? void 0 : error.stack
-            },
             indexDBError: {
               name: indexDBError == null ? void 0 : indexDBError.name,
               message: indexDBError == null ? void 0 : indexDBError.message,

package/lib/request/cache.js

@@ -66,8 +66,9 @@ var setCache = async (key, data, cache) => {
       let tasksData = await app.dbManager.get("requests", key);
       if (!tasksData) {
         await app.dbManager.add("requests", cacheData);
+      } else {
+        await app.dbManager.update("requests", cacheData);
       }
-      app.dbManager.update("requests", cacheData);
     }
   }
   console.log("设置缓存成功", CACHES);

package/lib/request/index.js

@@ -103,7 +103,8 @@ var createRequest = (props) => {
           title: `[ Request ]: Complete - ${requestId2}`,
           metadata: {
             error: isError ? JSON.stringify(result) : "",
-            duration: `${(duration / 1e3).toFixed(2)}s`
+            duration: `${(duration / 1e3).toFixed(2)}s`,
+            url: url2
           }
         });
       } catch (error) {

package/lib/tasks/index.d.ts

@@ -108,7 +108,7 @@ export declare class TasksManager {
      */
     getQueueStatus(module: string, queueId: string): {
         isRunning: boolean;
-        status: "completed" | "uncompleted";
+        status: "uncompleted" | "completed";
         progress: {
             total: number;
             completed: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",