@taicode/common-base 1.7.1 → 1.7.3
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.
- package/output/batching-buffer/batching-buffer.d.ts +10 -17
- package/output/batching-buffer/batching-buffer.d.ts.map +1 -1
- package/output/batching-buffer/batching-buffer.js +37 -46
- package/output/batching-buffer/batching-buffer.test.js +8 -161
- package/output/events/disposer.d.ts +6 -0
- package/output/events/disposer.d.ts.map +1 -0
- package/output/events/disposer.js +19 -0
- package/output/events/disposer.test.d.ts +2 -0
- package/output/events/disposer.test.d.ts.map +1 -0
- package/output/events/disposer.test.js +192 -0
- package/output/events/event-emitter.d.ts +33 -0
- package/output/events/event-emitter.d.ts.map +1 -0
- package/output/events/event-emitter.js +66 -0
- package/output/events/event-emitter.test.d.ts +2 -0
- package/output/events/event-emitter.test.d.ts.map +1 -0
- package/output/events/event-emitter.test.js +213 -0
- package/output/events/index.d.ts +3 -0
- package/output/events/index.d.ts.map +1 -0
- package/output/events/index.js +3 -0
- package/output/flow-queue/flow-queue.d.ts +418 -0
- package/output/flow-queue/flow-queue.d.ts.map +1 -0
- package/output/flow-queue/flow-queue.js +582 -0
- package/output/flow-queue/flow-queue.test.d.ts +2 -0
- package/output/flow-queue/flow-queue.test.d.ts.map +1 -0
- package/output/flow-queue/flow-queue.test.js +1033 -0
- package/output/flow-queue/index.d.ts +3 -0
- package/output/flow-queue/index.d.ts.map +1 -0
- package/output/flow-queue/index.js +3 -0
- package/output/index.d.ts +2 -0
- package/output/index.d.ts.map +1 -1
- package/output/index.js +2 -0
- package/output/logger/logger.d.ts +3 -3
- package/output/logger/logger.d.ts.map +1 -1
- package/output/logger/logger.js +2 -3
- package/output/logger/logger.test.js +1 -1
- package/output/ttl-cache/index.d.ts +2 -0
- package/output/ttl-cache/index.d.ts.map +1 -0
- package/output/ttl-cache/index.js +1 -0
- package/output/ttl-cache/ttl-cache.d.ts +148 -0
- package/output/ttl-cache/ttl-cache.d.ts.map +1 -0
- package/output/ttl-cache/ttl-cache.js +313 -0
- package/output/ttl-cache/ttl-cache.test.d.ts +2 -0
- package/output/ttl-cache/ttl-cache.test.d.ts.map +1 -0
- package/output/ttl-cache/ttl-cache.test.js +222 -0
- package/package.json +1 -1
|
@@ -25,12 +25,6 @@ export interface BatchingBufferOptions<T> {
|
|
|
25
25
|
* @default true
|
|
26
26
|
*/
|
|
27
27
|
autoFlush?: boolean;
|
|
28
|
-
/**
|
|
29
|
-
* 错误处理回调函数
|
|
30
|
-
* @param error 发生的错误
|
|
31
|
-
* @param failedItems 处理失败的项目
|
|
32
|
-
*/
|
|
33
|
-
onError?: (error: Error, failedItems: T[]) => void;
|
|
34
28
|
}
|
|
35
29
|
/**
|
|
36
30
|
* 批处理缓冲区
|
|
@@ -48,11 +42,7 @@ export interface BatchingBufferOptions<T> {
|
|
|
48
42
|
* await saveToDatabase(items)
|
|
49
43
|
* },
|
|
50
44
|
* bufferSize: 10,
|
|
51
|
-
* flushInterval: 5000
|
|
52
|
-
* onError: (error, failedItems) => {
|
|
53
|
-
* console.error('处理失败:', error, '失败项目:', failedItems)
|
|
54
|
-
* // 可以进行重试或其他错误处理逻辑
|
|
55
|
-
* }
|
|
45
|
+
* flushInterval: 5000
|
|
56
46
|
* })
|
|
57
47
|
*
|
|
58
48
|
* // 单个处理模式
|
|
@@ -66,9 +56,8 @@ export interface BatchingBufferOptions<T> {
|
|
|
66
56
|
* })
|
|
67
57
|
*
|
|
68
58
|
* // 添加数据
|
|
69
|
-
* buffer.add('data1')
|
|
70
|
-
* buffer.add('data2'
|
|
71
|
-
* buffer.add(...array) // 展开数组添加
|
|
59
|
+
* buffer.add('data1')
|
|
60
|
+
* buffer.add('data2')
|
|
72
61
|
*
|
|
73
62
|
* // 手动刷新
|
|
74
63
|
* await buffer.flush()
|
|
@@ -87,13 +76,17 @@ export declare class BatchingBuffer<T> {
|
|
|
87
76
|
private readonly bufferSize;
|
|
88
77
|
private readonly flushInterval;
|
|
89
78
|
private readonly autoFlush;
|
|
90
|
-
private readonly onError?;
|
|
91
79
|
constructor(options: BatchingBufferOptions<T>);
|
|
92
80
|
/**
|
|
93
81
|
* 添加数据到缓冲区
|
|
94
|
-
* @param
|
|
82
|
+
* @param item 要添加的数据项
|
|
83
|
+
*/
|
|
84
|
+
add(item: T): void;
|
|
85
|
+
/**
|
|
86
|
+
* 批量添加数据到缓冲区
|
|
87
|
+
* @param items 要添加的数据项数组
|
|
95
88
|
*/
|
|
96
|
-
|
|
89
|
+
addBatch(items: T[]): void;
|
|
97
90
|
/**
|
|
98
91
|
* 手动刷新缓冲区,处理所有待处理的数据
|
|
99
92
|
* @returns Promise,在处理完成后 resolve
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batching-buffer.d.ts","sourceRoot":"","sources":["../../source/batching-buffer/batching-buffer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAErD;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAEjD;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"batching-buffer.d.ts","sourceRoot":"","sources":["../../source/batching-buffer/batching-buffer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAErD;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAEjD;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,qBAAa,cAAc,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAsC;IACtE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAmC;IAClE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEvB,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC;IA0B7C;;;OAGG;IACH,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAmBlB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI;IAyB1B;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;OAEG;IACH,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED;;;OAGG;IACG,OAAO,CAAC,cAAc,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB5D;;OAEG;IACH,OAAO,CAAC,UAAU;IAQlB;;OAEG;IACH,OAAO,CAAC,UAAU;IAOlB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAiDzB;;OAEG;YACW,kBAAkB;CA2BjC"}
|
|
@@ -14,11 +14,7 @@
|
|
|
14
14
|
* await saveToDatabase(items)
|
|
15
15
|
* },
|
|
16
16
|
* bufferSize: 10,
|
|
17
|
-
* flushInterval: 5000
|
|
18
|
-
* onError: (error, failedItems) => {
|
|
19
|
-
* console.error('处理失败:', error, '失败项目:', failedItems)
|
|
20
|
-
* // 可以进行重试或其他错误处理逻辑
|
|
21
|
-
* }
|
|
17
|
+
* flushInterval: 5000
|
|
22
18
|
* })
|
|
23
19
|
*
|
|
24
20
|
* // 单个处理模式
|
|
@@ -32,9 +28,8 @@
|
|
|
32
28
|
* })
|
|
33
29
|
*
|
|
34
30
|
* // 添加数据
|
|
35
|
-
* buffer.add('data1')
|
|
36
|
-
* buffer.add('data2'
|
|
37
|
-
* buffer.add(...array) // 展开数组添加
|
|
31
|
+
* buffer.add('data1')
|
|
32
|
+
* buffer.add('data2')
|
|
38
33
|
*
|
|
39
34
|
* // 手动刷新
|
|
40
35
|
* await buffer.flush()
|
|
@@ -53,7 +48,6 @@ export class BatchingBuffer {
|
|
|
53
48
|
bufferSize;
|
|
54
49
|
flushInterval;
|
|
55
50
|
autoFlush;
|
|
56
|
-
onError;
|
|
57
51
|
constructor(options) {
|
|
58
52
|
// 验证处理器配置
|
|
59
53
|
if (!options.batchProcessor && !options.itemProcessor) {
|
|
@@ -67,7 +61,6 @@ export class BatchingBuffer {
|
|
|
67
61
|
this.bufferSize = options.bufferSize ?? 100;
|
|
68
62
|
this.flushInterval = options.flushInterval ?? 5000;
|
|
69
63
|
this.autoFlush = options.autoFlush ?? true;
|
|
70
|
-
this.onError = options.onError;
|
|
71
64
|
// 验证配置参数
|
|
72
65
|
if (this.bufferSize <= 0) {
|
|
73
66
|
throw new Error('bufferSize 必须大于 0');
|
|
@@ -78,33 +71,46 @@ export class BatchingBuffer {
|
|
|
78
71
|
}
|
|
79
72
|
/**
|
|
80
73
|
* 添加数据到缓冲区
|
|
81
|
-
* @param
|
|
74
|
+
* @param item 要添加的数据项
|
|
82
75
|
*/
|
|
83
|
-
add(
|
|
76
|
+
add(item) {
|
|
84
77
|
if (this.isDestroyed) {
|
|
85
78
|
throw new Error('BatchingBuffer 已被销毁,不能添加新数据');
|
|
86
79
|
}
|
|
87
|
-
|
|
80
|
+
this.buffer.push(item);
|
|
81
|
+
// 检查是否需要基于大小触发处理
|
|
82
|
+
if (this.buffer.length >= this.bufferSize) {
|
|
83
|
+
this.processBufferSync();
|
|
88
84
|
return;
|
|
89
85
|
}
|
|
86
|
+
// 启动或重置定时器
|
|
87
|
+
if (this.autoFlush) {
|
|
88
|
+
this.resetTimer();
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* 批量添加数据到缓冲区
|
|
93
|
+
* @param items 要添加的数据项数组
|
|
94
|
+
*/
|
|
95
|
+
addBatch(items) {
|
|
96
|
+
if (this.isDestroyed) {
|
|
97
|
+
throw new Error('BatchingBuffer 已被销毁,不能添加新数据');
|
|
98
|
+
}
|
|
90
99
|
let i = 0;
|
|
91
100
|
while (i < items.length) {
|
|
92
|
-
//
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
for (let j = 0; j < itemsToAdd; j++) {
|
|
97
|
-
this.buffer.push(items[i + j]);
|
|
101
|
+
// 填充缓冲区直到达到大小限制
|
|
102
|
+
while (i < items.length && this.buffer.length < this.bufferSize) {
|
|
103
|
+
this.buffer.push(items[i]);
|
|
104
|
+
i++;
|
|
98
105
|
}
|
|
99
|
-
i += itemsToAdd;
|
|
100
106
|
// 如果缓冲区满了,处理它
|
|
101
107
|
if (this.buffer.length >= this.bufferSize) {
|
|
102
108
|
this.processBufferSync();
|
|
103
109
|
}
|
|
104
110
|
}
|
|
105
|
-
//
|
|
106
|
-
if (this.buffer.length > 0
|
|
107
|
-
this.
|
|
111
|
+
// 处理剩余的项目(如果有的话)
|
|
112
|
+
if (this.buffer.length > 0) {
|
|
113
|
+
this.processBufferSync();
|
|
108
114
|
}
|
|
109
115
|
}
|
|
110
116
|
/**
|
|
@@ -188,44 +194,29 @@ export class BatchingBuffer {
|
|
|
188
194
|
const result = this.batchProcessor(itemsToProcess);
|
|
189
195
|
// 如果返回 Promise,处理异步
|
|
190
196
|
if (result && typeof result.then === 'function') {
|
|
191
|
-
result.catch((
|
|
192
|
-
//
|
|
193
|
-
|
|
194
|
-
this.buffer.unshift(...itemsToProcess);
|
|
195
|
-
}
|
|
196
|
-
// 调用错误处理回调
|
|
197
|
-
if (this.onError) {
|
|
198
|
-
this.onError(error, itemsToProcess);
|
|
199
|
-
}
|
|
197
|
+
result.catch(() => {
|
|
198
|
+
// 处理失败时,将数据重新放回缓冲区开头
|
|
199
|
+
this.buffer.unshift(...itemsToProcess);
|
|
200
200
|
});
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
203
|
else if (this.itemProcessor) {
|
|
204
204
|
// 单个处理模式 - 同步处理每个项目
|
|
205
|
-
const failedItems = [];
|
|
206
205
|
for (let i = 0; i < itemsToProcess.length; i++) {
|
|
207
206
|
const item = itemsToProcess[i];
|
|
208
207
|
try {
|
|
209
208
|
const result = this.itemProcessor(item);
|
|
210
209
|
// 如果返回 Promise,处理异步
|
|
211
210
|
if (result && typeof result.then === 'function') {
|
|
212
|
-
result.catch((
|
|
213
|
-
//
|
|
214
|
-
|
|
215
|
-
this.buffer.unshift(item);
|
|
216
|
-
}
|
|
217
|
-
// 调用错误处理回调
|
|
218
|
-
if (this.onError) {
|
|
219
|
-
this.onError(error, [item]);
|
|
220
|
-
}
|
|
211
|
+
result.catch(() => {
|
|
212
|
+
// 处理失败时,将数据重新放回缓冲区开头
|
|
213
|
+
this.buffer.unshift(item);
|
|
221
214
|
});
|
|
222
215
|
}
|
|
223
216
|
}
|
|
224
217
|
catch (error) {
|
|
225
|
-
// 同步错误处理 -
|
|
226
|
-
|
|
227
|
-
failedItems.push(...itemsToProcess.slice(i + 1));
|
|
228
|
-
this.buffer.unshift(...failedItems);
|
|
218
|
+
// 同步错误处理 - 只把未处理的项目放回缓冲区
|
|
219
|
+
this.buffer.unshift(...itemsToProcess.slice(i));
|
|
229
220
|
throw error;
|
|
230
221
|
}
|
|
231
222
|
}
|
|
@@ -122,32 +122,12 @@ describe('BatchingBuffer', () => {
|
|
|
122
122
|
expect(buffer.size).toBe(0);
|
|
123
123
|
});
|
|
124
124
|
it('应该支持批量添加数据', () => {
|
|
125
|
-
buffer.
|
|
126
|
-
expect(batchProcessor).toHaveBeenCalledTimes(
|
|
125
|
+
buffer.addBatch(['item1', 'item2', 'item3', 'item4', 'item5']);
|
|
126
|
+
expect(batchProcessor).toHaveBeenCalledTimes(2);
|
|
127
127
|
expect(batchProcessor).toHaveBeenNthCalledWith(1, ['item1', 'item2', 'item3']);
|
|
128
|
-
|
|
129
|
-
expect(buffer.size).toBe(2);
|
|
130
|
-
});
|
|
131
|
-
it('应该支持添加空参数', () => {
|
|
132
|
-
buffer.add();
|
|
133
|
-
expect(batchProcessor).not.toHaveBeenCalled();
|
|
134
|
-
expect(buffer.size).toBe(0);
|
|
135
|
-
});
|
|
136
|
-
it('应该支持混合添加单个和多个数据', () => {
|
|
137
|
-
buffer.add('item1'); // 单个
|
|
138
|
-
buffer.add('item2', 'item3'); // 多个
|
|
139
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
140
|
-
expect(batchProcessor).toHaveBeenCalledWith(['item1', 'item2', 'item3']);
|
|
128
|
+
expect(batchProcessor).toHaveBeenNthCalledWith(2, ['item4', 'item5']);
|
|
141
129
|
expect(buffer.size).toBe(0);
|
|
142
130
|
});
|
|
143
|
-
it('应该支持使用数组展开语法', () => {
|
|
144
|
-
const items = ['item1', 'item2', 'item3', 'item4', 'item5'];
|
|
145
|
-
buffer.add(...items);
|
|
146
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
147
|
-
expect(batchProcessor).toHaveBeenNthCalledWith(1, ['item1', 'item2', 'item3']);
|
|
148
|
-
// 剩余的项目应该在缓冲区中
|
|
149
|
-
expect(buffer.size).toBe(2);
|
|
150
|
-
});
|
|
151
131
|
it('应该正确处理处理器异常', () => {
|
|
152
132
|
const error = new Error('处理失败');
|
|
153
133
|
batchProcessor.mockImplementationOnce(() => {
|
|
@@ -236,11 +216,10 @@ describe('BatchingBuffer', () => {
|
|
|
236
216
|
it('应该正确报告距离上次刷新的时间', async () => {
|
|
237
217
|
const startTime = Date.now();
|
|
238
218
|
buffer.add(1);
|
|
239
|
-
// 使用假定时器来精确控制时间
|
|
240
219
|
vi.advanceTimersByTime(500);
|
|
241
|
-
expect(buffer.timeSinceLastFlush).
|
|
220
|
+
expect(buffer.timeSinceLastFlush).toBeGreaterThanOrEqual(500);
|
|
242
221
|
await buffer.flush();
|
|
243
|
-
expect(buffer.timeSinceLastFlush).
|
|
222
|
+
expect(buffer.timeSinceLastFlush).toBeLessThan(100);
|
|
244
223
|
});
|
|
245
224
|
});
|
|
246
225
|
describe('销毁功能', () => {
|
|
@@ -275,7 +254,7 @@ describe('BatchingBuffer', () => {
|
|
|
275
254
|
buffer.add('item1');
|
|
276
255
|
}).toThrow('BatchingBuffer 已被销毁,不能添加新数据');
|
|
277
256
|
expect(() => {
|
|
278
|
-
buffer.
|
|
257
|
+
buffer.addBatch(['item1', 'item2']);
|
|
279
258
|
}).toThrow('BatchingBuffer 已被销毁,不能添加新数据');
|
|
280
259
|
});
|
|
281
260
|
it('应该支持重复销毁', async () => {
|
|
@@ -314,45 +293,6 @@ describe('BatchingBuffer', () => {
|
|
|
314
293
|
expect(batchProcessor).toHaveBeenCalledWith(['item1', 'item2']);
|
|
315
294
|
await buffer.destroy();
|
|
316
295
|
});
|
|
317
|
-
it('应该正确处理定时器重置', async () => {
|
|
318
|
-
const buffer = new BatchingBuffer({
|
|
319
|
-
batchProcessor: batchProcessor,
|
|
320
|
-
bufferSize: 5,
|
|
321
|
-
flushInterval: 1000,
|
|
322
|
-
autoFlush: true
|
|
323
|
-
});
|
|
324
|
-
// 添加第一个项目,启动定时器
|
|
325
|
-
buffer.add('item1');
|
|
326
|
-
vi.advanceTimersByTime(500);
|
|
327
|
-
// 添加第二个项目,应该重置定时器
|
|
328
|
-
buffer.add('item2');
|
|
329
|
-
vi.advanceTimersByTime(500);
|
|
330
|
-
// 此时应该还没触发(总共过了1000ms,但最后一次重置后只过了500ms)
|
|
331
|
-
expect(batchProcessor).not.toHaveBeenCalled();
|
|
332
|
-
// 再等500ms,现在应该触发了
|
|
333
|
-
vi.advanceTimersByTime(500);
|
|
334
|
-
await vi.runAllTimersAsync();
|
|
335
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
336
|
-
expect(batchProcessor).toHaveBeenCalledWith(['item1', 'item2']);
|
|
337
|
-
await buffer.destroy();
|
|
338
|
-
});
|
|
339
|
-
it('应该在销毁时清除定时器避免内存泄漏', async () => {
|
|
340
|
-
const buffer = new BatchingBuffer({
|
|
341
|
-
batchProcessor: batchProcessor,
|
|
342
|
-
bufferSize: 5,
|
|
343
|
-
flushInterval: 1000,
|
|
344
|
-
autoFlush: true
|
|
345
|
-
});
|
|
346
|
-
buffer.add('item1');
|
|
347
|
-
// 立即销毁,应该处理剩余数据但不会因为定时器再次触发
|
|
348
|
-
await buffer.destroy();
|
|
349
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
350
|
-
// 等待原本的定时器时间,不应该再次触发
|
|
351
|
-
vi.advanceTimersByTime(1000);
|
|
352
|
-
await vi.runAllTimersAsync();
|
|
353
|
-
// 仍然只被调用一次
|
|
354
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
355
|
-
});
|
|
356
296
|
});
|
|
357
297
|
describe('复杂数据类型', () => {
|
|
358
298
|
let buffer;
|
|
@@ -381,11 +321,11 @@ describe('BatchingBuffer', () => {
|
|
|
381
321
|
let asyncItemProcessor;
|
|
382
322
|
beforeEach(() => {
|
|
383
323
|
asyncBatchProcessor = vi.fn().mockImplementation(async (items) => {
|
|
384
|
-
|
|
324
|
+
await new Promise(resolve => setTimeout(resolve, 100));
|
|
385
325
|
return `处理了 ${items.length} 个项目`;
|
|
386
326
|
});
|
|
387
327
|
asyncItemProcessor = vi.fn().mockImplementation(async (item) => {
|
|
388
|
-
|
|
328
|
+
await new Promise(resolve => setTimeout(resolve, 50));
|
|
389
329
|
return `处理了项目: ${item}`;
|
|
390
330
|
});
|
|
391
331
|
});
|
|
@@ -415,97 +355,4 @@ describe('BatchingBuffer', () => {
|
|
|
415
355
|
buffer.destroy();
|
|
416
356
|
});
|
|
417
357
|
});
|
|
418
|
-
describe('错误处理回调', () => {
|
|
419
|
-
it('应该支持配置错误处理回调', () => {
|
|
420
|
-
const onError = vi.fn();
|
|
421
|
-
const buffer = new BatchingBuffer({
|
|
422
|
-
batchProcessor: vi.fn(),
|
|
423
|
-
bufferSize: 10,
|
|
424
|
-
flushInterval: 1000,
|
|
425
|
-
onError
|
|
426
|
-
});
|
|
427
|
-
expect(buffer).toBeDefined();
|
|
428
|
-
buffer.destroy();
|
|
429
|
-
});
|
|
430
|
-
it('错误处理回调应该可以正确配置', () => {
|
|
431
|
-
const onError = vi.fn();
|
|
432
|
-
const buffer = new BatchingBuffer({
|
|
433
|
-
batchProcessor: vi.fn(),
|
|
434
|
-
bufferSize: 10,
|
|
435
|
-
flushInterval: 1000,
|
|
436
|
-
onError
|
|
437
|
-
});
|
|
438
|
-
// 验证缓冲区正常工作
|
|
439
|
-
buffer.add('item1');
|
|
440
|
-
expect(buffer.size).toBe(1);
|
|
441
|
-
buffer.destroy();
|
|
442
|
-
});
|
|
443
|
-
});
|
|
444
|
-
describe('边界条件测试', () => {
|
|
445
|
-
it('应该正确处理极小的 bufferSize', () => {
|
|
446
|
-
const buffer = new BatchingBuffer({
|
|
447
|
-
batchProcessor: batchProcessor,
|
|
448
|
-
bufferSize: 1,
|
|
449
|
-
flushInterval: 1000
|
|
450
|
-
});
|
|
451
|
-
buffer.add('item1');
|
|
452
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
453
|
-
expect(batchProcessor).toHaveBeenCalledWith(['item1']);
|
|
454
|
-
buffer.destroy();
|
|
455
|
-
});
|
|
456
|
-
it('应该正确处理极小的 flushInterval', async () => {
|
|
457
|
-
const buffer = new BatchingBuffer({
|
|
458
|
-
batchProcessor: batchProcessor,
|
|
459
|
-
bufferSize: 5,
|
|
460
|
-
flushInterval: 1 // 1ms
|
|
461
|
-
});
|
|
462
|
-
buffer.add('item1');
|
|
463
|
-
vi.advanceTimersByTime(1);
|
|
464
|
-
await vi.runAllTimersAsync();
|
|
465
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
466
|
-
expect(batchProcessor).toHaveBeenCalledWith(['item1']);
|
|
467
|
-
await buffer.destroy();
|
|
468
|
-
});
|
|
469
|
-
it('应该正确处理同时达到大小和时间限制', async () => {
|
|
470
|
-
const buffer = new BatchingBuffer({
|
|
471
|
-
batchProcessor: batchProcessor,
|
|
472
|
-
bufferSize: 2,
|
|
473
|
-
flushInterval: 100
|
|
474
|
-
});
|
|
475
|
-
buffer.add('item1');
|
|
476
|
-
// 在时间限制之前添加第二个项目,应该立即触发
|
|
477
|
-
buffer.add('item2');
|
|
478
|
-
expect(batchProcessor).toHaveBeenCalledTimes(1);
|
|
479
|
-
expect(batchProcessor).toHaveBeenCalledWith(['item1', 'item2']);
|
|
480
|
-
await buffer.destroy();
|
|
481
|
-
});
|
|
482
|
-
it('应该正确处理在处理过程中继续添加数据', () => {
|
|
483
|
-
const processedBatches = [];
|
|
484
|
-
let processingCount = 0;
|
|
485
|
-
const batchProcessorWithCallback = vi.fn().mockImplementation((items) => {
|
|
486
|
-
processingCount++;
|
|
487
|
-
processedBatches.push([...items]);
|
|
488
|
-
// 在第一次处理过程中添加新数据
|
|
489
|
-
if (processingCount === 1) {
|
|
490
|
-
buffer.add('item4');
|
|
491
|
-
}
|
|
492
|
-
});
|
|
493
|
-
const buffer = new BatchingBuffer({
|
|
494
|
-
batchProcessor: batchProcessorWithCallback,
|
|
495
|
-
bufferSize: 2,
|
|
496
|
-
flushInterval: 1000
|
|
497
|
-
});
|
|
498
|
-
buffer.add('item1', 'item2', 'item3');
|
|
499
|
-
// 验证处理次数
|
|
500
|
-
expect(batchProcessorWithCallback).toHaveBeenCalledTimes(2);
|
|
501
|
-
// 验证第一次处理了前两个项目
|
|
502
|
-
expect(processedBatches[0]).toEqual(['item1', 'item2']);
|
|
503
|
-
// 第二次处理的顺序可能是 ['item4', 'item3'] 或 ['item3', 'item4']
|
|
504
|
-
// 这取决于具体实现,我们验证包含了正确的项目
|
|
505
|
-
expect(processedBatches[1]).toHaveLength(2);
|
|
506
|
-
expect(processedBatches[1]).toContain('item3');
|
|
507
|
-
expect(processedBatches[1]).toContain('item4');
|
|
508
|
-
buffer.destroy();
|
|
509
|
-
});
|
|
510
|
-
});
|
|
511
358
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"disposer.d.ts","sourceRoot":"","sources":["../../source/events/disposer.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACnB,OAAO,CAAC,gBAAgB,CAAyB;IAGjD,WAAW,CAAC,SAAS,EAAE,MAAM,OAAO,GAAG,IAAI;IAK3C,OAAO,IAAI,IAAI;CAUhB"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export class Disposer {
|
|
2
|
+
cleanupFunctions = [];
|
|
3
|
+
// 添加清理函数
|
|
4
|
+
addDisposer(cleanupFn) {
|
|
5
|
+
this.cleanupFunctions.push(cleanupFn);
|
|
6
|
+
}
|
|
7
|
+
// 执行所有清理函数
|
|
8
|
+
dispose() {
|
|
9
|
+
for (const cleanupFn of this.cleanupFunctions) {
|
|
10
|
+
try {
|
|
11
|
+
cleanupFn();
|
|
12
|
+
}
|
|
13
|
+
catch (error) {
|
|
14
|
+
console.error('Error during cleanup:', error);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
this.cleanupFunctions = []; // 清空清理函数列表
|
|
18
|
+
}
|
|
19
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"disposer.test.d.ts","sourceRoot":"","sources":["../../source/events/disposer.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { Disposer } from './disposer';
|
|
3
|
+
describe('Disposer', () => {
|
|
4
|
+
let disposer;
|
|
5
|
+
beforeEach(() => {
|
|
6
|
+
disposer = new Disposer();
|
|
7
|
+
});
|
|
8
|
+
describe('addDisposer', () => {
|
|
9
|
+
it('应该能够添加清理函数', () => {
|
|
10
|
+
const cleanupFn = vi.fn();
|
|
11
|
+
expect(() => {
|
|
12
|
+
disposer.addDisposer(cleanupFn);
|
|
13
|
+
}).not.toThrow();
|
|
14
|
+
});
|
|
15
|
+
it('应该能够添加多个清理函数', () => {
|
|
16
|
+
const cleanupFn1 = vi.fn();
|
|
17
|
+
const cleanupFn2 = vi.fn();
|
|
18
|
+
const cleanupFn3 = vi.fn();
|
|
19
|
+
disposer.addDisposer(cleanupFn1);
|
|
20
|
+
disposer.addDisposer(cleanupFn2);
|
|
21
|
+
disposer.addDisposer(cleanupFn3);
|
|
22
|
+
disposer.dispose();
|
|
23
|
+
expect(cleanupFn1).toHaveBeenCalledOnce();
|
|
24
|
+
expect(cleanupFn2).toHaveBeenCalledOnce();
|
|
25
|
+
expect(cleanupFn3).toHaveBeenCalledOnce();
|
|
26
|
+
});
|
|
27
|
+
it('应该能够添加返回不同类型的清理函数', () => {
|
|
28
|
+
const voidFn = vi.fn(() => { });
|
|
29
|
+
const stringFn = vi.fn(() => 'cleanup result');
|
|
30
|
+
const numberFn = vi.fn(() => 42);
|
|
31
|
+
const promiseFn = vi.fn(() => Promise.resolve('async cleanup'));
|
|
32
|
+
disposer.addDisposer(voidFn);
|
|
33
|
+
disposer.addDisposer(stringFn);
|
|
34
|
+
disposer.addDisposer(numberFn);
|
|
35
|
+
disposer.addDisposer(promiseFn);
|
|
36
|
+
disposer.dispose();
|
|
37
|
+
expect(voidFn).toHaveBeenCalled();
|
|
38
|
+
expect(stringFn).toHaveBeenCalled();
|
|
39
|
+
expect(numberFn).toHaveBeenCalled();
|
|
40
|
+
expect(promiseFn).toHaveBeenCalled();
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
describe('dispose', () => {
|
|
44
|
+
it('应该执行所有清理函数', () => {
|
|
45
|
+
const cleanupFn1 = vi.fn();
|
|
46
|
+
const cleanupFn2 = vi.fn();
|
|
47
|
+
const cleanupFn3 = vi.fn();
|
|
48
|
+
disposer.addDisposer(cleanupFn1);
|
|
49
|
+
disposer.addDisposer(cleanupFn2);
|
|
50
|
+
disposer.addDisposer(cleanupFn3);
|
|
51
|
+
disposer.dispose();
|
|
52
|
+
expect(cleanupFn1).toHaveBeenCalledOnce();
|
|
53
|
+
expect(cleanupFn2).toHaveBeenCalledOnce();
|
|
54
|
+
expect(cleanupFn3).toHaveBeenCalledOnce();
|
|
55
|
+
});
|
|
56
|
+
it('应该按添加顺序执行清理函数', () => {
|
|
57
|
+
const executionOrder = [];
|
|
58
|
+
disposer.addDisposer(() => executionOrder.push(1));
|
|
59
|
+
disposer.addDisposer(() => executionOrder.push(2));
|
|
60
|
+
disposer.addDisposer(() => executionOrder.push(3));
|
|
61
|
+
disposer.dispose();
|
|
62
|
+
expect(executionOrder).toEqual([1, 2, 3]);
|
|
63
|
+
});
|
|
64
|
+
it('应该处理清理函数中的错误', () => {
|
|
65
|
+
const workingFn1 = vi.fn();
|
|
66
|
+
const errorFn = vi.fn(() => {
|
|
67
|
+
throw new Error('Cleanup error');
|
|
68
|
+
});
|
|
69
|
+
const workingFn2 = vi.fn();
|
|
70
|
+
// 模拟 console.error
|
|
71
|
+
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
72
|
+
disposer.addDisposer(workingFn1);
|
|
73
|
+
disposer.addDisposer(errorFn);
|
|
74
|
+
disposer.addDisposer(workingFn2);
|
|
75
|
+
// dispose 不应该抛出错误
|
|
76
|
+
expect(() => {
|
|
77
|
+
disposer.dispose();
|
|
78
|
+
}).not.toThrow();
|
|
79
|
+
// 所有函数都应该被调用
|
|
80
|
+
expect(workingFn1).toHaveBeenCalled();
|
|
81
|
+
expect(errorFn).toHaveBeenCalled();
|
|
82
|
+
expect(workingFn2).toHaveBeenCalled();
|
|
83
|
+
// 错误应该被记录
|
|
84
|
+
expect(consoleSpy).toHaveBeenCalledWith('Error during cleanup:', expect.any(Error));
|
|
85
|
+
consoleSpy.mockRestore();
|
|
86
|
+
});
|
|
87
|
+
it('应该在执行后清空清理函数列表', () => {
|
|
88
|
+
const cleanupFn = vi.fn();
|
|
89
|
+
disposer.addDisposer(cleanupFn);
|
|
90
|
+
disposer.dispose();
|
|
91
|
+
expect(cleanupFn).toHaveBeenCalledOnce();
|
|
92
|
+
// 再次调用 dispose 不应该执行任何函数
|
|
93
|
+
disposer.dispose();
|
|
94
|
+
expect(cleanupFn).toHaveBeenCalledOnce();
|
|
95
|
+
});
|
|
96
|
+
it('应该能够在清空后重新添加清理函数', () => {
|
|
97
|
+
const firstCleanup = vi.fn();
|
|
98
|
+
const secondCleanup = vi.fn();
|
|
99
|
+
disposer.addDisposer(firstCleanup);
|
|
100
|
+
disposer.dispose();
|
|
101
|
+
disposer.addDisposer(secondCleanup);
|
|
102
|
+
disposer.dispose();
|
|
103
|
+
expect(firstCleanup).toHaveBeenCalledOnce();
|
|
104
|
+
expect(secondCleanup).toHaveBeenCalledOnce();
|
|
105
|
+
});
|
|
106
|
+
it('应该在没有清理函数时安全执行', () => {
|
|
107
|
+
expect(() => {
|
|
108
|
+
disposer.dispose();
|
|
109
|
+
}).not.toThrow();
|
|
110
|
+
});
|
|
111
|
+
it('应该能够多次调用 dispose', () => {
|
|
112
|
+
const cleanupFn = vi.fn();
|
|
113
|
+
disposer.addDisposer(cleanupFn);
|
|
114
|
+
disposer.dispose();
|
|
115
|
+
disposer.dispose();
|
|
116
|
+
disposer.dispose();
|
|
117
|
+
expect(cleanupFn).toHaveBeenCalledOnce();
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
describe('实际使用场景', () => {
|
|
121
|
+
it('应该能够清理事件监听器', () => {
|
|
122
|
+
const removeEventListener = vi.fn();
|
|
123
|
+
const unsubscribe = vi.fn();
|
|
124
|
+
disposer.addDisposer(removeEventListener);
|
|
125
|
+
disposer.addDisposer(unsubscribe);
|
|
126
|
+
disposer.dispose();
|
|
127
|
+
expect(removeEventListener).toHaveBeenCalled();
|
|
128
|
+
expect(unsubscribe).toHaveBeenCalled();
|
|
129
|
+
});
|
|
130
|
+
it('应该能够清理定时器', () => {
|
|
131
|
+
const clearTimeout = vi.fn();
|
|
132
|
+
const clearInterval = vi.fn();
|
|
133
|
+
disposer.addDisposer(() => clearTimeout(123));
|
|
134
|
+
disposer.addDisposer(() => clearInterval(456));
|
|
135
|
+
disposer.dispose();
|
|
136
|
+
expect(clearTimeout).toHaveBeenCalledWith(123);
|
|
137
|
+
expect(clearInterval).toHaveBeenCalledWith(456);
|
|
138
|
+
});
|
|
139
|
+
it('应该能够清理资源连接', () => {
|
|
140
|
+
const closeConnection = vi.fn();
|
|
141
|
+
const releaseResource = vi.fn();
|
|
142
|
+
disposer.addDisposer(() => closeConnection());
|
|
143
|
+
disposer.addDisposer(() => releaseResource());
|
|
144
|
+
disposer.dispose();
|
|
145
|
+
expect(closeConnection).toHaveBeenCalled();
|
|
146
|
+
expect(releaseResource).toHaveBeenCalled();
|
|
147
|
+
});
|
|
148
|
+
it('应该与 EventEmitter 配合使用', () => {
|
|
149
|
+
// 模拟 EventEmitter 的使用
|
|
150
|
+
const mockEventEmitter = {
|
|
151
|
+
on: vi.fn().mockReturnValue(vi.fn()), // 返回 off 函数
|
|
152
|
+
cleanup: vi.fn()
|
|
153
|
+
};
|
|
154
|
+
const offFunction1 = mockEventEmitter.on('event1', vi.fn());
|
|
155
|
+
const offFunction2 = mockEventEmitter.on('event2', vi.fn());
|
|
156
|
+
disposer.addDisposer(offFunction1);
|
|
157
|
+
disposer.addDisposer(offFunction2);
|
|
158
|
+
disposer.addDisposer(() => mockEventEmitter.cleanup());
|
|
159
|
+
disposer.dispose();
|
|
160
|
+
expect(offFunction1).toHaveBeenCalled();
|
|
161
|
+
expect(offFunction2).toHaveBeenCalled();
|
|
162
|
+
expect(mockEventEmitter.cleanup).toHaveBeenCalled();
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
describe('错误处理', () => {
|
|
166
|
+
it('应该捕获并记录同步错误', () => {
|
|
167
|
+
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
168
|
+
const error = new Error('Sync error');
|
|
169
|
+
disposer.addDisposer(() => {
|
|
170
|
+
throw error;
|
|
171
|
+
});
|
|
172
|
+
disposer.dispose();
|
|
173
|
+
expect(consoleSpy).toHaveBeenCalledWith('Error during cleanup:', error);
|
|
174
|
+
consoleSpy.mockRestore();
|
|
175
|
+
});
|
|
176
|
+
it('应该处理不同类型的错误', () => {
|
|
177
|
+
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
178
|
+
disposer.addDisposer(() => {
|
|
179
|
+
throw new TypeError('Type error');
|
|
180
|
+
});
|
|
181
|
+
disposer.addDisposer(() => {
|
|
182
|
+
throw 'String error';
|
|
183
|
+
});
|
|
184
|
+
disposer.addDisposer(() => {
|
|
185
|
+
throw { message: 'Object error' };
|
|
186
|
+
});
|
|
187
|
+
disposer.dispose();
|
|
188
|
+
expect(consoleSpy).toHaveBeenCalledTimes(3);
|
|
189
|
+
consoleSpy.mockRestore();
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
});
|