From 81869f75d0a7338ad701c04e37e6f823d3d78732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 20 Nov 2026 21:56:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd-collect):=20=E5=88=A0=E9=99=A4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=85=88=E5=8F=AB=E5=81=9C=E6=9C=AC=E6=9C=BA=20worker?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E7=AD=89=E5=88=86=E7=89=87/?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E5=8F=91=E7=8E=B0=E4=BB=BB=E5=8A=A1=E5=B7=B2?= =?UTF-8?q?=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除回调先过桥 stop_task(客户端 4.0.12 起 expose,5.0.2 包内可用)再发物理删除; 桥不可用/旧包吞错,回退服务端删除后「任务不存在」兜底,停止不得阻断删除。 - 先停再删:任务行一删就没有停止依据,子进程会一直占着京麦浏览器锁直到下一批分片。 - pywebview.ts 登记 stop_task 桥类型;新增 jd-collect-delete-stop.test.ts 三支判据。 --- frontend-vue/src/pages/jd/JdCollectTab.vue | 17 ++++++- frontend-vue/src/shared/bridges/pywebview.ts | 9 ++++ .../tests/jd-collect-delete-stop.test.ts | 48 +++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 frontend-vue/tests/jd-collect-delete-stop.test.ts diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index 8edfdc2ec..104b0cce1 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -251,12 +251,27 @@ const board = useLiveTaskBoard({ settleOnTaskStatuses: ['SUCCESS', 'FAILED', 'CANCELLED'], deleteTask: { shouldDeleteTask: (item) => item.taskId != null, - deleteTask: (taskId) => deleteJdCollectTask(taskId), + deleteTask: async (taskId) => { + // 先叫停本机这一单的独立 worker,再让服务端物理删除:任务行一删,子进程只能等 + // 下一批分片/60 秒心跳才发现「任务不存在」,期间仍占着京麦浏览器锁(登录/下一单被挡)。 + await stopLocalJdWorker(taskId) + return deleteJdCollectTask(taskId) + }, deleteHistory: async () => undefined, onTaskDeleted: (item) => board.removePollingTask(item.taskId as number), }, }) +/** 删除前停止本机 worker(尽力而为):桥不可用/旧包都不得阻断删除,删除后 worker 下一批 + * 分片或心跳仍会按「任务不存在」自行收手。stop_task 自 4.0.12 起就在 expose 名单里。 */ +async function stopLocalJdWorker(taskId: number) { + try { + await getPywebviewApi()?.stop_task?.(taskId) + } catch (error) { + console.warn('[jd-collect] 停止本机 worker 失败,回退服务端「任务不存在」兜底', error) + } +} + const { batchDeleteHistory, deleteTaskRecord } = board const jdCards = computed(() => [ diff --git a/frontend-vue/src/shared/bridges/pywebview.ts b/frontend-vue/src/shared/bridges/pywebview.ts index e480914d0..883362230 100644 --- a/frontend-vue/src/shared/bridges/pywebview.ts +++ b/frontend-vue/src/shared/bridges/pywebview.ts @@ -236,6 +236,15 @@ export interface PywebviewApi { message?: string; error?: string; }>; + /** + * 叫停本机正在执行的任务(桌面桥 `main.py::WindowAPI.stop_task`):京东采集走 + * `amazon/jd/desktop_worker.stop` → 给独立 worker 的 .job 记录置 stop_requested, + * worker 下一行/下一页就收手,不必等下一批分片回传或 60 秒心跳。 + * 删除任务前调用:任务行一删,子进程只能等「任务不存在」才收手,期间仍占着京麦 + * 浏览器锁(登录京麦被 jd_busy 挡、下一单排队)。4.0.12 起就在 expose 名单里, + * 老客户端同样可用;纯浏览器降级桥没有该方法,调用方按服务端兜底处理。 + */ + stop_task?: (taskId: number) => Promise<{ success: boolean; message?: string; error?: string }>; // —— ASIN 变体采集(VariantCollectionAPI,vc_* 前缀)—— vc_select_input_files?: () => Promise; vc_start_collect?: (params: { diff --git a/frontend-vue/tests/jd-collect-delete-stop.test.ts b/frontend-vue/tests/jd-collect-delete-stop.test.ts new file mode 100644 index 000000000..db3e244ee --- /dev/null +++ b/frontend-vue/tests/jd-collect-delete-stop.test.ts @@ -0,0 +1,48 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { join } from 'node:path' + +/** 删除京东采集任务时的本机 worker 收手契约(2026-11-20)。 + * + * 删除只删服务端行;本机独立 worker 若不叫停,只能等下一批分片或 60 秒心跳发现 + * 「任务不存在」才收手,期间仍占着京麦浏览器锁(登录京麦被 jd_busy 挡、下一单排队)。 + * 页面在删除回调里先过桥 stop_task(客户端 4.0.12 起已在 expose 名单里,5.0.2 包内可用), + * 桥不可用/旧包才交服务端删除后的「任务不存在」兜底——停止不得阻断删除本身。 + */ + +const PAGE = join(process.cwd(), 'src', 'pages', 'jd', 'JdCollectTab.vue') +const BRIDGE = join(process.cwd(), 'src', 'shared', 'bridges', 'pywebview.ts') + +test('pywebview 桥类型登记 stop_task', () => { + const bridge = readFileSync(BRIDGE, 'utf8') + assert.ok(bridge.includes('stop_task?:'), + 'pywebview.ts 必须登记 stop_task 桥类型(删除前叫停本机 worker 的唯一通道)') +}) + +test('删除回调先停本机 worker 再删服务端任务', () => { + const page = readFileSync(PAGE, 'utf8') + const startAt = page.indexOf('deleteTask: {') + assert.ok(startAt > 0, 'JdCollectTab.vue 缺 deleteTask 配置') + const endAt = page.indexOf('})', startAt) + assert.ok(endAt > startAt, 'deleteTask 配置段形状变了,请同步本判据') + const body = page.slice(startAt, endAt) + const stopAt = body.indexOf('stopLocalJdWorker(') + const deleteAt = body.indexOf('deleteJdCollectTask(') + assert.ok(stopAt > 0, '删除回调必须先调用 stopLocalJdWorker(否则 worker 继续占着京麦浏览器锁)') + assert.ok(deleteAt > stopAt, '停止本机 worker 必须排在服务端删除之前(任务行一删就没有停止依据)') +}) + +test('停 worker 不得阻断删除:桥缺失/抛错都吞掉并回退服务端兜底', () => { + const page = readFileSync(PAGE, 'utf8') + const startAt = page.indexOf('async function stopLocalJdWorker') + assert.ok(startAt > 0, 'JdCollectTab.vue 缺 stopLocalJdWorker') + const endAt = page.indexOf('const { batchDeleteHistory', startAt) + assert.ok(endAt > startAt, 'stopLocalJdWorker 之后的锚点形状变了,请同步本判据') + const body = page.slice(startAt, endAt) + assert.ok(body.includes('getPywebviewApi()?.stop_task?.('), + '必须走桥 stop_task,且对纯浏览器降级桥/旧客户端保持可空(缺方法不报错)') + assert.ok(body.includes('catch'), '桥调用失败必须吞掉(停止是尽力而为,删除不能被阻断)') + assert.ok(body.includes('console.warn'), '失败必须留一行可观测日志(不许静默吞)') + assert.ok(!body.includes('throw'), 'stopLocalJdWorker 不得向外抛错(否则删除被一起打断)') +}) \ No newline at end of file