@antglobal/rlog-sdk 0.0.1755855517-dev.13 → 0.0.1755855517-dev.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * Rlog SDK 日志工具
3
- * 统一管理所有日志输出,添加统一前缀和个性化颜色
3
+ * 统一管理所有日志输出,添加统一前缀 [Rlog]
4
4
  */
5
5
  /**
6
6
  * 日志工具对象
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/lib/logger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkIH;;GAEG;AACH,QAAA,MAAM,MAAM;IACV;;OAEG;iBACU,GAAG,EAAE,GAAG,IAAI;IAIzB;;OAEG;kBACW,GAAG,EAAE,GAAG,IAAI;IAI1B;;OAEG;kBACW,GAAG,EAAE,GAAG,IAAI;IAI1B;;OAEG;mBACY,GAAG,EAAE,GAAG,IAAI;CAG5B,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/lib/logger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+BH;;GAEG;AACH,QAAA,MAAM,MAAM;IACV;;OAEG;iBACU,GAAG,EAAE,GAAG,IAAI;IAIzB;;OAEG;kBACW,GAAG,EAAE,GAAG,IAAI;IAI1B;;OAEG;kBACW,GAAG,EAAE,GAAG,IAAI;IAI1B;;OAEG;mBACY,GAAG,EAAE,GAAG,IAAI;CAG5B,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -6,127 +6,37 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  /**
8
8
  * Rlog SDK 日志工具
9
- * 统一管理所有日志输出,添加统一前缀和个性化颜色
9
+ * 统一管理所有日志输出,添加统一前缀 [Rlog]
10
10
  */
11
11
 
12
- /**
13
- * ANSI 颜色代码
14
- */
15
- var Colors = {
16
- reset: '\x1b[0m',
17
- bright: '\x1b[1m',
18
- dim: '\x1b[2m',
19
- // 前景色
20
- cyan: '\x1b[36m',
21
- green: '\x1b[32m',
22
- yellow: '\x1b[33m',
23
- red: '\x1b[31m',
24
- blue: '\x1b[34m',
25
- magenta: '\x1b[35m',
26
- // 背景色
27
- bgCyan: '\x1b[46m',
28
- bgGreen: '\x1b[42m',
29
- bgYellow: '\x1b[43m',
30
- bgRed: '\x1b[41m',
31
- bgBlue: '\x1b[44m'
32
- };
33
-
34
- /**
35
- * 日志级别配置
36
- */
37
- var LogLevelConfig = {
38
- log: {
39
- prefix: '📝 LOG',
40
- color: Colors.cyan,
41
- style: 'color: #00bcd4; font-weight: bold;'
42
- },
43
- info: {
44
- prefix: 'ℹ️ INFO',
45
- color: Colors.blue,
46
- style: 'color: #2196f3; font-weight: bold;'
47
- },
48
- warn: {
49
- prefix: '⚠️ WARN',
50
- color: Colors.yellow,
51
- style: 'color: #ff9800; font-weight: bold;'
52
- },
53
- error: {
54
- prefix: '❌ ERROR',
55
- color: Colors.red,
56
- style: 'color: #f44336; font-weight: bold;'
57
- }
58
- };
59
-
60
12
  /**
61
13
  * 日志级别
62
14
  */
63
15
 
64
- /**
65
- * 检测是否支持颜色输出
66
- */
67
- function supportsColor() {
68
- // 浏览器环境始终支持颜色
69
- if (typeof window !== 'undefined') {
70
- return true;
71
- }
72
-
73
- // Node.js 环境检测
74
- if (typeof process !== 'undefined' && process.stdout) {
75
- return process.stdout.isTTY === true;
76
- }
77
- return false;
78
- }
79
-
80
16
  /**
81
17
  * 统一的日志输出函数
82
18
  * @param level 日志级别
83
19
  * @param args 日志参数
84
20
  */
85
21
  function _log(level) {
86
- var _console, _console2, _console3, _console4, _console5, _console6, _console7, _console8;
87
- var config = LogLevelConfig[level];
88
- var useColor = supportsColor();
89
-
90
- // 构建前缀
91
- var prefix = useColor ? "".concat(config.color).concat(Colors.bright, "[Rlog]").concat(Colors.reset, " ").concat(config.prefix).concat(Colors.reset) : "[Rlog] ".concat(config.prefix);
92
-
93
- // 浏览器环境使用 console 的 %c 格式化
22
+ var _console, _console2, _console3, _console4;
23
+ var prefix = '[Rlog]';
94
24
  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
95
25
  args[_key - 1] = arguments[_key];
96
26
  }
97
- if (typeof window !== 'undefined') {
98
- var browserPrefix = "%c[Rlog]%c ".concat(config.prefix, "%c");
99
- var styles = ['color: #9c27b0; font-weight: bold; font-size: 14px;', config.style, 'color: inherit; font-weight: normal;'];
100
- switch (level) {
101
- case 'log':
102
- (_console = console).log.apply(_console, [browserPrefix].concat(styles, args));
103
- break;
104
- case 'info':
105
- (_console2 = console).info.apply(_console2, [browserPrefix].concat(styles, args));
106
- break;
107
- case 'warn':
108
- (_console3 = console).warn.apply(_console3, [browserPrefix].concat(styles, args));
109
- break;
110
- case 'error':
111
- (_console4 = console).error.apply(_console4, [browserPrefix].concat(styles, args));
112
- break;
113
- }
114
- } else {
115
- // Node.js 环境使用 ANSI 颜色
116
- switch (level) {
117
- case 'log':
118
- (_console5 = console).log.apply(_console5, [prefix].concat(args));
119
- break;
120
- case 'info':
121
- (_console6 = console).info.apply(_console6, [prefix].concat(args));
122
- break;
123
- case 'warn':
124
- (_console7 = console).warn.apply(_console7, [prefix].concat(args));
125
- break;
126
- case 'error':
127
- (_console8 = console).error.apply(_console8, [prefix].concat(args));
128
- break;
129
- }
27
+ switch (level) {
28
+ case 'log':
29
+ (_console = console).log.apply(_console, [prefix].concat(args));
30
+ break;
31
+ case 'info':
32
+ (_console2 = console).info.apply(_console2, [prefix].concat(args));
33
+ break;
34
+ case 'warn':
35
+ (_console3 = console).warn.apply(_console3, [prefix].concat(args));
36
+ break;
37
+ case 'error':
38
+ (_console4 = console).error.apply(_console4, [prefix].concat(args));
39
+ break;
130
40
  }
131
41
  }
132
42
 
@@ -9,6 +9,11 @@
9
9
  * - 提供与现有 uploader.ts 相同的对外 API
10
10
  */
11
11
  import type { WorkerConfig } from './upload-worker';
12
+ /**
13
+ * 设置 Worker 降级回调
14
+ * @param callback 降级回调函数
15
+ */
16
+ export declare function setWorkerFallbackCallback(callback: (() => void) | null): void;
12
17
  /**
13
18
  * 尝试初始化 Worker 模式
14
19
  * @returns 是否成功启用 Worker 模式
@@ -16,8 +21,9 @@ import type { WorkerConfig } from './upload-worker';
16
21
  export declare function initWorkerUpload(serv: string, appId: string): boolean;
17
22
  /**
18
23
  * 销毁 Worker
24
+ * @param triggerFallback 是否触发降级回调
19
25
  */
20
- export declare function destroyWorker(): void;
26
+ export declare function destroyWorker(triggerFallback?: boolean): void;
21
27
  /**
22
28
  * 是否正在使用 Worker 模式
23
29
  */
@@ -1 +1 @@
1
- {"version":3,"file":"upload-worker-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/upload-worker-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAgC,MAAM,iBAAiB,CAAC;AAkTlF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CA8BrE;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,IAAI,CAkBpC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAQpE;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAErE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAKtE"}
1
+ {"version":3,"file":"upload-worker-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/upload-worker-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAgC,MAAM,iBAAiB,CAAC;AAqUlF;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAE7E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CA0CrE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,eAAe,UAAQ,GAAG,IAAI,CA6B3D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAQpE;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAErE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAKtE"}
@@ -8,6 +8,7 @@ exports.initWorkerUpload = initWorkerUpload;
8
8
  exports.isUsingWorkerMode = isUsingWorkerMode;
9
9
  exports.setWorkerErrorModeUploading = setWorkerErrorModeUploading;
10
10
  exports.setWorkerErrorModeWindowStart = setWorkerErrorModeWindowStart;
11
+ exports.setWorkerFallbackCallback = setWorkerFallbackCallback;
11
12
  exports.updateWorkerConfig = updateWorkerConfig;
12
13
  var _uploadWorker = require("./upload-worker");
13
14
  var _storageManager = require("./storage-manager");
@@ -55,6 +56,12 @@ var isFetchingBatch = false;
55
56
  // batchId 计数器
56
57
  var batchIdCounter = 0;
57
58
 
59
+ // Worker 就绪超时检测
60
+ var workerReadyTimeout = null;
61
+
62
+ // Worker 降级回调(当 Worker 模式失败时调用)
63
+ var onWorkerFallback = null;
64
+
58
65
  /**
59
66
  * 生成唯一的 batchId
60
67
  */
@@ -92,14 +99,23 @@ function createInlineWorker() {
92
99
  */
93
100
  function handleWorkerMessage(e) {
94
101
  var msg = e.data;
95
- if (!msg || !msg.type) return;
102
+ if (!msg || !msg.type) {
103
+ _logger.default.warn('Received invalid Worker message:', msg);
104
+ return;
105
+ }
106
+ _logger.default.log('Received Worker message:', msg.type);
96
107
  switch (msg.type) {
97
108
  case 'READY':
98
109
  workerReady = true;
99
- _logger.default.log('Upload Worker is ready');
110
+ // 清除超时检测
111
+ if (workerReadyTimeout) {
112
+ clearTimeout(workerReadyTimeout);
113
+ workerReadyTimeout = null;
114
+ }
115
+ _logger.default.log('Upload Worker is ready, workerReady state:', workerReady, 'isWorkerMode:', isWorkerMode);
100
116
  break;
101
117
  case 'REQUEST_BATCH':
102
- handleRequestBatch(msg.mode);
118
+ handleRequestBatch();
103
119
  break;
104
120
  case 'UPLOAD_SUCCESS':
105
121
  handleUploadSuccess(msg.batchId);
@@ -117,11 +133,11 @@ function handleWorkerMessage(e) {
117
133
  * 处理 Worker 请求数据批次
118
134
  * Worker 内部定时器触发,主线程从 storage 读取数据后发给 Worker
119
135
  */
120
- function handleRequestBatch(_x) {
136
+ function handleRequestBatch() {
121
137
  return _handleRequestBatch.apply(this, arguments);
122
138
  } // 待处理的批次元数据
123
139
  function _handleRequestBatch() {
124
- _handleRequestBatch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(mode) {
140
+ _handleRequestBatch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
125
141
  var currentConfig, isErrorMode, events, windowStart, config, consumeOnly, queryParams, customHeaders, batchId;
126
142
  return _regeneratorRuntime().wrap(function _callee$(_context) {
127
143
  while (1) switch (_context.prev = _context.next) {
@@ -231,7 +247,7 @@ var pendingBatches = new Map();
231
247
  /**
232
248
  * 处理上传成功
233
249
  */
234
- function handleUploadSuccess(_x2) {
250
+ function handleUploadSuccess(_x) {
235
251
  return _handleUploadSuccess.apply(this, arguments);
236
252
  }
237
253
  /**
@@ -273,7 +289,7 @@ function _handleUploadSuccess() {
273
289
  }));
274
290
  return _handleUploadSuccess.apply(this, arguments);
275
291
  }
276
- function handleUploadFailure(_x3, _x4, _x5) {
292
+ function handleUploadFailure(_x2, _x3, _x4) {
277
293
  return _handleUploadFailure.apply(this, arguments);
278
294
  }
279
295
  /**
@@ -306,7 +322,7 @@ function _handleUploadFailure() {
306
322
  }));
307
323
  return _handleUploadFailure.apply(this, arguments);
308
324
  }
309
- function handleMaxRetryReached(_x6, _x7) {
325
+ function handleMaxRetryReached(_x5, _x6) {
310
326
  return _handleMaxRetryReached.apply(this, arguments);
311
327
  }
312
328
  /**
@@ -378,7 +394,10 @@ function _handleMaxRetryReached() {
378
394
  }
379
395
  function sendToWorker(command) {
380
396
  if (worker && workerReady) {
397
+ _logger.default.log('Sending command to Worker:', command.type);
381
398
  worker.postMessage(command);
399
+ } else {
400
+ _logger.default.warn('Cannot send to Worker - worker:', !!worker, 'workerReady:', workerReady, 'command:', command.type);
382
401
  }
383
402
  }
384
403
 
@@ -387,12 +406,20 @@ function sendToWorker(command) {
387
406
  */
388
407
  function handleWorkerError(e) {
389
408
  _logger.default.error('Upload Worker error:', e.message);
390
- // Worker 出错时销毁,后续由 uploader.ts 降级到主线程
391
- destroyWorker();
409
+ // Worker 出错时销毁,降级到主线程
410
+ destroyWorker(true);
392
411
  }
393
412
 
394
413
  // ==================== 对外 API ====================
395
414
 
415
+ /**
416
+ * 设置 Worker 降级回调
417
+ * @param callback 降级回调函数
418
+ */
419
+ function setWorkerFallbackCallback(callback) {
420
+ onWorkerFallback = callback;
421
+ }
422
+
396
423
  /**
397
424
  * 尝试初始化 Worker 模式
398
425
  * @returns 是否成功启用 Worker 模式
@@ -420,19 +447,39 @@ function initWorkerUpload(serv, appId) {
420
447
  uploadInterval: config.uploadInterval,
421
448
  maxRetryCount: config.maxRetryCount || 3
422
449
  };
450
+
451
+ // 注意:这里先将 isWorkerMode 设为 true
452
+ // 但 workerReady 仍为 false,需要等待 Worker 发送 READY 消息
453
+ // sendToWorker 会检查 workerReady 状态
423
454
  worker.postMessage({
424
455
  type: 'START',
425
456
  config: startConfig
426
457
  });
427
458
  isWorkerMode = true;
428
- _logger.default.log('Upload Worker mode initialized');
459
+
460
+ // 设置超时检测:如果 5 秒内没有收到 READY 消息,降级到主线程模式
461
+ workerReadyTimeout = setTimeout(function () {
462
+ if (!workerReady) {
463
+ _logger.default.warn('Worker failed to send READY within 5 seconds, falling back to main thread');
464
+ // 销毁并触发降级回调
465
+ destroyWorker(true);
466
+ }
467
+ }, 5000);
468
+ _logger.default.log('Upload Worker mode initialized, waiting for READY...');
429
469
  return true;
430
470
  }
431
471
 
432
472
  /**
433
473
  * 销毁 Worker
474
+ * @param triggerFallback 是否触发降级回调
434
475
  */
435
476
  function destroyWorker() {
477
+ var triggerFallback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
478
+ // 清理超时检测
479
+ if (workerReadyTimeout) {
480
+ clearTimeout(workerReadyTimeout);
481
+ workerReadyTimeout = null;
482
+ }
436
483
  if (worker) {
437
484
  try {
438
485
  worker.postMessage({
@@ -451,6 +498,11 @@ function destroyWorker() {
451
498
  errorModeWindowStart = 0;
452
499
  batchIdCounter = 0;
453
500
  pendingBatches.clear();
501
+
502
+ // 触发降级回调(仅在需要时)
503
+ if (triggerFallback && onWorkerFallback) {
504
+ onWorkerFallback();
505
+ }
454
506
  }
455
507
 
456
508
  /**
@@ -37,7 +37,6 @@ export type WorkerMessage = {
37
37
  type: 'READY';
38
38
  } | {
39
39
  type: 'REQUEST_BATCH';
40
- mode: 'full' | 'error';
41
40
  } | {
42
41
  type: 'UPLOAD_SUCCESS';
43
42
  batchId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"upload-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/upload-worker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB;AAGD,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACpI;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,0BAA0B,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AAG7D,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAChF;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAIlE;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAsN5C"}
1
+ {"version":3,"file":"upload-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/upload-worker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB;AAGD,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACpI;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,0BAA0B,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AAG7D,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAChF;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAIlE;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAqN5C"}
@@ -28,5 +28,5 @@ exports.getUploadWorkerCode = getUploadWorkerCode;
28
28
  * 用于通过 Blob URL 内联创建 Worker
29
29
  */
30
30
  function getUploadWorkerCode() {
31
- return "\n'use strict';\n\n// ===== Worker \u5185\u90E8\u72B6\u6001 =====\nvar config = null;\nvar pollTimer = null;\nvar isRunning = false;\nvar errorModeUploading = false;\nvar failureCountMap = {};\n\n// ===== UUID \u751F\u6210 =====\nfunction generateUUID() {\n return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {\n var r = (Math.random() * 16) | 0;\n var v = c === 'x' ? r : (r & 0x3) | 0x8;\n return v.toString(16);\n });\n}\n\n// ===== \u6784\u5EFA\u4E0A\u4F20 URL =====\nfunction buildUploadUrl(serv, queryParams) {\n var params = [];\n for (var key in queryParams) {\n if (queryParams.hasOwnProperty(key) && queryParams[key] != null && queryParams[key] !== '') {\n params.push(encodeURIComponent(key) + '=' + encodeURIComponent(queryParams[key]));\n }\n }\n var queryString = params.join('&');\n return serv + (queryString ? '?' + queryString : '');\n}\n\n// ===== \u6267\u884C\u4E0A\u4F20 =====\nfunction performUpload(msg) {\n var batchId = msg.batchId;\n var events = msg.events;\n var queryParams = msg.queryParams;\n var customHeaders = msg.customHeaders;\n\n try {\n // JSON \u5E8F\u5217\u5316\u5728 Worker \u4E2D\u6267\u884C\uFF0C\u4E0D\u963B\u585E\u4E3B\u7EBF\u7A0B\n var jsonStr = JSON.stringify(events);\n var blob = new Blob([jsonStr], { type: 'application/json' });\n var formData = new FormData();\n formData.append('file', blob, generateUUID() + '.json');\n\n var url = buildUploadUrl(config ? config.serv : '', queryParams);\n\n var xhr = new XMLHttpRequest();\n xhr.open('POST', url, true);\n xhr.timeout = 10000;\n\n // \u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8BF7\u6C42\u5934\n if (customHeaders) {\n for (var key in customHeaders) {\n if (customHeaders.hasOwnProperty(key)) {\n xhr.setRequestHeader(key, customHeaders[key]);\n }\n }\n }\n\n xhr.onreadystatechange = function() {\n if (xhr.readyState === 4) {\n if (xhr.status >= 200 && xhr.status < 300) {\n // \u68C0\u67E5\u4E1A\u52A1\u5C42 success \u5B57\u6BB5\n var uploadSuccess = true;\n var errorMessage = '';\n try {\n var responseData = JSON.parse(xhr.responseText);\n if (responseData && typeof responseData === 'object' && responseData.success === false) {\n uploadSuccess = false;\n errorMessage = responseData.errorMessage || 'Upload failed with success=false';\n }\n } catch(e) {\n // \u65E0\u6CD5\u89E3\u6790 JSON\uFF0C\u89C6\u4E3A\u6210\u529F\n }\n\n if (uploadSuccess) {\n // \u4E0A\u4F20\u6210\u529F\uFF0C\u91CD\u7F6E\u5931\u8D25\u8BA1\u6570\n var batchKey = config ? (config.appId + '_' + config.deviceId) : batchId;\n delete failureCountMap[batchKey];\n self.postMessage({ type: 'UPLOAD_SUCCESS', batchId: batchId });\n } else {\n handleFailure(batchId, errorMessage);\n }\n } else {\n handleFailure(batchId, 'HTTP ' + xhr.status + ': ' + xhr.statusText);\n }\n }\n };\n\n xhr.onerror = function() {\n handleFailure(batchId, 'Network error');\n };\n\n xhr.ontimeout = function() {\n handleFailure(batchId, 'Request timeout');\n };\n\n xhr.send(formData);\n } catch (e) {\n handleFailure(batchId, 'Upload exception: ' + (e.message || String(e)));\n }\n}\n\n// ===== \u5904\u7406\u4E0A\u4F20\u5931\u8D25 =====\nfunction handleFailure(batchId, errorMessage) {\n var batchKey = config ? (config.appId + '_' + config.deviceId) : batchId;\n var currentCount = failureCountMap[batchKey] || 0;\n var newCount = currentCount + 1;\n failureCountMap[batchKey] = newCount;\n\n var maxRetry = (config && config.maxRetryCount) ? config.maxRetryCount : 3;\n\n if (newCount >= maxRetry) {\n // \u8FBE\u5230\u6700\u5927\u91CD\u8BD5\u6B21\u6570\n delete failureCountMap[batchKey];\n self.postMessage({\n type: 'MAX_RETRY_REACHED',\n batchId: batchId,\n error: errorMessage\n });\n } else {\n self.postMessage({\n type: 'UPLOAD_FAILURE',\n batchId: batchId,\n error: errorMessage,\n failureCount: newCount\n });\n }\n}\n\n// ===== \u8F6E\u8BE2\u8C03\u5EA6 =====\nfunction startPolling() {\n if (pollTimer) {\n clearInterval(pollTimer);\n }\n\n var interval = (config && config.uploadInterval) ? config.uploadInterval : 2000;\n\n pollTimer = setInterval(function() {\n if (!isRunning) return;\n\n // \u5411\u4E3B\u7EBF\u7A0B\u8BF7\u6C42\u6570\u636E\u6279\u6B21\n // \u4E3B\u7EBF\u7A0B\u4F1A\u6839\u636E\u5F53\u524D\u6A21\u5F0F\uFF08full/error\uFF09\u548C\u72B6\u6001\u51B3\u5B9A\u662F\u5426\u63D0\u4F9B\u6570\u636E\n self.postMessage({\n type: 'REQUEST_BATCH',\n mode: errorModeUploading ? 'error' : 'full'\n });\n }, interval);\n}\n\nfunction stopPolling() {\n if (pollTimer) {\n clearInterval(pollTimer);\n pollTimer = null;\n }\n}\n\n// ===== \u6E05\u7406 =====\nfunction cleanup() {\n isRunning = false;\n stopPolling();\n failureCountMap = {};\n config = null;\n errorModeUploading = false;\n}\n\n// ===== \u6D88\u606F\u5904\u7406 =====\nself.onmessage = function(e) {\n var msg = e.data;\n if (!msg || !msg.type) return;\n\n switch (msg.type) {\n case 'START':\n config = msg.config;\n isRunning = true;\n failureCountMap = {};\n startPolling();\n break;\n\n case 'STOP':\n cleanup();\n break;\n\n case 'UPLOAD_BATCH':\n if (isRunning) {\n performUpload(msg);\n }\n break;\n\n case 'UPDATE_CONFIG':\n if (msg.config) {\n for (var key in msg.config) {\n if (msg.config.hasOwnProperty(key) && config) {\n config[key] = msg.config[key];\n }\n }\n // \u5982\u679C uploadInterval \u53D8\u4E86\uFF0C\u91CD\u542F\u8F6E\u8BE2\n if (msg.config.uploadInterval && isRunning) {\n startPolling();\n }\n }\n break;\n\n case 'SET_ERROR_MODE_UPLOADING':\n errorModeUploading = msg.uploading;\n break;\n }\n};\n\n// Worker \u5C31\u7EEA\u901A\u77E5\nself.postMessage({ type: 'READY' });\n";
31
+ return "\n'use strict';\n\n// ===== Worker \u5185\u90E8\u72B6\u6001 =====\nvar config = null;\nvar pollTimer = null;\nvar isRunning = false;\nvar errorModeUploading = false;\nvar failureCountMap = {};\n\n// ===== UUID \u751F\u6210 =====\nfunction generateUUID() {\n return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {\n var r = (Math.random() * 16) | 0;\n var v = c === 'x' ? r : (r & 0x3) | 0x8;\n return v.toString(16);\n });\n}\n\n// ===== \u6784\u5EFA\u4E0A\u4F20 URL =====\nfunction buildUploadUrl(serv, queryParams) {\n var params = [];\n for (var key in queryParams) {\n if (queryParams.hasOwnProperty(key) && queryParams[key] != null && queryParams[key] !== '') {\n params.push(encodeURIComponent(key) + '=' + encodeURIComponent(queryParams[key]));\n }\n }\n var queryString = params.join('&');\n return serv + (queryString ? '?' + queryString : '');\n}\n\n// ===== \u6267\u884C\u4E0A\u4F20 =====\nfunction performUpload(msg) {\n var batchId = msg.batchId;\n var events = msg.events;\n var queryParams = msg.queryParams;\n var customHeaders = msg.customHeaders;\n\n try {\n // JSON \u5E8F\u5217\u5316\u5728 Worker \u4E2D\u6267\u884C\uFF0C\u4E0D\u963B\u585E\u4E3B\u7EBF\u7A0B\n var jsonStr = JSON.stringify(events);\n var blob = new Blob([jsonStr], { type: 'application/json' });\n var formData = new FormData();\n formData.append('file', blob, generateUUID() + '.json');\n\n var url = buildUploadUrl(config ? config.serv : '', queryParams);\n\n var xhr = new XMLHttpRequest();\n xhr.open('POST', url, true);\n xhr.timeout = 10000;\n\n // \u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8BF7\u6C42\u5934\n if (customHeaders) {\n for (var key in customHeaders) {\n if (customHeaders.hasOwnProperty(key)) {\n xhr.setRequestHeader(key, customHeaders[key]);\n }\n }\n }\n\n xhr.onreadystatechange = function() {\n if (xhr.readyState === 4) {\n if (xhr.status >= 200 && xhr.status < 300) {\n // \u68C0\u67E5\u4E1A\u52A1\u5C42 success \u5B57\u6BB5\n var uploadSuccess = true;\n var errorMessage = '';\n try {\n var responseData = JSON.parse(xhr.responseText);\n if (responseData && typeof responseData === 'object' && responseData.success === false) {\n uploadSuccess = false;\n errorMessage = responseData.errorMessage || 'Upload failed with success=false';\n }\n } catch(e) {\n // \u65E0\u6CD5\u89E3\u6790 JSON\uFF0C\u89C6\u4E3A\u6210\u529F\n }\n\n if (uploadSuccess) {\n // \u4E0A\u4F20\u6210\u529F\uFF0C\u91CD\u7F6E\u5931\u8D25\u8BA1\u6570\n var batchKey = config ? (config.appId + '_' + config.deviceId) : batchId;\n delete failureCountMap[batchKey];\n self.postMessage({ type: 'UPLOAD_SUCCESS', batchId: batchId });\n } else {\n handleFailure(batchId, errorMessage);\n }\n } else {\n handleFailure(batchId, 'HTTP ' + xhr.status + ': ' + xhr.statusText);\n }\n }\n };\n\n xhr.onerror = function() {\n handleFailure(batchId, 'Network error');\n };\n\n xhr.ontimeout = function() {\n handleFailure(batchId, 'Request timeout');\n };\n\n xhr.send(formData);\n } catch (e) {\n handleFailure(batchId, 'Upload exception: ' + (e.message || String(e)));\n }\n}\n\n// ===== \u5904\u7406\u4E0A\u4F20\u5931\u8D25 =====\nfunction handleFailure(batchId, errorMessage) {\n var batchKey = config ? (config.appId + '_' + config.deviceId) : batchId;\n var currentCount = failureCountMap[batchKey] || 0;\n var newCount = currentCount + 1;\n failureCountMap[batchKey] = newCount;\n\n var maxRetry = (config && config.maxRetryCount) ? config.maxRetryCount : 3;\n\n if (newCount >= maxRetry) {\n // \u8FBE\u5230\u6700\u5927\u91CD\u8BD5\u6B21\u6570\n delete failureCountMap[batchKey];\n self.postMessage({\n type: 'MAX_RETRY_REACHED',\n batchId: batchId,\n error: errorMessage\n });\n } else {\n self.postMessage({\n type: 'UPLOAD_FAILURE',\n batchId: batchId,\n error: errorMessage,\n failureCount: newCount\n });\n }\n}\n\n// ===== \u8F6E\u8BE2\u8C03\u5EA6 =====\nfunction startPolling() {\n if (pollTimer) {\n clearInterval(pollTimer);\n }\n\n var interval = (config && config.uploadInterval) ? config.uploadInterval : 2000;\n\n pollTimer = setInterval(function() {\n if (!isRunning) return;\n\n // \u5411\u4E3B\u7EBF\u7A0B\u8BF7\u6C42\u6570\u636E\u6279\u6B21\n // \u4E3B\u7EBF\u7A0B\u4F1A\u6839\u636E\u5F53\u524D\u6A21\u5F0F\uFF08full/error\uFF09\u548C\u72B6\u6001\u51B3\u5B9A\u662F\u5426\u63D0\u4F9B\u6570\u636E\n self.postMessage({\n type: 'REQUEST_BATCH'\n });\n }, interval);\n}\n\nfunction stopPolling() {\n if (pollTimer) {\n clearInterval(pollTimer);\n pollTimer = null;\n }\n}\n\n// ===== \u6E05\u7406 =====\nfunction cleanup() {\n isRunning = false;\n stopPolling();\n failureCountMap = {};\n config = null;\n errorModeUploading = false;\n}\n\n// ===== \u6D88\u606F\u5904\u7406 =====\nself.onmessage = function(e) {\n var msg = e.data;\n if (!msg || !msg.type) return;\n\n switch (msg.type) {\n case 'START':\n config = msg.config;\n isRunning = true;\n failureCountMap = {};\n startPolling();\n break;\n\n case 'STOP':\n cleanup();\n break;\n\n case 'UPLOAD_BATCH':\n if (isRunning) {\n performUpload(msg);\n }\n break;\n\n case 'UPDATE_CONFIG':\n if (msg.config) {\n for (var key in msg.config) {\n if (msg.config.hasOwnProperty(key) && config) {\n config[key] = msg.config[key];\n }\n }\n // \u5982\u679C uploadInterval \u53D8\u4E86\uFF0C\u91CD\u542F\u8F6E\u8BE2\n if (msg.config.uploadInterval && isRunning) {\n startPolling();\n }\n }\n break;\n\n case 'SET_ERROR_MODE_UPLOADING':\n errorModeUploading = msg.uploading;\n break;\n }\n};\n\n// Worker \u5C31\u7EEA\u901A\u77E5\nself.postMessage({ type: 'READY' });\n";
32
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/lib/uploader.ts"],"names":[],"mappings":"AAgCA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAM9D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAM/D;AAqPD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAYjE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAWvC;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAYtC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
1
+ {"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/lib/uploader.ts"],"names":[],"mappings":"AAiCA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAM9D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAM/D;AAqPD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAoBjE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAcvC;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAetC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
@@ -380,10 +380,18 @@ function startMainThreadUploadLoop(serv, appId) {
380
380
  * @param appId 应用ID
381
381
  */
382
382
  function startUploadLoop(serv, appId) {
383
+ // 设置 Worker 降级回调
384
+ (0, _uploadWorkerManager.setWorkerFallbackCallback)(function () {
385
+ _logger.default.log('Worker mode was downgraded, starting main thread upload');
386
+ startMainThreadUploadLoop(serv, appId);
387
+ });
388
+
383
389
  // 优先尝试 Worker 模式
384
390
  var workerInitialized = (0, _uploadWorkerManager.initWorkerUpload)(serv, appId);
385
391
  if (workerInitialized) {
386
392
  _logger.default.log('Upload loop started in Worker mode');
393
+ // Worker 模式下,超时降级逻辑在 initWorkerUpload 中处理
394
+ // 如果 Worker READY 超时,会自动调用 destroyWorker 并通过回调启动主线程上传
387
395
  return;
388
396
  }
389
397
 
@@ -397,6 +405,9 @@ function startUploadLoop(serv, appId) {
397
405
  * 同时处理 Worker 模式和主线程模式
398
406
  */
399
407
  function cancelUploadLoop() {
408
+ // 清理降级回调
409
+ (0, _uploadWorkerManager.setWorkerFallbackCallback)(null);
410
+
400
411
  // 销毁 Worker(如果存在)
401
412
  if ((0, _uploadWorkerManager.isUsingWorkerMode)()) {
402
413
  (0, _uploadWorkerManager.destroyWorker)();
@@ -413,6 +424,9 @@ function cancelUploadLoop() {
413
424
  * 重置上传循环状态(用于重新初始化)
414
425
  */
415
426
  function resetUploadLoop() {
427
+ // 清理降级回调
428
+ (0, _uploadWorkerManager.setWorkerFallbackCallback)(null);
429
+
416
430
  // 销毁 Worker(如果存在)
417
431
  if ((0, _uploadWorkerManager.isUsingWorkerMode)()) {
418
432
  (0, _uploadWorkerManager.destroyWorker)();