Compare commits

..

1 Commits

Author SHA1 Message Date
Cursor Agent 3f2b2585b8 fix(StorageCleaner): 同一标签页 URL 变更时阻止误清理
handleClean 原先仅校验 tab id,未校验 url。用户在页面内导航后、
存储信息刷新完成前确认清理,会按旧页面展示的数据清理新页面存储。
2026-06-27 11:03:39 +00:00
5 changed files with 59 additions and 78 deletions
@@ -126,7 +126,34 @@ describe('StorageCleaner 页面', () => {
await waitFor(() => {
expect(clearStorage).not.toHaveBeenCalled();
expect(toast.warning).toHaveBeenCalledWith('当前标签页已切换,请等待数据刷新后再清理');
expect(toast.warning).toHaveBeenCalledWith('当前页面已变更,请等待数据刷新后再清理');
});
});
it('同一标签页 URL 变更后、数据刷新完成前不应执行清理', async () => {
let currentUrl = 'https://a.example.com';
vi.mocked(getCurrentTab).mockImplementation(
async () =>
({
id: 1,
url: currentUrl,
}) as any,
);
render(<Index />);
await waitFor(() => {
expect(screen.getByRole('button', { name: /立即清理/ })).not.toBeDisabled();
});
currentUrl = 'https://b.example.com';
fireEvent.click(screen.getByRole('button', { name: /立即清理/ }));
fireEvent.click(screen.getByRole('button', { name: /确认清理/ }));
await waitFor(() => {
expect(clearStorage).not.toHaveBeenCalled();
expect(toast.warning).toHaveBeenCalledWith('当前页面已变更,请等待数据刷新后再清理');
});
});
});
@@ -258,8 +258,8 @@ export function useStorageCleaner(): UseStorageCleanerReturn {
}
const boundTab = boundTabRef.current;
if (!boundTab || boundTab.id !== tab.id) {
toast.warning('当前标签页已切换,请等待数据刷新后再清理');
if (!boundTab || boundTab.id !== tab.id || boundTab.url !== tab.url) {
toast.warning('当前页面已变更,请等待数据刷新后再清理');
setShowConfirm(false);
return;
}
@@ -114,25 +114,4 @@ describe('useGenerator', () => {
expect(result.current.isGenerating).toBe(false);
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,12 +37,6 @@ export function useGenerator(): UseGeneratorReturn {
const workerRef = useRef<Worker | null>(null);
const generationIdRef = useRef(0);
const isGeneratingRef = useRef(false);
const finishGenerating = useCallback(() => {
isGeneratingRef.current = false;
setIsGenerating(false);
}, []);
// 清理 Worker
useEffect(() => {
@@ -79,7 +73,7 @@ export function useGenerator(): UseGeneratorReturn {
setProgress(data.payload);
break;
case 'complete':
finishGenerating();
setIsGenerating(false);
if (data.payload.success) {
setResult(data.payload);
} else if (data.payload.error && data.payload.error !== '生成已取消') {
@@ -88,7 +82,7 @@ export function useGenerator(): UseGeneratorReturn {
setProgress(null);
break;
case 'error':
finishGenerating();
setIsGenerating(false);
setError(data.payload.error);
setProgress(null);
break;
@@ -97,7 +91,7 @@ export function useGenerator(): UseGeneratorReturn {
worker.onerror = (err) => {
console.error('[useGenerator] Worker 错误:', err);
finishGenerating();
setIsGenerating(false);
setError(err.message || 'Worker 运行错误');
setProgress(null);
// Worker 出错后销毁,下次重新创建
@@ -107,17 +101,16 @@ export function useGenerator(): UseGeneratorReturn {
workerRef.current = worker;
return worker;
}, [finishGenerating]);
}, []);
/**
* 开始生成
*/
const generate = useCallback(
(fields: FieldConfig[], count: number, csvMode = false) => {
if (isGeneratingRef.current) return;
if (isGenerating) return;
const generationId = ++generationIdRef.current;
isGeneratingRef.current = true;
setIsGenerating(true);
setProgress(null);
@@ -131,22 +124,21 @@ export function useGenerator(): UseGeneratorReturn {
};
worker.postMessage(message);
},
[getWorker],
[isGenerating, getWorker],
);
/**
* 取消生成
*/
const cancel = useCallback(() => {
if (workerRef.current && isGeneratingRef.current) {
if (workerRef.current && isGenerating) {
++generationIdRef.current;
const message: WorkerRequestMessage = { type: 'cancel' };
workerRef.current.postMessage(message);
isGeneratingRef.current = false;
setIsGenerating(false);
setProgress(null);
}
}, []);
}, [isGenerating]);
/**
* 清除结果
+5 -22
View File
@@ -14,14 +14,10 @@ import type {
/** 每生成 N 行让出一次事件循环,以便处理 cancel 消息 */
const YIELD_EVERY = 100;
/** 当前活跃生成任务 ID;新 start 会 supersede 旧任务 */
let activeGenerationId: number | null = null;
// 生成结果缓存
let generatedData: Record<string, unknown>[] = [];
let isCancelled = false;
function shouldAbort(generationId: number): boolean {
return isCancelled || generationId !== activeGenerationId;
}
/**
* Worker 消息处理器
*/
@@ -31,17 +27,12 @@ self.onmessage = async (e: MessageEvent<WorkerRequestMessage>) => {
switch (type) {
case 'start':
activeGenerationId = data.payload.generationId;
isCancelled = false;
await handleStart(data.payload);
break;
case 'cancel':
isCancelled = true;
break;
default: {
const _exhaustive: never = type;
return _exhaustive;
}
}
};
@@ -55,7 +46,7 @@ async function handleStart(payload: {
csvMode: boolean;
}): Promise<void> {
const { generationId, fields, count } = payload;
const generatedData: Record<string, unknown>[] = [];
generatedData = [];
try {
// 验证所有生成器是否存在
@@ -76,8 +67,7 @@ async function handleStart(payload: {
// 生成数据
for (let i = 0; i < count; i++) {
if (shouldAbort(generationId)) {
if (generationId === activeGenerationId) {
if (isCancelled) {
self.postMessage({
type: 'complete',
generationId,
@@ -86,7 +76,6 @@ async function handleStart(payload: {
error: '生成已取消',
},
});
}
return;
}
@@ -159,8 +148,7 @@ async function handleStart(payload: {
// 定期让出事件循环,使 cancel 消息能被处理
if ((i + 1) % YIELD_EVERY === 0) {
await new Promise<void>((resolve) => setTimeout(resolve, 0));
if (shouldAbort(generationId)) {
if (generationId === activeGenerationId) {
if (isCancelled) {
self.postMessage({
type: 'complete',
generationId,
@@ -169,16 +157,11 @@ async function handleStart(payload: {
error: '生成已取消',
},
});
}
return;
}
}
}
if (shouldAbort(generationId)) {
return;
}
const duration = Date.now() - startTime;
const successCount = generatedData.filter((item) => Object.keys(item).length > 0).length;