agora-foundation 3.6.1 → 3.6.3

package/lib/logger/logger-impl.js

@@ -32,8 +32,8 @@ var LoggerImpl = exports.LoggerImpl = /*#__PURE__*/function () {
         var path = window.require('path');
         var _window$require = window.require('@electron/remote'),
           app = _window$require.app;
-        var logPath = path.resolve(app.getPath('logs'), 'logs', "apaas-".concat(_label, ".log"));
-        _logWorkerInteractor.addFsLogger(_label, logPath);
+        var logFolderPath = path.resolve(app.getPath('logs'), 'logs');
+        _logWorkerInteractor.addFsLogger(_label, logFolderPath);
       } 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, logPath: string): void;
+    addFsLogger(label: string, logFolderPath: string): void;
 }

package/lib/utilities/zip.js

@@ -104,7 +104,11 @@ var zipDir = exports.zipDir = function zipDir(dirPath, filter) {
               case 32:
                 _context.next = 34;
                 return zip.generateAsync({
-                  type: 'blob'
+                  type: 'blob',
+                  compression: 'DEFLATE',
+                  compressionOptions: {
+                    level: 9
+                  }
                 });
               case 34:
                 blob = _context.sent;

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

@@ -0,0 +1,2 @@
+import type winstonType from 'winston';
+export declare const createRotateTransport: (filenamePrefix: string, logFolderPath: string) => winstonType.transport;

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

@@ -0,0 +1,89 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createRotateTransport = void 0;
+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.slice.js");
+require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.regexp.constructor.js");
+require("core-js/modules/es.regexp.dot-all.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.sticky.js");
+require("core-js/modules/es.regexp.test.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.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/web.dom-collections.for-each.js");
+require("core-js/modules/web.timers.js");
+var createRotateTransport = exports.createRotateTransport = function createRotateTransport(filenamePrefix, logFolderPath) {
+  require('winston-daily-rotate-file');
+  var winston = require('winston');
+  console.log('[worker] log rotate transport created:', filenamePrefix, logFolderPath);
+  var transport = new winston.transports.DailyRotateFile({
+    level: 'info',
+    frequency: '9999d',
+    dirname: logFolderPath,
+    filename: "".concat(filenamePrefix, "-%DATE%.log"),
+    datePattern: 'YYYYMMDDhhmmss',
+    maxSize: 1024 * 1024
+  });
+  transport.on('error', function (error) {
+    // log or handle errors here
+    console.error('[worker] winston transport error:', error);
+  });
+  transport.on('new', function (filename) {
+    console.log("[worker] winston transport new file created: ".concat(filename));
+  });
+  transport.on('rotate', function (oldFilename, newFilename) {
+    console.log("[worker] winston transport rotated: ".concat(oldFilename, " -> ").concat(newFilename));
+    clearLogFolder(logFolderPath, filenamePrefix);
+  });
+
+  // only keep the latest 5 log files
+  clearLogFolder(logFolderPath, filenamePrefix);
+  return transport;
+};
+var clearLogFolder = function clearLogFolder(logFolderPath, filenamePrefix) {
+  var fs = require('node:fs');
+  setTimeout(function () {
+    fs.readdir(logFolderPath, function (err, files) {
+      if (err) {
+        console.error("[worker] failed to read log folder: ".concat(logFolderPath), err);
+        return;
+      }
+      var sortedLogFileList = files.filter(function (file) {
+        return new RegExp("^".concat(filenamePrefix, "-\\d{14}\\.log")).test(file);
+      }).sort(function (a, b) {
+        return fs.statSync("".concat(logFolderPath, "/").concat(a)).mtime.getTime() - fs.statSync("".concat(logFolderPath, "/").concat(b)).mtime.getTime();
+      });
+      console.log("[worker] sorted log files: ".concat(sortedLogFileList.join(', '), ", count: ").concat(sortedLogFileList.length));
+      if (sortedLogFileList.length <= 5) {
+        return; // 不需要删除文件
+      }
+      var listToDelete = sortedLogFileList.slice(0, sortedLogFileList.length - 5);
+
+      // 判断如果超过5个文件，则删除最旧的文件
+      console.log("[worker] log files to delete: ".concat(listToDelete.join(', ')));
+      listToDelete.forEach(function (file) {
+        var oldFilename = "".concat(logFolderPath, "/").concat(file);
+        fs.unlink(oldFilename, function (err) {
+          if (err) {
+            console.error("[worker] failed to delete log file: ".concat(oldFilename), err);
+          } else {
+            console.log("[worker] successfully deleted log file: ".concat(oldFilename));
+          }
+        });
+      });
+    });
+  });
+};

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, logPath: string) => void;
+export declare const addFsLogger: (self: WorkerContext, callId: number, label: string, logFolderPath: string) => void;
 export declare const writeLogsToDisk: (logs: LogSchema[]) => void;
 export {};

package/lib/worker/handler/log.js

@@ -41,6 +41,7 @@ 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");
 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; }
@@ -259,20 +260,22 @@ var setMaxRecords = exports.setMaxRecords = function setMaxRecords(self, callId,
     isSuccess: true
   });
 };
-var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label, logPath) {
-  var winston = eval('require("winston")');
+var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label, logFolderPath) {
+  var winston = require('winston');
   if (!winston.loggers.has(label)) {
-    console.log("[worker] add fs logger, label: ".concat(label, ", path: ").concat(logPath));
+    console.log("[worker] add fs logger, label: ".concat(label));
     winston.loggers.add(label, {
       format: winston.format.printf(function (_ref4) {
         var message = _ref4.message;
         return "".concat(message);
       }),
-      transports: [new winston.transports.File({
-        filename: logPath,
-        maxFiles: 3,
-        maxsize: 1048576 //1MB,
-      })]
+      transports: [
+      // new winston.transports.File({
+      //   filename: logPath,
+      //   maxFiles: 3,
+      //   maxsize: 1048576, //1MB,
+      // }),
+      (0, _logRotate.createRotateTransport)("apaas-".concat(label), logFolderPath)]
     });
   }
   (0, _reply.reply)(self, callId, _constants.WorkerDirectives.ADD_FS_LOGGER, {
@@ -280,7 +283,7 @@ var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label
   });
 };
 var writeLogsToDisk = exports.writeLogsToDisk = function writeLogsToDisk(logs) {
-  var winston = eval('require("winston")');
+  var winston = require('winston');
   logs.forEach(function (log) {
     winston.loggers.get(log.label).info(log.content);
   });

package/lib/worker/interactor.d.ts

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

package/lib/worker/interactor.js

@@ -10,7 +10,6 @@ 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.concat.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");
@@ -39,14 +38,14 @@ var WorkerInteractor = exports.WorkerInteractor = /*#__PURE__*/function () {
   }
   return (0, _createClass2["default"])(WorkerInteractor, [{
     key: "addFsLogger",
-    value: function addFsLogger(label, logPath) {
+    value: function addFsLogger(label, logFolderPath) {
       try {
-        console.info("[WorkerInteractor] add fs logger, label: ".concat(label, ", log path: ").concat(logPath));
+        console.info("[WorkerInteractor] add fs logger, label: ".concat(label));
         return this._promisify({
           type: _constants.WorkerDirectives.ADD_FS_LOGGER,
           data: {
             label: label,
-            logPath: logPath
+            logFolderPath: logFolderPath
           }
         });
       } catch (err) {