agora-foundation 3.6.4 → 3.7.0

package/lib/logger/index.d.ts

@@ -6,6 +6,7 @@ export declare const createLogger: (opts?: {
     label?: string;
     prefix?: string;
     database?: boolean;
+    maxFiles?: number;
 }) => Logger;
 export declare const getLogManager: () => LogManager;
 export declare const setLogLevel: (_logLevel: LogLevel) => void;

package/lib/logger/index.js

@@ -47,7 +47,7 @@ var _constants = require("./constants");
 var logLevel = _type.LogLevel.DEBUG;
 var getLogger = exports.getLogger = function getLogger() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var label = opts.label || 'default';
+  var label = opts.label || 'agora-default';
   if (!_common.loggerRegistrar.has(label)) {
     _common.loggerLabels.add(label);
     _common.loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {}, {
@@ -59,7 +59,7 @@ var getLogger = exports.getLogger = function getLogger() {
 };
 var createLogger = exports.createLogger = function createLogger() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var label = opts.label || 'default';
+  var label = opts.label || 'agora-default';
   var databaseValue = (0, _isBoolean["default"])(opts.database) ? opts.database : true;
   var logger = new _loggerImpl.LoggerImpl(label, opts, {
     console: true,

package/lib/logger/logger-impl.d.ts

@@ -7,6 +7,7 @@ export declare class LoggerImpl implements Logger {
     private _logWorkerInteractor;
     constructor(_label: string, _opts: {
         prefix?: string;
+        maxFiles?: number;
     }, _dest: {
         console: boolean;
         database: boolean;

package/lib/logger/logger-impl.js

@@ -33,7 +33,8 @@ var LoggerImpl = exports.LoggerImpl = /*#__PURE__*/function () {
         var _window$require = window.require('@electron/remote'),
           app = _window$require.app;
         var logFolderPath = path.resolve(app.getPath('logs'), 'logs');
-        _logWorkerInteractor.addFsLogger(_label, logFolderPath);
+        var maxFiles = _opts.maxFiles || 5;
+        _logWorkerInteractor.addFsLogger(_label, logFolderPath, maxFiles);
       } else {
         this.warn('window.require is not present, logWorkerInteractor.addFsLogger cannot proceed');
       }

package/lib/logger/type.d.ts

@@ -22,5 +22,5 @@ export interface LogWorkerInteractor {
         lastId: number;
     }>;
     deleteLogs(labels: string[], lastId: number): Promise<void>;
-    addFsLogger(label: string, logFolderPath: string): void;
+    addFsLogger(label: string, logFolderPath: string, maxFiles: number): void;
 }

package/lib/upload/scheduler.js

@@ -126,11 +126,12 @@ var AgoraUploadScheduler = exports.AgoraUploadScheduler = /*#__PURE__*/function
             case 5:
               _context.prev = 5;
               _t = _context["catch"](3);
-              this._eventEmitter.emit('upload-failure', _t, task);
               retries = this._taskRetries.get(task) || 0;
               if (retries < this._maxRetries) {
                 this._taskRetries.set(task, retries + 1);
                 this._taskQueue.unshift(task);
+              } else {
+                this._eventEmitter.emit('upload-failure', _t, task);
               }
             case 6:
               _context.prev = 6;

package/lib/worker/handler/log-rotate-new.d.ts

@@ -0,0 +1,6 @@
+import type winstonType from 'winston';
+export declare const createRotateTransport: (filenamePrefix: string, logFolderPath: string, options?: {
+    level?: string;
+    maxSize?: number;
+    maxFiles?: number;
+}) => winstonType.transport;

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

@@ -0,0 +1,238 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.reflect.construct.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createRotateTransport = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.join.js");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.ends-with.js");
+require("core-js/modules/es.string.pad-start.js");
+require("core-js/modules/es.string.starts-with.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.immediate.js");
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+var formatTimestamp = function formatTimestamp() {
+  var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
+  var year = date.getFullYear();
+  var month = String(date.getMonth() + 1).padStart(2, '0');
+  var day = String(date.getDate()).padStart(2, '0');
+  var hours = String(date.getHours()).padStart(2, '0');
+  var minutes = String(date.getMinutes()).padStart(2, '0');
+  var seconds = String(date.getSeconds()).padStart(2, '0');
+  return "".concat(year).concat(month).concat(day).concat(hours).concat(minutes).concat(seconds);
+};
+var createRotateTransport = exports.createRotateTransport = function createRotateTransport(filenamePrefix, logFolderPath) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var WinstonTransport = require('winston-transport');
+  var CustomRotateTransport = /*#__PURE__*/function (_WinstonTransport) {
+    function CustomRotateTransport(opts) {
+      var _this;
+      (0, _classCallCheck2["default"])(this, CustomRotateTransport);
+      _this = _callSuper(this, CustomRotateTransport, [{
+        level: opts.level || 'info'
+      }]);
+      (0, _defineProperty2["default"])(_this, "currentFile", '');
+      (0, _defineProperty2["default"])(_this, "currentStream", null);
+      (0, _defineProperty2["default"])(_this, "currentSize", 0);
+      (0, _defineProperty2["default"])(_this, "writeQueue", []);
+      (0, _defineProperty2["default"])(_this, "writing", false);
+      (0, _defineProperty2["default"])(_this, "lastTimestamp", '');
+      (0, _defineProperty2["default"])(_this, "rotateIndex", 0);
+      _this.filenamePrefix = opts.filenamePrefix;
+      _this.logFolderPath = opts.logFolderPath;
+      _this.maxSize = opts.maxSize || 1024 * 1024;
+      _this.maxFiles = opts.maxFiles || 5;
+      _this.level = opts.level || 'info';
+      _this.fs = require('fs');
+      _this.path = require('path');
+      return _this;
+    }
+
+    /**
+     * 生成唯一的日志文件名，避免同一秒多次轮转导致的覆盖
+     */
+    (0, _inherits2["default"])(CustomRotateTransport, _WinstonTransport);
+    return (0, _createClass2["default"])(CustomRotateTransport, [{
+      key: "generateLogFilename",
+      value: function generateLogFilename() {
+        var timestamp = formatTimestamp();
+        if (timestamp === this.lastTimestamp) {
+          this.rotateIndex += 1;
+        } else {
+          this.rotateIndex = 0;
+          this.lastTimestamp = timestamp;
+        }
+        return this.rotateIndex === 0 ? "".concat(this.filenamePrefix, "-").concat(timestamp, ".log") : "".concat(this.filenamePrefix, "-").concat(timestamp, "-").concat(this.rotateIndex, ".log");
+      }
+
+      /**
+       * 创建新日志文件，并清理旧文件
+       */
+    }, {
+      key: "createNewLogFile",
+      value: function createNewLogFile() {
+        if (this.currentStream) {
+          this.currentStream.end();
+        }
+        var filename = this.generateLogFilename();
+        this.currentFile = this.path.join(this.logFolderPath, filename);
+        console.log("[CustomRotateTransport] Creating new log file: ".concat(this.currentFile));
+        this.currentStream = this.fs.createWriteStream(this.currentFile, {
+          flags: 'a'
+        });
+        this.currentSize = this.fs.existsSync(this.currentFile) ? this.fs.statSync(this.currentFile).size : 0;
+        this.cleanupOldFiles();
+      }
+
+      /**
+       * 只允许每个 buffer 触发一次轮转，避免多余文件
+       */
+    }, {
+      key: "processQueue",
+      value: function processQueue() {
+        var _this2 = this;
+        if (this.writing || this.writeQueue.length === 0) return;
+        this.writing = true;
+        var _ref = this.writeQueue.shift(),
+          buffer = _ref.buffer,
+          callback = _ref.callback;
+
+        // 1. 单条日志大于 maxSize，直接新建新文件并写入，不要理会 currentStream
+        if (buffer.length > this.maxSize) {
+          this.createNewLogFile();
+          console.log("[CustomRotateTransport] buffer.length (".concat(buffer.length, ") > maxSize (").concat(this.maxSize, "), force rotate."));
+          this.currentStream.write(buffer, function () {
+            try {
+              _this2.currentSize = _this2.fs.statSync(_this2.currentFile).size;
+            } catch (_unused) {
+              _this2.currentSize += buffer.length;
+            }
+            callback();
+            _this2.writing = false;
+            _this2.processQueue();
+          });
+          return;
+        }
+
+        // 2. buffer.length <= maxSize，才需要判断 currentStream 是否为空
+        if (!this.currentStream) {
+          this.createNewLogFile();
+        }
+        var actualSize = 0;
+        try {
+          actualSize = this.fs.existsSync(this.currentFile) ? this.fs.statSync(this.currentFile).size : 0;
+        } catch (_unused2) {
+          actualSize = this.currentSize;
+        }
+        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 {
+            _this2.currentSize = _this2.fs.statSync(_this2.currentFile).size;
+          } catch (_unused3) {
+            _this2.currentSize += buffer.length;
+          }
+          callback();
+          _this2.writing = false;
+          _this2.processQueue();
+        });
+      }
+
+      /**
+       * 清理旧日志文件，只保留 maxFiles 个
+       */
+    }, {
+      key: "cleanupOldFiles",
+      value: function cleanupOldFiles() {
+        var _this3 = this;
+        try {
+          var files = this.fs.readdirSync(this.logFolderPath).filter(function (file) {
+            return file.startsWith(_this3.filenamePrefix) && file.endsWith('.log');
+          }).map(function (file) {
+            return {
+              name: file,
+              path: _this3.path.join(_this3.logFolderPath, file),
+              stat: _this3.fs.statSync(_this3.path.join(_this3.logFolderPath, file))
+            };
+          }).sort(function (a, b) {
+            return b.stat.mtime.getTime() - a.stat.mtime.getTime();
+          });
+          console.log("[CustomRotateTransport] Found ".concat(files.length, " log files, maxFiles: ").concat(this.maxFiles));
+          if (files.length > this.maxFiles) {
+            var filesToDelete = files.slice(this.maxFiles);
+            console.log("[CustomRotateTransport] Will delete ".concat(filesToDelete.length, " old files"));
+            filesToDelete.forEach(function (file) {
+              try {
+                _this3.fs.unlinkSync(file.path);
+                console.log("[CustomRotateTransport] Deleted old log file: ".concat(file.path));
+              } catch (err) {
+                console.warn("[CustomRotateTransport] Failed to delete log file: ".concat(file.path), err);
+              }
+            });
+          }
+        } catch (err) {
+          console.warn('[CustomRotateTransport] Error cleaning up old log files:', err);
+        }
+      }
+    }, {
+      key: "log",
+      value: function log(info, callback) {
+        var _this4 = this;
+        setImmediate(function () {
+          return _this4.emit('logged', info);
+        });
+        var message = info[Symbol["for"]('message')] || info.message || '';
+        var buffer = Buffer.from(message + '\n', 'utf8');
+        this.writeQueue.push({
+          buffer: buffer,
+          callback: callback
+        });
+        this.processQueue();
+      }
+    }, {
+      key: "close",
+      value: function close() {
+        if (this.currentStream) {
+          this.currentStream.end();
+          this.currentStream = null;
+        }
+      }
+    }]);
+  }(WinstonTransport);
+  return new CustomRotateTransport({
+    filenamePrefix: filenamePrefix,
+    logFolderPath: logFolderPath,
+    maxSize: options.maxSize,
+    maxFiles: options.maxFiles,
+    level: options.level
+  });
+};

package/lib/worker/handler/log.d.ts

@@ -10,6 +10,6 @@ export declare const writeLog: (self: WorkerContext, callId: number, log: Log) =
 export declare const collectLogs: (self: WorkerContext, callId: number, labels: string[]) => Promise<void>;
 export declare const deleteLogs: (self: WorkerContext, callId: number, labels: string[], lastId: number) => Promise<void>;
 export declare const setMaxRecords: (self: WorkerContext, callId: number, max: number) => void;
-export declare const addFsLogger: (self: WorkerContext, callId: number, label: string, logFolderPath: string) => void;
+export declare const addFsLogger: (self: WorkerContext, callId: number, label: string, logFolderPath: string, maxFiles: number) => void;
 export declare const writeLogsToDisk: (logs: LogSchema[]) => void;
 export {};

package/lib/worker/handler/log.js

@@ -40,10 +40,10 @@ var _reply = require("./reply");
 var _raceCondition = require("../../utilities/race-condition");
 var _jszip = _interopRequireDefault(require("jszip"));
 var _env = require("../../utilities/env");
-var _logRotate = require("./log-rotate");
+var _logRotateNew = require("./log-rotate-new");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // import { createRotateTransport } from './log-rotate';
 var MAX_WAIT_TIME = 3000;
 var mutex = new _mutex.Mutex();
 var maxRecords = 50000;
@@ -259,7 +259,7 @@ var setMaxRecords = exports.setMaxRecords = function setMaxRecords(self, callId,
     isSuccess: true
   });
 };
-var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label, logFolderPath) {
+var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label, logFolderPath, maxFiles) {
   var winston = require('winston');
   if (!winston.loggers.has(label)) {
     console.log("[worker] add fs logger, label: ".concat(label));
@@ -268,13 +268,9 @@ var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label
         var message = _ref4.message;
         return "".concat(message);
       }),
-      transports: [
-      // new winston.transports.File({
-      //   filename: logPath,
-      //   maxFiles: 3,
-      //   maxsize: 1048576, //1MB,
-      // }),
-      (0, _logRotate.createRotateTransport)("apaas-".concat(label), logFolderPath)]
+      transports: [(0, _logRotateNew.createRotateTransport)("".concat(label), logFolderPath, {
+        maxFiles: maxFiles
+      })]
     });
   }
   (0, _reply.reply)(self, callId, _constants.WorkerDirectives.ADD_FS_LOGGER, {

package/lib/worker/interactor.d.ts

@@ -3,7 +3,7 @@ export declare class WorkerInteractor implements LogWorkerInteractor {
     private _eventEmitter;
     private _logWorker;
     constructor();
-    addFsLogger(label: string, logFolderPath: string): Promise<void>;
+    addFsLogger(label: string, logFolderPath: string, maxFiles: number): Promise<void>;
     clearTempLogs(): Promise<void>;
     setMaxRecords(maxRecords: number): Promise<void>;
     sendLog(message: string, label: string): void;

package/lib/worker/interactor.js

@@ -10,10 +10,51 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array-buffer.constructor.js");
+require("core-js/modules/es.array-buffer.slice.js");
+require("core-js/modules/es.data-view.js");
 require("core-js/modules/es.date.now.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
+require("core-js/modules/es.typed-array.uint8-array.js");
+require("core-js/modules/es.typed-array.at.js");
+require("core-js/modules/es.typed-array.copy-within.js");
+require("core-js/modules/es.typed-array.every.js");
+require("core-js/modules/es.typed-array.fill.js");
+require("core-js/modules/es.typed-array.filter.js");
+require("core-js/modules/es.typed-array.find.js");
+require("core-js/modules/es.typed-array.find-index.js");
+require("core-js/modules/es.typed-array.find-last.js");
+require("core-js/modules/es.typed-array.find-last-index.js");
+require("core-js/modules/es.typed-array.for-each.js");
+require("core-js/modules/es.typed-array.includes.js");
+require("core-js/modules/es.typed-array.index-of.js");
+require("core-js/modules/es.typed-array.iterator.js");
+require("core-js/modules/es.typed-array.join.js");
+require("core-js/modules/es.typed-array.last-index-of.js");
+require("core-js/modules/es.typed-array.map.js");
+require("core-js/modules/es.typed-array.reduce.js");
+require("core-js/modules/es.typed-array.reduce-right.js");
+require("core-js/modules/es.typed-array.reverse.js");
+require("core-js/modules/es.typed-array.set.js");
+require("core-js/modules/es.typed-array.slice.js");
+require("core-js/modules/es.typed-array.some.js");
+require("core-js/modules/es.typed-array.sort.js");
+require("core-js/modules/es.typed-array.subarray.js");
+require("core-js/modules/es.typed-array.to-locale-string.js");
+require("core-js/modules/es.typed-array.to-reversed.js");
+require("core-js/modules/es.typed-array.to-sorted.js");
+require("core-js/modules/es.typed-array.to-string.js");
+require("core-js/modules/es.typed-array.with.js");
+require("core-js/modules/esnext.array-buffer.detached.js");
+require("core-js/modules/esnext.array-buffer.transfer.js");
+require("core-js/modules/esnext.array-buffer.transfer-to-fixed-length.js");
+require("core-js/modules/esnext.typed-array.filter-reject.js");
+require("core-js/modules/esnext.typed-array.group-by.js");
+require("core-js/modules/esnext.typed-array.to-spliced.js");
+require("core-js/modules/esnext.typed-array.unique-by.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -38,14 +79,15 @@ var WorkerInteractor = exports.WorkerInteractor = /*#__PURE__*/function () {
   }
   return (0, _createClass2["default"])(WorkerInteractor, [{
     key: "addFsLogger",
-    value: function addFsLogger(label, logFolderPath) {
+    value: function addFsLogger(label, logFolderPath, maxFiles) {
       try {
         console.info("[WorkerInteractor] add fs logger, label: ".concat(label));
         return this._promisify({
           type: _constants.WorkerDirectives.ADD_FS_LOGGER,
           data: {
             label: label,
-            logFolderPath: logFolderPath
+            logFolderPath: logFolderPath,
+            maxFiles: maxFiles
           }
         });
       } catch (err) {
@@ -158,7 +200,7 @@ var WorkerInteractor = exports.WorkerInteractor = /*#__PURE__*/function () {
               buffer = _yield$this$_promisif.buffer;
               lastId = _yield$this$_promisif.lastId;
               datefmt = (0, _dayjs["default"])().format('YYYY-MM-DDTHH:mm:ssZ[Z]');
-              file = new File([buffer], "logs-".concat(datefmt, ".zip"), {
+              file = new File([new Uint8Array(buffer)], "logs-".concat(datefmt, ".zip"), {
                 type: 'application/zip'
               });
               return _context2.abrupt("return", {
@@ -309,7 +351,7 @@ var WorkerInteractor = exports.WorkerInteractor = /*#__PURE__*/function () {
               _yield$this$_promisif3 = _context4.sent;
               buffer = _yield$this$_promisif3.buffer;
               datefmt = (0, _dayjs["default"])().format('YYYY-MM-DDTHH:mm:ssZ[Z]');
-              file = new File([buffer], "logs-".concat(datefmt, ".zip"), {
+              file = new File([new Uint8Array(buffer)], "logs-".concat(datefmt, ".zip"), {
                 type: 'application/zip'
               });
               return _context4.abrupt("return", file);