diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index 2d8e100..82bdede 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -1,5 +1,15 @@ # 开发交接(2026-10-23) +## 2026-10-26 订单采集失败修复与剩余边界 + +- 修复动态明细 datamap 包含合法隐藏列时被误判的问题:额外列必须有同表隐藏控件,且每条后端记录都确有对应列;仍拒绝跨表映射、不明确行关系及缺少可见字段。 +- 后端字段读取成功而静态 PDF 失败时保存独立字段证据 captureEvidenceId,不写入成功 sampleId,不作为 PDF/归档凭据。保存结构原因、表名、行数与字段路径;授权详情弹窗可查看字段值及接口/表/列/行来源,列表不返回字段值。 +- 确定性结构、身份及权限错误暂停自动重试;暂时连接错误指数退避(1分钟起,上限30分钟)。只有新鲜完整待办扫描成功才把已离开待办的失败采集任务转为待历史核验;失败扫描与旧发现线索不能推导任务离开。已归档、发送中、已发送、unknown、冲突及替代任务保持保护。 +- 原任务重新出现且人工核验后重试,必须重新采集完整 PDF;独立字段证据不得代替成功快照。成功后清理当前“已离开”标记,保留历史证据,重复扫描不重复归档。 +- 两个真实海外更改单的历史表单只读证据证明:V7 / 列表1.9 的隐藏列误判已解决,但 HTML 仍包含后端 Columns 与行数据都不存在的 SubsidiaryDelivery1、SubsidiaryDelivery2、SoftRequireImage_Remark。当前继续阻断,不猜测字段别名;是否在 PDF 明确标注未提供后继续,已向业务负责人询问,尚待答复。 +- 当前历史列表只提供实例与开始/完成时间,不能恢复原通知节点到达身份;禁止把历史开始时间当通知到达时间、构造任务或自动补发。零售国内返工订单更改评审在两个已核验历史来源均无样本,继续标明未覆盖,不能声称15类实单闭环完成。 +- 分类与测试设置现在列出未覆盖流程的具体名称。隔离回归仍使用临时文件/本机 SMTP;真实资料只保存在忽略的 output,未办理 BPM 或手动发送业务邮件。本机更新与最终测试结果以本轮回执为准。 + ## 2026-10-26 订单中心与发送前收集批次 - 用户确认保留11:00/17:00自动发送,发送前可以编辑,未编辑继续使用分类模板。邮件批次新增“收集中”,按当前发送窗口、分类、规则版本、模板及普通/惠州模式分组;订单中心有对应批次入口。读取分组不写业务订单或冻结批次,不把未匹配记录放入订单中心。 diff --git a/docs/superpowers/plans/2026-10-26-order-failure-recovery.md b/docs/superpowers/plans/2026-10-26-order-failure-recovery.md new file mode 100644 index 0000000..b6fcad3 --- /dev/null +++ b/docs/superpowers/plans/2026-10-26-order-failure-recovery.md @@ -0,0 +1,12 @@ +# 订单采集失败与恢复修复 + +用户已确认按诊断优先级修复;保持 Excel 精确流程/节点匹配、BPM 只读、PDF 归档后通知、隔离收件和 unknown 不自动重发。 + +1. 取得失败表单的真实只读结构证据,先用隔离表单复现,再扩展已证实的静态明细布局;不关闭作用域/字段完整性保护。 +2. 表单字段成功、PDF 失败时保存独立字段证据,不能将其当作成功 PDF 或归档依据。错误保存具体结构原因。 +3. 确定性结构问题暂停自动重试,连接故障有界退避;原任务不在当前通知节点时转人工核验。显式重试仍重新验证身份与节点。 +4. 订单详情弹窗显示失败阶段、字段来源和恢复建议,保持账号权限隔离。 +5. 核实历史只读来源与缺少适配流程。只有取得原通知任务 ID、原到达时间和归属证据才允许恢复执行;普通历史详情只供诊断,不冒充通知任务。 +6. 执行新增失败测试、相关回归与当前业务测试;复核边界后交付。真实样本/业务 PDF/凭据不进 Git,原用户草稿不动。 + +验收区分代码测试通过与真实业务验收。未能取得证据的流程/恢复来源列为具体阻断,不编造映射或通知身份。 diff --git a/src/bpm-readonly-form.cjs b/src/bpm-readonly-form.cjs index a692033..2962115 100644 --- a/src/bpm-readonly-form.cjs +++ b/src/bpm-readonly-form.cjs @@ -89,7 +89,7 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){ }; for(const element of document.querySelectorAll('[hiddenexpress]')){const expression=element.getAttribute('hiddenexpress')||'';if(!hiddenPredicates.has(expression))hiddenPredicates.set(expression,expression.trim()?predicate(expression):{known:true,value:false});} const uncertainVisibility=element=>{for(let node=element;node;node=node.parentElement){const expression=node.getAttribute('hiddenexpress');if(expression!==null&&hiddenPredicates.get(expression)?.known===false)return true;}return false;}; - const blocked=()=>({blocker:'明细多行表单的行数、字段或表格关系不明确,PDF 快照已阻断;可仅采集字段供核对。'}); + const blocked=(reason='AMBIGUOUS_DETAIL_STRUCTURE',table,host,extra={})=>({blocker:'明细多行表单的行数、字段或表格关系不明确,PDF 快照已阻断;可仅采集字段供核对。',diagnostics:{reason,...(table?{tableName:table.TableName,backendRows:table.Rows.length}:{}),...(host?{dynamicArea:host.getAttribute('dynamicarea'),domRows:host.rows.length}:{}),...extra}}); const currentTaskScopeError=table=>{ if(!table.Rows.length||!table.Rows.some(row=>Object.keys(row).some(column=>/^TaskID$/i.test(column))))return null; const readTask=row=>{const columns=Object.keys(row).filter(column=>/^TaskID$/i.test(column));if(columns.length!==1)return null;const value=row[columns[0]];if(typeof value==='string'&&value.trim())return value;if(typeof value==='number'&&Number.isSafeInteger(value))return String(value);return null;}; @@ -105,29 +105,40 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){ const selector='[xdatabind],[data-xdatabind],[data-bind]',expandedPrefixes=new Set(); for(const host of form.querySelectorAll('table[dynamicarea]')){ const ownBindings=[...host.querySelectorAll(selector)].filter(visible);if(!ownBindings.length)continue; - const marker=/^\s*(0|[1-9]\d*)\s*,\s*1\s*$/.exec(host.getAttribute('dynamicarea')||'');if(!marker)return blocked(); - const start=Number(marker[1]),hostRows=[...host.rows];if(!Number.isSafeInteger(start)||start>=hostRows.length||hostRows.some(row=>[...row.cells].some(cell=>cell.rowSpan!==1)))return blocked(); + const marker=/^\s*(0|[1-9]\d*)\s*,\s*1\s*$/.exec(host.getAttribute('dynamicarea')||'');if(!marker)return blocked('UNSUPPORTED_DYNAMIC_RANGE',null,host); + const start=Number(marker[1]),hostRows=[...host.rows];if(!Number.isSafeInteger(start)||start>=hostRows.length||hostRows.some(row=>[...row.cells].some(cell=>cell.rowSpan!==1)))return blocked('INVALID_TEMPLATE_ROWS',null,host); const template=hostRows[start]; - if(ownBindings.some(element=>element.closest('table')!==host||element.closest('tr')!==template||element.parentElement?.closest(selector)))return blocked(); + if(ownBindings.some(element=>element.closest('table')!==host||element.closest('tr')!==template||element.parentElement?.closest(selector)))return blocked('NESTED_OR_CROSS_ROW_BINDING',null,host); const matches=tables.filter(table=>{const prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase();return ownBindings.every(element=>{const key=binding(element).toLowerCase();return key.startsWith(prefix+'.')&&/^[\p{L}\p{N}_]+$/u.test(key.slice(prefix.length+1));});}); - if(matches.length!==1)return blocked();const table=matches[0],prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase(); - const scopeError=currentTaskScopeError(table);if(scopeError)return {blocker:scopeError}; - if(expandedPrefixes.has(prefix)||bindings.filter(element=>visible(element)&&binding(element)?.toLowerCase().startsWith(prefix+'.')).some(element=>element.closest('table')!==host))return blocked(); + if(matches.length!==1)return blocked('AMBIGUOUS_TABLE_BINDING',null,host);const table=matches[0],prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase(); + const scopeError=currentTaskScopeError(table);if(scopeError)return {...blocked('TASK_SCOPE_MISMATCH',table,host),blocker:scopeError}; + if(expandedPrefixes.has(prefix)||bindings.filter(element=>visible(element)&&binding(element)?.toLowerCase().startsWith(prefix+'.')).some(element=>element.closest('table')!==host))return blocked('CROSS_TABLE_BINDING',table,host); expandedPrefixes.add(prefix); const datasource=host.getAttribute('xdatasource'); if(datasource){ // Vendor WriteToTable comes from bound columns. DataSource/Filter describe // lookup/import, not a predicate for persisted current-order display rows. - const entries=datasource.split(';').map(part=>part.trim()).filter(Boolean),names=entries.filter(part=>/^TableName:/i.test(part));if(names.length!==1||names[0].slice(names[0].indexOf(':')+1).trim().toLowerCase()!==table.TableName.toLowerCase()||entries.some(part=>!/^TableName:[\p{L}\p{N}_]+$/iu.test(part)&&!/^Filter:[\p{L}\p{N}_]+->[\p{L}\p{N}_:.]+$/iu.test(part)))return blocked(); + const entries=datasource.split(';').map(part=>part.trim()).filter(Boolean),names=entries.filter(part=>/^TableName:/i.test(part));if(names.length!==1||names[0].slice(names[0].indexOf(':')+1).trim().toLowerCase()!==table.TableName.toLowerCase()||entries.some(part=>!/^TableName:[\p{L}\p{N}_]+$/iu.test(part)&&!/^Filter:[\p{L}\p{N}_]+->[\p{L}\p{N}_:.]+$/iu.test(part)))return blocked('UNSUPPORTED_DATASOURCE',table,host); } const groups=new Map();for(const element of ownBindings){const key=binding(element).toLowerCase(),list=groups.get(key)||[];list.push(element);groups.set(key,list);} const datamap=host.getAttribute('datamap'); - if(datamap){const mapped=new Set();for(const part of datamap.split(';').map(part=>part.trim()).filter(Boolean)){const pair=part.split('->');if(pair.length!==2||pair[1].toLowerCase()!==prefix+'.'+pair[0].toLowerCase()||mapped.has(pair[1].toLowerCase()))return blocked();mapped.add(pair[1].toLowerCase());}if([...groups.keys()].some(key=>!mapped.has(key))||[...mapped].some(key=>!groups.has(key)))return blocked();} - for(const controls of groups.values())if(controls.length>1){const type=controls[0].type;if(!['checkbox','radio'].includes(type)||controls.some(control=>control.type!==type||!control.hasAttribute('value')||!control.value.trim())||new Set(controls.map(control=>control.value)).size!==controls.length)return blocked();} + if(datamap){ + const mapped=new Set(),allBindings=[...template.querySelectorAll(selector)]; + for(const part of datamap.split(';').map(part=>part.trim()).filter(Boolean)){ + const pair=part.split('->'),key=pair[1]?.toLowerCase(),column=pair[0]?.toLowerCase(); + if(pair.length!==2||key!==prefix+'.'+column||mapped.has(key))return blocked('INVALID_DATAMAP',table,host); + mapped.add(key); + // A mapped hidden column is legitimate only when its actual same-table + // control and backend column prove the relationship. Never infer a column. + if(!groups.has(key)&&(!allBindings.some(element=>element.closest('table')===host&&binding(element)?.toLowerCase()===key&&!visible(element))||table.Rows.some(row=>Object.keys(row).filter(name=>name.toLowerCase()===column).length!==1)))return blocked('UNPROVEN_HIDDEN_MAPPING',table,host,{fieldPaths:[key]}); + } + if([...groups.keys()].some(key=>!mapped.has(key)))return blocked('VISIBLE_MAPPING_MISSING',table,host,{fieldPaths:[...groups.keys()].filter(key=>!mapped.has(key))}); + } + for(const controls of groups.values())if(controls.length>1){const type=controls[0].type;if(!['checkbox','radio'].includes(type)||controls.some(control=>control.type!==type||!control.hasAttribute('value')||!control.value.trim())||new Set(controls.map(control=>control.value)).size!==controls.length)return blocked('AMBIGUOUS_CHOICE_CONTROLS',table,host);} const rows=[]; for(const [rowIndex,row]of table.Rows.entries()){ const assignments=new Map(); - for(const [key,controls]of groups){const column=key.slice(prefix.length+1),columns=Object.keys(row).filter(name=>name.toLowerCase()===column);if(columns.length!==1)return blocked();const value=row[columns[0]],item={value,rowIndex}; + for(const [key,controls]of groups){const column=key.slice(prefix.length+1),columns=Object.keys(row).filter(name=>name.toLowerCase()===column);if(columns.length!==1)return blocked('MISSING_BACKEND_FIELD',table,host,{fieldPaths:[key]});const value=row[columns[0]],item={value,rowIndex}; if(controls.length>1){let selected;if(value===null||value==='')selected=[];else if(Array.isArray(value)&&controls[0].type==='checkbox'&&value.every(option=>['string','number','boolean'].includes(typeof option)))selected=value.map(String);else if(['string','number','boolean'].includes(typeof value))selected=[String(value)];else return blocked();const choices=new Set(controls.map(control=>control.value));if(new Set(selected).size!==selected.length||selected.some(option=>!choices.has(option)))return blocked();for(const control of controls)assignments.set(control,{...item,choiceSelected:selected.includes(control.value)}); }else assignments.set(controls[0],item); } @@ -142,16 +153,17 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){ const prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase(),bound=bindings.filter(element=>visible(element)&&(binding(element)?.toLowerCase().startsWith(prefix+'.')||binding(element)?.toLowerCase().startsWith(prefix+'['))); for(const [rowIndex,row]of table.Rows.entries())for(const [column,value]of Object.entries(row)){const key=prefix+'.'+column.toLowerCase(),items=values.get(key)||[];items.push({value,rowIndex});values.set(key,items);} if(!bound.length)continue; - const scopeError=currentTaskScopeError(table);if(scopeError)return {blocker:scopeError}; + const scopeError=currentTaskScopeError(table);if(scopeError)return {...blocked('TASK_SCOPE_MISMATCH',table),blocker:scopeError}; if(bound.every(element=>resolved.has(element)))continue; if(table.Rows.length>1){ const rows=new Map(),keys=new Set(bound.map(element=>binding(element).toLowerCase()));let container,section; for(const element of bound){const row=element.closest('tr'),host=element.closest('table'),cell=element.closest('td,th'),key=binding(element).toLowerCase(),items=values.get(key);if(!row||!host||row.closest('table')!==host||!cell||cell.rowSpan!==1||element.parentElement?.closest('[xdatabind],[data-xdatabind],[data-bind]')||!items||items.length!==table.Rows.length)return blocked();if(container&&(container!==host||section!==row.parentElement))return blocked();container=host;section=row.parentElement;const columns=rows.get(row)||new Map();if(columns.has(key))return blocked();columns.set(key,element);rows.set(row,columns);} - if(rows.size!==table.Rows.length||detailTables.has(container))return blocked();detailTables.add(container); + if(rows.size!==table.Rows.length||detailTables.has(container))return blocked('ROW_COUNT_MISMATCH',table,container,{domRows:rows.size});detailTables.add(container); for(const [index,columns]of [...rows.values()].entries()){if(columns.size!==keys.size||[...keys].some(key=>!columns.has(key)))return blocked();for(const [key,element]of columns)resolved.set(element,values.get(key)[index]);} }else for(const element of bound){const items=values.get(binding(element).toLowerCase());if(items?.length===1)resolved.set(element,items[0]);} } - for(const element of bindings.filter(visible))if(!resolved.has(element))return {blocker:uncertainVisibility(element)?'字段所在 hiddenexpress 的可见性不能安全确认,PDF 快照已阻断;不能猜测隐藏缺失字段。':'可见字段缺少已核实的后端值,PDF 快照已阻断。'}; + const missing=bindings.filter(element=>visible(element)&&!resolved.has(element)); + if(missing.length){const uncertain=missing.some(uncertainVisibility);return {blocker:uncertain?'字段所在 hiddenexpress 的可见性不能安全确认,PDF 快照已阻断;不能猜测隐藏缺失字段。':'可见字段缺少已核实的后端值,PDF 快照已阻断。',diagnostics:{reason:uncertain?'UNSUPPORTED_VISIBILITY':'MISSING_BACKEND_FIELD',fieldPaths:[...new Set(missing.map(binding))]}};} const printable=(element,item)=>{if(Object.hasOwn(item||{},'choiceSelected'))return item.choiceSelected?'☑':'☐';const raw=item?.value;if(raw!==null&&typeof raw==='object')return null;const text=raw==null?'':String(raw);if(['radio','checkbox'].includes(element.type))return raw===true||text===element.value?'☑':'☐';if(element.tagName==='SELECT')return [...element.options].find(option=>option.value===text)?.textContent||text;return text;}; for(const [element,item]of resolved)if(printable(element,item)===null)return {blocker:'字段包含多个或复合值,PDF 快照已阻断。'}; const copy=document.documentElement.cloneNode(true),originals=[document.documentElement,...document.documentElement.querySelectorAll('*')],copies=[copy,...copy.querySelectorAll('*')]; @@ -168,17 +180,25 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){ function allowedResource(value){try{const url=baseURL(value);return !url.search&&!/(?:approve|fulfill|markread|upload|delete)/i.test(url.pathname)&&/\.(?:css|png|jpe?g|gif|webp|woff2?|ttf|ico)$/i.test(url.pathname);}catch{return false;}} async function captureReadonlyForm({storageState,detailUrl,processName,nodeName,listProcessVersion=null,fieldsOnly=false,requestFactory=options=>loadPlaywright().request.newContext(options),browserFactory=()=>loadPlaywright().chromium.launch(browserOptions()),timeout=20000}){ if(!storageState)fail('BPM 会话需要续登。',401);if(typeof nodeName!=='string'||!nodeName.trim())fail('BPM 到达记录缺少明确当前节点。'); - let request,browser,context; + let request,browser,context,partialDetail; try{ request=await requestFactory({storageState,timeout});const loaded=await loadForm(request,detailUrl,{timeout}),identity={...loaded.identity,...require('./bpm-form-contracts.cjs').resolveFormIdentity({...loaded.identity,url:loaded.url},{processName,listProcessVersion})},tables=await loadData(request,loaded.url,{timeout}),evidence=flattenTables(tables); + const capturedAt=new Date().toISOString(),detail={readOnly:true,...identity,formVersion:identity.formVersion,listProcessVersion,processInstanceId:identity.pid,nodeName,nodeSource:'list.activityName',fields:evidence.fields,fieldSources:evidence.sources,processSteps:[],capturedAt,fieldSource:'DataProvider.GetFormProcessData'}; + partialDetail={...identity,detail,snapshot:null,capturedAt,detailUrl:loaded.url.href,fieldsOnly:true,blockedRequests:[]}; browser=await browserFactory();context=await browser.newContext({storageState,javaScriptEnabled:false,serviceWorkers:'block',acceptDownloads:false,permissions:[]});const images=[]; await context.route('**/*',async route=>{try{const incoming=route.request();if(incoming.method()!=='GET')return await route.abort();if(incoming.url()===loaded.url.href&&incoming.isNavigationRequest())return await route.fulfill({status:200,contentType:'text/html; charset=utf-8',body:loaded.bytes});if(incoming.isNavigationRequest()||!allowedResource(incoming.url()))return await route.abort();const response=await request.get(incoming.url(),{maxRedirects:0,timeout});if(response.status()!==200)return await route.abort();const bytes=await response.body();if(bytes.length>MAX_BYTES)return await route.abort();const contentType=(response.headers()['content-type']||'').split(';')[0];if(/^image\/(png|jpeg|gif|webp)$/.test(contentType))images.push({url:incoming.url(),data:'data:'+contentType+';base64,'+bytes.toString('base64')});return await route.fulfill({status:200,headers:{'content-type':contentType||'application/octet-stream'},body:bytes});}catch{await route.abort().catch(()=>{});}}); if(context.routeWebSocket)await context.routeWebSocket(/.*/,socket=>socket.close());const page=await context.newPage();page.on('dialog',dialog=>dialog.dismiss().catch(()=>{}));page.on('download',download=>download.cancel().catch(()=>{})); const response=await page.goto(loaded.url.href,{waitUntil:'load',timeout});if(!response||response.status()!==200||page.url()!==loaded.url.href)fail('BPM 静态表单未能只读加载。',401); - const hydrated=await page.evaluate(hydrateReadonlyDocument,{tables,fieldsOnly});if(hydrated.blocker)fail(hydrated.blocker);if(hydrated.snapshot)hydrated.snapshot.images=images; - const capturedAt=new Date().toISOString(),detail={readOnly:true,...identity,formVersion:identity.formVersion,listProcessVersion,processInstanceId:identity.pid,nodeName,nodeSource:'list.activityName',fields:evidence.fields,fieldSources:evidence.sources,processSteps:hydrated.processSteps||[],capturedAt,fieldSource:'DataProvider.GetFormProcessData'}; + const hydrated=await page.evaluate(hydrateReadonlyDocument,{tables,fieldsOnly});if(hydrated.snapshot)hydrated.snapshot.images=images; + detail.processSteps=hydrated.processSteps||[]; const evidenceHash=crypto.createHash('sha256').update(JSON.stringify(detail)).digest('hex');detail.evidenceHash=evidenceHash; - return {...identity,detail,snapshot:hydrated.snapshot||null,capturedAt,evidenceHash,detailUrl:loaded.url.href,fieldsOnly,blockedRequests:[]}; - }catch(error){if(error.status)throw error;fail('BPM 只读字段或静态快照采集失败。',502);}finally{await context?.close().catch(()=>{});await browser?.close().catch(()=>{});await request?.dispose?.().catch(()=>{});} + const captured={...identity,detail,snapshot:hydrated.snapshot||null,capturedAt,evidenceHash,detailUrl:loaded.url.href,fieldsOnly,blockedRequests:[]}; + if(hydrated.blocker)throw Object.assign(new Error(hydrated.blocker),{status:409,code:'FORM_STRUCTURE_UNSUPPORTED',diagnostics:hydrated.diagnostics||{reason:'UNSUPPORTED_FORM_LAYOUT'},partialDetail:{...captured,snapshot:null,fieldsOnly:true}}); + return captured; + }catch(error){ + const cause=error.status?error:Object.assign(new Error('BPM 只读字段或静态快照采集失败。'),{status:502}); + if(partialDetail&&!cause.partialDetail){const evidenceHash=crypto.createHash('sha256').update(JSON.stringify(partialDetail.detail)).digest('hex');partialDetail.detail.evidenceHash=evidenceHash;cause.partialDetail={...partialDetail,evidenceHash};} + throw cause; + }finally{await context?.close().catch(()=>{});await browser?.close().catch(()=>{});await request?.dispose?.().catch(()=>{});} } module.exports={parseEntryURL,loadForm,loadData,flattenTables,hydrateReadonlyDocument,captureReadonlyForm,allowedResource}; diff --git a/src/modules/bpm/order-provider.cjs b/src/modules/bpm/order-provider.cjs index f079edb..824941f 100644 --- a/src/modules/bpm/order-provider.cjs +++ b/src/modules/bpm/order-provider.cjs @@ -141,13 +141,23 @@ class BpmOrderProvider{ return this.saved(connection,principal,async storageState=>{ if(row.source!=='todo'||row.configurationOnly||row.demo)throw fail('只读执行只接受真实当前通知任务。'); const rows=await this.client.scan(storageState),same=rows.filter(fresh=>fresh.source===row.source&&String(fresh.taskId)===String(row.taskId)&&(!row.portalSource||fresh.portalSource===row.portalSource)); - if(same.length!==1)throw fail('此任务已不在当前列表或来源存在歧义,请重新扫描。'); + if(same.length!==1)throw Object.assign(fail('此任务已不在当前列表或来源存在歧义,请核验原通知任务后再恢复。'),{code:'BPM_TASK_NOT_CURRENT'}); const current=same[0]; if(['instanceId','processName','nodeName','processVersion','revision','receivedAt','serialNum','title'].some(key=>String(current[key]??'')!==String(row[key]??'')))throw fail('当前通知任务的节点、版本、摘要或时间已变化,请重新核对。'); const original=row.detailUrl?safeEntry(row.detailUrl):null,fresh=current.detailUrl?safeEntry(current.detailUrl):null; if(!fresh||original&&(original.target.searchParams.get('tid')!==fresh.target.searchParams.get('tid')||original.target.searchParams.get('pid')!==fresh.target.searchParams.get('pid')))throw fail('通知任务与详情标识不一致。'); const reader=this.readonlyReader||require('../../bpm-readonly-form.cjs').captureReadonlyForm; - const captured=await reader({storageState,detailUrl:current.detailUrl,processName:current.processName,nodeName:current.nodeName,listProcessVersion:current.processVersion,fieldsOnly,browserFactory:this.browserFactory}); + let captured; + try{captured=await reader({storageState,detailUrl:current.detailUrl,processName:current.processName,nodeName:current.nodeName,listProcessVersion:current.processVersion,fieldsOnly,browserFactory:this.browserFactory});} + catch(error){ + if(error.partialDetail){ + const partial=error.partialDetail; + const fields=Object.entries(partial.detail.fields).map(([path,value])=>({path,label:path,value})); + error.partialCapture={sample:{...row,detailUrl:fresh.target.href,connectionId:connection.id,fields:structuredClone(partial.detail.fields),brief:row.title,formVersion:partial.detail.formVersion,formPath:partial.detail.formPath,detailEvidence:{tid:partial.detail.tid,pid:partial.detail.pid,formVersion:partial.detail.formVersion,listProcessVersion:current.processVersion,readOnly:true}},snapshot:{purpose:'field-mapping',fields,sourceUrl:partial.detailUrl,processVersion:current.processVersion,formVersion:partial.detail.formVersion,formPath:partial.detail.formPath,fieldSources:partial.detail.fieldSources,capturedAt:partial.capturedAt,evidenceHash:partial.evidenceHash}}; + delete error.partialDetail; + } + this.checks={...this.checks,pdfExport:false,message:error.message};throw error; + } const fields=Object.entries(captured.detail.fields).map(([path,value])=>({path,label:path,value})); if(!fields.length||fields.length>4000||fields.every(field=>field.value===null||field.value===''))throw fail('只读表单缺少有效字段或超过采集上限。'); const snapshot={...(captured.snapshot||{purpose:'field-mapping'}),fields,sourceUrl:captured.detailUrl,processVersion:current.processVersion,formVersion:captured.detail.formVersion,formPath:captured.detail.formPath,fieldSources:captured.detail.fieldSources,capturedAt:captured.capturedAt,evidenceHash:captured.evidenceHash}; diff --git a/src/modules/order-execution/coordinator.cjs b/src/modules/order-execution/coordinator.cjs index e79162d..9a709a6 100644 --- a/src/modules/order-execution/coordinator.cjs +++ b/src/modules/order-execution/coordinator.cjs @@ -47,10 +47,48 @@ class OrderExecutionCoordinator{ } validateCapture(task,connection,{sample,snapshot}){ for(const key of ['source','portalSource','instanceId','taskId','revision','processName','nodeName','receivedAt']){ - if(String(sample?.[key])!==String(task.row[key]))throw Error('采集样本与待办事件身份不一致。'); + if(String(sample?.[key])!==String(task.row[key]))throw Object.assign(Error('采集样本与待办事件身份不一致。'),{code:'BPM_CAPTURE_IDENTITY_MISMATCH',status:409}); } - if(sample.connectionId!==connection.id)throw Error('采集样本连接身份不一致。'); - if(!snapshot||snapshot.processVersion!==sample.processVersion||!Array.isArray(snapshot.fields))throw Error('采集样本流程版本或实际字段证据不一致。'); + if(sample.connectionId!==connection.id)throw Object.assign(Error('采集样本连接身份不一致。'),{code:'BPM_CAPTURE_IDENTITY_MISMATCH',status:409}); + if(!snapshot||snapshot.processVersion!==sample.processVersion||!Array.isArray(snapshot.fields))throw Object.assign(Error('采集样本流程版本或实际字段证据不一致。'),{code:'BPM_CAPTURE_IDENTITY_MISMATCH',status:409}); + } + captureFailure(task,connection,error){ + task.errorCode=typeof error.code==='string'?error.code:'CAPTURE_FAILED'; + if(error.diagnostics)task.captureDiagnostics=clone(error.diagnostics); + if(error.partialCapture){ + try{ + const partial=clone(error.partialCapture);this.validateCapture(task,connection,partial); + // Fields are useful diagnostic evidence, never a completed PDF snapshot. + partial.snapshot={...partial.snapshot,purpose:'field-mapping'};delete partial.snapshot.html; + task.captureEvidenceId=this.store.recordCapture({...partial,taskId:task.id}).id; + delete task.captureEvidenceError; + }catch(evidenceError){task.captureEvidenceError=evidenceError.message;} + } + task.retryCount=(task.retryCount||0)+1; + if(['FORM_STRUCTURE_UNSUPPORTED','BPM_TASK_NOT_CURRENT','BPM_CAPTURE_IDENTITY_MISMATCH'].includes(task.errorCode)||[403,409].includes(Number(error.status))){ + task.retryPolicy='manual';delete task.nextRetryAt; + if(task.errorCode==='BPM_TASK_NOT_CURRENT')task.status='blocked'; + }else{ + task.retryPolicy='automatic'; + task.nextRetryAt=new Date(+this.clock()+Math.min(1800000,60000*2**Math.min(task.retryCount-1,5))).toISOString(); + } + } + resetCaptureRetry(task){delete task.retryPolicy;delete task.retryCount;delete task.nextRetryAt;delete task.errorCode;delete task.captureDiagnostics;delete task.captureEvidenceError;} + markUnavailableCaptures(rows,connection){ + const absent=[]; + this.store.transaction(()=>{ + for(const task of this.store.all('execution-tasks')){ + if(task.connectionId!==connection.id||task.step!=='capture'||!['failed','blocked'].includes(task.status)||task.sampleId||task.conflict||task.missedWindow||task.supersededBy||task.revisionIgnored)continue; + const order=task.orderId&&this.store.get('orders',task.orderId); + if(order&&(order.archive||reserved(order)||['batched','sending','sent','unknown','ignored'].includes(order.status)))continue; + if(rows.some(row=>row.source==='todo'&&taskIdentity.sameTask(task,row)))continue; + if(task.errorCode==='BPM_TASK_NOT_CURRENT'&&task.recovery?.status==='requires-history-verification')continue; + task.recovery={status:'requires-history-verification',at:this.now(),previousErrorCode:task.errorCode||null,previousError:task.error||null,reason:'完整待办对账已成功,但原通知任务不在当前待办;需核验原通知节点及历史到达证据,禁止自动补发。'}; + task.sourceUnavailableAt=task.sourceUnavailableAt||this.now();task.errorCode='BPM_TASK_NOT_CURRENT';task.status='blocked';task.retryPolicy='manual';delete task.nextRetryAt; + task.error=task.recovery.reason;this.persist(task);absent.push(task); + } + }); + return absent; } async checkArchivedRuntime(task,order,connection,principal){ const published=this.store.executionRule(this.store.get('rules',order.ruleSnapshot?.id)); @@ -239,6 +277,7 @@ class OrderExecutionCoordinator{ if(needsRuntimeCheck(order))await this.checkArchivedRuntime(task,order,connection,principal); continue; } + if(task.step==='capture'&&(task.retryPolicy==='manual'||input.automatic&&Date.parse(task.nextRetryAt)>+this.clock()))continue; await this.execute(task,connection,principal,{automatic:input.automatic===true}); }finally{ this.query.processedCount++; @@ -257,6 +296,9 @@ class OrderExecutionCoordinator{ await this.checkArchivedRuntime(task,order,connection,principal); } if(input.automatic&&!this.store.settings().processingEnabled)throw Error('自动处理已暂停,待处理对账保留到恢复后继续。'); + // Durable discovery hints can replay an older complete list. Only a fresh, + // fully successful provider scan can establish that a retained task left. + if(trustedRows===undefined)for(const task of this.markUnavailableCaptures(rows,connection))await this.exception(task,connection,false); this.query={...this.query,status:'complete',finishedAt:this.now(),rowCount:rows.length,targetCount:considered};this.store.put('execution-requests',{id:key,at:this.now()}); }catch(error){this.query={...this.query,status:'failed',error:error.message,finishedAt:this.now()};throw error;} finally{ @@ -275,7 +317,12 @@ class OrderExecutionCoordinator{ task.status='capturing';task.step='capture';this.persist(task); const {sample,snapshot}=await this.provider.capture(connection,principal,clone(task.row)); this.validateCapture(task,connection,{sample,snapshot}); - const captured=this.store.recordCapture({sample,snapshot,taskId:task.id});task.sampleId=captured.id;task.step='identify';this.persist(task); + const captured=this.store.recordCapture({sample,snapshot,taskId:task.id});task.sampleId=captured.id;task.step='identify';this.resetCaptureRetry(task); + if(task.sourceUnavailableAt||task.recovery?.status==='requires-history-verification'){ + task.sourceAvailabilityHistory=[...(task.sourceAvailabilityHistory||[]),{sourceUnavailableAt:task.sourceUnavailableAt||null,recovery:clone(task.recovery||null),verifiedAt:this.now()}].slice(-100); + delete task.sourceUnavailableAt;if(task.recovery?.status==='requires-history-verification')delete task.recovery; + } + this.persist(task); } const captured=this.store.get('capture-samples',task.sampleId);let order; await this.refreshCapabilities(this.store.executionRule(this.store.all('rules').find(r=>task.categoryIds.includes(r.id)))); @@ -296,7 +343,9 @@ class OrderExecutionCoordinator{ await this.exception(task,connection,true); }catch(error){ if(expectedArchive&&!require('../order-rules/migrations.cjs').archiveContextMatches(this.store,this.store.get('orders',task.orderId),expectedArchive))return; - const uncertain=task.status==='archiving';task.status=uncertain&&this.archive.supportsRecovery!==true?'unknown':'failed';task.error=uncertain?'归档结果待核验,需人工受控恢复:'+error.message:error.message;this.persist(task);await this.exception(task,connection,false); + const uncertain=task.status==='archiving';task.status=uncertain&&this.archive.supportsRecovery!==true?'unknown':'failed';task.error=uncertain?'归档结果待核验,需人工受控恢复:'+error.message:error.message; + if(task.step==='capture')this.captureFailure(task,connection,error); + this.persist(task);await this.exception(task,connection,false); } } adoptRevision(task,order,captured){ @@ -401,6 +450,7 @@ class OrderExecutionCoordinator{ if(typeof input.note!=='string'||input.note.trim().length<5||input.note.length>2000)fail('请填写至少5字重试依据。'); if(!['failed','blocked'].includes(task.status)||task.conflict||task.missedWindow)fail('此任务结果未明确或不允许重试。',409); this.store.audit(principal.user.username,'人工重试订单任务',id+':'+input.note.trim()); + if(task.step==='capture')this.resetCaptureRetry(task); await this.execute(task,connection,principal); this.store.put('execution-requests',{id:requestId,taskId:id,inputHash,at:this.now()}); return this.snapshot(principal); diff --git a/src/modules/order-rules/query.cjs b/src/modules/order-rules/query.cjs index b51c4e9..b05cdb4 100644 --- a/src/modules/order-rules/query.cjs +++ b/src/modules/order-rules/query.cjs @@ -31,11 +31,21 @@ const pick=(row,keys)=>Object.fromEntries(keys.filter(k=>row?.[k]!==undefined).m const identity=row=>pick(row,['source','connectionId','instanceId','taskId','revision','processName','nodeName','orderNo','serialNum','receivedAt','quantity','brief','model','project','title']); function taskEvidence(task,context,user){ if(!task)return null; - const value=pick(task,['id','version','connectionId','status','step','error','exceptionId','conflict','missedWindow','recovery','updatedAt','createdAt']); + const value=pick(task,['id','version','connectionId','status','step','error','errorCode','retryPolicy','nextRetryAt','exceptionId','conflict','missedWindow','recovery','updatedAt','createdAt']); + if(Array.isArray(task.diagnostics))value.diagnostics=task.diagnostics.slice(0,100).map(d=>pick(d,['code','reason','message','table','path','field','rowCount','expectedRows','actualRows'])); + if(task.captureDiagnostics)value.captureDiagnostics=pick(task.captureDiagnostics,['reason','tableName','dynamicArea','backendRows','domRows','fieldPaths']); + const previous=(task.history||[]).findLast(h=>h.step==='capture'&&h.error&&h.error!==task.error&&['failed','blocked'].includes(h.status)); + if(previous)value.previousCaptureFailure=pick(previous,['at','error']); value.row=identity(task.row); if(task.conflictRow){const previous=task.previousTaskId?context.orderRules.get('execution-tasks',task.previousTaskId):task;value.revisionEvidence={previous:identity(previous&&canReadConnection(context.workspace,user,previous.connectionId)?previous.row:undefined),incoming:identity(task.conflictRow)};} return value; } +function captureEvidence(context,task,user){ + if(!task?.captureEvidenceId||!canReadConnection(context.workspace,user,task.connectionId))return undefined; + const captured=context.orderRules.get('capture-samples',task.captureEvidenceId),sample=captured?.sample; + if(captured?.provenance!=='server-provider'||captured.taskId!==task.id||sample?.connectionId!==task.connectionId||sample.taskId!==task.row?.taskId||sample.instanceId!==task.row?.instanceId)return undefined; + return {id:captured.id,readOnly:true,capturedAt:captured.capturedAt,processVersion:sample.processVersion,fields:(captured.snapshot?.fields||[]).slice(0,1000).map(f=>({...pick(f,['path','label','value']),source:pick(captured.snapshot?.fieldSources?.[f.path],['source','table','column','rowIndex'])}))}; +} function orderRow(order,task){ const event=identity(order?.event||task?.row); return {...event,...pick(order,['id','status','categoryId','error','reason','batchId','createdAt','updatedAt','orderNo','receivedAt']),...(order?{notifications:notifications(order),...(order.ruleSnapshot?.testRunId?{testRunId:order.ruleSnapshot.testRunId}:{})}:{}), @@ -93,7 +103,7 @@ function orderDetail(context,id,user){ const order=id.startsWith('task:')?null:context.orderRules.get('orders',id); if(!classified(order,task)||(order?!canReadOrder(context.workspace,user,order):!task||!canReadConnection(context.workspace,user,task.connectionId)))fail('订单不存在或无权查看。',404); const files=(order?.archive?.files||[]).map((file,index)=>({...pick(file,['name','size','sha256','kind']),index,url:'/api/order-rules/orders/'+encodeURIComponent(id)+'/files/'+index})); - return {...orderRow(order,task),event:identity(order?.event||task?.row),executionTask:taskEvidence(task,context,user),files,archivedAt:order?.archive?.archivedAt,archiveGeneration:order?.archiveGeneration||1,ruleVersion:order?.ruleSnapshot?.version,batches:[...data.batches,...require('./collecting-batches.cjs').list(context.orderRules)].filter(b=>b.orderIds?.includes(id)&&canReadBatch(context.workspace,user,b,context.orderRules)).map(b=>batchRow(context,b))}; + return {...orderRow(order,task),event:identity(order?.event||task?.row),executionTask:taskEvidence(task,context,user),captureEvidence:captureEvidence(context,task,user),files,archivedAt:order?.archive?.archivedAt,archiveGeneration:order?.archiveGeneration||1,ruleVersion:order?.ruleSnapshot?.version,batches:[...data.batches,...require('./collecting-batches.cjs').list(context.orderRules)].filter(b=>b.orderIds?.includes(id)&&canReadBatch(context.workspace,user,b,context.orderRules)).map(b=>batchRow(context,b))}; } function batchDetail(context,id,user){ const batch=id.startsWith('collecting-')?require('./collecting-batches.cjs').get(context.orderRules,id):context.orderRules.get('batches',id); diff --git a/tests/bpm-dynamicarea.test.cjs b/tests/bpm-dynamicarea.test.cjs index 497f29d..18a3b51 100644 --- a/tests/bpm-dynamicarea.test.cjs +++ b/tests/bpm-dynamicarea.test.cjs @@ -41,3 +41,11 @@ test('undeclared generic single-row templates do not expand and fieldsOnly remai test('dynamic row expansion never evaluates hidden expressions or executes page scripts',{timeout:30000},async t=>{ const hydrate=await fixture(t),html=remarksHTML.replace('