agora-foundation 3.9.1 → 3.10.0-alpha

package/lib/logger/logger-impl.js

@@ -32,7 +32,7 @@ var LoggerImpl = exports.LoggerImpl = /*#__PURE__*/function () {
         var path = window.require('path');
         var _window$require = window.require('@electron/remote'),
           app = _window$require.app;
-        var logFolderPath = path.resolve(app.getPath('logs'), 'logs', this._label);
+        var logFolderPath = path.resolve(app.getPath('logs'), 'logs');
         var maxFiles = _opts.maxFiles || 5;
         var maxSize = _opts.maxSize || 512;
         _logWorkerInteractor.addFsLogger(_label, logFolderPath, maxFiles, maxSize);

package/lib/worker/handler/log-rotate-new.js

@@ -98,7 +98,7 @@ var createRotateTransport = exports.createRotateTransport = function createRotat
           this.currentStream.end();
         }
         var filename = this.generateLogFilename();
-        this.currentFile = this.path.join(this.logFolderPath, filename);
+        this.currentFile = this.path.join(this.logFolderPath, this.filenamePrefix, filename);
         console.log("[CustomRotateTransport] Creating new log file: ".concat(this.currentFile));
         var dirPath = this.path.dirname(this.currentFile);
         if (!this.fs.existsSync(dirPath)) {
@@ -110,6 +110,7 @@ var createRotateTransport = exports.createRotateTransport = function createRotat
           flags: 'a'
         });
         this.currentSize = this.fs.existsSync(this.currentFile) ? this.fs.statSync(this.currentFile).size : 0;
+        this.cleanupOldFiles();
       }
 
       /**
@@ -138,7 +139,6 @@ var createRotateTransport = exports.createRotateTransport = function createRotat
             callback();
             _this2.writing = false;
             _this2.processQueue();
-            _this2.cleanupOldFiles();
           });
           return;
         }
@@ -156,6 +156,10 @@ var createRotateTransport = exports.createRotateTransport = function createRotat
         if (actualSize + buffer.length > this.maxSize) {
           console.log("[CustomRotateTransport] actualSize (".concat(actualSize, ") + buffer.length (").concat(buffer.length, ") > maxSize (").concat(this.maxSize, "), rotate."));
           this.createNewLogFile();
+          // 强制清理，确保文件数量不超过限制
+          setImmediate(function () {
+            return _this2.cleanupOldFiles();
+          });
         }
         this.currentStream.write(buffer, function () {
           try {
@@ -166,7 +170,6 @@ var createRotateTransport = exports.createRotateTransport = function createRotat
           callback();
           _this2.writing = false;
           _this2.processQueue();
-          _this2.cleanupOldFiles();
         });
       }
 

package/lib-es/logger/logger-impl.js

@@ -24,7 +24,7 @@ export var LoggerImpl = /*#__PURE__*/function () {
         var path = window.require('path');
         var _window$require = window.require('@electron/remote'),
           app = _window$require.app;
-        var logFolderPath = path.resolve(app.getPath('logs'), 'logs', this._label);
+        var logFolderPath = path.resolve(app.getPath('logs'), 'logs');
         var maxFiles = _opts.maxFiles || 5;
         var maxSize = _opts.maxSize || 512;
         _logWorkerInteractor.addFsLogger(_label, logFolderPath, maxFiles, maxSize);

package/lib-es/worker/handler/log-rotate-new.js

@@ -90,7 +90,7 @@ export var createRotateTransport = function createRotateTransport(filenamePrefix
           this.currentStream.end();
         }
         var filename = this.generateLogFilename();
-        this.currentFile = this.path.join(this.logFolderPath, filename);
+        this.currentFile = this.path.join(this.logFolderPath, this.filenamePrefix, filename);
         console.log("[CustomRotateTransport] Creating new log file: ".concat(this.currentFile));
         var dirPath = this.path.dirname(this.currentFile);
         if (!this.fs.existsSync(dirPath)) {
@@ -102,6 +102,7 @@ export var createRotateTransport = function createRotateTransport(filenamePrefix
           flags: 'a'
         });
         this.currentSize = this.fs.existsSync(this.currentFile) ? this.fs.statSync(this.currentFile).size : 0;
+        this.cleanupOldFiles();
       }
 
       /**
@@ -130,7 +131,6 @@ export var createRotateTransport = function createRotateTransport(filenamePrefix
             callback();
             _this2.writing = false;
             _this2.processQueue();
-            _this2.cleanupOldFiles();
           });
           return;
         }
@@ -148,6 +148,10 @@ export var createRotateTransport = function createRotateTransport(filenamePrefix
         if (actualSize + buffer.length > this.maxSize) {
           console.log("[CustomRotateTransport] actualSize (".concat(actualSize, ") + buffer.length (").concat(buffer.length, ") > maxSize (").concat(this.maxSize, "), rotate."));
           this.createNewLogFile();
+          // 强制清理，确保文件数量不超过限制
+          setImmediate(function () {
+            return _this2.cleanupOldFiles();
+          });
         }
         this.currentStream.write(buffer, function () {
           try {
@@ -158,7 +162,6 @@ export var createRotateTransport = function createRotateTransport(filenamePrefix
           callback();
           _this2.writing = false;
           _this2.processQueue();
-          _this2.cleanupOldFiles();
         });
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-foundation",
-  "version": "3.9.1",
+  "version": "3.10.0-alpha",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -24,7 +24,7 @@
     "@types/jasmine": "^5.1.4",
     "@types/lodash": "^4.14.168",
     "@types/node": "^20.11.30",
-    "agora-toolchain": "3.9.1",
+    "agora-toolchain": "3.10.0-alpha",
     "core-js": "^3.33.3",
     "tslib": "^2.6.2",
     "winston": "^3.16.0",