@pisell/core 1.0.52 → 1.0.54

package/es/logger/index.js

@@ -308,18 +308,16 @@ var LoggerManager = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              // 每次上传日志时，检查下IndexDB是否有日志，如果有则上传到AWS
-              this.uploadIndexDBLog();
               if (!(this.logBuffer.length === 0 || !this.db)) {
-                _context4.next = 3;
+                _context4.next = 2;
                 break;
               }
               return _context4.abrupt("return");
-            case 3:
-              _context4.prev = 3;
-              _context4.next = 6;
+            case 2:
+              _context4.prev = 2;
+              _context4.next = 5;
               return this.createAWSFileName(urgent);
-            case 6:
+            case 5:
               fileName = _context4.sent;
               console.log("-------- 存储日志到AWS 开始", fileName);
 
@@ -333,13 +331,13 @@ var LoggerManager = /*#__PURE__*/function () {
                 return item.logId;
               });
               logs = JSON.stringify(buffer, null, 2);
-              _context4.next = 13;
+              _context4.next = 12;
               return this.app.aws.upload({
                 Bucket: "",
                 Key: fileName,
                 Body: logs
               });
-            case 13:
+            case 12:
               this.addLog({
                 type: "info",
                 title: "存储日志到AWS 成功",
@@ -356,11 +354,11 @@ var LoggerManager = /*#__PURE__*/function () {
               this.logBuffer = this.logBuffer.filter(function (item) {
                 return !bufferIds.includes(item.logId);
               });
-              _context4.next = 31;
+              _context4.next = 30;
               break;
-            case 18:
-              _context4.prev = 18;
-              _context4.t0 = _context4["catch"](3);
+            case 17:
+              _context4.prev = 17;
+              _context4.t0 = _context4["catch"](2);
               console.error("存储日志上传AWS失败:", _context4.t0);
               this.addLog({
                 type: "info",
@@ -375,15 +373,15 @@ var LoggerManager = /*#__PURE__*/function () {
               });
 
               // 将日志存储到IndexDB
-              _context4.prev = 22;
-              _context4.next = 25;
+              _context4.prev = 21;
+              _context4.next = 24;
               return this.storeLogToIndexDB();
-            case 25:
-              _context4.next = 31;
+            case 24:
+              _context4.next = 30;
               break;
-            case 27:
-              _context4.prev = 27;
-              _context4.t1 = _context4["catch"](22);
+            case 26:
+              _context4.prev = 26;
+              _context4.t1 = _context4["catch"](21);
               this.sendFeishuNotification({
                 type: "error",
                 title: "将日志存储到IndexDB失败",
@@ -396,11 +394,11 @@ var LoggerManager = /*#__PURE__*/function () {
                 }
               });
               console.error("存储日志到IndexDB也失败:", _context4.t1);
-            case 31:
+            case 30:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[3, 18], [22, 27]]);
+        }, _callee4, this, [[2, 17], [21, 26]]);
       }));
       function storeLog(_x2) {
         return _storeLog.apply(this, arguments);
@@ -416,46 +414,60 @@ var LoggerManager = /*#__PURE__*/function () {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
+              this.addLog({
+                type: "info",
+                title: "准备将IndexDB中的日志上传到AWS"
+              });
               if (this.db) {
-                _context5.next = 3;
+                _context5.next = 4;
                 break;
               }
               return _context5.abrupt("return");
-            case 3:
-              _context5.next = 5;
+            case 4:
+              _context5.next = 6;
               return (_this$db = this.db) === null || _this$db === void 0 ? void 0 : _this$db.getAll("logs");
-            case 5:
+            case 6:
               logFile = _context5.sent;
               if (!(!logFile || (logFile === null || logFile === void 0 ? void 0 : logFile.length) === 0)) {
-                _context5.next = 8;
+                _context5.next = 9;
                 break;
               }
               return _context5.abrupt("return");
-            case 8:
-              _context5.next = 10;
+            case 9:
+              _context5.next = 11;
               return this.createAWSFileName(true);
-            case 10:
+            case 11:
               awsFileName = _context5.sent;
               logs = JSON.stringify(logFile, null, 2);
-              _context5.next = 14;
+              _context5.next = 15;
               return this.app.aws.upload({
                 Bucket: "",
                 Key: awsFileName,
                 Body: logs
               });
-            case 14:
+            case 15:
               console.log("-------- 存储日志到AWS 成功");
-              _context5.next = 17;
+              _context5.next = 18;
               return (_this$db2 = this.db) === null || _this$db2 === void 0 ? void 0 : _this$db2.clear("logs");
-            case 17:
+            case 18:
               console.log("-------- 清空IndexDB日志成功");
-              _context5.next = 24;
+              _context5.next = 25;
               break;
-            case 20:
-              _context5.prev = 20;
+            case 21:
+              _context5.prev = 21;
               _context5.t0 = _context5["catch"](0);
               console.log("-------- 存储日志到IndexDB 失败", _context5.t0);
-
+              this.addLog({
+                type: "info",
+                title: "存储IndexDB日志到AWS失败",
+                metadata: {
+                  error: {
+                    name: _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.name,
+                    message: _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message,
+                    stack: _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.stack
+                  }
+                }
+              });
               // this.sendFeishuNotification({
               //   type: "error",
               //   title: "存储IndexDB日志到AWS失败",
@@ -468,12 +480,11 @@ var LoggerManager = /*#__PURE__*/function () {
               //   },
               // });
               // 重新抛出错误，让外层 catch 能够捕获
-              throw _context5.t0;
-            case 24:
+            case 25:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 20]]);
+        }, _callee5, this, [[0, 21]]);
       }));
       function uploadIndexDBLog() {
         return _uploadIndexDBLog.apply(this, arguments);
@@ -558,63 +569,95 @@ var LoggerManager = /*#__PURE__*/function () {
               return _context7.abrupt("return");
             case 2:
               _context7.prev = 2;
-              _context7.next = 5;
+              this.addLog({
+                type: "info",
+                title: "准备清理旧日志，开始获取所有日志文件"
+              });
+
+              // 获取所有日志文件
+              _context7.next = 6;
               return this.getLogFiles();
-            case 5:
+            case 6:
               logFiles = _context7.sent;
+              this.addLog({
+                type: "info",
+                title: "获取旧日志成功",
+                metadata: {
+                  logFilesCount: logFiles === null || logFiles === void 0 ? void 0 : logFiles.length
+                }
+              });
+
               // 计算保留日志的截止日期
               cutoffDate = dayjs().subtract(this.retentionDays, "day").format("YYYY-MM-DD"); // 筛选出需要删除的日志文件
-              filesToDelete = logFiles.filter(function (file) {
+              filesToDelete = (logFiles || []).filter(function (file) {
                 return file.date < cutoffDate;
               });
               console.log("-------- \u6E05\u7406\u65E7\u65E5\u5FD7\uFF0C\u4FDD\u7559 ".concat(this.retentionDays, " \u5929\u5185\u7684\u65E5\u5FD7\uFF0C\u622A\u6B62\u65E5\u671F: ").concat(cutoffDate));
 
               // 删除旧日志文件
               _iterator = _createForOfIteratorHelper(filesToDelete);
-              _context7.prev = 10;
+              _context7.prev = 12;
               _iterator.s();
-            case 12:
+            case 14:
               if ((_step = _iterator.n()).done) {
-                _context7.next = 19;
+                _context7.next = 21;
                 break;
               }
               file = _step.value;
-              _context7.next = 16;
+              _context7.next = 18;
               return this.db.delete("logs", file.fileName);
-            case 16:
+            case 18:
               console.log("-------- \u5220\u9664\u65E7\u65E5\u5FD7\u6587\u4EF6: ".concat(file.fileName, ", \u65E5\u671F: ").concat(file.date));
-            case 17:
-              _context7.next = 12;
-              break;
             case 19:
-              _context7.next = 24;
+              _context7.next = 14;
               break;
             case 21:
-              _context7.prev = 21;
-              _context7.t0 = _context7["catch"](10);
+              _context7.next = 26;
+              break;
+            case 23:
+              _context7.prev = 23;
+              _context7.t0 = _context7["catch"](12);
               _iterator.e(_context7.t0);
-            case 24:
-              _context7.prev = 24;
+            case 26:
+              _context7.prev = 26;
               _iterator.f();
-              return _context7.finish(24);
-            case 27:
+              return _context7.finish(26);
+            case 29:
               if (filesToDelete.length > 0) {
                 console.log("-------- \u5171\u6E05\u7406 ".concat(filesToDelete.length, " \u4E2A\u65E7\u65E5\u5FD7\u6587\u4EF6"));
               }
+              this.addLog({
+                type: "info",
+                title: "清理旧日志成功",
+                metadata: {
+                  filesToDelete: filesToDelete
+                }
+              });
 
               // 清理完成后，将IndexDB中的日志上传到AWS
               this.uploadIndexDBLog();
-              _context7.next = 34;
+              _context7.next = 38;
               break;
-            case 31:
-              _context7.prev = 31;
+            case 34:
+              _context7.prev = 34;
               _context7.t1 = _context7["catch"](2);
+              this.addLog({
+                type: "error",
+                title: "清理旧日志失败！",
+                metadata: {
+                  error: {
+                    name: _context7.t1 === null || _context7.t1 === void 0 ? void 0 : _context7.t1.name,
+                    message: _context7.t1 === null || _context7.t1 === void 0 ? void 0 : _context7.t1.message,
+                    stack: _context7.t1 === null || _context7.t1 === void 0 ? void 0 : _context7.t1.stack
+                  }
+                }
+              });
               console.error("清理旧日志失败:", _context7.t1);
-            case 34:
+            case 38:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[2, 31], [10, 21, 24, 27]]);
+        }, _callee7, this, [[2, 34], [12, 23, 26, 29]]);
       }));
       function cleanupOldLogs() {
         return _cleanupOldLogs.apply(this, arguments);
@@ -647,9 +690,13 @@ var LoggerManager = /*#__PURE__*/function () {
             case 8:
               _context8.prev = 8;
               _context8.t0 = _context8["catch"](2);
+              this.addLog({
+                type: "error",
+                title: "获取本地日志文件列表失败"
+              });
               console.error("获取日志文件列表失败:", _context8.t0);
               return _context8.abrupt("return", []);
-            case 12:
+            case 13:
             case "end":
               return _context8.stop();
           }
@@ -776,9 +823,13 @@ var LoggerManager = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
+              this.addLog({
+                type: "info",
+                title: "manualCleanup 手动触发清理旧日志"
+              });
+              _context11.next = 3;
               return this.cleanupOldLogs();
-            case 2:
+            case 3:
             case "end":
               return _context11.stop();
           }

package/es/request/cache.js

@@ -295,12 +295,14 @@ var getIsCache = function getIsCache(config) {
 
   // 优先使用云端, 没网使用本地
   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 false;
+    // // 判断是否有网络, 有网络就使用接口
+    // if (getApp()?.getPlugin("network")?.connected) {
+    //   return false;
+    // }
+
+    // return true;
   }
   return true;
 };

package/lib/logger/index.js

@@ -211,7 +211,6 @@ var LoggerManager = class {
    */
   async storeLog(urgent) {
     var _a;
-    this.uploadIndexDBLog();
     if (this.logBuffer.length === 0 || !this.db) {
       return;
     }
@@ -272,6 +271,10 @@ var LoggerManager = class {
   async uploadIndexDBLog() {
     var _a, _b;
     try {
+      this.addLog({
+        type: "info",
+        title: "准备将IndexDB中的日志上传到AWS"
+      });
       if (!this.db) {
         return;
       }
@@ -287,7 +290,17 @@ var LoggerManager = class {
       console.log("-------- 清空IndexDB日志成功");
     } catch (error) {
       console.log("-------- 存储日志到IndexDB 失败", error);
-      throw error;
+      this.addLog({
+        type: "info",
+        title: "存储IndexDB日志到AWS失败",
+        metadata: {
+          error: {
+            name: error == null ? void 0 : error.name,
+            message: error == null ? void 0 : error.message,
+            stack: error == null ? void 0 : error.stack
+          }
+        }
+      });
     }
   }
   async storeLogToIndexDB() {
@@ -319,9 +332,20 @@ var LoggerManager = class {
       return;
     }
     try {
+      this.addLog({
+        type: "info",
+        title: "准备清理旧日志，开始获取所有日志文件"
+      });
       const logFiles = await this.getLogFiles();
+      this.addLog({
+        type: "info",
+        title: "获取旧日志成功",
+        metadata: {
+          logFilesCount: logFiles == null ? void 0 : logFiles.length
+        }
+      });
       const cutoffDate = (0, import_dayjs.default)().subtract(this.retentionDays, "day").format("YYYY-MM-DD");
-      const filesToDelete = logFiles.filter((file) => file.date < cutoffDate);
+      const filesToDelete = (logFiles || []).filter((file) => file.date < cutoffDate);
       console.log(`-------- 清理旧日志，保留 ${this.retentionDays} 天内的日志，截止日期: ${cutoffDate}`);
       for (const file of filesToDelete) {
         await this.db.delete("logs", file.fileName);
@@ -330,8 +354,26 @@ var LoggerManager = class {
       if (filesToDelete.length > 0) {
         console.log(`-------- 共清理 ${filesToDelete.length} 个旧日志文件`);
       }
+      this.addLog({
+        type: "info",
+        title: "清理旧日志成功",
+        metadata: {
+          filesToDelete
+        }
+      });
       this.uploadIndexDBLog();
     } catch (error) {
+      this.addLog({
+        type: "error",
+        title: "清理旧日志失败！",
+        metadata: {
+          error: {
+            name: error == null ? void 0 : error.name,
+            message: error == null ? void 0 : error.message,
+            stack: error == null ? void 0 : error.stack
+          }
+        }
+      });
       console.error("清理旧日志失败:", error);
     }
   }
@@ -346,6 +388,10 @@ var LoggerManager = class {
     try {
       return await this.db.getAll("logs");
     } catch (error) {
+      this.addLog({
+        type: "error",
+        title: "获取本地日志文件列表失败"
+      });
       console.error("获取日志文件列表失败:", error);
       return [];
     }
@@ -403,6 +449,10 @@ var LoggerManager = class {
    * 手动触发清理旧日志
    */
   async manualCleanup() {
+    this.addLog({
+      type: "info",
+      title: "manualCleanup 手动触发清理旧日志"
+    });
     await this.cleanupOldLogs();
   }
   /**

package/lib/request/cache.js

@@ -135,7 +135,6 @@ var setCacheData = (url, data, res, cache = {
   setCache(_key, res, cache);
 };
 var getIsCache = (config) => {
-  var _a, _b;
   if (!(config == null ? void 0 : config.cache) && !(config == null ? void 0 : config.useCache)) {
     return false;
   }
@@ -150,10 +149,7 @@ var getIsCache = (config) => {
     return true;
   }
   if (cache.mode === import_type.RequestModeENUM.REMOTE_LOCAL) {
-    if ((_b = (_a = (0, import_app.getApp)()) == null ? void 0 : _a.getPlugin("network")) == null ? void 0 : _b.connected) {
-      return false;
-    }
-    return true;
+    return false;
   }
   return true;
 };

package/package.json

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