fix(测试数据生成器): 修复 Worker 并发生成导致的数据污染

Co-authored-by: LingandRX <LingandRX@users.noreply.github.com>
This commit is contained in:
Cursor Agent
2026-06-28 11:04:38 +00:00
committed by 雨霖铃
parent 647e3dd308
commit 4084dafc29
3 changed files with 75 additions and 29 deletions
@@ -114,4 +114,25 @@ describe('useGenerator', () => {
expect(result.current.isGenerating).toBe(false); expect(result.current.isGenerating).toBe(false);
expect(worker.postedMessages).toEqual(expect.arrayContaining([{ type: 'cancel' }])); expect(worker.postedMessages).toEqual(expect.arrayContaining([{ type: 'cancel' }]));
}); });
it('正在生成时不应重复发送 start 消息', () => {
const { result } = renderHook(() => useGenerator());
act(() => {
result.current.generate([mockField], 10);
result.current.generate([mockField], 20);
});
const worker = MockWorker.instances[0];
const startMessages = worker.postedMessages.filter(
(message): message is { type: 'start'; payload: { count: number } } =>
typeof message === 'object' &&
message !== null &&
'type' in message &&
message.type === 'start',
);
expect(startMessages).toHaveLength(1);
expect(startMessages[0]?.payload.count).toBe(10);
});
}); });
@@ -37,6 +37,12 @@ export function useGenerator(): UseGeneratorReturn {
const workerRef = useRef<Worker | null>(null); const workerRef = useRef<Worker | null>(null);
const generationIdRef = useRef(0); const generationIdRef = useRef(0);
const isGeneratingRef = useRef(false);
const finishGenerating = useCallback(() => {
isGeneratingRef.current = false;
setIsGenerating(false);
}, []);
// 清理 Worker // 清理 Worker
useEffect(() => { useEffect(() => {
@@ -73,7 +79,7 @@ export function useGenerator(): UseGeneratorReturn {
setProgress(data.payload); setProgress(data.payload);
break; break;
case 'complete': case 'complete':
setIsGenerating(false); finishGenerating();
if (data.payload.success) { if (data.payload.success) {
setResult(data.payload); setResult(data.payload);
} else if (data.payload.error && data.payload.error !== '生成已取消') { } else if (data.payload.error && data.payload.error !== '生成已取消') {
@@ -82,7 +88,7 @@ export function useGenerator(): UseGeneratorReturn {
setProgress(null); setProgress(null);
break; break;
case 'error': case 'error':
setIsGenerating(false); finishGenerating();
setError(data.payload.error); setError(data.payload.error);
setProgress(null); setProgress(null);
break; break;
@@ -91,7 +97,7 @@ export function useGenerator(): UseGeneratorReturn {
worker.onerror = (err) => { worker.onerror = (err) => {
console.error('[useGenerator] Worker 错误:', err); console.error('[useGenerator] Worker 错误:', err);
setIsGenerating(false); finishGenerating();
setError(err.message || 'Worker 运行错误'); setError(err.message || 'Worker 运行错误');
setProgress(null); setProgress(null);
// Worker 出错后销毁,下次重新创建 // Worker 出错后销毁,下次重新创建
@@ -101,16 +107,17 @@ export function useGenerator(): UseGeneratorReturn {
workerRef.current = worker; workerRef.current = worker;
return worker; return worker;
}, []); }, [finishGenerating]);
/** /**
* 开始生成 * 开始生成
*/ */
const generate = useCallback( const generate = useCallback(
(fields: FieldConfig[], count: number, csvMode = false) => { (fields: FieldConfig[], count: number, csvMode = false) => {
if (isGenerating) return; if (isGeneratingRef.current) return;
const generationId = ++generationIdRef.current; const generationId = ++generationIdRef.current;
isGeneratingRef.current = true;
setIsGenerating(true); setIsGenerating(true);
setProgress(null); setProgress(null);
@@ -124,21 +131,22 @@ export function useGenerator(): UseGeneratorReturn {
}; };
worker.postMessage(message); worker.postMessage(message);
}, },
[isGenerating, getWorker], [getWorker],
); );
/** /**
* 取消生成 * 取消生成
*/ */
const cancel = useCallback(() => { const cancel = useCallback(() => {
if (workerRef.current && isGenerating) { if (workerRef.current && isGeneratingRef.current) {
++generationIdRef.current; ++generationIdRef.current;
const message: WorkerRequestMessage = { type: 'cancel' }; const message: WorkerRequestMessage = { type: 'cancel' };
workerRef.current.postMessage(message); workerRef.current.postMessage(message);
isGeneratingRef.current = false;
setIsGenerating(false); setIsGenerating(false);
setProgress(null); setProgress(null);
} }
}, [isGenerating]); }, []);
/** /**
* 清除结果 * 清除结果
+38 -21
View File
@@ -14,10 +14,14 @@ import type {
/** 每生成 N 行让出一次事件循环,以便处理 cancel 消息 */ /** 每生成 N 行让出一次事件循环,以便处理 cancel 消息 */
const YIELD_EVERY = 100; const YIELD_EVERY = 100;
// 生成结果缓存 /** 当前活跃生成任务 ID;新 start 会 supersede 旧任务 */
let generatedData: Record<string, unknown>[] = []; let activeGenerationId: number | null = null;
let isCancelled = false; let isCancelled = false;
function shouldAbort(generationId: number): boolean {
return isCancelled || generationId !== activeGenerationId;
}
/** /**
* Worker 消息处理器 * Worker 消息处理器
*/ */
@@ -27,12 +31,17 @@ self.onmessage = async (e: MessageEvent<WorkerRequestMessage>) => {
switch (type) { switch (type) {
case 'start': case 'start':
activeGenerationId = data.payload.generationId;
isCancelled = false; isCancelled = false;
await handleStart(data.payload); await handleStart(data.payload);
break; break;
case 'cancel': case 'cancel':
isCancelled = true; isCancelled = true;
break; break;
default: {
const _exhaustive: never = type;
return _exhaustive;
}
} }
}; };
@@ -46,7 +55,7 @@ async function handleStart(payload: {
csvMode: boolean; csvMode: boolean;
}): Promise<void> { }): Promise<void> {
const { generationId, fields, count } = payload; const { generationId, fields, count } = payload;
generatedData = []; const generatedData: Record<string, unknown>[] = [];
try { try {
// 验证所有生成器是否存在 // 验证所有生成器是否存在
@@ -67,15 +76,17 @@ async function handleStart(payload: {
// 生成数据 // 生成数据
for (let i = 0; i < count; i++) { for (let i = 0; i < count; i++) {
if (isCancelled) { if (shouldAbort(generationId)) {
self.postMessage({ if (generationId === activeGenerationId) {
type: 'complete', self.postMessage({
generationId, type: 'complete',
payload: { generationId,
success: false, payload: {
error: '生成已取消', success: false,
}, error: '生成已取消',
}); },
});
}
return; return;
} }
@@ -148,20 +159,26 @@ async function handleStart(payload: {
// 定期让出事件循环,使 cancel 消息能被处理 // 定期让出事件循环,使 cancel 消息能被处理
if ((i + 1) % YIELD_EVERY === 0) { if ((i + 1) % YIELD_EVERY === 0) {
await new Promise<void>((resolve) => setTimeout(resolve, 0)); await new Promise<void>((resolve) => setTimeout(resolve, 0));
if (isCancelled) { if (shouldAbort(generationId)) {
self.postMessage({ if (generationId === activeGenerationId) {
type: 'complete', self.postMessage({
generationId, type: 'complete',
payload: { generationId,
success: false, payload: {
error: '生成已取消', success: false,
}, error: '生成已取消',
}); },
});
}
return; return;
} }
} }
} }
if (shouldAbort(generationId)) {
return;
}
const duration = Date.now() - startTime; const duration = Date.now() - startTime;
const successCount = generatedData.filter((item) => Object.keys(item).length > 0).length; const successCount = generatedData.filter((item) => Object.keys(item).length > 0).length;