From 46ab5abc1c0687ca18dda4f66acbcea4963e392a Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 28 Jul 2026 20:03:59 +0800 Subject: [PATCH] feat(test): browserUrl from menu + workflow targeted TC-B (Task 8, webapi hardening) --- src/commands/test/_browser_url.ts | 20 +++++++++++ src/commands/test/_workflow_target.ts | 29 +++++++++++++++ src/commands/test/browser.ts | 36 +++++++++++++++++++ src/commands/test/run.ts | 34 ++++++++++++++++-- .../unit/test_browser_workflow_target.test.ts | 27 ++++++++++++++ tests/unit/test_run_browser_url.test.ts | 28 +++++++++++++++ 6 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 src/commands/test/_browser_url.ts create mode 100644 src/commands/test/_workflow_target.ts create mode 100644 tests/unit/test_browser_workflow_target.test.ts create mode 100644 tests/unit/test_run_browser_url.test.ts diff --git a/src/commands/test/_browser_url.ts b/src/commands/test/_browser_url.ts new file mode 100644 index 0000000..d30c564 --- /dev/null +++ b/src/commands/test/_browser_url.ts @@ -0,0 +1,20 @@ +/** + * test run browserUrl 推导 (webapi hardening) + * 从 appCode + formId/formEnCode + 菜单 urlAddress 推导, 禁用硬编码 developSystem. + */ + +export interface BrowserUrlInput { appCode: string; formId?: string; formEnCode?: string } +export interface BrowserUrlResult { browserUrl: string | null; reason?: string } + +export async function resolveBrowserUrl(webapi: any, input: BrowserUrlInput): Promise { + const { data } = (await webapi.listMenu?.()) ?? { data: [] } + const list: any[] = Array.isArray(data) ? data : [] + const hit = list.find((m: any) => + (input.formId && m.formId === input.formId) || + (input.formEnCode && m.enCode?.startsWith(input.formEnCode)) + ) + if (!hit) return { browserUrl: null, reason: `no menu for formId=${input.formId} enCode=${input.formEnCode}` } + // 标准化 URL + const u = hit.urlAddress.startsWith('http') ? hit.urlAddress : `http://nginx${hit.urlAddress}` + return { browserUrl: u } +} \ No newline at end of file diff --git a/src/commands/test/_workflow_target.ts b/src/commands/test/_workflow_target.ts new file mode 100644 index 0000000..2cc5c8d --- /dev/null +++ b/src/commands/test/_workflow_target.ts @@ -0,0 +1,29 @@ +/** + * test browser workflow 定向 (webapi hardening) + * --id/--taskId 优先; 不传时回退通用 flowTodo 兼容. + */ + +export type WorkflowStatus = 'ACTIONABLE' | 'NO_ACTIONABLE_TASK' | 'GENERIC_PAGE' + +export interface WorkflowTargetInput { id?: string; taskId?: string; userId: string } +export interface WorkflowTargetResult { + mode: 'targeted' | 'generic' + status: WorkflowStatus + operatorId?: string + exitCode: 0 | 2 + reason?: string +} + +export async function resolveWorkflowTarget(webapi: any, input: WorkflowTargetInput): Promise { + if (!input.id || !input.taskId) { + return { mode: 'generic', status: 'GENERIC_PAGE', exitCode: 0 } + } + const op = (await webapi.getFlowTaskOperator?.({ flowId: input.id, taskId: input.taskId })) ?? null + if (!op) { + return { mode: 'targeted', status: 'NO_ACTIONABLE_TASK', exitCode: 2, reason: 'operator not found for given flow/task' } + } + if (op.userId !== input.userId) { + return { mode: 'targeted', status: 'NO_ACTIONABLE_TASK', exitCode: 2, reason: `operator user ${op.userId} ≠ current ${input.userId}` } + } + return { mode: 'targeted', status: 'ACTIONABLE', operatorId: op.id, exitCode: 0 } +} \ No newline at end of file diff --git a/src/commands/test/browser.ts b/src/commands/test/browser.ts index 1870559..d90d945 100644 --- a/src/commands/test/browser.ts +++ b/src/commands/test/browser.ts @@ -44,6 +44,7 @@ import { homedir } from 'node:os' import { fileURLToPath } from 'node:url' import { log } from '../../core/log.ts' import { JnpfClient } from '../../core/client.ts' +import { resolveWorkflowTarget } from './_workflow_target.ts' // webapi hardening (Task 8): 定向 operator 查询 // 局部 DOM Element 类型 (tsconfig lib 不含 DOM, 复用 playwright evaluateAll 回调签名) type DomElement = { textContent: string; id: string } @@ -765,6 +766,7 @@ interface BrowserOpts { module: string id?: string formId?: string // 向后兼容 alias + taskId?: string // workflow module 定向 TC-B (Task 8) appCode?: string baseUrl?: string noSnapshot?: boolean @@ -779,6 +781,7 @@ export function buildTestBrowserCommand(): Command { .requiredOption('--module ', '模块名: form | workflow (后续扩展 dict/di/menu/portal/report/bigscreen)') .option('--id ', '实体 id (workflow module 可选, 不传只跑 UI 检查; form module 用 --formId 别名)') .option('--formId ', '表单 id (form module 必填, 向后兼容别名, 等同 --id)') + .option('--taskId ', 'workflow 任务节点 id (与 --id 配套, 启用定向 TC-B (Task 8))') .addHelpText('after', ` Examples: $ dacli test browser --module=form --formId= --appCode=workSystem # 跑 form 7 检查 (~7s) @@ -830,6 +833,39 @@ Prerequisites (workflow module): log.dim(`[appCode 默认值] 从 token 读 → ${effectiveAppCode}`) } + // webapi hardening (Task 8): workflow module 定向 TC-B (--id + --taskId) + // 走 resolveWorkflowTarget 查 operator — 失败早退 (exit 2) 不浪费 11s 浏览器跑空 + if (opts.module === 'workflow' && id && opts.taskId) { + try { + const c2 = await JnpfClient.fromToken({ appCode: effectiveAppCode, baseUrl: opts.baseUrl || 'http://nginx' }) + const { loadAuth, initWebapi } = await import('../../webapi/auth.ts') + await initWebapi(c2) + const meR = (await loadAuth.getCurrentUser?.()) as { data?: { userId?: string; id?: string } } | undefined + const meId = meR?.data?.userId || meR?.data?.id || '' + const webapi = { + getFlowTaskOperator: async (q: { flowId: string; taskId: string }) => { + // 注: webapi/auth 或 webapi/flowMonitor 暴露 operator 接口, 此处用客户端走 proxy + const r = await c2.get(`/api/workflow/Engine/FlowBefore/Operator?flowId=${encodeURIComponent(q.flowId)}&taskId=${encodeURIComponent(q.taskId)}`) + return (r as any)?.data ?? null + }, + } + const target = await resolveWorkflowTarget(webapi, { id, taskId: opts.taskId, userId: meId }) + if (target.status === 'NO_ACTIONABLE_TASK') { + const out = { ok: false, ...target, id, taskId: opts.taskId } + console.log(JSON.stringify(out, null, 2)) + log.error(`[TC-B workflow 定向] 无 actionable task (${target.reason})`) + process.exit(target.exitCode) + } + if (opts.json) { + console.log(JSON.stringify({ ok: true, ...target, id, taskId: opts.taskId }, null, 2)) + } else { + log.ok(`[TC-B workflow 定向] operator=${target.operatorId} (userId=${meId}) → ACTIONABLE`) + } + } catch (e) { + log.warn(`[TC-B workflow 定向] 探活失败 (${(e as Error).message?.slice(0, 80)}), 走通用 flowTodo 模式`) + } + } + const r = await runBrowserTest({ module: opts.module, id: id!, diff --git a/src/commands/test/run.ts b/src/commands/test/run.ts index 2165cf3..f310238 100644 --- a/src/commands/test/run.ts +++ b/src/commands/test/run.ts @@ -25,6 +25,7 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHookWithPatterns } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 +import { resolveBrowserUrl } from './_browser_url.ts' // webapi hardening (Task 8): 推导 browserUrl 不用硬编码 developSystem interface RunOpts { formId: string @@ -121,16 +122,19 @@ export function buildTestRunCommand(): Command { const runBusinessRules = !!businessRulesArr const relationSampleN = Math.min(Math.max(parseInt(opts.relationFormSample || '1', 10) || 1, 1), 5) + let formEnCode = '' // webapi hardening (Task 8): 推导 browserUrl 用 + // Step 1: 拉 form schema 推导 sample data const t0 = Date.now() try { const schemaR = (await c.get(`/visualdev/Base/${opts.formId}`)) as { code: number - data: { formData: string; tables: string } + data: { formData: string; tables: string; enCode?: string } } if (schemaR.code !== 200) throw new Error(`get schema failed: ${schemaR.code}`) const formData = JSON.parse(schemaR.data.formData) const fields = formData.fields || [] + formEnCode = schemaR.data.enCode || '' // 主子表自动 sample (testspace testjxcjp02ai 实战) // 旧 (dacli-2026-06-29-04): 主子表检测到 tables.length > 1 时强制 exit(1), 逼用户传 --real-fields @@ -502,11 +506,34 @@ export function buildTestRunCommand(): Command { const failCount = steps.filter(s => s.status === 'FAIL').length const skipCount = steps.filter(s => s.status === 'SKIP').length + // webapi hardening (Task 8): 浏览器访问 URL 走 menu.urlAddress 推导, 不用硬编码 developSystem + let browserUrl: string | null = null + let browserUrlReason: string | undefined + try { + const { initWebapi: initMenu, loadMenu } = await import('../../webapi/menu.ts') + await initMenu(c) + const webapi = { + listMenu: async () => { + const r = (await loadMenu.getMenuList({})) as { data?: any[] } | undefined + return { data: (r?.data as any[]) ?? [] } + }, + } + const res = await resolveBrowserUrl(webapi, { appCode: c.appCode, formId: opts.formId, formEnCode }) + browserUrl = res.browserUrl + browserUrlReason = res.reason + } catch (e) { + browserUrlReason = `menu lookup failed: ${(e as Error).message?.slice(0, 80)}` + } + const report = { formId: opts.formId, + formEnCode, + appCode: c.appCode, mode: opts.realData ? 'real-data' : 'fixture', keepData: !!opts.keepData, testDataId, + browserUrl, + browserUrlReason, totalSteps: steps.length, pass: passCount, fail: failCount, @@ -852,7 +879,7 @@ function evalBusinessRule(fieldValue: unknown, rule: string): boolean { } } -function renderMarkdownReport(r: { formId: string; mode: string; keepData: boolean; testDataId: string | null; totalSteps: number; pass: number; fail: number; skip: number; totalDuration: number; steps: StepResult[] }): string { +function renderMarkdownReport(r: { formId: string; formEnCode?: string; appCode?: string; mode: string; keepData: boolean; testDataId: string | null; browserUrl?: string | null; browserUrlReason?: string; totalSteps: number; pass: number; fail: number; skip: number; totalDuration: number; steps: StepResult[] }): string { const lines: string[] = [] lines.push(`# form API 测试报告 (v0.11+ 真实业务数据模式)`) lines.push('') @@ -881,7 +908,8 @@ function renderMarkdownReport(r: { formId: string; mode: string; keepData: boole lines.push(`## 数据保留 (供浏览器层 TC-B 验证)`) lines.push('') lines.push(`- 测试数据保留 ID: \`${r.testDataId}\``) - lines.push(`- 浏览器访问: \`http://nginx/jnpf_app_developSystem/model/{enCode}?dataId=${r.testDataId}\``) + lines.push(`- 浏览器访问: \`${r.browserUrl || `http://nginx/jnpf_app_${r.appCode || 'developSystem'}/model/${r.formEnCode || r.formId}?dataId=${r.testDataId}`}\``) + if (r.browserUrlReason) lines.push(`- ⚠️ menu 解析失败: \`${r.browserUrlReason}\``) lines.push(`- 清理: \`dacli form delete-data <${r.testDataId}>\` 或浏览器端手动删除`) lines.push('') } diff --git a/tests/unit/test_browser_workflow_target.test.ts b/tests/unit/test_browser_workflow_target.test.ts new file mode 100644 index 0000000..e79483c --- /dev/null +++ b/tests/unit/test_browser_workflow_target.test.ts @@ -0,0 +1,27 @@ +import { describe, expect, it, vi } from 'vitest' +import { resolveWorkflowTarget } from '../../src/commands/test/_workflow_target.ts' + +describe('test browser workflow target (Task 8b)', () => { + it('--id --taskId 都传 → 定向 operator 查询', async () => { + const webapi = { + getFlowTaskOperator: vi.fn().mockResolvedValue({ id: 'op1', userId: 'u1' }), + } + const r = await resolveWorkflowTarget(webapi, { id: 'F1', taskId: 'T1', userId: 'u1' }) + expect(r.mode).toBe('targeted') + expect(r.operatorId).toBe('op1') + expect(r.status).toBe('ACTIONABLE') + }) + + it('--id 传但 operator 为空 → NO_ACTIONABLE_TASK', async () => { + const webapi = { getFlowTaskOperator: vi.fn().mockResolvedValue(null) } + const r = await resolveWorkflowTarget(webapi, { id: 'F1', taskId: 'T1', userId: 'u1' }) + expect(r.status).toBe('NO_ACTIONABLE_TASK') + expect(r.exitCode).toBe(2) + }) + + it('不传 --id → 走通用 flowTodo 兼容模式', async () => { + const r = await resolveWorkflowTarget({}, { userId: 'u1' }) + expect(r.mode).toBe('generic') + expect(r.status).toBe('GENERIC_PAGE') + }) +}) \ No newline at end of file diff --git a/tests/unit/test_run_browser_url.test.ts b/tests/unit/test_run_browser_url.test.ts new file mode 100644 index 0000000..7f972cd --- /dev/null +++ b/tests/unit/test_run_browser_url.test.ts @@ -0,0 +1,28 @@ +import { describe, expect, it, vi } from 'vitest' +import { resolveBrowserUrl } from '../../src/commands/test/_browser_url.ts' + +describe('test run browserUrl (Task 8a)', () => { + it('菜单 urlAddress 命中 → browserUrl', async () => { + const webapi = { + listMenu: vi.fn().mockResolvedValue({ + data: [{ enCode: 'tdd5supplyrequest', urlAddress: '/jnpf_app_tdd5/model/tdd5supplyrequestd89a7', formId: 'F1' }], + }), + } + const r = await resolveBrowserUrl(webapi, { appCode: 'tdd5', formId: 'F1', formEnCode: 'tdd5supplyrequest' }) + expect(r.browserUrl).toBe('http://nginx/jnpf_app_tdd5/model/tdd5supplyrequestd89a7') + expect(r.reason).toBeUndefined() + }) + + it('菜单找不到 → browserUrl=null + reason', async () => { + const webapi = { listMenu: vi.fn().mockResolvedValue({ data: [] }) } + const r = await resolveBrowserUrl(webapi, { appCode: 'tdd5', formId: 'F1', formEnCode: 'tdd5supplyrequest' }) + expect(r.browserUrl).toBeNull() + expect(r.reason).toMatch(/no menu/) + }) + + it('传错的硬编码 URL (developSystem) → 永远不返回 developSystem', async () => { + const webapi = { listMenu: vi.fn().mockResolvedValue({ data: [] }) } + const r = await resolveBrowserUrl(webapi, { appCode: 'tdd5', formId: 'F1', formEnCode: 'tdd5' }) + expect(r.browserUrl ?? '').not.toContain('developSystem') + }) +}) \ No newline at end of file