From 3ff69c6832dbd81c70ea2f5dd4a5c18875f02a28 Mon Sep 17 00:00:00 2001 From: abaishu0730 Date: Wed, 21 Oct 2026 09:54:28 +0800 Subject: [PATCH] fix: preserve late discoveries across notification windows --- src/modules/order-execution/coordinator.cjs | 251 +++++++++++++++----- src/modules/order-rules/access.cjs | 16 +- src/modules/order-rules/dispatcher.cjs | 2 +- src/modules/order-rules/migrations.cjs | 104 +++++++- src/modules/order-rules/store.cjs | 28 ++- tests/order-rules/execution.test.cjs | 3 + tests/order-rules/global-core.test.cjs | 1 + 7 files changed, 338 insertions(+), 67 deletions(-) diff --git a/src/modules/order-execution/coordinator.cjs b/src/modules/order-execution/coordinator.cjs index d4c973c..c3b0caf 100644 --- a/src/modules/order-execution/coordinator.cjs +++ b/src/modules/order-execution/coordinator.cjs @@ -1,7 +1,7 @@ 'use strict'; const crypto=require('node:crypto'); const {fail}=require('../order-rules/validation.cjs'); -const {dayPolicy}=require('../../shared/schedule.cjs'); +const {dayPolicy,nextSlots}=require('../../shared/schedule.cjs'); const {matchesScope}=require('../order-rules/scopes.cjs'); const hash=value=>crypto.createHash('sha256').update(JSON.stringify(value)).digest('hex'); const clone=value=>structuredClone(value); @@ -11,6 +11,11 @@ class OrderExecutionCoordinator{ store.executionSources=()=>this.workspace.snapshot().connections.filter(c=>c.status!=='disabled').map(c=>c.id); store.ownerForConnection=id=>{try{return this.workspace.getConnection(id)?.owner||'';}catch{return this.workspace.recordSources?.().find(c=>c.id===id)?.owner||'';}}; store.activeDiscoveries=0; + for(const hint of store.all('execution-discoveries')){ + if(hint.status!=='pending')continue; + const id=hash([hint.connectionId,hint.runId]); + if(!store.get('execution-discovery-runs',id))store.put('execution-discovery-runs',{...hint,id}); + } for(const scan of store.all('execution-scans'))if(scan.status==='scanning')store.put('execution-scans',{...scan,status:'failed',error:'扫描被重启中断,请重新扫描。'}); this.tail=Promise.resolve();this.stopped=false;this.timer=null;this.query=store.get('execution-query','main')||{id:'main',status:'idle'};this.blockers=[];this.runtimeRuleChecks=new Set(); if(this.query.status==='scanning'){this.query={...this.query,status:'failed',error:'服务重启中断了上次只读扫描,请重新扫描。',finishedAt:this.now()};store.put('execution-query',this.query);} @@ -44,7 +49,7 @@ class OrderExecutionCoordinator{ if(sample.connectionId!==connection.id)throw Error('采集样本连接身份不一致。'); if(!snapshot||snapshot.processVersion!==sample.processVersion||!Array.isArray(snapshot.fields))throw Error('采集样本流程版本或实际字段证据不一致。'); } - async checkArchivedRuntime(task,order,connection,principal,{forceCapture=false}={}){ + async checkArchivedRuntime(task,order,connection,principal){ const published=this.store.get('rules',order.ruleSnapshot?.id)?.published; if(published?.status!=='enabled')return; try{ @@ -76,7 +81,7 @@ class OrderExecutionCoordinator{ for(const key of Object.keys(capabilities))if(!capabilities[key])this.blockers.push(key+' 尚未通过实际探测。');this.store.capabilities=capabilities;return capabilities; } canRetry(task,principal){ - if(task.conflict||!['failed','blocked'].includes(task.status))return false; + if(task.conflict||task.missedWindow||!['failed','blocked'].includes(task.status))return false; try{this.connection(task.connectionId,principal);return true;} catch{return false;} } @@ -104,18 +109,55 @@ class OrderExecutionCoordinator{ } request(input){if(typeof input?.idempotencyKey!=='string'||!/^[\w:.-]{1,160}$/.test(input.idempotencyKey))fail('请提供有效的操作幂等标识。');} notifyDiscovery(payload){ - if(!payload||typeof payload.connectionId!=='string'||typeof payload.runId!=='string'||!Array.isArray(payload.rows)||!Number.isFinite(Date.parse(payload.startedAt))||!Number.isFinite(Date.parse(payload.finishedAt)))fail('完整对账线索无效。'); - const prior=this.store.get('execution-discoveries',payload.connectionId); - if(prior&&Date.parse(prior.startedAt)>Date.parse(payload.startedAt))return; - if(prior?.runId===payload.runId)return; - this.store.put('execution-discoveries',{...clone(payload),id:payload.connectionId,status:'pending'}); + if(!payload||typeof payload.connectionId!=='string'||typeof payload.runId!=='string'||!Array.isArray(payload.rows)||!Number.isFinite(Date.parse(payload.startedAt))||!Number.isFinite(Date.parse(payload.finishedAt))){ + fail('完整对账线索无效。'); + } + this.store.transaction(()=>{ + const id=hash([payload.connectionId,payload.runId]); + const existing=this.store.get('execution-discovery-runs',id); + if(existing){ + if(hash(existing.rows)!==hash(payload.rows)||existing.startedAt!==payload.startedAt||existing.finishedAt!==payload.finishedAt){ + fail('同一完整对账标识的证据已变化。',409); + } + return; + } + // Preserve each complete list independently. A later empty list must not + // erase discoveries that have not yet passed through execution handling. + this.store.put('execution-discovery-runs',{...clone(payload),id,status:'pending'}); + const latest=this.store.get('execution-discoveries',payload.connectionId); + if(!latest||Date.parse(latest.startedAt)<=Date.parse(payload.startedAt)){ + this.store.put('execution-discoveries',{...clone(payload),id:payload.connectionId,status:'pending'}); + } + }); + } + holdMissedTask(task,order,frozen){ + const received=new Date(task.row.receivedAt); + const cutoff=frozen?.cutoff||nextSlots(this.store.schedule(),received,1,this.store.calendar())[0]; + const calculated=cutoff?require('../order-rules/window.cjs').windowForCutoff(cutoff,this.store.schedule(),this.store.calendar()):null; + task.missedWindow=frozen?.window||calculated||{start:task.row.receivedAt,end:null}; + task.blockedByBatchId=frozen?.id||null; + task.status='blocked'; + task.step='missed_window'; + task.error=frozen?'原接收时段已冻结,迟到发现订单等待人工核验。':'已错过原接收时段整理期限,等待人工处理,禁止自动补发。'; + this.persist(task); + if(order){ + order.missedWindow=clone(task.missedWindow); + order.status='blocked'; + order.error=task.error; + this.store.put('orders',order); + } + this.store.recordIssue('missed-task:'+task.id,{ + component:'rules',taskId:task.id,taskIds:[task.id],batchId:task.blockedByBatchId, + window:task.missedWindow,error:task.error,orderIds:task.orderId?[task.orderId]:[], + }); } scan(input,principal,{rows:trustedRows,runId,startedAt}={}){ // Reserve the shared boundary synchronously, including work queued behind a retry. this.store.activeDiscoveries++; return this.serialize(async()=>{ this.request(input);const connection=this.connection(input.connectionId,principal),key=hash(['scan',connection.id,principal.user.username,input.idempotencyKey]); - if(this.store.get('execution-requests',key))return this.snapshot(principal); + const previousScan=this.store.get('execution-scans',connection.id); + if(this.store.get('execution-requests',key)&&previousScan?.status==='complete')return this.snapshot(principal); this.query={id:'main',status:'scanning',connectionId:connection.id,startedAt:startedAt||this.now()};this.store.put('execution-query',this.query);this.store.put('execution-scans',{...this.query,id:connection.id}); try{ const rows=trustedRows===undefined?await this.provider.scan(connection,principal):clone(trustedRows);if(!Array.isArray(rows))throw Error('待办提供器返回格式无效。'); @@ -126,12 +168,19 @@ class OrderExecutionCoordinator{ if(row.source!=='todo')continue; const rules=this.store.all('rules').map(r=>r.published?.status==='enabled'?r.published:r.draft).filter(rule=>matchesScope(rule,row)); if(!rules.length)continue; - // Historical rows are ignored before any capture or export. - const window=this.store.snapshot().window;if(window&&Number.isFinite(Date.parse(row.receivedAt))&&Date.parse(row.receivedAt)rules.some(rule=>rule.categoryId===batch.categoryId)&&batch.window&&received>=Date.parse(batch.window.start)&&received!t.supersededBy&&t.orderId&&t.connectionId===connection.id&&t.row.source===row.source&&String(t.row.instanceId)===String(row.instanceId)&&String(t.row.taskId)===String(row.taskId)&&String(t.row.revision)!==String(row.revision)); task={id,version:0,connectionId:connection.id,owner:connection.owner||'',row:clone(row),categoryIds:[...new Set(rules.map(r=>r.categoryId))],status:'identified',step:'capture',createdAt:this.now()}; @@ -139,6 +188,10 @@ class OrderExecutionCoordinator{ this.persist(task); } if(hash(task.row)!==hash(row)&&task.ignoredRevisionHash!==hash(row)){task.conflictRow=clone(row);task.status='blocked';task.error='同一事件修订内容冲突,需核对源版本。';task.conflict=true;this.persist(task);} + const order=task.orderId&&this.store.get('orders',task.orderId); + const reserved=order?.batchId||['batched','sending','sent','unknown'].includes(order?.status); + const protectedTask=task.supersededBy||task.revisionIgnored||['unknown','sending','sent'].includes(task.status); + if(historical&&!reserved&&!protectedTask)this.holdMissedTask(task,order,frozen); discovered.push(task); } this.query={...this.query,rowCount:rows.length,targetCount:considered,processedCount:0,discoveredAt:this.now()}; @@ -148,6 +201,7 @@ class OrderExecutionCoordinator{ for(const task of discovered){ try{ if(task.supersededBy||task.revisionIgnored)continue; + if(task.missedWindow){await this.exception(task,connection,false);continue;} if(task.conflict){await this.exception(task,connection,false);continue;} this.reconcileArchive(task); if(task.conflict||task.status==='unknown'||task.step==='archive'&&task.status==='failed')continue; @@ -166,9 +220,8 @@ class OrderExecutionCoordinator{ this.store.put('execution-scans',{...this.query,id:connection.id}); } } - // Already archived work can outlive its todo row. Recheck its original - // read-only source through the provider; an unavailable source remains an - // explicit runtime blocker and never causes another archive export. + // Completed work may outlive its todo row. Validate retained archive + // receipts directly; source disappearance never triggers another export. for(const task of this.store.all('execution-tasks')){ if(task.connectionId!==connection.id||observed.has(task.id)||task.conflict)continue; this.reconcileArchive(task); @@ -176,17 +229,22 @@ class OrderExecutionCoordinator{ if(!order?.archive||!['pending','batched'].includes(order.status))continue; const window=this.store.snapshot().window; if(window&&!order.batchId&&Date.parse(order.event.receivedAt)Date.parse(this.query.startedAt); + this.store.put('execution-scans',preserveNewer?previousScan:{...this.query,id:connection.id}); + } return this.snapshot(principal); }).finally(()=>{this.store.activeDiscoveries--;}).then(()=>this.snapshot(principal)); } async execute(task,connection,principal,{automatic=false}={}){ try{ - if(automatic&&!this.store.settings().processingEnabled)return; + if(task.missedWindow||automatic&&!this.store.settings().processingEnabled)return; if(!task.sampleId){ task.status='capturing';task.step='capture';this.persist(task); const {sample,snapshot}=await this.provider.capture(connection,principal,clone(task.row)); @@ -201,38 +259,98 @@ class OrderExecutionCoordinator{ if(order.status==='blocked'){await this.exception(task,connection,false);return;} if(order.archive){task.step='complete';task.status=order.status;this.persist(task);await this.exception(task,connection,true);return;} if(!['identified','preparing'].includes(order.status))return; - if(automatic&&!this.store.settings().processingEnabled)return; + if(task.missedWindow||automatic&&!this.store.settings().processingEnabled)return; task.status='archiving';task.step='archive';this.persist(task); const evidence=await this.archive.archive({order:clone(order),rule:clone(order.ruleSnapshot),snapshot:clone(captured.snapshot),taskId:task.id}); order=this.store.recordArchive(order.id,evidence,principal.user.username);task.status=order.status;task.error=order.error;task.step='complete';this.persist(task); await this.exception(task,connection,true); }catch(error){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);} } - resolve(id,input,principal){return this.serialize(async()=>{ - if(principal?.user?.role!=='admin')fail('仅管理员可核验修订。',403); - const {frozen,validate,digest}=require('../order-rules/migrations.cjs');validate(input); - if(!['adopt','ignore'].includes(input.resolution))fail('请选择采用新修订或忽略变更。'); - const key=digest(['revision',id,principal.user.username,input.idempotencyKey]),inputHash=digest(input),prior=this.store.get('execution-requests',key); - if(prior){if(prior.inputHash!==inputHash)fail('幂等标识已用于不同修订核验。',409);return this.snapshot(principal);} - const task=this.store.get('execution-tasks',id);if(!task||task.version!==input.version||!task.conflict||!task.conflictRow)fail('修订冲突或任务版本已变化。',409); - const connection=this.connection(task.connectionId,principal),order=task.orderId&&this.store.get('orders',task.orderId); - if(frozen(this.store,order)||['sending','sent','unknown'].includes(task.status))fail('冻结或结果不确定的任务必须从原批次核验,禁止采用新修订。',409); - let captured; - if(input.resolution==='adopt'){captured=await this.provider.capture(connection,principal,clone(task.conflictRow));this.validateCapture({...task,row:task.conflictRow},connection,captured);} - this.store.transaction(()=>{ - const current=this.store.get('execution-tasks',id),liveOrder=task.orderId&&this.store.get('orders',task.orderId); - if(current.version!==input.version||frozen(this.store,liveOrder))fail('核验期间任务已变化,请刷新。',409); - this.store.put('execution-revisions',{id:id+':'+task.version,task:clone(task),order:clone(liveOrder),resolution:input.resolution,note:input.note,actor:principal.user.username,at:this.now()}); - if(captured){ - const sample=this.store.recordCapture({sample:captured.sample,snapshot:captured.snapshot,taskId:task.id});task.sampleId=sample.id;task.row=clone(task.conflictRow);task.localGeneration=(task.localGeneration||1)+1; - if(liveOrder){liveOrder.sample=clone(captured.sample);liveOrder.sourceHash=digest(captured.sample);liveOrder.archiveHistory=[...(liveOrder.archiveHistory||[]),...(liveOrder.archive?[{generation:liveOrder.archiveGeneration||1,evidence:liveOrder.archive}]:[])];liveOrder.archiveGeneration=(liveOrder.archiveGeneration||1)+1;liveOrder.archive=null;liveOrder.status='blocked';liveOrder.error='已采用新修订,等待按当前规则重新识别。';this.store.put('orders',liveOrder);} - if(task.previousTaskId){const previous=this.store.get('execution-tasks',task.previousTaskId);if(previous){previous.supersededBy=task.id;previous.status='ignored';this.persist(previous);}} - task.status='identified';task.step='identify'; - }else{task.ignoredRevisionHash=hash(task.conflictRow);task.status=liveOrder?.status||'identified';if(task.previousTaskId){task.priorOrderId=task.orderId;delete task.orderId;task.revisionIgnored=true;task.status='ignored';}} - task.conflict=false;delete task.conflictRow;task.error=null;this.persist(task); - this.store.put('execution-requests',{id:key,inputHash,at:this.now()});this.store.audit(principal.user.username,'核验订单修订',id+' '+input.resolution+':'+input.note); - });return this.snapshot(principal); - });} + adoptRevision(task,order,captured){ + const {digest,invalidateArchive}=require('../order-rules/migrations.cjs'); + const sample=this.store.recordCapture({sample:captured.sample,snapshot:captured.snapshot,taskId:task.id}); + task.sampleId=sample.id; + task.row=clone(task.conflictRow); + task.localGeneration=(task.localGeneration||1)+1; + if(order){ + order.sample=clone(captured.sample); + order.sourceHash=digest(captured.sample); + invalidateArchive(order); + order.status='blocked'; + order.error='已采用新修订,等待按当前规则重新识别。'; + this.store.put('orders',order); + } + if(task.previousTaskId){ + const previous=this.store.get('execution-tasks',task.previousTaskId); + if(previous){ + previous.supersededBy=task.id; + previous.status='ignored'; + this.persist(previous); + } + } + task.status='identified'; + task.step='identify'; + } + ignoreRevision(task,order){ + task.ignoredRevisionHash=hash(task.conflictRow); + task.status=order?.status||'identified'; + if(task.previousTaskId){ + task.priorOrderId=task.orderId; + delete task.orderId; + task.revisionIgnored=true; + task.status='ignored'; + } + } + resolve(id,input,principal){ + return this.serialize(async()=>{ + if(principal?.user?.role!=='admin')fail('仅管理员可核验修订。',403); + const {frozen,validate,digest}=require('../order-rules/migrations.cjs'); + validate(input); + if(!['adopt','ignore'].includes(input.resolution))fail('请选择采用新修订或忽略变更。'); + const key=digest(['revision',id,principal.user.username,input.idempotencyKey]); + const inputHash=digest(input); + const prior=this.store.get('execution-requests',key); + if(prior){ + if(prior.inputHash!==inputHash)fail('幂等标识已用于不同修订核验。',409); + return this.snapshot(principal); + } + const task=this.store.get('execution-tasks',id); + if(!task||task.version!==input.version||!task.conflict||!task.conflictRow){ + fail('修订冲突或任务版本已变化。',409); + } + const connection=this.connection(task.connectionId,principal); + const order=task.orderId&&this.store.get('orders',task.orderId); + if(task.missedWindow||frozen(this.store,order)||['sending','sent','unknown'].includes(task.status)){ + fail('冻结、逾期或结果不确定的任务须从原业务证据核验,禁止采用新修订。',409); + } + let captured; + if(input.resolution==='adopt'){ + captured=await this.provider.capture(connection,principal,clone(task.conflictRow)); + this.validateCapture({...task,row:task.conflictRow},connection,captured); + } + this.store.transaction(()=>{ + const current=this.store.get('execution-tasks',id); + const liveOrder=task.orderId&&this.store.get('orders',task.orderId); + // Capture yielded outside the transaction; revalidate the mutation boundary. + if(current.version!==input.version||current.missedWindow||frozen(this.store,liveOrder)){ + fail('核验期间任务已变化,请刷新。',409); + } + this.store.put('execution-revisions',{ + id:id+':'+task.version,task:clone(task),order:clone(liveOrder), + resolution:input.resolution,note:input.note,actor:principal.user.username,at:this.now(), + }); + if(captured)this.adoptRevision(task,liveOrder,captured); + else this.ignoreRevision(task,liveOrder); + task.conflict=false; + delete task.conflictRow; + task.error=null; + this.persist(task); + this.store.put('execution-requests',{id:key,inputHash,at:this.now()}); + this.store.audit(principal.user.username,'核验订单修订',id+' '+input.resolution+':'+input.note); + }); + return this.snapshot(principal); + }); + } retry(id,input,principal){ return this.serialize(async()=>{ this.request(input); @@ -248,7 +366,7 @@ class OrderExecutionCoordinator{ } if(input.version!==task.version)fail('任务版本已变化,请刷新。',409); if(typeof input.note!=='string'||input.note.trim().length<5||input.note.length>2000)fail('请填写至少5字重试依据。'); - if(!['failed','blocked'].includes(task.status)||task.conflict)fail('此任务结果未明确或不允许重试。',409); + if(!['failed','blocked'].includes(task.status)||task.conflict||task.missedWindow)fail('此任务结果未明确或不允许重试。',409); this.store.audit(principal.user.username,'人工重试订单任务',id+':'+input.note.trim()); await this.execute(task,connection,principal); this.store.put('execution-requests',{id:requestId,taskId:id,inputHash,at:this.now()}); @@ -266,19 +384,42 @@ class OrderExecutionCoordinator{ if(recovered&&task.exceptionId){const item=this.workspace.snapshot().exceptions?.find(e=>e.id===task.exceptionId);if(item?.status==='in_progress')this.workspace.actOnException(item.id,{version:item.version,action:'verify',note:'执行重试成功,等待负责人核验归档与订单证据。'},actor,members);task.recovery={at:this.now(),status:'awaiting_verification',exceptionId:task.exceptionId};this.persist(task);this.workspace.record?.(actor,'订单执行恢复待核验','执行任务 '+task.id+';异常 '+task.exceptionId);} } start(){if(this.timer||this.stopped)return;this.timer=setInterval(()=>this.background().catch(error=>{this.store.put('execution-background',{id:'main',status:'failed',at:this.now(),error:error.message});}),30000);this.timer.unref?.();} + async consumeDiscovery(hint,connection){ + await this.scan({ + connectionId:connection.id,idempotencyKey:'background:hint:'+hint.runId,automatic:true, + },this.systemPrincipal,hint); + this.store.put('execution-discovery-runs',{...hint,status:'complete',consumedAt:this.now()}); + const latest=this.store.get('execution-discoveries',connection.id); + if(latest?.runId===hint.runId){ + this.store.put('execution-discoveries',{...latest,status:'complete',consumedAt:this.now()}); + } + } async background(){ if(!this.systemPrincipal||!this.store.settings().processingEnabled)return; - const day=new Date(this.clock().getTime()+8*3600000).toISOString().slice(0,10);if(!dayPolicy(day,this.settings()?.schedule||{},this.calendar()).scan)return; + const day=new Date(this.clock().getTime()+8*3600000).toISOString().slice(0,10); + if(!dayPolicy(day,this.settings()?.schedule||{},this.calendar()).scan)return; for(const connection of this.workspace.snapshot().connections||[]){ if(!connection.owner||connection.status!=='connected')continue; - const hint=this.store.get('execution-discoveries',connection.id); - const last=this.store.get('execution-scans',connection.id); - const window=this.store.snapshot().window,cutoffDue=window?.available&&(!last?.startedAt||Date.parse(last.startedAt)hint.connectionId===connection.id&&hint.status==='pending') + .sort((a,b)=>Date.parse(a.startedAt)-Date.parse(b.startedAt)); + for(const hint of pending){ + if(!this.store.settings().processingEnabled)return; + await this.consumeDiscovery(hint,connection); + } + const last=this.store.get('execution-scans',connection.id); + const window=this.store.snapshot().window; + const cutoffDue=window?.available&&(last?.status!=='complete'||!last?.startedAt||Date.parse(last.startedAt){});} diff --git a/src/modules/order-rules/access.cjs b/src/modules/order-rules/access.cjs index cb5814f..3e73783 100644 --- a/src/modules/order-rules/access.cjs +++ b/src/modules/order-rules/access.cjs @@ -6,5 +6,19 @@ function canReadConnection(workspace,user,id){ const canReadOrder=(workspace,user,order)=>!!order&&canReadConnection(workspace,user,order.sample?.connectionId||order.event?.connectionId||order.connectionId); function canReadBatch(workspace,user,batch,store){if(!user||!batch)return false;if(user.role==='admin')return true;return Array.isArray(batch.orderIds)&&batch.orderIds.length>0&&batch.orderIds.every(id=>canReadOrder(workspace,user,store.get('orders',id)));} function publicOrder(order){if(!order)return null;const value=structuredClone(order);delete value.sample;delete value.trace;if(value.event){delete value.event.fields;delete value.event.raw;}return value;} -function publicSnapshot(store,workspace,user){const value=store.snapshot();value.orders=value.orders.filter(o=>canReadOrder(workspace,user,o)).map(publicOrder);value.batches=value.batches.filter(b=>canReadBatch(workspace,user,b,store));value.issues=(store.all?.('business-issues')||[]).filter(issue=>user?.role==='admin'||issue.orderIds?.length&&issue.orderIds.every(id=>canReadOrder(workspace,user,store.get('orders',id))));if(user?.role!=='admin')value.audit=[];return value;} +function canReadIssue(store,workspace,user,issue){ + if(user?.role==='admin')return true; + const orders=issue.orderIds||[],tasks=issue.taskIds||[]; + if(!orders.length&&!tasks.length)return false; + return orders.every(id=>canReadOrder(workspace,user,store.get('orders',id))) + &&tasks.every(id=>canReadConnection(workspace,user,store.get('execution-tasks',id)?.connectionId)); +} +function publicSnapshot(store,workspace,user){ + const value=store.snapshot(); + value.orders=value.orders.filter(order=>canReadOrder(workspace,user,order)).map(publicOrder); + value.batches=value.batches.filter(batch=>canReadBatch(workspace,user,batch,store)); + value.issues=(store.all?.('business-issues')||[]).filter(issue=>canReadIssue(store,workspace,user,issue)); + if(user?.role!=='admin')value.audit=[]; + return value; +} module.exports={canReadConnection,canReadOrder,canReadBatch,publicOrder,publicSnapshot}; diff --git a/src/modules/order-rules/dispatcher.cjs b/src/modules/order-rules/dispatcher.cjs index 2fefe12..8adb7f5 100644 --- a/src/modules/order-rules/dispatcher.cjs +++ b/src/modules/order-rules/dispatcher.cjs @@ -33,7 +33,7 @@ class OrderRuleDispatcher{ const config=freeze(structuredClone(this.store.settings())),schedule=this.settings()?.schedule,calendar=this.calendar(); if(!schedule?.times?.length)return; const signature=JSON.stringify([schedule,calendar]); - if(!this.schedule||this.schedule.signature!==signature){const current=require('./window.cjs').upcomingWindow(now,schedule,calendar);this.schedule={signature,next:current?.available?current.end:nextSlots(schedule,now,1,calendar)[0]};} + if(!this.schedule||this.schedule.signature!==signature||now-Date.parse(this.schedule.next)>60000){const current=require('./window.cjs').upcomingWindow(now,schedule,calendar);this.schedule={signature,next:current?.available?current.end:nextSlots(schedule,now,1,calendar)[0]};} const cutoff=this.schedule.next,canPrepare=cutoff&&now-Date.parse(cutoff)>=0&&now-Date.parse(cutoff)<=60000; const queued=(this.store.snapshot().batches||[]).some(b=>b.status==='prepared'&&!b.manual&&now-Date.parse(b.cutoff)>=0&&now-Date.parse(b.cutoff)<=1800000); if(!canPrepare&&!queued)return; diff --git a/src/modules/order-rules/migrations.cjs b/src/modules/order-rules/migrations.cjs index ec6f039..511946c 100644 --- a/src/modules/order-rules/migrations.cjs +++ b/src/modules/order-rules/migrations.cjs @@ -4,10 +4,100 @@ const {fail}=require('./validation.cjs'); const {previewMatch}=require('./matching.cjs'); const canonical=v=>Array.isArray(v)?v.map(canonical):v&&typeof v==='object'?Object.fromEntries(Object.keys(v).sort().map(k=>[k,canonical(v[k])])):v; const digest=v=>crypto.createHash('sha256').update(JSON.stringify(canonical(v))).digest('hex'); -function frozen(store,order){return !!order&&(!!order.batchId||!!order.blockedByBatchId||['batched','sending','sent','unknown'].includes(order.status)||store.all('batches').some(b=>b.orderIds?.includes(order.id)));} -function validate(input){if(!input||!Number.isInteger(input.version)||typeof input.idempotencyKey!=='string'||!/^[\w:.-]{1,160}$/.test(input.idempotencyKey)||typeof input.note!=='string'||input.note.trim().length<5||input.note.length>2000)fail('请提供版本、幂等标识和至少5字依据。');} -const outputEvent=event=>{const value={...event};delete value.ruleVersion;delete value.adapterId;return value;}; -function projection(store,order,rule){const result=previewMatch([rule],store.adapters(),order.sample);if(!result.valid)fail('订单 '+order.id+' 无法应用当前规则:'+result.issues.join(';'),409);return {result,archiveChanged:digest([outputEvent(order.event),order.ruleSnapshot?.archiveDirectory,order.ruleSnapshot?.filenameDate])!==digest([outputEvent(result.event),rule.archiveDirectory,rule.filenameDate])};} -function preview(store,id,input){validate(input);const rule=store.get('rules',id)?.published;if(!rule||rule.status!=='enabled'||input.version!==rule.version)fail('已发布规则版本已变化或未启用。',409);const items=[],excluded=[];for(const order of store.all('orders').filter(o=>o.ruleSnapshot?.id===id||o.categoryId===rule.categoryId)){if(frozen(store,order)||!['blocked','identified','preparing','archived','pending'].includes(order.status)){excluded.push({id:order.id,status:order.status,reason:'冻结或已终结订单不可迁移'});continue;}const p=projection(store,order,rule);items.push({id:order.id,archiveChanged:p.archiveChanged,fromVersion:order.ruleSnapshot?.version,toVersion:rule.version});}return {ruleId:id,version:rule.version,items,excluded};} -function apply(store,id,input,actor){validate(input);return store.transaction(()=>{const requestId=digest([id,actor,input.idempotencyKey]),inputHash=digest(input),prior=store.get('migration-requests',requestId);if(prior){if(prior.inputHash!==inputHash)fail('幂等标识已用于不同迁移。',409);return prior.result;}const result=preview(store,id,input),rule=store.get('rules',id).published;for(const item of result.items){const order=store.get('orders',item.id),p=projection(store,order,rule);if(p.archiveChanged){order.archiveHistory=[...(order.archiveHistory||[]),...(order.archive?[{generation:order.archiveGeneration||1,evidence:order.archive}]:[])];order.archiveGeneration=(order.archiveGeneration||1)+1;order.archive=null;order.status='identified';}order.event=p.result.event;order.trace=p.result;order.ruleSnapshot=structuredClone(rule);order.categoryId=rule.categoryId;order.updatedAt=store.now();order.error=null;store.put('orders',order);for(const task of store.all('execution-tasks').filter(t=>t.orderId===order.id)){task.status=order.status;task.step=order.archive?'complete':'identify';task.error=null;task.version=(task.version||0)+1;store.put('execution-tasks',task);}}store.put('migration-requests',{id:requestId,inputHash,result,at:store.now()});store.audit(actor,'批量应用已发布规则',id+':'+input.note.trim());return result;});} -module.exports={preview,apply,frozen,validate,digest}; + +function frozen(store,order){ + if(!order)return false; + return !!order.batchId||!!order.blockedByBatchId||!!order.missedWindow + ||['batched','sending','sent','unknown'].includes(order.status) + ||store.all('batches').some(batch=>batch.orderIds?.includes(order.id)); +} +function validate(input){ + if(!input||!Number.isInteger(input.version)||typeof input.idempotencyKey!=='string' + ||!/^[\w:.-]{1,160}$/.test(input.idempotencyKey)||typeof input.note!=='string' + ||input.note.trim().length<5||input.note.length>2000){ + fail('请提供版本、幂等标识和至少5字依据。'); + } +} +function outputEvent(event){ + const value={...event}; + delete value.ruleVersion; + delete value.adapterId; + return value; +} +function projection(store,order,rule){ + const result=previewMatch([rule],store.adapters(),order.sample); + if(!result.valid)fail('订单 '+order.id+' 无法应用当前规则:'+result.issues.join(';'),409); + const before=[outputEvent(order.event),order.ruleSnapshot?.archiveDirectory,order.ruleSnapshot?.filenameDate]; + const after=[outputEvent(result.event),rule.archiveDirectory,rule.filenameDate]; + return {result,archiveChanged:digest(before)!==digest(after)}; +} +function invalidateArchive(order){ + const history=order.archiveHistory||[]; + if(order.archive)history.push({generation:order.archiveGeneration||1,evidence:order.archive}); + order.archiveHistory=history; + order.archiveGeneration=(order.archiveGeneration||1)+1; + order.archive=null; +} +function synchronizeTasks(store,order){ + for(const task of store.all('execution-tasks').filter(task=>task.orderId===order.id)){ + task.status=order.status; + task.step=order.archive?'complete':'identify'; + task.error=null; + task.version=(task.version||0)+1; + store.put('execution-tasks',task); + } +} +function preview(store,id,input){ + validate(input); + const rule=store.get('rules',id)?.published; + if(!rule||rule.status!=='enabled'||input.version!==rule.version){ + fail('已发布规则版本已变化或未启用。',409); + } + const items=[],excluded=[]; + const candidates=store.all('orders').filter(order=>order.ruleSnapshot?.id===id||order.categoryId===rule.categoryId); + for(const order of candidates){ + if(frozen(store,order)||!['blocked','identified','preparing','archived','pending'].includes(order.status)){ + excluded.push({id:order.id,status:order.status,reason:'冻结、逾期或已终结订单不可迁移'}); + continue; + } + const proposed=projection(store,order,rule); + items.push({id:order.id,archiveChanged:proposed.archiveChanged,fromVersion:order.ruleSnapshot?.version,toVersion:rule.version}); + } + return {ruleId:id,version:rule.version,items,excluded}; +} +function apply(store,id,input,actor){ + validate(input); + return store.transaction(()=>{ + const requestId=digest([id,actor,input.idempotencyKey]); + const inputHash=digest(input); + const prior=store.get('migration-requests',requestId); + if(prior){ + if(prior.inputHash!==inputHash)fail('幂等标识已用于不同迁移。',409); + return prior.result; + } + // Validate every candidate before the first mutation; the transaction also + // protects replay, archive history, task synchronization and audit as one unit. + const result=preview(store,id,input); + const rule=store.get('rules',id).published; + for(const item of result.items){ + const order=store.get('orders',item.id); + const proposed=projection(store,order,rule); + if(proposed.archiveChanged){ + invalidateArchive(order); + order.status='identified'; + } + order.event=proposed.result.event; + order.trace=proposed.result; + order.ruleSnapshot=structuredClone(rule); + order.categoryId=rule.categoryId; + order.updatedAt=store.now(); + order.error=null; + store.put('orders',order); + synchronizeTasks(store,order); + } + store.put('migration-requests',{id:requestId,inputHash,result,at:store.now()}); + store.audit(actor,'批量应用已发布规则',id+':'+input.note.trim()); + return result; + }); +} +module.exports={preview,apply,frozen,validate,digest,invalidateArchive}; diff --git a/src/modules/order-rules/store.cjs b/src/modules/order-rules/store.cjs index 9c86148..8bb22ba 100644 --- a/src/modules/order-rules/store.cjs +++ b/src/modules/order-rules/store.cjs @@ -167,14 +167,15 @@ class RuleStore{ const result=previewMatch(published,this.adapters(),order.sample),rule=published.find(r=>r.id===result.ruleId); if(!result.valid||rule?.status!=='enabled')fail(result.issues.join(';')||'对应规则尚未启用。',409); order.event=result.event;order.ruleSnapshot=copy(rule);order.categoryId=rule.categoryId;order.trace=result; - order.archiveHistory=[...(order.archiveHistory||[]),...(order.archive?[{generation:order.archiveGeneration||1,evidence:order.archive}]:[])];order.archiveGeneration=(order.archiveGeneration||1)+1;order.archive=null;order.status=this.providersReady()?'identified':'blocked'; + require('./migrations.cjs').invalidateArchive(order);order.status=this.providersReady()?'identified':'blocked'; order.error=order.status==='blocked'?'待办接入、PDF 导出和自动归档待联调。':null;order.updatedAt=this.now(); this.put('orders',order);this.audit(actor,'应用当前规则重新识别',id+':'+input.note.trim());return order; });} discoveryBlockers(cutoff,allowed=()=>true){ if(!this.executionSources)return []; const blockers=[]; - for(const hint of this.all('execution-discoveries'))if(hint.status==='pending'&&allowed(hint.connectionId))blockers.push('连接 '+hint.connectionId+' 完整对账线索尚未处理。'); + const pendingSources=new Set([...this.all('execution-discoveries'),...this.all('execution-discovery-runs')].filter(hint=>hint.status==='pending'&&allowed(hint.connectionId)).map(hint=>hint.connectionId)); + for(const id of pendingSources)blockers.push('连接 '+id+' 完整对账线索尚未处理。'); if(this.activeDiscoveries>0)blockers.push('待办扫描尚未完成,不能冻结或发送不完整类别。'); const window=cutoff?windowForCutoff(cutoff,this.schedule(),this.calendar()):null; const relevant=this.all('execution-tasks').filter(t=>!window||inWindow(t.row?.receivedAt,window)); @@ -193,7 +194,28 @@ class RuleStore{ batchIncomplete(batch){ return this.all('execution-tasks').some(task=>batch.orderIds.includes(task.orderId)&&(task.conflict||task.runtimeCheck?.status==='blocked'||['failed','unknown','capturing','archiving'].includes(task.status))); } - recordIssue(id,input){const old=this.get('business-issues',id);const orderIds=input.orderIds||[];const owners=[...new Set(this.all('execution-tasks').filter(t=>orderIds.includes(t.orderId)).map(t=>t.owner).concat(orderIds.map(id=>this.get('orders',id)).filter(Boolean).map(o=>this.ownerForConnection?.(o.sample?.connectionId))).filter(Boolean))];return this.put('business-issues',{...old,...input,id,status:old?.status==='resolved'?'awaiting_verification':old?.status||'open',owners,ownerStatus:owners.length?'assigned':'unassigned',verification:'核对订单归档、冻结批次和邮件服务器记录后人工处理。',createdAt:old?.createdAt||this.now(),updatedAt:this.now()});} + issueOwners(input){ + const orderIds=input.orderIds||[]; + const taskIds=input.taskIds||[]; + const taskOwners=this.all('execution-tasks') + .filter(task=>orderIds.includes(task.orderId)||taskIds.includes(task.id)) + .map(task=>task.owner); + const sourceOwners=orderIds.map(id=>this.get('orders',id)).filter(Boolean) + .map(order=>this.ownerForConnection?.(order.sample?.connectionId)); + return [...new Set([...taskOwners,...sourceOwners].filter(Boolean))]; + } + recordIssue(id,input){ + const old=this.get('business-issues',id); + const owners=this.issueOwners(input); + const status=old?.status==='resolved'?'awaiting_verification':old?.status||'open'; + return this.put('business-issues',{ + ...old,...input,id,status,owners, + ownerStatus:owners.length?'assigned':'unassigned', + verification:'核对订单归档、冻结批次和邮件服务器记录后人工处理。', + createdAt:old?.createdAt||this.now(), + updatedAt:this.now(), + }); + } prepare(cutoff,actor,requestedWindow){return this.transaction(()=>{ if(!validDate(cutoff))fail('请选择包含时区的有效发送截止时间。'); const window=windowForCutoff(cutoff,this.schedule(),this.calendar()); diff --git a/tests/order-rules/execution.test.cjs b/tests/order-rules/execution.test.cjs index c03f2f7..1df71b5 100644 --- a/tests/order-rules/execution.test.cjs +++ b/tests/order-rules/execution.test.cjs @@ -222,3 +222,6 @@ test('published migration is atomic versioned idempotent and preserves distribut test('revision resolution preserves identity, suppresses ignored repeat, blocks frozen orders',async t=>{const f=fixture(t);await configure(f);await f.execution.scan({connectionId:'c1',idempotencyKey:'archive'},principal);f.row.title='changed revision content';await f.execution.scan({connectionId:'c1',idempotencyKey:'conflict'},principal);let task=f.store.all('execution-tasks')[0];assert.equal(task.conflict,true);await f.execution.resolve(task.id,{version:task.version,idempotencyKey:'ignore1',resolution:'ignore',note:'人工比对确认忽略变化'},principal);await f.execution.scan({connectionId:'c1',idempotencyKey:'repeat'},principal);task=f.store.get('execution-tasks',task.id);assert.equal(task.conflict,false);const o=f.store.get('orders',task.orderId);o.status='unknown';f.store.put('orders',o);task.conflict=true;task.conflictRow={...task.row,title:'another'};f.store.put('execution-tasks',task);await assert.rejects(f.execution.resolve(task.id,{version:task.version,idempotencyKey:'adopt1',resolution:'adopt',note:'人工确认采用新修订'},principal),{status:409});}); test('a new BPM revision is held against the prior identity and cannot bypass a frozen batch',async t=>{const f=fixture(t);await configure(f);await f.execution.scan({connectionId:'c1',idempotencyKey:'archive-old'},principal);const batch=f.store.prepare('2026-10-19T03:00:00Z','admin')[0];f.row.revision='2';await f.execution.scan({connectionId:'c1',idempotencyKey:'revision2'},principal);const task=f.store.all('execution-tasks').find(t=>t.row.revision==='2');assert.equal(task.conflict,true);assert.equal(f.counts().exports,1);await assert.rejects(f.execution.resolve(task.id,{version:task.version,idempotencyKey:'adopt',resolution:'adopt',note:'核对新修订仍不能重发'},principal),{status:409});assert.equal(f.store.get('batches',batch.id).status,'prepared');}); test('adopting a new unfrozen revision preserves original evidence and requires fresh archive',async t=>{const f=fixture(t);await configure(f);await f.execution.scan({connectionId:'c1',idempotencyKey:'original'},principal);const original=f.store.all('orders')[0];f.row.revision='2';await f.execution.scan({connectionId:'c1',idempotencyKey:'changed'},principal);const task=f.store.all('execution-tasks').find(t=>t.row.revision==='2');await f.execution.resolve(task.id,{version:task.version,idempotencyKey:'adopt2',resolution:'adopt',note:'人工确认新版业务修订'},principal);await f.execution.scan({connectionId:'c1',idempotencyKey:'process-new'},principal);const order=f.store.get('orders',original.id);assert.equal(order.sample.revision,'2');assert.equal(order.archiveHistory.length,1);assert.equal(f.counts().exports,2);assert.equal(f.store.all('execution-tasks').find(t=>t.row.revision==='1').status,'ignored');assert.equal(f.store.get('execution-tasks',task.id).conflict,false);}); +test('R2 post-allowance trusted hints retain late and missed work but exclude preactivation history',async t=>{const f=fixture(t);await configure(f);await f.execution.scan({connectionId:'c1',idempotencyKey:'frozen-ready'},principal);const batch=f.store.prepare('2026-10-19T03:00:00Z','admin')[0],before=f.counts();f.store.put('settings',{...f.store.get('settings','main'),processingEnabled:true,processingSince:'2026-10-19T00:00:00Z'});f.execution.systemPrincipal=principal;f.execution.clock=f.store.clock=()=>new Date('2026-10-19T03:01:30Z');await f.execution.notifyDiscovery({connectionId:'c1',runId:'late90',rows:[{...f.row,taskId:'late90',receivedAt:'2026-10-19T02:59:00Z'},{...f.row,taskId:'old',receivedAt:'2026-10-18T02:00:00Z'}],startedAt:f.execution.now(),finishedAt:f.execution.now()});await f.execution.background();const late=f.store.all('execution-tasks').find(t=>t.row.taskId==='late90');assert.ok(late);assert.equal(late.status,'blocked');assert.equal(late.blockedByBatchId,batch.id);assert.equal(late.missedWindow.end,'2026-10-19T03:00:00.000Z');assert.equal(f.store.all('execution-tasks').some(t=>t.row.taskId==='old'),false);assert.deepEqual(f.counts(),before);f.execution.clock=f.store.clock=()=>new Date('2026-10-20T03:01:30Z');await f.execution.notifyDiscovery({connectionId:'c1',runId:'missed-next-day',rows:[{...f.row,taskId:'missed',receivedAt:'2026-10-19T08:00:00Z'}],startedAt:f.execution.now(),finishedAt:f.execution.now()});await f.execution.background();const missed=f.store.all('execution-tasks').find(t=>t.row.taskId==='missed');assert.equal(missed.status,'blocked');assert.equal(missed.missedWindow.end,'2026-10-19T09:00:00.000Z');assert.ok(f.store.all('business-issues').some(i=>i.taskId===missed.id&&i.owners.includes('admin')));assert.ok(require('../../src/modules/order-rules/access.cjs').publicSnapshot(f.store,f.execution.workspace,{username:'admin',role:'operator'}).issues.some(i=>i.taskId===missed.id));assert.deepEqual(f.counts(),before);}); +test('R3 non-five-minute cutoff forces distinct post-cutoff fallback',async t=>{const f=fixture(t);let now=new Date('2026-10-19T03:01:00Z'),scans=0;f.execution.clock=f.store.clock=()=>now;f.store.schedule=()=>({times:['11:02','17:02'],weekends:false});f.execution.systemPrincipal=principal;f.store.put('settings',{...f.store.get('settings','main'),processingEnabled:true,processingSince:'2026-10-19T00:00:00Z'});f.provider.scan=async()=>{scans++;return [];};await f.execution.background();now=new Date('2026-10-19T03:02:00Z');await f.execution.background();assert.equal(scans,2);assert.equal(f.store.get('execution-scans','c1').startedAt,now.toISOString());assert.deepEqual(f.store.discoveryBlockers(now.toISOString()),[]);}); +test('pending discovery runs retain an event missing from the next complete list',async t=>{const f=fixture(t);await configure(f);f.execution.systemPrincipal=principal;const row={...f.row,taskId:'transient',instanceId:'transient'};await f.execution.notifyDiscovery({connectionId:'c1',runId:'first-pending',rows:[row],startedAt:'2026-10-19T03:00:00Z',finishedAt:'2026-10-19T03:00:01Z'});await f.execution.notifyDiscovery({connectionId:'c1',runId:'next-empty',rows:[],startedAt:'2026-10-19T03:00:02Z',finishedAt:'2026-10-19T03:00:03Z'});await f.execution.background();assert.equal(f.store.all('execution-tasks').some(t=>t.row.taskId==='transient'),false);f.store.put('settings',{...f.store.get('settings','main'),processingEnabled:true,processingSince:'2026-10-19T00:00:00Z'});f.execution=new OrderExecutionCoordinator({...f.execution,systemPrincipal:principal});f.provider.capture=async()=>{throw Error('已离开授权节点,需核对历史证据');};await f.execution.background();const task=f.store.all('execution-tasks').find(t=>t.row.taskId==='transient');assert.ok(task);assert.equal(task.status,'failed');assert.match(task.error,/已离开授权节点/);assert.equal(f.store.get('execution-scans','c1').rowCount,0);assert.equal(f.store.all('execution-discovery-runs').filter(r=>r.status==='pending').length,0);}); diff --git a/tests/order-rules/global-core.test.cjs b/tests/order-rules/global-core.test.cjs index 6041918..ebaf58a 100644 --- a/tests/order-rules/global-core.test.cjs +++ b/tests/order-rules/global-core.test.cjs @@ -8,3 +8,4 @@ test('F02 corrected archive generation never reuses an old destination receipt', test('fifteen legally frozen categories finish through slow SMTP within 30 minute queue',async()=>{const {OrderRuleDispatcher}=require('../../src/modules/order-rules/dispatcher.cjs');let now=new Date('2026-10-21T02:59:59Z');const cutoff='2026-10-21T03:00:00.000Z',window=windowForCutoff(cutoff,{times:['11:00','17:00'],weekends:false});const batches=Array.from({length:15},(_,i)=>({id:'b'+i,status:'prepared',cutoff,window,createdAt:cutoff,to:['x@example.test'],cc:[],attachments:[],orderIds:[]}));let sends=0;const store={settings:()=>({enabled:true,channelId:'c'}),snapshot:()=>({capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true},batches}),discoveryBlockers:()=>[],batchIncomplete:()=>false,prepare:()=>[],beginSending:id=>{batches.find(b=>b.id===id).status='sending';},finishSending:(id,status)=>{batches.find(b=>b.id===id).status=status;}};const mail={exclusive:async(_,f)=>f(),store:{channelSecret:()=>({id:'c',version:1,email:'s@example.test',smtp:{}}),guard:()=>{}},smtpFactory:()=>({verify:async()=>{},sendMail:async()=>{sends++;now=new Date(+now+6000);return {accepted:['x@example.test']};},close:()=>{}})};const d=new OrderRuleDispatcher({store,mail,clock:()=>now,settings:()=>({schedule:{times:['11:00','17:00'],weekends:false}}),providersReady:()=>true});await d.tick(now);now=new Date(cutoff);await d.tick(now);assert.equal(sends,15);assert.equal(batches.every(b=>b.status==='sent'),true);}); test('blocked collection retries within 60 seconds but never creates a late batch',async()=>{const {OrderRuleDispatcher}=require('../../src/modules/order-rules/dispatcher.cjs');let now=new Date('2026-10-21T03:00:00Z'),prepares=0;const store={settings:()=>({enabled:true,channelId:'c'}),snapshot:()=>({capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true},batches:[]}),discoveryBlockers:()=>[],prepare:()=>{prepares++;return [];}};const d=new OrderRuleDispatcher({store,mail:{exclusive:async(_,fn)=>fn()},clock:()=>now,settings:()=>({schedule:{times:['11:00','17:00'],weekends:false}}),providersReady:()=>true});await d.tick();now=new Date(+now+30000);await d.tick();assert.equal(prepares,2);now=new Date(+now+31000);await d.tick();assert.equal(prepares,2);}); test('external rules snapshot filters foreign orders mixed batches audit and raw form evidence',async()=>{const {orderRuleApi}=require('../../src/modules/order-rules/api.cjs');const owned={id:'own',sample:{connectionId:'a',fields:{private:'secret-owned'}},event:{orderNo:'OWN'}},foreign={id:'foreign',sample:{connectionId:'b',fields:{private:'secret-other'}},event:{orderNo:'FOREIGN'}};const orders=[owned,foreign],batches=[{id:'mixed',orderIds:['own','foreign'],text:'private frozen body'},{id:'owned',orderIds:['own']}];let output;await orderRuleApi({orderRules:{snapshot:()=>({orders,batches,audit:[{detail:'foreign evidence'}]}),get:(_,id)=>orders.find(o=>o.id===id)},workspace:{recordSources:()=>[{id:'a',owner:'alice'},{id:'b',owner:'bob'}]},user:{username:'alice',role:'operator'},route:'/api/order-rules',method:'GET',reply:(_,value)=>{output=value;}});assert.deepEqual(output.orders.map(o=>o.id),['own']);assert.deepEqual(output.batches.map(b=>b.id),['owned']);assert.deepEqual(output.audit,[]);assert.doesNotMatch(JSON.stringify(output),/secret-|FOREIGN|private frozen/);}); +test('R1 empty and completed slots advance to afternoon and next day',async()=>{const {OrderRuleDispatcher}=require('../../src/modules/order-rules/dispatcher.cjs');for(const completed of [false,true]){let now,prepared=[];const store={settings:()=>({enabled:true,channelId:'c'}),snapshot:()=>({capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true},batches:completed?[{status:'sent',cutoff:'2026-10-21T03:00:00Z'}]:[]}),discoveryBlockers:()=>[],prepare:cutoff=>{prepared.push(cutoff);return [];}};const d=new OrderRuleDispatcher({store,mail:{exclusive:async(_,fn)=>fn()},clock:()=>now,settings:()=>({schedule:{times:['11:00','17:00'],weekends:false}}),providersReady:()=>true});for(const time of ['2026-10-21T02:59:59Z','2026-10-21T03:00:00Z','2026-10-21T03:01:30Z','2026-10-21T09:00:00Z','2026-10-22T03:00:00Z']){now=new Date(time);await d.tick();}assert.deepEqual(prepared,['2026-10-21T03:00:00.000Z','2026-10-21T09:00:00.000Z','2026-10-22T03:00:00.000Z']);}});