agora-foundation 3.4.1 → 3.4.2

package/lib/logger/common.d.ts

@@ -0,0 +1,3 @@
+import { type LoggerImpl } from './logger-impl';
+export declare const loggerRegistrar: Map<string, LoggerImpl>;
+export declare const loggerLabels: Set<string>;

package/lib/logger/common.js

@@ -0,0 +1,52 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loggerRegistrar = exports.loggerLabels = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.set.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.v2.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.v2.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.v2.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.v2.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.v2.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.v2.js");
+require("core-js/modules/esnext.set.union.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var loggerRegistrar = exports.loggerRegistrar = new Map();
+var loggerLabels = exports.loggerLabels = new Set();

package/lib/logger/index.js

@@ -31,55 +31,40 @@ Object.defineProperty(exports, "setupConsoleHijack", {
   }
 });
 require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.string.iterator.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.for-each.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.for-each.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _worker = require("../worker");
+var _common = require("./common");
 var _loggerImpl = require("./logger-impl");
 var _managerImpl = require("./manager-impl");
 var _type = require("./type");
 var _hijack = require("./hijack");
 var _constants = require("./constants");
-var loggerRegistrar = new Map();
 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';
-  if (!loggerRegistrar.has(label)) {
-    loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {}, {
+  if (!_common.loggerRegistrar.has(label)) {
+    _common.loggerLabels.add(label);
+    _common.loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {}, {
       console: true,
       database: true
     }, logLevel, (0, _worker.getWorkerSingleton)()));
   }
-  return loggerRegistrar.get(label);
+  return _common.loggerRegistrar.get(label);
 };
 var createLogger = exports.createLogger = function createLogger() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var label = opts.label || 'default';
-  return new _loggerImpl.LoggerImpl(label, opts, {
+  var logger = new _loggerImpl.LoggerImpl(label, opts, {
     console: true,
     database: true
   }, logLevel, (0, _worker.getWorkerSingleton)());
+  _common.loggerLabels.add(label);
+  return logger;
 };
 var logManager;
 var getLogManager = exports.getLogManager = function getLogManager() {
@@ -90,7 +75,7 @@ var getLogManager = exports.getLogManager = function getLogManager() {
 };
 var setLogLevel = exports.setLogLevel = function setLogLevel(_logLevel) {
   logLevel = _logLevel;
-  loggerRegistrar.forEach(function (logger) {
+  _common.loggerRegistrar.forEach(function (logger) {
     logger.setLogLevel(logLevel);
   });
 };

package/lib/logger/logger-impl.js

@@ -89,7 +89,7 @@ var LoggerImpl = exports.LoggerImpl = /*#__PURE__*/function () {
       // prepend log level to second position of the log message
       args.unshift((0, _padEnd["default"])((0, _upperCase["default"])(_constants.logLevelMap[logLevel] || 'unknown'), 5, ' '));
       // prepend log level to first position of the log message
-      args.unshift((0, _dayjs["default"])().format('YYYY-MM-DD HH:mm:ss'));
+      args.unshift((0, _dayjs["default"])().format('YYYY-MM-DD HH:mm:ss.SSS'));
       if (this._dest.database) {
         this._pipeToDatabase(args.join(' '));
       }

package/lib/logger/manager-impl.js

@@ -7,10 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.LogManagerImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.string.iterator.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"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _common = require("./common");
 var LogManagerImpl = exports.LogManagerImpl = /*#__PURE__*/function () {
   function LogManagerImpl(_logWorkerInteractor) {
     (0, _classCallCheck2["default"])(this, LogManagerImpl);
@@ -24,8 +27,9 @@ var LogManagerImpl = exports.LogManagerImpl = /*#__PURE__*/function () {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              this._logWorkerInteractor.deleteLogs(['default'], this._lastId);
-            case 1:
+              _context.next = 2;
+              return this._logWorkerInteractor.deleteLogs(Array.from(_common.loggerLabels), this._lastId);
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -45,7 +49,7 @@ var LogManagerImpl = exports.LogManagerImpl = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this._logWorkerInteractor.collectLogs(['default']);
+              return this._logWorkerInteractor.collectLogs(Array.from(_common.loggerLabels));
             case 2:
               _yield$this$_logWorke = _context2.sent;
               file = _yield$this$_logWorke.file;

package/lib/worker/handler/log.js

@@ -128,17 +128,18 @@ var debouncedWriting = (0, _debounce["default"])(function () {
 });
 var collectLogs = exports.collectLogs = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(self, callId, labels) {
-    var blob, lastId, _iterator, _step, _loop, buffer;
+    var zip, blob, lastId, _iterator, _step, _loop, buffer;
     return _regenerator["default"].wrap(function _callee2$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
+          zip = new _jszip["default"]();
           blob = new Blob();
           lastId = 0;
-          _context3.prev = 2;
+          _context3.prev = 3;
           _iterator = _createForOfIteratorHelper(labels);
-          _context3.prev = 4;
+          _context3.prev = 5;
           _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-            var label, logsStr, count, zip;
+            var label, logsStr, count;
             return _regenerator["default"].wrap(function _loop$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
@@ -152,68 +153,67 @@ var collectLogs = exports.collectLogs = /*#__PURE__*/function () {
                     if (e.id > lastId) lastId = e.id;
                   });
                 case 5:
-                  zip = new _jszip["default"]();
                   zip.file("".concat(label, "-logs.txt"), logsStr);
-                  _context2.next = 9;
-                  return zip.generateAsync({
-                    type: 'blob'
-                  });
-                case 9:
-                  blob = _context2.sent;
                   console.log("[worker] collected ".concat(count, " logs by labels [").concat(label, "]."));
-                case 11:
+                case 7:
                 case "end":
                   return _context2.stop();
               }
             }, _loop);
           });
           _iterator.s();
-        case 7:
+        case 8:
           if ((_step = _iterator.n()).done) {
-            _context3.next = 11;
+            _context3.next = 12;
             break;
           }
-          return _context3.delegateYield(_loop(), "t0", 9);
-        case 9:
-          _context3.next = 7;
+          return _context3.delegateYield(_loop(), "t0", 10);
+        case 10:
+          _context3.next = 8;
           break;
-        case 11:
-          _context3.next = 16;
+        case 12:
+          _context3.next = 17;
           break;
-        case 13:
-          _context3.prev = 13;
-          _context3.t1 = _context3["catch"](4);
+        case 14:
+          _context3.prev = 14;
+          _context3.t1 = _context3["catch"](5);
           _iterator.e(_context3.t1);
-        case 16:
-          _context3.prev = 16;
+        case 17:
+          _context3.prev = 17;
           _iterator.f();
-          return _context3.finish(16);
-        case 19:
-          _context3.next = 25;
+          return _context3.finish(17);
+        case 20:
+          _context3.next = 22;
+          return zip.generateAsync({
+            type: 'blob'
+          });
+        case 22:
+          blob = _context3.sent;
+          _context3.next = 29;
           break;
-        case 21:
-          _context3.prev = 21;
-          _context3.t2 = _context3["catch"](2);
+        case 25:
+          _context3.prev = 25;
+          _context3.t2 = _context3["catch"](3);
           console.error("[worker] failed to collect logs.", _context3.t2);
           (0, _reply.reply)(self, callId, _constants.WorkerDirectives.COLLECT_LOGS, {
             isSuccess: false
           });
-        case 25:
+        case 29:
           console.log("[worker] completed collecting logs, compressed size: ".concat(blob.size, " bytes."));
-          _context3.next = 28;
+          _context3.next = 32;
           return blob.arrayBuffer();
-        case 28:
+        case 32:
           buffer = _context3.sent;
           (0, _reply.reply)(self, callId, _constants.WorkerDirectives.COLLECT_LOGS, {
             isSuccess: true,
             buffer: buffer,
             lastId: lastId
           }, [buffer]);
-        case 30:
+        case 34:
         case "end":
           return _context3.stop();
       }
-    }, _callee2, null, [[2, 21], [4, 13, 16, 19]]);
+    }, _callee2, null, [[3, 25], [5, 14, 17, 20]]);
   }));
   return function collectLogs(_x, _x2, _x3) {
     return _ref2.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-foundation",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "license": "MIT",
   "scripts": {
     "build": "agora-tc-transpile",
@@ -19,7 +19,7 @@
     "@types/jasmine": "^5.1.4",
     "@types/lodash": "^4.14.168",
     "@types/node": "^20.11.30",
-    "agora-toolchain": "^3.4.1",
+    "agora-toolchain": "^3.4.2",
     "core-js": "^3.33.3",
     "tslib": "^2.6.2",
     "winston": "^3.16.0"