agora-foundation 3.9.0-alpha → 3.9.1-alpha

package/lib/logger/index.d.ts

@@ -1,6 +1,7 @@
 import { LogLevel, Logger, LogManager } from './type';
 export declare const getLogger: (opts?: {
     label?: string;
+    maxSize?: number;
 }) => Logger;
 export declare const createLogger: (opts?: {
     label?: string;
@@ -8,6 +9,7 @@ export declare const createLogger: (opts?: {
     database?: boolean;
     console?: boolean;
     maxFiles?: number;
+    maxSize?: number;
 }) => Logger;
 export declare const getLogManager: () => LogManager;
 export declare const setLogLevel: (_logLevel: LogLevel) => void;

package/lib/logger/index.js

@@ -50,7 +50,9 @@ var getLogger = exports.getLogger = function getLogger() {
   var label = opts.label || 'agora-default';
   if (!_common.loggerRegistrar.has(label)) {
     _common.loggerLabels.add(label);
-    _common.loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {}, {
+    _common.loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {
+      maxSize: opts.maxSize
+    }, {
       console: true,
       database: true
     }, logLevel, (0, _worker.getWorkerSingleton)()));

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

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

package/lib/logger/logger-impl.js

@@ -34,7 +34,8 @@ var LoggerImpl = exports.LoggerImpl = /*#__PURE__*/function () {
           app = _window$require.app;
         var logFolderPath = path.resolve(app.getPath('logs'), 'logs');
         var maxFiles = _opts.maxFiles || 5;
-        _logWorkerInteractor.addFsLogger(_label, logFolderPath, maxFiles);
+        var maxSize = _opts.maxSize || 512;
+        _logWorkerInteractor.addFsLogger(_label, logFolderPath, maxFiles, maxSize);
       } 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, maxFiles: number): void;
+    addFsLogger(label: string, logFolderPath: string, maxFiles: number, maxSize: number): void;
 }

package/lib/utilities/env.d.ts

@@ -4,9 +4,11 @@ export declare enum FcrApplicationPlatform {
     MACOS = 2,
     WINDOWS = 3,
     WEB_MOBILE = 6,
-    HARMONY = 7
+    HARMONY = 7,
+    LINUX = 8
 }
 export declare const getPlatform: () => FcrApplicationPlatform;
 export declare const isWindows: () => boolean;
 export declare const windowsVersion: () => string | null;
 export declare const isMac: () => boolean;
+export declare const isLinux: () => boolean;

package/lib/utilities/env.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowsVersion = exports.isWindows = exports.isMac = exports.isElectron = exports.getPlatform = exports.FcrApplicationPlatform = void 0;
+exports.windowsVersion = exports.isWindows = exports.isMac = exports.isLinux = exports.isElectron = exports.getPlatform = exports.FcrApplicationPlatform = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.index-of.js");
@@ -26,6 +26,7 @@ var FcrApplicationPlatform = exports.FcrApplicationPlatform = /*#__PURE__*/funct
   FcrApplicationPlatform[FcrApplicationPlatform["WINDOWS"] = 3] = "WINDOWS";
   FcrApplicationPlatform[FcrApplicationPlatform["WEB_MOBILE"] = 6] = "WEB_MOBILE";
   FcrApplicationPlatform[FcrApplicationPlatform["HARMONY"] = 7] = "HARMONY";
+  FcrApplicationPlatform[FcrApplicationPlatform["LINUX"] = 8] = "LINUX";
   return FcrApplicationPlatform;
 }({});
 var getPlatform = exports.getPlatform = function getPlatform() {
@@ -37,6 +38,9 @@ var getPlatform = exports.getPlatform = function getPlatform() {
     }, {
       key: 'mac',
       value: FcrApplicationPlatform.MACOS
+    }, {
+      key: 'linux',
+      value: FcrApplicationPlatform.LINUX
     }];
     var platform = platforms.find(function (p) {
       return userAgent.includes(p.key);
@@ -59,4 +63,7 @@ var windowsVersion = exports.windowsVersion = function windowsVersion() {
 };
 var isMac = exports.isMac = function isMac() {
   return getPlatform() === FcrApplicationPlatform.MACOS;
+};
+var isLinux = exports.isLinux = function isLinux() {
+  return getPlatform() === FcrApplicationPlatform.LINUX;
 };

package/lib/utilities/logger.d.ts

@@ -1,9 +1,11 @@
 import { Logger } from '../logger';
 export declare class LoggerManager {
     private _logger;
-    private label;
-    constructor({ label }: {
+    private _label;
+    private _maxSize?;
+    constructor({ label, maxSize }: {
         label: string;
+        maxSize?: number;
     });
     getLogger(): Logger;
     createLogger(opts: {
@@ -11,4 +13,5 @@ export declare class LoggerManager {
         database?: boolean;
     }): Logger;
     generateLogObserver<T>(logger: Logger, callbackMethods: (keyof T | [keyof T, string[]])[]): T;
+    release(): void;
 }

package/lib/utilities/logger.js

@@ -53,6 +53,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _bound = require("../decorator/bound");
 var _logSerializer = require("../decorator/log/log-serializer");
 var _logger = require("../logger");
+var _common = require("../logger/common");
 var _misc = require("./misc");
 var _LoggerManager;
 var _initProto;
@@ -63,12 +64,15 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var LoggerManager = exports.LoggerManager = /*#__PURE__*/function () {
   function LoggerManager(_ref) {
-    var label = _ref.label;
+    var label = _ref.label,
+      maxSize = _ref.maxSize;
     (0, _classCallCheck2["default"])(this, LoggerManager);
     (0, _defineProperty2["default"])(this, "_logger", void _initProto(this));
-    this.label = label;
+    this._label = label;
+    this._maxSize = maxSize;
     this._logger = (0, _logger.getLogger)({
-      label: this.label
+      label: this._label,
+      maxSize: this._maxSize
     });
   }
   return (0, _createClass2["default"])(LoggerManager, [{
@@ -80,9 +84,10 @@ var LoggerManager = exports.LoggerManager = /*#__PURE__*/function () {
     key: "createLogger",
     value: function createLogger(opts) {
       return (0, _logger.createLogger)({
-        label: this.label,
+        label: this._label,
         prefix: "".concat(opts.prefix, "@").concat((0, _misc.randomString)(5)),
-        database: opts.database
+        database: opts.database,
+        maxSize: this._maxSize
       });
     }
   }, {
@@ -107,6 +112,12 @@ var LoggerManager = exports.LoggerManager = /*#__PURE__*/function () {
       });
       return observer;
     }
+  }, {
+    key: "release",
+    value: function release() {
+      _common.loggerLabels["delete"](this._label);
+      _common.loggerRegistrar["delete"](this._label);
+    }
   }]);
 }();
 _LoggerManager = LoggerManager;

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

@@ -98,8 +98,14 @@ 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)) {
+          this.fs.mkdirSync(dirPath, {
+            recursive: true
+          });
+        }
         this.currentStream = this.fs.createWriteStream(this.currentFile, {
           flags: 'a'
         });

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

package/lib/worker/handler/log.js

@@ -272,8 +272,10 @@ var setMaxRecords = exports.setMaxRecords = function setMaxRecords(self, callId,
     isSuccess: true
   });
 };
-var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label, logFolderPath, maxFiles) {
+var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label, logFolderPath, maxFiles, maxSize) {
   var winston = require('winston');
+  var KB = 1024;
+  var maxSizeInKB = maxSize * KB;
   if (!winston.loggers.has(label)) {
     console.log("[worker] add fs logger, label: ".concat(label));
     winston.loggers.add(label, {
@@ -282,7 +284,8 @@ var addFsLogger = exports.addFsLogger = function addFsLogger(self, callId, label
         return "".concat(message);
       }),
       transports: [(0, _logRotateNew.createRotateTransport)("".concat(label), logFolderPath, {
-        maxFiles: maxFiles
+        maxFiles: maxFiles,
+        maxSize: maxSizeInKB
       })]
     });
   }

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, maxFiles: number): Promise<void>;
+    addFsLogger(label: string, logFolderPath: string, maxFiles: number, maxSize: number): Promise<void>;
     clearTempLogs(): Promise<void>;
     setMaxRecords(maxRecords: number): Promise<void>;
     sendLog(message: string, label: string): void;

package/lib/worker/interactor.js

@@ -79,16 +79,16 @@ var WorkerInteractor = exports.WorkerInteractor = /*#__PURE__*/function () {
   }
   return (0, _createClass2["default"])(WorkerInteractor, [{
     key: "addFsLogger",
-    value: function addFsLogger(label, logFolderPath, maxFiles) {
+    value: function addFsLogger(label, logFolderPath, maxFiles, maxSize) {
       try {
         // console.info(`[WorkerInteractor] add fs logger, label: ${label}`);
-
         return this._promisify({
           type: _constants.WorkerDirectives.ADD_FS_LOGGER,
           data: {
             label: label,
             logFolderPath: logFolderPath,
-            maxFiles: maxFiles
+            maxFiles: maxFiles,
+            maxSize: maxSize
           }
         });
       } catch (err) {

package/lib/worker/worker-installer.js

@@ -34,8 +34,9 @@ var installHandler = exports.installHandler = function installHandler(self) {
         var _evt$data$data2 = evt.data.data,
           _label = _evt$data$data2.label,
           logFolderPath = _evt$data$data2.logFolderPath,
-          maxFiles = _evt$data$data2.maxFiles;
-        (0, _log.addFsLogger)(self, callId, _label, logFolderPath, maxFiles);
+          maxFiles = _evt$data$data2.maxFiles,
+          maxSize = _evt$data$data2.maxSize;
+        (0, _log.addFsLogger)(self, callId, _label, logFolderPath, maxFiles, maxSize);
       } else if (type === _constants.WorkerDirectives.SET_MAX_RECORDS) {
         (0, _log.setMaxRecords)(self, callId, evt.data.data.maxRecords || 50000);
       } else if (type === _constants.WorkerDirectives.COLLECT_LOGS) {

package/lib-es/logger/index.js

@@ -15,7 +15,9 @@ export var getLogger = function getLogger() {
   var label = opts.label || 'agora-default';
   if (!loggerRegistrar.has(label)) {
     loggerLabels.add(label);
-    loggerRegistrar.set(label, new LoggerImpl(label, {}, {
+    loggerRegistrar.set(label, new LoggerImpl(label, {
+      maxSize: opts.maxSize
+    }, {
       console: true,
       database: true
     }, logLevel, getWorkerSingleton()));

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

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

package/lib-es/utilities/env.js

@@ -19,6 +19,7 @@ export var FcrApplicationPlatform = /*#__PURE__*/function (FcrApplicationPlatfor
   FcrApplicationPlatform[FcrApplicationPlatform["WINDOWS"] = 3] = "WINDOWS";
   FcrApplicationPlatform[FcrApplicationPlatform["WEB_MOBILE"] = 6] = "WEB_MOBILE";
   FcrApplicationPlatform[FcrApplicationPlatform["HARMONY"] = 7] = "HARMONY";
+  FcrApplicationPlatform[FcrApplicationPlatform["LINUX"] = 8] = "LINUX";
   return FcrApplicationPlatform;
 }({});
 export var getPlatform = function getPlatform() {
@@ -30,6 +31,9 @@ export var getPlatform = function getPlatform() {
     }, {
       key: 'mac',
       value: FcrApplicationPlatform.MACOS
+    }, {
+      key: 'linux',
+      value: FcrApplicationPlatform.LINUX
     }];
     var platform = platforms.find(function (p) {
       return userAgent.includes(p.key);
@@ -52,4 +56,7 @@ export var windowsVersion = function windowsVersion() {
 };
 export var isMac = function isMac() {
   return getPlatform() === FcrApplicationPlatform.MACOS;
+};
+export var isLinux = function isLinux() {
+  return getPlatform() === FcrApplicationPlatform.LINUX;
 };

package/lib-es/utilities/logger.js

@@ -53,15 +53,19 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 import { bound } from '../decorator/bound';
 import { serializeArgs } from '../decorator/log/log-serializer';
 import { getLogger as _getLogger, createLogger as _createLogger } from '../logger';
+import { loggerLabels, loggerRegistrar } from '../logger/common';
 import { randomString } from './misc';
 export var LoggerManager = /*#__PURE__*/function () {
   function LoggerManager(_ref) {
-    var label = _ref.label;
+    var label = _ref.label,
+      maxSize = _ref.maxSize;
     _classCallCheck(this, LoggerManager);
     _defineProperty(this, "_logger", void _initProto(this));
-    this.label = label;
+    this._label = label;
+    this._maxSize = maxSize;
     this._logger = _getLogger({
-      label: this.label
+      label: this._label,
+      maxSize: this._maxSize
     });
   }
   return _createClass(LoggerManager, [{
@@ -73,9 +77,10 @@ export var LoggerManager = /*#__PURE__*/function () {
     key: "createLogger",
     value: function createLogger(opts) {
       return _createLogger({
-        label: this.label,
+        label: this._label,
         prefix: "".concat(opts.prefix, "@").concat(randomString(5)),
-        database: opts.database
+        database: opts.database,
+        maxSize: this._maxSize
       });
     }
   }, {
@@ -100,6 +105,12 @@ export var LoggerManager = /*#__PURE__*/function () {
       });
       return observer;
     }
+  }, {
+    key: "release",
+    value: function release() {
+      loggerLabels["delete"](this._label);
+      loggerRegistrar["delete"](this._label);
+    }
   }]);
 }();
 _LoggerManager = LoggerManager;

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

@@ -90,8 +90,14 @@ 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)) {
+          this.fs.mkdirSync(dirPath, {
+            recursive: true
+          });
+        }
         this.currentStream = this.fs.createWriteStream(this.currentFile, {
           flags: 'a'
         });

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

@@ -265,8 +265,10 @@ export var setMaxRecords = function setMaxRecords(self, callId, max) {
     isSuccess: true
   });
 };
-export var addFsLogger = function addFsLogger(self, callId, label, logFolderPath, maxFiles) {
+export var addFsLogger = function addFsLogger(self, callId, label, logFolderPath, maxFiles, maxSize) {
   var winston = require('winston');
+  var KB = 1024;
+  var maxSizeInKB = maxSize * KB;
   if (!winston.loggers.has(label)) {
     console.log("[worker] add fs logger, label: ".concat(label));
     winston.loggers.add(label, {
@@ -275,7 +277,8 @@ export var addFsLogger = function addFsLogger(self, callId, label, logFolderPath
         return "".concat(message);
       }),
       transports: [createRotateTransport("".concat(label), logFolderPath, {
-        maxFiles: maxFiles
+        maxFiles: maxFiles,
+        maxSize: maxSizeInKB
       })]
     });
   }

package/lib-es/worker/interactor.js

@@ -71,16 +71,16 @@ export var WorkerInteractor = /*#__PURE__*/function () {
   }
   return _createClass(WorkerInteractor, [{
     key: "addFsLogger",
-    value: function addFsLogger(label, logFolderPath, maxFiles) {
+    value: function addFsLogger(label, logFolderPath, maxFiles, maxSize) {
       try {
         // console.info(`[WorkerInteractor] add fs logger, label: ${label}`);
-
         return this._promisify({
           type: WorkerDirectives.ADD_FS_LOGGER,
           data: {
             label: label,
             logFolderPath: logFolderPath,
-            maxFiles: maxFiles
+            maxFiles: maxFiles,
+            maxSize: maxSize
           }
         });
       } catch (err) {

package/lib-es/worker/worker-installer.js

@@ -27,8 +27,9 @@ export var installHandler = function installHandler(self) {
         var _evt$data$data2 = evt.data.data,
           _label = _evt$data$data2.label,
           logFolderPath = _evt$data$data2.logFolderPath,
-          maxFiles = _evt$data$data2.maxFiles;
-        addFsLogger(self, callId, _label, logFolderPath, maxFiles);
+          maxFiles = _evt$data$data2.maxFiles,
+          maxSize = _evt$data$data2.maxSize;
+        addFsLogger(self, callId, _label, logFolderPath, maxFiles, maxSize);
       } else if (type === WorkerDirectives.SET_MAX_RECORDS) {
         setMaxRecords(self, callId, evt.data.data.maxRecords || 50000);
       } else if (type === WorkerDirectives.COLLECT_LOGS) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-foundation",
-  "version": "3.9.0-alpha",
+  "version": "3.9.1-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.0-alpha",
+    "agora-toolchain": "3.9.1-alpha",
     "core-js": "^3.33.3",
     "tslib": "^2.6.2",
     "winston": "^3.16.0",