agora-rte-sdk 2.9.1 → 2.9.10

package/lib/configs/index.d.ts

@@ -1,5 +1,5 @@
 import type { AGRtcConfig } from '../core/rtc/adapter';
-import { AgoraComponentRegion, AgoraLatencyLevel, AgoraRegion, AgoraRtcSDKExtension, AgoraRteLogLevel, AgoraRteOptions, AgoraRteRuntimePlatform, AgoraRteSequenceVersion, AgoraRteServiceConfig } from '../type';
+import { AgoraCloudProxyType, AgoraComponentRegion, AgoraLatencyLevel, AgoraRegion, AgoraRtcSDKExtension, AgoraRteLogLevel, AgoraRteOptions, AgoraRteRuntimePlatform, AgoraRteSequenceVersion, AgoraRteServiceConfig } from '../type';
 export declare class AgoraRteEngineConfig {
     appId: string;
     service: AgoraRteServiceConfig;
@@ -26,6 +26,9 @@ export declare class AgoraRteEngineConfig {
     static consoleHijackEnabled: boolean;
     static sequenceVersion: AgoraRteSequenceVersion;
     static volumeIndicatorInterval: number;
+    static cloudProxyType?: AgoraCloudProxyType;
+    static rtcLogUploadEnabled: boolean;
+    static rtmLogUploadEnabled: boolean;
     static setConfig(config: AgoraRteEngineConfig): void;
     static get shared(): AgoraRteEngineConfig;
     static get platform(): AgoraRteRuntimePlatform;

package/lib/configs/index.js

@@ -116,6 +116,9 @@ _class = AgoraRteEngineConfig;
 AgoraRteEngineConfig._config = void 0;
 // these settings should not depend on the shared instance therefore set to static
 AgoraRteEngineConfig.logLevel = _type.AgoraRteLogLevel.INFO;
-AgoraRteEngineConfig.consoleHijackEnabled = false;
+AgoraRteEngineConfig.consoleHijackEnabled = true;
 AgoraRteEngineConfig.sequenceVersion = _type.AgoraRteSequenceVersion.v2;
-AgoraRteEngineConfig.volumeIndicatorInterval = 500;
+AgoraRteEngineConfig.volumeIndicatorInterval = 500;
+AgoraRteEngineConfig.cloudProxyType = void 0;
+AgoraRteEngineConfig.rtcLogUploadEnabled = false;
+AgoraRteEngineConfig.rtmLogUploadEnabled = false;

package/lib/core/decorator/log/handler.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from '../../logger';
+import { Logger } from '../../logger/type';
 import { Result } from '../../utils/interceptor';
 import { InvocationEvent, InvocationHandler } from '../type';
 export declare const createLogHandler: (logger: Logger) => (evt: InvocationEvent) => Result;

package/lib/core/decorator/log/handler.js

@@ -1,7 +1,6 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,26 +11,20 @@ require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.array.index-of.js");
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _upperCase = _interopRequireDefault(require("lodash/upperCase"));
-var _type = require("../../../type");
-var _logger = require("../../logger");
-var _logSerializer = require("../../logger/log-serializer");
+var _logSerializer = require("./log-serializer");
 var _interceptor = require("../../utils/interceptor");
-var _type2 = require("../type");
-var formatLog = function formatLog(loglevel, msg, identifier) {
-  // `{date} {time} [threadName] [traceId] {level} {package} {method} {line}: {msg}`
-  return "".concat((0, _dayjs["default"])().format('YYYY-MM-DD HH:mm:ss'), " ").concat((0, _upperCase["default"])(_logger.logLevelMap[loglevel] || 'unknown'), " [").concat(identifier.className, ".").concat(identifier.methodName, "] [").concat(identifier.traceId, "] ").concat(msg);
+var _type = require("../type");
+var formatLog = function formatLog(msg, identifier) {
+  return "[".concat(identifier.traceId, "] [").concat(identifier.className, ".").concat(identifier.methodName, "] ").concat(msg);
 };
 var createLogHandler = exports.createLogHandler = function createLogHandler(logger) {
-  var level = _type.AgoraRteLogLevel.INFO;
   return function (evt) {
-    if (evt.type === _type2.InvocationEventType.pre) {
+    if (evt.type === _type.InvocationEventType.pre) {
       var _evt$arguments;
       evt.context.start = new Date().getTime();
-      evt.context.traceId = "trace-".concat(evt.context.start).concat(Math.ceil(Math.random() * 1000));
+      evt.context.traceId = "trace-".concat(evt.context.start);
       var args = (_evt$arguments = evt.arguments) !== null && _evt$arguments !== void 0 ? _evt$arguments : [];
-      var msg = formatLog(level, "args: [".concat((0, _logSerializer.serializeArgs)(args), "]"), {
+      var msg = formatLog("args: [".concat((0, _logSerializer.serializeArgs)(args), "]"), {
         className: evt["class"],
         methodName: evt.method,
         traceId: evt.context.traceId
@@ -47,7 +40,7 @@ var createLogHandler = exports.createLogHandler = function createLogHandler(logg
         results.push("error: ".concat((0, _logSerializer.serialize)(evt.error)));
       }
       results.push("Time elapsed: ".concat(elapsed, "ms"));
-      var _msg = formatLog(level, results.join(", "), {
+      var _msg = formatLog(results.join(", "), {
         className: evt["class"],
         methodName: evt.method,
         traceId: evt.context.traceId

package/lib/core/decorator/log/index.js

@@ -17,7 +17,7 @@ var _logger2 = require("../../logger");
  * @param descriptor
  */
 var trace = function trace(proto, propertyName, descriptor) {
-  var handler = (0, _handler.createLogHandler)(_logger2.Logger.logger);
+  var handler = (0, _handler.createLogHandler)(_logger2.Logger);
   var method = descriptor.value;
   if (typeof method === 'function') {
     descriptor.value = (0, _proxy.proxyMethod)(method, proto, propertyName, handler);
@@ -66,7 +66,7 @@ var silence = function silence(proto, propertyName) {
 var attach = function attach(options) {
   var proxyMethods = true;
   var label = (options === null || options === void 0 ? void 0 : options.label) || 'default';
-  var logger = _logger2.Logger.getLogger(label);
+  var logger = _logger2.Logger;
   if (options) {
     proxyMethods = !!options.proxyMethods;
   }

package/lib/core/decorator/log/log-serializer.d.ts

@@ -0,0 +1,8 @@
+interface Serializer {
+    match(obj: any): boolean;
+    serialize(obj: any): string;
+}
+export declare const addSerializer: (serializer: Serializer) => void;
+export declare const serialize: (data: unknown) => string;
+export declare const serializeArgs: (args: unknown[]) => string;
+export {};

package/lib/core/decorator/log/log-serializer.js

@@ -0,0 +1,64 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.serializeArgs = exports.serialize = exports.addSerializer = void 0;
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.match.js");
+require("core-js/modules/es.array.join.js");
+require("core-js/modules/es.array.map.js");
+var _lodash = require("lodash");
+var _utils = require("../../utils/utils");
+var serializers = [];
+var fileSerializer = {
+  match: function match(obj) {
+    return obj instanceof File;
+  },
+  serialize: function serialize(file) {
+    return (0, _utils.jsonstring)({
+      filename: file.name,
+      size: file.size
+    });
+  }
+};
+var plainObjectSerializer = {
+  match: function match(obj) {
+    return (0, _lodash.isPlainObject)(obj);
+  },
+  serialize: function serialize(obj) {
+    return (0, _utils.jsonstring)(obj);
+  }
+};
+var functionSerializer = {
+  match: function match(obj) {
+    return typeof obj === 'function';
+  },
+  serialize: function serialize(obj) {
+    return '[Function]';
+  }
+};
+var addSerializer = exports.addSerializer = function addSerializer(serializer) {
+  serializers.push(serializer);
+};
+var serialize = exports.serialize = function serialize(data) {
+  if (typeof data === 'string') {
+    return data;
+  }
+  var serializer = serializers.find(function (serializer) {
+    return serializer.match(data);
+  });
+  if (serializer) {
+    return serializer.serialize(data);
+  }
+  return "".concat(data);
+};
+var serializeArgs = exports.serializeArgs = function serializeArgs(args) {
+  return "".concat(args.map(serialize).join(' '));
+};
+addSerializer(fileSerializer);
+addSerializer(plainObjectSerializer);
+addSerializer(functionSerializer);

package/lib/core/decorator/log/logger.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from '../../logger';
+import { Logger } from '../../logger/type';
 declare type FunctionLike = {
     name: string;
 };

package/lib/core/decorator/log/logger.js

@@ -1,7 +1,6 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,14 +8,11 @@ exports.createFormatLogger = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.object.freeze.js");
 require("core-js/modules/es.function.name.js");
-var _logger = require("../../logger");
 var _type = require("../../../type");
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _upperCase = _interopRequireDefault(require("lodash/upperCase"));
-var _logSerializer = require("../../logger/log-serializer");
+var _logSerializer = require("./log-serializer");
 var formatLog = function formatLog(loglevel, msg, indentifier) {
   // `{date} {time} [threadName] [traceId] {level} {package} {method} {line}: {msg}`
-  return "".concat((0, _dayjs["default"])().format('YYYY-MM-DD HH:mm:ss'), " ").concat((0, _upperCase["default"])(_logger.logLevelMap[loglevel] || 'unknown'), " [").concat(indentifier, "] [trace-0] ").concat(msg);
+  return "[".concat(indentifier, "] ").concat(msg);
 };
 var createFormatLogger = exports.createFormatLogger = function createFormatLogger(constructor, logger) {
   return Object.freeze({

package/lib/core/engine/index.d.ts

@@ -2,13 +2,15 @@ import { AGEventEmitter } from '../utils/events';
 import { AgoraRteEngineConfig } from '../../configs';
 import { AgoraRteScene } from '../../scene';
 import { AgoraMediaControl } from '../media/control';
-import { TagInfo } from '../services/oss';
+import { AgoraCloudProxyType } from '../../type';
+import { TagInfo } from '../log-upload/type';
 export declare class AgoraRteEngine extends AGEventEmitter {
     private _mediaControl;
-    private _logService;
     private _rtmManager;
     private _rtcManager;
     private _apiServicePathPrefix;
+    private _logUploadScheduler;
+    private _electronLogUploadScheduler;
     constructor(config: AgoraRteEngineConfig);
     static createWithConfig(config: AgoraRteEngineConfig): AgoraRteEngine;
     get apiServicePathPrefix(): string;
@@ -19,5 +21,6 @@ export declare class AgoraRteEngine extends AGEventEmitter {
     static getRtcVersion(): string;
     createAgoraRteScene(sceneId: string): AgoraRteScene;
     getAgoraMediaControl(): AgoraMediaControl;
+    setCloudProxy(proxyType: AgoraCloudProxyType): void;
     uploadSDKLogToAgoraService(tagInfo: TagInfo): Promise<void>;
 }

package/lib/core/engine/index.js

@@ -29,6 +29,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AgoraRteEngine = void 0;
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.date.now.js");
+require("core-js/modules/es.date.to-string.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -39,11 +41,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _events = require("../utils/events");
 var _configs = require("../../configs");
 var _scene = require("../../scene");
-var _logger = require("../logger");
 var _control = require("../media/control");
 var _rtc = require("../rtc");
 var _rtm = require("../rtm");
-var _log = require("../services/log");
 var _awaitToJs = require("await-to-js");
 var _error = require("../utils/error");
 var _web = require("../rtc/adapter/web");
@@ -52,6 +52,11 @@ var _bound = require("../decorator/bound");
 var _lodash = require("../decorator/lodash");
 var _type = require("../../type");
 var _report = require("../services/report");
+var _logger = require("../logger");
+var _electronLogFile = require("../utils/electron-log-file");
+var _scheduler = require("../log-upload/scheduler");
+var _upload = require("../upload");
+var _handler = require("../log-upload/handler");
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -65,15 +70,15 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function (_AGEventEmi
     // there will be only 1 rte engine exist at same time
     // so it's safe to overwrite the config directly into global shared variable
     _this._mediaControl = void 0;
-    _this._logService = void 0;
     _this._rtmManager = void 0;
     _this._rtcManager = void 0;
     _this._apiServicePathPrefix = '';
+    _this._logUploadScheduler = new _scheduler.AgoraLogUploadScheduler();
+    _this._electronLogUploadScheduler = new _upload.AgoraUploadScheduler(new _handler.AgoraElectronLogUploadHandler());
     _configs.AgoraRteEngineConfig.setConfig(config);
     if (_configs.AgoraRteEngineConfig.consoleHijackEnabled) {
       _logger.Logger.setupConsoleHijack();
     }
-    _this._logService = new _log.AgoraLogService();
     _this._rtmManager = new _rtm.AGRtmManager();
     _this._rtcManager = new _rtc.AGRtcManager(config.rtcConfigs);
     _this._mediaControl = new _control.AgoraMediaControl(_this._rtcManager);
@@ -120,7 +125,7 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function (_AGEventEmi
               };
               _context.next = 9;
               return this._rtmManager.login(rtmToken, userId, {
-                uploadLog: false
+                uploadLog: _configs.AgoraRteEngineConfig.rtmLogUploadEnabled
               });
             case 9:
               return _context.abrupt("return", _context.sent);
@@ -157,78 +162,79 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function (_AGEventEmi
     value: function getAgoraMediaControl() {
       return this._mediaControl;
     }
+  }, {
+    key: "setCloudProxy",
+    value: function setCloudProxy(proxyType) {
+      this._rtcManager.setCloudProxy(proxyType);
+    }
   }, {
     key: "uploadSDKLogToAgoraService",
     value: function () {
       var _uploadSDKLogToAgoraService = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tagInfo) {
-        var err, consoleLog, electronLog, _yield$to, _yield$to2, _yield$to3, _yield$to4, _yield$to5, _yield$to6, _yield$to7, _yield$to8;
+        var err, consoleLog, _yield$to, _yield$to2, _yield$to3, _yield$to4, electronLog, _yield$to5, _yield$to6;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              consoleLog = null;
-              electronLog = null;
-              _context2.next = 4;
-              return (0, _awaitToJs.to)(_logger.Logger.collectConsoleLogs());
-            case 4:
+              consoleLog = undefined;
+              _context2.next = 3;
+              return (0, _awaitToJs.to)(_logger.Logger.collectLogs());
+            case 3:
               _yield$to = _context2.sent;
               _yield$to2 = (0, _slicedToArray2["default"])(_yield$to, 2);
               err = _yield$to2[0];
               consoleLog = _yield$to2[1];
-              if (err) {
-                _context2.next = 22;
+              if (!(!err && consoleLog)) {
+                _context2.next = 21;
                 break;
               }
-              _context2.next = 11;
-              return (0, _awaitToJs.to)(this._logService.uploadLogFile(tagInfo, consoleLog));
-            case 11:
+              _context2.next = 10;
+              return (0, _awaitToJs.to)(this._logUploadScheduler.scheduleUploadTask({
+                id: Date.now(),
+                file: consoleLog,
+                tagInfo: tagInfo
+              }));
+            case 10:
               _yield$to3 = _context2.sent;
               _yield$to4 = (0, _slicedToArray2["default"])(_yield$to3, 1);
               err = _yield$to4[0];
               if (!err) {
-                _context2.next = 18;
+                _context2.next = 17;
                 break;
               }
-              _error.RteErrorCenter.shared.handleNonThrowableError(_error.AGRteErrorCode.RTE_ERR_WEB_LOG_UPLOAD_ERR, err);
-              _context2.next = 20;
+              _error.RteErrorCenter.shared.handleThrowableError(_error.AGRteErrorCode.RTE_ERR_WEB_LOG_UPLOAD_ERR, err);
+              _context2.next = 19;
               break;
-            case 18:
-              _context2.next = 20;
-              return (0, _awaitToJs.to)(_logger.Logger.cleanupConsoleLogs());
-            case 20:
-              _context2.next = 23;
+            case 17:
+              _context2.next = 19;
+              return (0, _awaitToJs.to)(_logger.Logger.flush());
+            case 19:
+              _context2.next = 22;
               break;
+            case 21:
+              _error.RteErrorCenter.shared.handleThrowableError(_error.AGRteErrorCode.RTE_ERR_WEB_LOG_UPLOAD_ERR, err);
             case 22:
-              _error.RteErrorCenter.shared.handleNonThrowableError(_error.AGRteErrorCode.RTE_ERR_WEB_LOG_UPLOAD_ERR, err);
-            case 23:
+              electronLog = null;
               if (!(_configs.AgoraRteEngineConfig.platform === _type.AgoraRteRuntimePlatform.Electron)) {
-                _context2.next = 40;
+                _context2.next = 31;
                 break;
               }
               _context2.next = 26;
-              return (0, _awaitToJs.to)(_logger.Logger.collectElectronLogs(_electron.RtcAdapterElectron.logBasePath, _electron.RtcAdapterElectron.logFolderPath));
+              return (0, _awaitToJs.to)((0, _electronLogFile.collectElectronLogs)(_electron.RtcAdapterElectron.logBasePath, _electron.RtcAdapterElectron.logFolderPath));
             case 26:
               _yield$to5 = _context2.sent;
               _yield$to6 = (0, _slicedToArray2["default"])(_yield$to5, 2);
               err = _yield$to6[0];
               electronLog = _yield$to6[1];
-              if (err) {
-                _context2.next = 39;
-                break;
+              if (!err && electronLog) {
+                this._electronLogUploadScheduler.addUploadTask({
+                  id: Date.now(),
+                  file: electronLog,
+                  tagInfo: tagInfo
+                });
+              } else {
+                _error.RteErrorCenter.shared.handleThrowableError(_error.AGRteErrorCode.RTE_ERR_ELECTRON_LOG_UPLOAD_ERR, err);
               }
-              _context2.next = 33;
-              return (0, _awaitToJs.to)(this._logService.uploadZipLogFile(tagInfo, electronLog));
-            case 33:
-              _yield$to7 = _context2.sent;
-              _yield$to8 = (0, _slicedToArray2["default"])(_yield$to7, 1);
-              err = _yield$to8[0];
-              if (err) {
-                _error.RteErrorCenter.shared.handleNonThrowableError(_error.AGRteErrorCode.RTE_ERR_ELECTRON_LOG_UPLOAD_ERR, err);
-              }
-              _context2.next = 40;
-              break;
-            case 39:
-              _error.RteErrorCenter.shared.handleNonThrowableError(_error.AGRteErrorCode.RTE_ERR_ELECTRON_LOG_UPLOAD_ERR, err);
-            case 40:
+            case 31:
             case "end":
               return _context2.stop();
           }

package/lib/core/log-upload/handler.d.ts

@@ -0,0 +1,22 @@
+import { AgoraUploadHandler } from '../upload';
+import { AgoraLogUploadTask } from './type';
+export declare class AgoraLogUploadHandler implements AgoraUploadHandler<AgoraLogUploadTask> {
+    protected _policyHost: string;
+    protected _httpTimeout: number;
+    protected _osName: string | undefined;
+    protected _osVersion: string | undefined;
+    protected _appId: string;
+    protected _appVersion: string;
+    protected _platform: string;
+    constructor();
+    handleUpload(task: AgoraLogUploadTask): Promise<void>;
+    private _putFile;
+    private _fetchPresignedArgs;
+    private _getHttpHeaders;
+}
+export declare class AgoraWebLogUploadHandler extends AgoraLogUploadHandler {
+    constructor();
+}
+export declare class AgoraElectronLogUploadHandler extends AgoraLogUploadHandler {
+    constructor();
+}