agora-foundation 3.7.9-alpha → 3.8.0-alpha

package/lib/restful-scheduler/scheduler.d.ts

@@ -0,0 +1,16 @@
+export declare const DEFAULT_MAX_CONCURRENT = 10;
+export declare class AgoraRequestScheduler {
+    private _maxConcurrent;
+    private _runningCount;
+    private _queueControl;
+    private _weightManager;
+    private _timeoutThreshold;
+    constructor(configs?: {
+        rules?: Map<RegExp, number>;
+        maxConcurrent?: number;
+    });
+    addTask(url: string, executor: () => Promise<any>): void;
+    private _isIdle;
+    private _executeTask;
+    private _onTaskComplete;
+}

package/lib/restful-scheduler/scheduler.js

@@ -0,0 +1,232 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.iterator.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFAULT_MAX_CONCURRENT = exports.AgoraRequestScheduler = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.find-index.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.splice.js");
+require("core-js/modules/es.date.now.js");
+require("core-js/modules/es.map.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/es.string.iterator.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.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 _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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; }
+var DEFAULT_MAX_CONCURRENT = exports.DEFAULT_MAX_CONCURRENT = 10;
+var AgoraRequestWeightManager = /*#__PURE__*/function () {
+  function AgoraRequestWeightManager() {
+    (0, _classCallCheck2["default"])(this, AgoraRequestWeightManager);
+    (0, _defineProperty2["default"])(this, "_rules", new Map());
+  }
+  return (0, _createClass2["default"])(AgoraRequestWeightManager, [{
+    key: "getWeight",
+    value: function getWeight(url) {
+      var _iterator = _createForOfIteratorHelper(this._rules),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _step$value = (0, _slicedToArray2["default"])(_step.value, 2),
+            pattern = _step$value[0],
+            weight = _step$value[1];
+          if (pattern.test(url)) {
+            return weight;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return 0;
+    }
+  }, {
+    key: "addRule",
+    value: function addRule(pattern, weight) {
+      if (typeof pattern === 'string') {
+        this._rules.set(new RegExp(pattern), weight);
+      } else {
+        this._rules.set(pattern, weight);
+      }
+    }
+  }]);
+}();
+var AgoraPriorityQueue = /*#__PURE__*/function () {
+  function AgoraPriorityQueue() {
+    (0, _classCallCheck2["default"])(this, AgoraPriorityQueue);
+    (0, _defineProperty2["default"])(this, "_items", []);
+  }
+  return (0, _createClass2["default"])(AgoraPriorityQueue, [{
+    key: "enqueue",
+    value: function enqueue(item) {
+      this._items.push(item);
+    }
+  }, {
+    key: "dequeue",
+    value: function dequeue(timeoutThreshold) {
+      var _this = this;
+      var now = Date.now();
+      var taskIndex = this._items.findIndex(function (item) {
+        return now - (item === null || item === void 0 ? void 0 : item.addedAt) > timeoutThreshold;
+      });
+      if (taskIndex !== -1) {
+        return this._items.splice(taskIndex, 1)[0];
+      }
+      taskIndex = this._items.findIndex(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.weight) === Math.max.apply(Math, (0, _toConsumableArray2["default"])(_this._items.map(function (item) {
+          return item === null || item === void 0 ? void 0 : item.weight;
+        })));
+      });
+      if (taskIndex !== -1) {
+        return this._items.splice(taskIndex, 1)[0];
+      }
+      return undefined;
+    }
+  }]);
+}();
+var AgoraRequestScheduler = exports.AgoraRequestScheduler = /*#__PURE__*/function () {
+  // in ms
+
+  function AgoraRequestScheduler(configs) {
+    var _rules$size,
+      _this2 = this;
+    (0, _classCallCheck2["default"])(this, AgoraRequestScheduler);
+    (0, _defineProperty2["default"])(this, "_maxConcurrent", DEFAULT_MAX_CONCURRENT);
+    (0, _defineProperty2["default"])(this, "_runningCount", 0);
+    (0, _defineProperty2["default"])(this, "_queueControl", new AgoraPriorityQueue());
+    (0, _defineProperty2["default"])(this, "_weightManager", new AgoraRequestWeightManager());
+    (0, _defineProperty2["default"])(this, "_timeoutThreshold", 5000);
+    var _ref = configs !== null && configs !== void 0 ? configs : {},
+      rules = _ref.rules,
+      maxConcurrent = _ref.maxConcurrent;
+    if (maxConcurrent && typeof maxConcurrent === 'number') {
+      this._maxConcurrent = maxConcurrent;
+    }
+    if (((_rules$size = rules === null || rules === void 0 ? void 0 : rules.size) !== null && _rules$size !== void 0 ? _rules$size : 0) > 0) {
+      rules === null || rules === void 0 || rules.forEach(function (v, k) {
+        if ((k instanceof RegExp || typeof k === 'string') && typeof v === 'number') {
+          _this2._weightManager.addRule(k, v);
+        }
+      });
+    }
+  }
+  return (0, _createClass2["default"])(AgoraRequestScheduler, [{
+    key: "addTask",
+    value: function addTask(url, executor) {
+      var task = {
+        url: url,
+        weight: this._weightManager.getWeight(url),
+        addedAt: Date.now(),
+        executor: executor
+      };
+      this._queueControl.enqueue(task);
+      this._executeTask();
+    }
+  }, {
+    key: "_isIdle",
+    value: function _isIdle() {
+      if (this._runningCount < this._maxConcurrent) {
+        return true;
+      }
+      return false;
+    }
+  }, {
+    key: "_executeTask",
+    value: function () {
+      var _executeTask2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var task, _t;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (this._isIdle()) {
+                _context.next = 1;
+                break;
+              }
+              return _context.abrupt("return");
+            case 1:
+              task = this._queueControl.dequeue(this._timeoutThreshold);
+              if (!task) {
+                _context.next = 6;
+                break;
+              }
+              this._runningCount++;
+              _context.prev = 2;
+              _context.next = 3;
+              return task.executor();
+            case 3:
+              _context.next = 5;
+              break;
+            case 4:
+              _context.prev = 4;
+              _t = _context["catch"](2);
+            case 5:
+              _context.prev = 5;
+              this._onTaskComplete();
+              return _context.finish(5);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[2, 4, 5, 6]]);
+      }));
+      function _executeTask() {
+        return _executeTask2.apply(this, arguments);
+      }
+      return _executeTask;
+    }()
+  }, {
+    key: "_onTaskComplete",
+    value: function _onTaskComplete() {
+      this._runningCount--;
+      this._executeTask();
+    }
+  }]);
+}();

package/lib/utilities/safely-remove-child.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 安全地使用 Node.removeChild 移除子节点
+ * @param parent 父节点
+ * @param child 要移除的子节点
+ * @returns 移除的节点，如果失败返回 null
+ */
+export declare function safelyRemoveChild<T extends Node>(parent: Node | null, child: T | null): T | null;

package/lib/utilities/safely-remove-child.js

@@ -0,0 +1,36 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.safelyRemoveChild = safelyRemoveChild;
+var _logger = require("../logger");
+/**
+ * 安全地使用 Node.removeChild 移除子节点
+ * @param parent 父节点
+ * @param child 要移除的子节点
+ * @returns 移除的节点，如果失败返回 null
+ */
+
+var logger = (0, _logger.getLogger)();
+function safelyRemoveChild(parent, child) {
+  // 参数检查
+  if (!parent || !child) {
+    return null;
+  }
+  try {
+    // 检查父子关系
+    if (parent.contains(child)) {
+      return parent.removeChild(child);
+    } else {
+      // 子节点不属于该父节点
+      logger.warn('safelyRemoveChild: The node to be removed is not a child of this node');
+      return null;
+    }
+  } catch (error) {
+    // 捕获其他可能的错误
+    logger.error('safelyRemoveChild: Failed to remove child node', error);
+    return null;
+  }
+}

package/lib/utilities/zip.d.ts

@@ -1 +1,5 @@
 export declare const zipDir: (dirPath: string, filter?: (fileName: string) => boolean) => Promise<File | null>;
+export declare const createMultiEntryZip: () => {
+    addFile: (fileName: string, content: string) => void;
+    finish: () => Promise<ArrayBuffer>;
+};

package/lib/utilities/zip.js

@@ -9,10 +9,8 @@ require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.slice.js");
-require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -21,27 +19,29 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.zipDir = void 0;
+exports.zipDir = exports.createMultiEntryZip = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.date.to-iso-string.js");
+require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.replace.js");
 var _jszip = _interopRequireDefault(require("jszip"));
-var _logger = require("../logger");
-var _dayjs = _interopRequireDefault(require("dayjs"));
 var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 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; }
+var COMPRESSION_LEVEL = 9;
 var zipDir = exports.zipDir = function zipDir(dirPath, filter) {
-  var logger = (0, _logger.getLogger)();
   return new Promise(function (resolve) {
     try {
       var fs = window.require('fs');
       fs.readdir(dirPath, /*#__PURE__*/function () {
         var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(err, files) {
-          var zip, _iterator, _step, _file, filePath, logsStr, blob, buffer, datefmt, file, _t;
+          var zip, _iterator, _step, _file, filePath, logsStr, blob, buffer, now, datefmt, file, _t;
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -107,7 +107,7 @@ var zipDir = exports.zipDir = function zipDir(dirPath, filter) {
                   type: 'blob',
                   compression: 'DEFLATE',
                   compressionOptions: {
-                    level: 9
+                    level: COMPRESSION_LEVEL
                   }
                 });
               case 12:
@@ -116,7 +116,9 @@ var zipDir = exports.zipDir = function zipDir(dirPath, filter) {
                 return blob.arrayBuffer();
               case 13:
                 buffer = _context.sent;
-                datefmt = (0, _dayjs["default"])().format('YYYY-MM-DDTHH:mm:ssZ[Z]');
+                // 使用 JavaScript 内置 Date 对象格式化日期
+                now = new Date();
+                datefmt = now.toISOString().replace(/\.\d{3}Z$/, 'Z') + 'Z';
                 file = new File([buffer], "logs-".concat(datefmt, ".zip"), {
                   type: 'application/zip'
                 });
@@ -132,7 +134,7 @@ var zipDir = exports.zipDir = function zipDir(dirPath, filter) {
         };
       }());
     } catch (e) {
-      logger.error("failed to get buffer.", e);
+      console.error("failed to get buffer.", e);
       resolve(null);
     }
   });
@@ -163,4 +165,44 @@ var isFile = /*#__PURE__*/function () {
   return function isFile(_x3) {
     return _ref2.apply(this, arguments);
   };
-}();
+}();
+var createMultiEntryZip = exports.createMultiEntryZip = function createMultiEntryZip() {
+  var zip = new _jszip["default"]();
+  return {
+    addFile: function addFile(fileName, content) {
+      zip.file(fileName, content);
+    },
+    finish: function () {
+      var _finish = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+        var blob, buffer;
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 1;
+              return zip.generateAsync({
+                type: 'blob',
+                compression: 'DEFLATE',
+                compressionOptions: {
+                  level: COMPRESSION_LEVEL
+                }
+              });
+            case 1:
+              blob = _context3.sent;
+              _context3.next = 2;
+              return blob.arrayBuffer();
+            case 2:
+              buffer = _context3.sent;
+              return _context3.abrupt("return", buffer);
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function finish() {
+        return _finish.apply(this, arguments);
+      }
+      return finish;
+    }()
+  };
+};

package/lib/worker/handler/log.js

@@ -24,10 +24,15 @@ require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.array.reverse.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.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.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.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -38,16 +43,17 @@ var _mutex = require("../mutex");
 var _constants = require("../constants");
 var _reply = require("./reply");
 var _raceCondition = require("../../utilities/race-condition");
-var _jszip = _interopRequireDefault(require("jszip"));
 var _env = require("../../utilities/env");
 var _logRotateNew = require("./log-rotate-new");
+var _zip = require("../../utilities/zip");
 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; } // import { createRotateTransport } from './log-rotate';
 var MAX_WAIT_TIME = 3000;
 var mutex = new _mutex.Mutex();
-var maxRecords = 50000;
+var maxRecords = 20000;
 var logsCount = 0;
+var maxDeleteCount = 5000;
 var logs = [];
 var writeLog = exports.writeLog = function writeLog(self, callId, log) {
   logsCount++;
@@ -60,7 +66,7 @@ var writeLog = exports.writeLog = function writeLog(self, callId, log) {
 var debouncedWriting = (0, _debounce["default"])(function () {
   mutex.dispatch(function () {
     return (0, _raceCondition.timeout)((0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var time1, logscopy, count, exceedNo, total, pk, time2, _t, _t2;
+      var time1, logscopy, count, exceedNo, records, maxIdToDelete, total, pk, time2, _t, _t2;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -72,7 +78,7 @@ var debouncedWriting = (0, _debounce["default"])(function () {
               break;
             }
             writeLogsToDisk(logscopy);
-            _context.next = 9;
+            _context.next = 11;
             break;
           case 1:
             _context.prev = 1;
@@ -82,43 +88,56 @@ var debouncedWriting = (0, _debounce["default"])(function () {
             count = _context.sent;
             exceedNo = logscopy.length + count - maxRecords;
             if (!(exceedNo > 0)) {
-              _context.next = 4;
+              _context.next = 6;
               break;
             }
             console.log("[worker] the count of stored logs exceeded limit of ".concat(maxRecords, " for ").concat(exceedNo, "."));
-            console.log("[worker] start deleting records. exceeded: ".concat(exceedNo));
+            console.log("[worker] start deleting records. will delete: ".concat(maxDeleteCount));
             _context.next = 3;
-            return _db.db.logs.orderBy(':id').reverse().limit(exceedNo)["delete"]();
+            return _db.db.logs.orderBy(':id').limit(maxDeleteCount).keys();
           case 3:
+            records = _context.sent;
+            if (!(records.length > 0)) {
+              _context.next = 5;
+              break;
+            }
+            maxIdToDelete = records[records.length - 1];
+            _context.next = 4;
+            return _db.db.logs.where(':id').belowOrEqual(maxIdToDelete)["delete"]();
+          case 4:
             total = _context.sent;
             console.log("[worker] done deleting records. total: ".concat(total));
-          case 4:
             _context.next = 6;
             break;
           case 5:
-            _context.prev = 5;
+            console.log("[worker] no records to delete");
+          case 6:
+            _context.next = 8;
+            break;
+          case 7:
+            _context.prev = 7;
             _t = _context["catch"](1);
             console.error("[worker] clear db failed.", _t);
-          case 6:
-            _context.prev = 6;
+          case 8:
+            _context.prev = 8;
             console.log("[worker] start writing logs. total: ".concat(logscopy.length));
-            _context.next = 7;
+            _context.next = 9;
             return _db.db.logs.bulkPut(logscopy);
-          case 7:
+          case 9:
             pk = _context.sent;
             time2 = new Date().getTime();
             console.log("[worker] done writing logs in ".concat(time2 - time1, "ms. total: ").concat(logscopy.length, ", lastId: ").concat(pk));
-            _context.next = 9;
+            _context.next = 11;
             break;
-          case 8:
-            _context.prev = 8;
-            _t2 = _context["catch"](6);
+          case 10:
+            _context.prev = 10;
+            _t2 = _context["catch"](8);
             console.error("[worker] bulkPut ".concat(logscopy.length, " failed."), _t2);
-          case 9:
+          case 11:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 5], [6, 8]]);
+      }, _callee, null, [[1, 7], [8, 10]]);
     }))(), MAX_WAIT_TIME);
   })["catch"](function (e) {
     console.log('[worker] an error during dispatching writeLog', e);
@@ -128,14 +147,14 @@ 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 zip, blob, lastId, _iterator, _step, _loop, buffer, _t3, _t4;
+    var buffer, lastId, _createMultiEntryZip, addFile, finish, _iterator, _step, _loop, _t3, _t4;
     return _regenerator["default"].wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          zip = new _jszip["default"]();
-          blob = new Blob();
+          buffer = new ArrayBuffer();
           lastId = 0;
           _context3.prev = 1;
+          _createMultiEntryZip = (0, _zip.createMultiEntryZip)(), addFile = _createMultiEntryZip.addFile, finish = _createMultiEntryZip.finish;
           _iterator = _createForOfIteratorHelper(labels);
           _context3.prev = 2;
           _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
@@ -153,7 +172,7 @@ var collectLogs = exports.collectLogs = /*#__PURE__*/function () {
                     if (e.id > lastId) lastId = e.id;
                   });
                 case 1:
-                  zip.file("".concat(label, "-logs.txt"), logsStr);
+                  addFile("".concat(label, "-logs.txt"), logsStr);
                   console.log("[worker] collected ".concat(count, " logs by labels [").concat(label, "]."));
                 case 2:
                 case "end":
@@ -184,11 +203,9 @@ var collectLogs = exports.collectLogs = /*#__PURE__*/function () {
           return _context3.finish(7);
         case 8:
           _context3.next = 9;
-          return zip.generateAsync({
-            type: 'blob'
-          });
+          return finish();
         case 9:
-          blob = _context3.sent;
+          buffer = _context3.sent;
           _context3.next = 11;
           break;
         case 10:
@@ -199,17 +216,13 @@ var collectLogs = exports.collectLogs = /*#__PURE__*/function () {
             isSuccess: false
           });
         case 11:
-          console.log("[worker] completed collecting logs, compressed size: ".concat(blob.size, " bytes."));
-          _context3.next = 12;
-          return blob.arrayBuffer();
-        case 12:
-          buffer = _context3.sent;
+          console.log("[worker] completed collecting logs, compressed size: ".concat(buffer.byteLength, " bytes."));
           (0, _reply.reply)(self, callId, _constants.WorkerDirectives.COLLECT_LOGS, {
             isSuccess: true,
             buffer: buffer,
             lastId: lastId
           }, [buffer]);
-        case 13:
+        case 12:
         case "end":
           return _context3.stop();
       }