@antglobal/rlog-sdk 0.0.1755855517-dev.8 → 1.0.0

package/dist/lib/lib/uploader.js

@@ -5,18 +5,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cancelUploadLoop = cancelUploadLoop;
+exports.flushOrphanSessions = flushOrphanSessions;
 exports.forceResetUploadState = forceResetUploadState;
 exports.resetUploadLoop = resetUploadLoop;
+exports.setCancelCallback = setCancelCallback;
+exports.setErrorModeUploading = setErrorModeUploading;
+exports.setErrorModeWindowStart = setErrorModeWindowStart;
 exports.startUploadLoop = startUploadLoop;
 var _api = require("./api");
 var _storageManager = require("./storage-manager");
 var _utils = require("./utils");
 var _config = require("./config");
 var _rrweb = require("rrweb");
-var _init = require("./init");
+var _uploadWorkerManager = require("./upload-worker-manager");
+var _logger = _interopRequireDefault(require("./logger"));
+var _constants = require("./constants");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+// ==================== 取消回调 ====================
+
+// 由 init.ts 注入的取消回调，解除循环依赖
+var onCancelCallback = null;
+
+/**
+ * 设置 SDK 取消回调（由 init.ts 在启动上传循环前注入）
+ */
+function setCancelCallback(callback) {
+  onCancelCallback = callback;
+}
+
+// ==================== 主线程降级模式状态 ====================
+
 // 全局取消标志
 var isUploadCancelled = false;
 
@@ -26,51 +50,252 @@ var uploadFailureCount = new Map();
 // 上传锁，防止并发上传
 var isUploading = false;
 
+// 错误模式状态：是否处于上传状态（由 ErrorTrigger 控制）
+var errorModeUploading = false;
+
+// 上传时间窗口起点（错误模式专用，用于记录历史事件起点）
+var errorModeWindowStart = 0;
+
 /**
- * 启动数据上传循环
+ * 设置错误模式上传状态
+ * 由 ErrorTrigger 调用：错误触发时设置为 true，cooldown 结束时设置为 false
+ * 自动分发到 Worker 模式或主线程模式
+ */
+function setErrorModeUploading(uploading) {
+  if ((0, _uploadWorkerManager.isUsingWorkerMode)()) {
+    (0, _uploadWorkerManager.setWorkerErrorModeUploading)(uploading);
+  } else {
+    errorModeUploading = uploading;
+  }
+}
+
+/**
+ * 设置错误模式上传时间窗口起点
+ * 由 ErrorTrigger 调用，记录错误触发前的时间窗口起点
+ * 自动分发到 Worker 模式或主线程模式
+ */
+function setErrorModeWindowStart(startTime) {
+  if ((0, _uploadWorkerManager.isUsingWorkerMode)()) {
+    (0, _uploadWorkerManager.setWorkerErrorModeWindowStart)(startTime);
+  } else {
+    errorModeWindowStart = startTime;
+  }
+}
+
+// ==================== 主线程降级模式上传逻辑 ====================
+
+/**
+ * 统一的上传函数（主线程降级模式）
  * @param serv 服务器地址
  * @param appId 应用ID
+ * @param events 要上传的事件数组
+ * @returns 上传结果：success 表示是否成功，error 包含错误信息（失败时）
  */
-function startUploadLoop(serv, appId) {
+function uploadEvents(_x, _x2, _x3) {
+  return _uploadEvents.apply(this, arguments);
+}
+/**
+ * 处理上传失败（主线程降级模式）
+ * @param events 失败的事件
+ * @param error 错误信息
+ * @param appId 应用ID
+ * @param serv 服务器地址
+ * @param maxRetryCount 最大重试次数
+ * @param currentCount 当前失败次数
+ * @returns 是否应该停止上传循环
+ */
+function _uploadEvents() {
+  _uploadEvents = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(serv, appId, events) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (!(!events || events.length === 0)) {
+            _context2.next = 2;
+            break;
+          }
+          return _context2.abrupt("return", {
+            success: true
+          });
+        case 2:
+          _context2.prev = 2;
+          _context2.next = 5;
+          return (0, _api.upload)({
+            appId: appId,
+            data: events,
+            deviceId: (0, _utils.getDeviceId)(),
+            url: serv
+          });
+        case 5:
+          return _context2.abrupt("return", {
+            success: true
+          });
+        case 8:
+          _context2.prev = 8;
+          _context2.t0 = _context2["catch"](2);
+          _logger.default.warn('Upload failed:', _context2.t0);
+          return _context2.abrupt("return", {
+            success: false,
+            error: _context2.t0
+          });
+        case 12:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[2, 8]]);
+  }));
+  return _uploadEvents.apply(this, arguments);
+}
+function handleUploadFailure(_x4, _x5, _x6, _x7, _x8, _x9) {
+  return _handleUploadFailure.apply(this, arguments);
+}
+/**
+ * 主线程降级模式的上传循环
+ */
+function _handleUploadFailure() {
+  _handleUploadFailure = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(events, error, appId, serv, maxRetryCount, currentCount) {
+    var newCount, batchKey, event;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          newCount = currentCount + 1;
+          batchKey = "".concat(appId, "_").concat((0, _utils.getStorageKey)());
+          uploadFailureCount.set(batchKey, newCount);
+
+          // 检查是否达到最大重试次数
+          if (!(newCount >= maxRetryCount)) {
+            _context3.next = 16;
+            break;
+          }
+          _logger.default.warn("Upload failed ".concat(maxRetryCount, " times consecutively, stopping upload"));
+
+          // 将事件放回存储
+          _context3.next = 7;
+          return _storageManager.storage.unshiftBatch((0, _utils.getStorageKey)(), events);
+        case 7:
+          // 创建并派发自定义事件
+          event = new CustomEvent(_constants.EVENT_UPLOAD_FAILURE, {
+            detail: {
+              error: error,
+              retryCount: maxRetryCount,
+              appId: appId,
+              deviceId: (0, _utils.getDeviceId)()
+            }
+          });
+          if (typeof window !== 'undefined') {
+            window.dispatchEvent(event);
+          }
+
+          // 使用 addCustomEvent 记录上传失败事件
+          try {
+            _rrweb.record.addCustomEvent(_constants.EVENT_UPLOAD_FAILURE, {
+              error: error,
+              retryCount: maxRetryCount,
+              appId: appId,
+              deviceId: (0, _utils.getDeviceId)(),
+              timestamp: Date.now()
+            });
+          } catch (e) {
+            _logger.default.warn('Failed to record upload failure event via addCustomEvent:', e);
+          }
+
+          // 重置计数器
+          uploadFailureCount.delete(batchKey);
+
+          // 停止 rrweb 录制（通过回调避免循环依赖）
+          if (onCancelCallback) {
+            setTimeout(function () {
+              try {
+                var _onCancelCallback;
+                (_onCancelCallback = onCancelCallback) === null || _onCancelCallback === void 0 || _onCancelCallback();
+              } catch (error) {
+                _logger.default.error('Error in cancel callback:', error);
+              }
+            }, 0);
+          }
+          _logger.default.error('Upload and recording stopped due to repeated failures');
+          return _context3.abrupt("return", true);
+        case 16:
+          _logger.default.warn("Upload failed ".concat(newCount, " time(s), will retry in next cycle"));
+          // 将事件放回存储头部，保持时间戳顺序
+          _context3.next = 19;
+          return _storageManager.storage.unshiftBatch((0, _utils.getStorageKey)(), events);
+        case 19:
+          return _context3.abrupt("return", false);
+        case 20:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _handleUploadFailure.apply(this, arguments);
+}
+function startMainThreadUploadLoop(serv, appId) {
   var push = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var currentConfig, events, config, consumeOnly, batchKey, maxRetryCount, _batchKey, currentCount, newCount, event;
+      var currentConfig, isErrorMode, events, windowStart, config, consumeOnly, result, batchKey, lastEvent, maxRetryCount, _batchKey, currentCount, shouldStop;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isUploadCancelled) {
-              _context.next = 3;
+              _context.next = 2;
               break;
             }
-            console.log('RLog upload has been cancelled');
             return _context.abrupt("return");
-          case 3:
+          case 2:
             if (!isUploading) {
-              _context.next = 6;
+              _context.next = 5;
               break;
             }
             setTimeout(function () {
               push();
-            }, 100); // 延迟重试
+            }, _constants.UPLOAD_RETRY_DELAY); // 延迟重试
             return _context.abrupt("return");
-          case 6:
+          case 5:
             // 检查采集总开关
             currentConfig = (0, _config.getConfig)();
             if (currentConfig.enable) {
-              _context.next = 10;
+              _context.next = 8;
               break;
             }
-            console.log('RLog is disabled by config, stopping upload');
             return _context.abrupt("return");
-          case 10:
-            _context.prev = 10;
+          case 8:
+            isErrorMode = currentConfig.captureMode === 'error'; // 错误模式下，如果未处于 uploading 状态，跳过上传但继续轮询
+            if (!(isErrorMode && !errorModeUploading)) {
+              _context.next = 12;
+              break;
+            }
+            setTimeout(function () {
+              push();
+            }, currentConfig.uploadInterval);
+            return _context.abrupt("return");
+          case 12:
+            _context.prev = 12;
             isUploading = true;
-            _context.next = 14;
-            return _storageManager.storage.pull((0, _utils.getDeviceId)(), 100);
-          case 14:
+            windowStart = 0;
+            if (!isErrorMode) {
+              _context.next = 23;
+              break;
+            }
+            // 错误模式：按时间范围提取事件
+            // 如果 errorModeWindowStart > 0，使用该值；否则从当前时间开始提取新事件
+            windowStart = errorModeWindowStart > 0 ? errorModeWindowStart : Date.now();
+            _context.next = 19;
+            return _storageManager.storage.pullByTimeRange((0, _utils.getStorageKey)(), windowStart, Date.now());
+          case 19:
+            events = _context.sent;
+            // 重置窗口起点为 0，下次上传时会从当前时间开始
+            // 但如果本次有事件上传成功，会更新为最后事件的时间戳
+            errorModeWindowStart = 0;
+            _context.next = 26;
+            break;
+          case 23:
+            _context.next = 25;
+            return _storageManager.storage.pull((0, _utils.getStorageKey)(), _constants.PULL_BATCH_SIZE);
+          case 25:
             events = _context.sent;
+          case 26:
             if (!(!events || events.length === 0)) {
-              _context.next = 19;
+              _context.next = 30;
               break;
             }
             isUploading = false;
@@ -78,114 +303,88 @@ function startUploadLoop(serv, appId) {
               push();
             }, currentConfig.uploadInterval);
             return _context.abrupt("return");
-          case 19:
+          case 30:
             // 检查是否只消费不上报
-            config = (0, _config.getConfig)(); // 支持通过配置或sessionStorage控制消费模式
-            consumeOnly = sessionStorage.getItem('RLOG_CONSUME_ONLY') === 'true' || config.consumeOnly;
+            config = (0, _config.getConfig)();
+            consumeOnly = sessionStorage.getItem(_constants.STORAGE_KEY_CONSUME_ONLY) === _constants.STORAGE_VALUE_CONSUME_ONLY || config.consumeOnly;
             if (!consumeOnly) {
-              _context.next = 26;
+              _context.next = 36;
               break;
             }
-            console.log('RLog consume only mode, skip upload');
             isUploading = false;
-            _context.next = 59;
-            break;
-          case 26:
-            _context.prev = 26;
-            _context.next = 29;
-            return (0, _api.upload)({
-              appId: appId,
-              data: events,
-              deviceId: (0, _utils.getDeviceId)(),
-              url: serv
-            });
-          case 29:
+            setTimeout(function () {
+              push();
+            }, currentConfig.uploadInterval);
+            return _context.abrupt("return");
+          case 36:
+            _context.next = 38;
+            return uploadEvents(serv, appId, events);
+          case 38:
+            result = _context.sent;
+            if (!result.success) {
+              _context.next = 50;
+              break;
+            }
             // 上传成功，重置失败计数
-            batchKey = "".concat(appId, "_").concat((0, _utils.getDeviceId)());
+            batchKey = "".concat(appId, "_").concat((0, _utils.getStorageKey)());
             uploadFailureCount.delete(batchKey);
+
+            // 错误模式：上传成功后移除已上传的事件
+            if (!(isErrorMode && windowStart > 0 && events.length > 0)) {
+              _context.next = 47;
+              break;
+            }
+            _context.next = 45;
+            return _storageManager.storage.removeByTimeRange((0, _utils.getStorageKey)(), windowStart);
+          case 45:
+            // 更新窗口起点为最后一个事件的时间戳，避免下次重复提取
+            lastEvent = events[events.length - 1];
+            if (lastEvent && lastEvent.timestamp) {
+              errorModeWindowStart = lastEvent.timestamp;
+            }
+          case 47:
+            // 全量模式：pull 已经自动移除了
+
             isUploading = false;
             _context.next = 59;
             break;
-          case 34:
-            _context.prev = 34;
-            _context.t0 = _context["catch"](26);
-            console.warn('Upload failed:', _context.t0);
+          case 50:
             isUploading = false;
 
             // 获取最大重试次数，默认3次
             maxRetryCount = config.maxRetryCount || 3; // 记录失败次数
-            _batchKey = "".concat(appId, "_").concat((0, _utils.getDeviceId)());
-            currentCount = uploadFailureCount.get(_batchKey) || 0;
-            newCount = currentCount + 1;
-            uploadFailureCount.set(_batchKey, newCount);
-
-            // 检查是否达到最大重试次数
-            if (!(newCount >= maxRetryCount)) {
-              _context.next = 56;
+            _batchKey = "".concat(appId, "_").concat((0, _utils.getStorageKey)());
+            currentCount = uploadFailureCount.get(_batchKey) || 0; // 处理上传失败
+            _context.next = 56;
+            return handleUploadFailure(events, result.error, appId, serv, maxRetryCount, currentCount);
+          case 56:
+            shouldStop = _context.sent;
+            if (!shouldStop) {
+              _context.next = 59;
               break;
             }
-            console.warn("Upload failed ".concat(maxRetryCount, " times consecutively, stopping upload"));
-            // 将事件放回存储
-            _context.next = 47;
-            return _storageManager.storage.unshiftBatch((0, _utils.getDeviceId)(), events);
-          case 47:
-            // 创建并派发自定义事件
-            event = new CustomEvent('rlog-upload-failure', {
-              detail: {
-                error: _context.t0,
-                retryCount: maxRetryCount,
-                appId: appId,
-                deviceId: (0, _utils.getDeviceId)()
-              }
-            });
-            if (typeof window !== 'undefined') {
-              window.dispatchEvent(event);
-            }
-
-            // 使用addCustomEvent记录上传失败事件
-            try {
-              _rrweb.record.addCustomEvent('rlog-upload-failure', {
-                error: _context.t0,
-                retryCount: maxRetryCount,
-                appId: appId,
-                deviceId: (0, _utils.getDeviceId)(),
-                timestamp: Date.now()
-              });
-            } catch (e) {
-              console.warn('Failed to record upload failure event via addCustomEvent:', e);
-            }
-
-            // 重置计数器
-            uploadFailureCount.delete(_batchKey);
-
-            // 停止rrweb录制
-            setTimeout(function () {
-              (0, _init.cancelRlog)();
-            }, 0);
-            console.error('RLog upload and recording stopped due to repeated failures');
             return _context.abrupt("return");
-          case 56:
-            console.warn("Upload failed ".concat(newCount, " time(s), will retry in next cycle"));
-            // 将事件放回存储头部，保持时间戳顺序
-            _context.next = 59;
-            return _storageManager.storage.unshiftBatch((0, _utils.getDeviceId)(), events);
           case 59:
             _context.next = 65;
             break;
           case 61:
             _context.prev = 61;
-            _context.t1 = _context["catch"](10);
+            _context.t0 = _context["catch"](12);
             isUploading = false;
-            console.error('Error in upload loop:', _context.t1);
+            _logger.default.error('Error in upload loop:', _context.t0);
           case 65:
-            setTimeout(function () {
-              push();
-            }, currentConfig.uploadInterval);
+            try {
+              setTimeout(function () {
+                push();
+              }, currentConfig.uploadInterval);
+            } catch (error) {
+              _logger.default.error('Failed to schedule next upload:', error);
+            }
           case 66:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[10, 61], [26, 34]]);
+      }, _callee, null, [[12, 61]]);
     }));
     return function push() {
       return _ref.apply(this, arguments);
@@ -194,27 +393,195 @@ function startUploadLoop(serv, appId) {
   push();
 }
 
+// ==================== 对外 API ====================
+
+/**
+ * 启动数据上传循环
+ * 优先尝试 Worker 模式，失败则降级到主线程模式
+ *
+ * 全量模式：持续轮询上传
+ * 错误模式：idle 时跳过上传，uploading 时轮询上传（由 ErrorTrigger 控制状态）
+ * @param serv 服务器地址
+ * @param appId 应用ID
+ */
+function startUploadLoop(serv, appId) {
+  // 设置 Worker 降级回调
+  (0, _uploadWorkerManager.setWorkerFallbackCallback)(function () {
+    _logger.default.log('Worker mode was downgraded, starting main thread upload');
+    startMainThreadUploadLoop(serv, appId);
+  });
+
+  // 优先尝试 Worker 模式
+  var workerInitialized = (0, _uploadWorkerManager.initWorkerUpload)(serv, appId);
+  if (workerInitialized) {
+    // Worker 模式下，超时降级逻辑在 initWorkerUpload 中处理
+    // 如果 Worker READY 超时，会自动调用 destroyWorker 并通过回调启动主线程上传
+    return;
+  }
+
+  // Worker 不可用，降级到主线程模式
+  _logger.default.log('Worker not available, falling back to main thread upload');
+  startMainThreadUploadLoop(serv, appId);
+}
+
 /**
  * 取消上传循环
+ * 同时处理 Worker 模式和主线程模式
  */
 function cancelUploadLoop() {
+  // 清理降级回调
+  (0, _uploadWorkerManager.setWorkerFallbackCallback)(null);
+
+  // 销毁 Worker（如果存在）
+  if ((0, _uploadWorkerManager.isUsingWorkerMode)()) {
+    (0, _uploadWorkerManager.destroyWorker)();
+  }
+
+  // 重置主线程模式状态
   isUploadCancelled = true;
   isUploading = false;
+  errorModeUploading = false;
+  errorModeWindowStart = 0;
 }
 
 /**
  * 重置上传循环状态（用于重新初始化）
  */
 function resetUploadLoop() {
+  // 清理降级回调
+  (0, _uploadWorkerManager.setWorkerFallbackCallback)(null);
+
+  // 销毁 Worker（如果存在）
+  if ((0, _uploadWorkerManager.isUsingWorkerMode)()) {
+    (0, _uploadWorkerManager.destroyWorker)();
+  }
+
+  // 重置主线程模式状态
   isUploadCancelled = false;
   isUploading = false;
+  errorModeUploading = false;
+  errorModeWindowStart = 0;
+  uploadFailureCount.clear();
 }
 
 /**
  * 强制重置上传状态（用于测试）
  */
 function forceResetUploadState() {
-  isUploadCancelled = false;
-  isUploading = false;
-  uploadFailureCount.clear();
+  resetUploadLoop();
+}
+
+// ==================== 孤儿 Session 残留数据回收 ====================
+
+/**
+ * 扫描并回收孤儿 session 的残留数据
+ *
+ * 在多页面应用（MPA）中，当用户从页面 A 导航到页面 B 时：
+ * - 页面 A 的上传循环被中断，storage 中可能还有未上传的事件数据
+ * - 页面 B 生成新的 sessionId，只会读取自己的数据
+ * - 页面 A 的残留数据成为"孤儿数据"
+ *
+ * 此函数在上传循环启动前调用（await），将孤儿数据合并到当前 session 的
+ * storage 队列头部，确保上传循环启动时数据已就位。
+ *
+ * 优势：
+ * - 不额外发起上传请求，复用现有上传循环
+ * - 孤儿数据在前、当前数据在后，时序天然连贯
+ * - 自动复用上传循环的重试机制
+ *
+ * 安全策略：
+ * 1. 只处理近期的 session（5 分钟内注册的）
+ * 2. 只回收时间跨度合理的数据（2 分钟内，即上传周期内的残留）
+ * 3. 回收失败不影响当前页面的正常录制和上传
+ */
+function flushOrphanSessions() {
+  return _flushOrphanSessions.apply(this, arguments);
+}
+function _flushOrphanSessions() {
+  _flushOrphanSessions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var orphans, currentStorageKey, _iterator, _step, orphan, events;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _context4.prev = 0;
+          orphans = (0, _utils.getOrphanSessions)();
+          if (!(orphans.length === 0)) {
+            _context4.next = 4;
+            break;
+          }
+          return _context4.abrupt("return");
+        case 4:
+          _logger.default.log("Found ".concat(orphans.length, " orphan session(s) with residual data"));
+          currentStorageKey = (0, _utils.getStorageKey)();
+          _iterator = _createForOfIteratorHelper(orphans);
+          _context4.prev = 7;
+          _iterator.s();
+        case 9:
+          if ((_step = _iterator.n()).done) {
+            _context4.next = 34;
+            break;
+          }
+          orphan = _step.value;
+          _context4.prev = 11;
+          _context4.next = 14;
+          return _storageManager.storage.pull(orphan.storageKey, _constants.ORPHAN_PULL_LIMIT);
+        case 14:
+          events = _context4.sent;
+          if (!(!events || events.length === 0)) {
+            _context4.next = 18;
+            break;
+          }
+          (0, _utils.cleanupOrphanSession)(orphan.sessionId);
+          return _context4.abrupt("continue", 32);
+        case 18:
+          if ((0, _utils.isOrphanDataValid)(events)) {
+            _context4.next = 22;
+            break;
+          }
+          _logger.default.log("Orphan session ".concat(orphan.sessionId, " data is out of valid range, discarding ").concat(events.length, " events"));
+          (0, _utils.cleanupOrphanSession)(orphan.sessionId);
+          return _context4.abrupt("continue", 32);
+        case 22:
+          _context4.next = 24;
+          return _storageManager.storage.unshiftBatch(currentStorageKey, events);
+        case 24:
+          _logger.default.log("Merged ".concat(events.length, " residual events from orphan session ").concat(orphan.sessionId, " into current storage"));
+
+          // 清理孤儿 session 的注册信息和存储
+          (0, _utils.cleanupOrphanSession)(orphan.sessionId);
+          _context4.next = 32;
+          break;
+        case 28:
+          _context4.prev = 28;
+          _context4.t0 = _context4["catch"](11);
+          _logger.default.warn("Error processing orphan session ".concat(orphan.sessionId, ":"), _context4.t0);
+          (0, _utils.cleanupOrphanSession)(orphan.sessionId);
+        case 32:
+          _context4.next = 9;
+          break;
+        case 34:
+          _context4.next = 39;
+          break;
+        case 36:
+          _context4.prev = 36;
+          _context4.t1 = _context4["catch"](7);
+          _iterator.e(_context4.t1);
+        case 39:
+          _context4.prev = 39;
+          _iterator.f();
+          return _context4.finish(39);
+        case 42:
+          _context4.next = 47;
+          break;
+        case 44:
+          _context4.prev = 44;
+          _context4.t2 = _context4["catch"](0);
+          _logger.default.warn('Error in flushOrphanSessions:', _context4.t2);
+        case 47:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4, null, [[0, 44], [7, 36, 39, 42], [11, 28]]);
+  }));
+  return _flushOrphanSessions.apply(this, arguments);
 }