fix(测试数据生成器): 修复 Worker 取消失效与规则存储静默失败 (#69)
- 为生成任务引入 generationId,忽略过期 Worker 响应,避免取消后展示错误数据 - Worker 每 100 行让出事件循环,使 cancel 消息能被及时处理 - ruleStorage.setAll 返回写入结果,save/update/delete 在 QuotaExceeded 时返回失败 - 补充 useGenerator 与 ruleStorage 单元测试
This commit is contained in:
@@ -0,0 +1,117 @@
|
||||
import { act, renderHook, waitFor } from '@testing-library/react';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { useGenerator } from '@/pages/TestDataGenerator/hooks/useGenerator';
|
||||
import type { FieldConfig, WorkerResponseMessage } from '@/types/testDataGenerator';
|
||||
|
||||
const mockField: FieldConfig = {
|
||||
id: 'field-1',
|
||||
name: 'username',
|
||||
generatorId: 'string',
|
||||
params: {},
|
||||
required: true,
|
||||
nullRate: 0,
|
||||
unique: false,
|
||||
};
|
||||
|
||||
type WorkerListener = (event: MessageEvent<WorkerResponseMessage>) => void;
|
||||
|
||||
class MockWorker {
|
||||
static instances: MockWorker[] = [];
|
||||
onmessage: WorkerListener | null = null;
|
||||
onerror: ((event: ErrorEvent) => void) | null = null;
|
||||
postedMessages: unknown[] = [];
|
||||
|
||||
constructor(_url: URL, _options?: WorkerOptions) {
|
||||
MockWorker.instances.push(this);
|
||||
}
|
||||
|
||||
postMessage(message: unknown) {
|
||||
this.postedMessages.push(message);
|
||||
}
|
||||
|
||||
terminate() {
|
||||
const index = MockWorker.instances.indexOf(this);
|
||||
if (index >= 0) {
|
||||
MockWorker.instances.splice(index, 1);
|
||||
}
|
||||
}
|
||||
|
||||
emit(message: WorkerResponseMessage) {
|
||||
this.onmessage?.({ data: message } as MessageEvent<WorkerResponseMessage>);
|
||||
}
|
||||
}
|
||||
|
||||
describe('useGenerator', () => {
|
||||
beforeEach(() => {
|
||||
MockWorker.instances = [];
|
||||
vi.stubGlobal('Worker', MockWorker);
|
||||
});
|
||||
|
||||
it('应忽略过期 generationId 的 complete 消息', async () => {
|
||||
const { result } = renderHook(() => useGenerator());
|
||||
|
||||
act(() => {
|
||||
result.current.generate([mockField], 10);
|
||||
});
|
||||
|
||||
const worker = MockWorker.instances[0];
|
||||
expect(worker).toBeDefined();
|
||||
|
||||
act(() => {
|
||||
result.current.cancel();
|
||||
});
|
||||
|
||||
act(() => {
|
||||
result.current.generate([mockField], 5);
|
||||
});
|
||||
|
||||
act(() => {
|
||||
worker.emit({
|
||||
type: 'complete',
|
||||
generationId: 1,
|
||||
payload: {
|
||||
success: true,
|
||||
data: [{ username: 'stale' }],
|
||||
stats: { total: 10, success: 10, failed: 0, duration: 1 },
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
expect(result.current.result).toBeNull();
|
||||
expect(result.current.isGenerating).toBe(true);
|
||||
|
||||
act(() => {
|
||||
worker.emit({
|
||||
type: 'complete',
|
||||
generationId: 3,
|
||||
payload: {
|
||||
success: true,
|
||||
data: [{ username: 'fresh' }],
|
||||
stats: { total: 5, success: 5, failed: 0, duration: 1 },
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
await waitFor(() => {
|
||||
expect(result.current.isGenerating).toBe(false);
|
||||
});
|
||||
expect(result.current.result?.data?.[0]).toEqual({ username: 'fresh' });
|
||||
});
|
||||
|
||||
it('cancel 后应发送 cancel 消息并使 generationId 失效', () => {
|
||||
const { result } = renderHook(() => useGenerator());
|
||||
|
||||
act(() => {
|
||||
result.current.generate([mockField], 100);
|
||||
});
|
||||
|
||||
const worker = MockWorker.instances[0];
|
||||
|
||||
act(() => {
|
||||
result.current.cancel();
|
||||
});
|
||||
|
||||
expect(result.current.isGenerating).toBe(false);
|
||||
expect(worker.postedMessages).toEqual(expect.arrayContaining([{ type: 'cancel' }]));
|
||||
});
|
||||
});
|
||||
@@ -8,7 +8,8 @@ import type {
|
||||
FieldConfig,
|
||||
GenerateResult,
|
||||
GenerateProgress,
|
||||
WorkerMessage,
|
||||
WorkerRequestMessage,
|
||||
WorkerResponseMessage,
|
||||
} from '@/types/testDataGenerator';
|
||||
|
||||
export interface UseGeneratorReturn {
|
||||
@@ -35,6 +36,7 @@ export function useGenerator(): UseGeneratorReturn {
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const workerRef = useRef<Worker | null>(null);
|
||||
const generationIdRef = useRef(0);
|
||||
|
||||
// 清理 Worker
|
||||
useEffect(() => {
|
||||
@@ -58,22 +60,30 @@ export function useGenerator(): UseGeneratorReturn {
|
||||
type: 'module',
|
||||
});
|
||||
|
||||
worker.onmessage = (e: MessageEvent<WorkerMessage>) => {
|
||||
worker.onmessage = (e: MessageEvent<WorkerResponseMessage>) => {
|
||||
const data = e.data;
|
||||
const { type } = data;
|
||||
|
||||
if (data.generationId !== generationIdRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case 'progress':
|
||||
setProgress(data.payload as GenerateProgress);
|
||||
setProgress(data.payload);
|
||||
break;
|
||||
case 'complete':
|
||||
setIsGenerating(false);
|
||||
setResult(data.payload as GenerateResult);
|
||||
if (data.payload.success) {
|
||||
setResult(data.payload);
|
||||
} else if (data.payload.error && data.payload.error !== '生成已取消') {
|
||||
setError(data.payload.error);
|
||||
}
|
||||
setProgress(null);
|
||||
break;
|
||||
case 'error':
|
||||
setIsGenerating(false);
|
||||
setError((data.payload as { error: string }).error);
|
||||
setError(data.payload.error);
|
||||
setProgress(null);
|
||||
break;
|
||||
}
|
||||
@@ -100,15 +110,17 @@ export function useGenerator(): UseGeneratorReturn {
|
||||
(fields: FieldConfig[], count: number, csvMode = false) => {
|
||||
if (isGenerating) return;
|
||||
|
||||
const generationId = ++generationIdRef.current;
|
||||
|
||||
setIsGenerating(true);
|
||||
setProgress(null);
|
||||
setResult(null);
|
||||
setError(null);
|
||||
|
||||
const worker = getWorker();
|
||||
const message: WorkerMessage = {
|
||||
const message: WorkerRequestMessage = {
|
||||
type: 'start',
|
||||
payload: { fields, count, csvMode },
|
||||
payload: { generationId, fields, count, csvMode },
|
||||
};
|
||||
worker.postMessage(message);
|
||||
},
|
||||
@@ -120,7 +132,8 @@ export function useGenerator(): UseGeneratorReturn {
|
||||
*/
|
||||
const cancel = useCallback(() => {
|
||||
if (workerRef.current && isGenerating) {
|
||||
const message: WorkerMessage = { type: 'cancel' };
|
||||
++generationIdRef.current;
|
||||
const message: WorkerRequestMessage = { type: 'cancel' };
|
||||
workerRef.current.postMessage(message);
|
||||
setIsGenerating(false);
|
||||
setProgress(null);
|
||||
|
||||
Reference in New Issue
Block a user