diff --git a/docs/ui-performance-2026-10-28.md b/docs/ui-performance-2026-10-28.md new file mode 100644 index 0000000..62a971a --- /dev/null +++ b/docs/ui-performance-2026-10-28.md @@ -0,0 +1,56 @@ +# 全站加载与后台刷新优化 + +本轮在 `codex/system-update` 继续处理现有页面的加载、切换和后台更新,不调整订单匹配、收件人、发送窗口、冻结/未知结果保护或受限测试期限。测量基线为上一轮规则优化后的 `649a0df`;使用隔离 HTTP、合成账号、内存 SQLite/AES-GCM 与本地文件,不调用真实 BPM、SMTP、IMAP、SMB 或更新仓库,不更新运行服务。 + +## 页面覆盖 + +| 界面 | 本轮改动 | +| --- | --- | +| 全站与登录 | 公共 HTML/JS/CSS/WASM 支持 ETag 重新验证、Brotli/gzip、受限内存缓存;保留安全响应头。已登录启动跳过 bootstrap,登录页只读取一次。登录验证改为异步 scrypt,参数不变,4 个执行位、32 个等待位;账号版本在异步验证及会话发放前再次核验。 | +| 全站顶栏 | 所有页面统一读取轻量通知状态,不再为顶栏计算订单/批次摘要。能力未齐时显示“自动通知待核验”;具体业务阻塞仍在首页/通知总览展示。 | +| 首页、通知总览 | 首次及每周期只读一次业务摘要;后台检查仅提示有更新,保留当前显示。隐藏时暂停,重新可见时检查。 | +| 订单中心、邮件批次、发送记录 | 每次同步查询内复用读取结果,建立任务身份多值索引、订单及收集批次反向索引;已发送/禁用/冻结模式先排除,再检查资格。普通与惠州模式分别判断。列表后台检查暂停/恢复,不覆盖筛选草稿或详情。 | +| PDF 台账、到达历史 | 共用列表轮询的可见性、取消、串行检查和页面离开清理。 | +| 分类规则、发送设置、模板 | 保留上一轮局部保存及按需样本;发送设置只取设置与测试状态,列表类别及模板使用情况取轻目录,独立邮箱/目录读取并行。 | +| 字段映射 | 流程节点目录和连接列表并行读取;延续搜索、保存和离开保护。 | +| BPM 连接、远程登录 | 状态及登录画面在隐藏时停止轮询,可见时恢复;扫描后读取新状态,避免复用扫描前请求。 | +| 系统健康 | 直接读取持久任务进度及已有能力,避免构造完整执行/字段证据快照;保留按连接负责人过滤和观测时间语义。页面轮询在离开时清理。 | +| 助手 | 对话更新使用可见性轮询,禁止同一轮询重叠,保留输入和账号/对话代际检查。 | +| 邮箱历史 | 最多 50 个 UID 一次 FETCH,保持降序、文件夹锁、UIDVALIDITY、消失邮件及分段协议响应处理;单封正文仍按需读取。 | +| 存储与文件预览 | 下载及 PDF 预览 Range 下推到同一验证过的文件句柄,IPC 只返回所需字节;检查头部、大小、路径身份和读前后变化。Office/图片仍完整验证,再返回所需片段;文本范围按解码后的 UTF-8 字节计算。 | +| 日历、异常、账号、计划、操作记录等 | 共用静态资源、轻顶栏、请求合并和生命周期改进;原编辑操作及权限保持。 | + +## 一致性与刷新约束 + +GET 仅合并同账号、同页面代际和生命周期内尚未完成的相同请求,不缓存业务响应。调用方各自拥有取消信号和独立结果对象,取消一个调用方不会误取消其他调用方。写入前后清除可合并入口;手动刷新及扫描后的刷新取消旧检查,重新读取。旧导航的 401 不会清除新会话。 + +服务端只读上下文只活在一次同步调用内,禁止写入,并在公开返回边界复制结果;异步归档读取前后分别创建上下文。移除依赖单连接 `total_changes()` 的跨请求记录缓存,避免漏掉其他连接的更新。旧记录没有 portalSource 时仍视为命名空间重叠,多条匹配仍拒绝自动合并。没有跨请求缓存资格、权限或测试期限。 + +后台调度仍执行必要的到期处理;普通通知完成后独立惠州通知仍可进入原检查。只在进入昂贵身份读取前排除确实不能到期的历史状态,不缓存写事务内的业务读取。 + +公共资产缓存与业务数据分开:API、Cookie、订单文件继续 `no-store`;HTML 和无指纹资源使用 `max-age=0, must-revalidate`,安装文件变化后重新发送。预览壳的隔离 CSP 保留。更新检查只合并正在进行的请求,下次手动检查仍访问上游。 + +## 隔离测量 + +每项取 3 次中位数。同一查询夹具、固定时钟的 18 个前后比较,完整 JSON 的 SHA-256 及字节数全部一致;健康与邮件列表比较也保持完整输出一致。 + +| 工作负载 | 修改前 | 修改后 | +| --- | ---: | ---: | +| 300 条已发送历史,订单列表 | 7937 ms | 32 ms | +| 300 条待处理订单,订单列表 | 7824 ms | 69 ms | +| 300 条待处理订单,批次列表 | 12124 ms | 48 ms | +| 300 条待处理订单,业务摘要 | 9293 ms | 41 ms | +| 健康:300 任务及每份 100 KiB 样本 | 226 ms | 35 ms | +| 暂停调度:300 条历史,含到期处理 | 4272 ms | 15 ms | +| 50 封邮件,模拟每条协议命令延时 | 52 命令 / 1627 ms | 3 命令 / 94 ms | +| 8 个同时更新检查 | 8 个上游请求 | 1 个上游请求 | +| 16 MiB 文件,下载请求 64 KiB | 实读 16 MiB | 实读 64 KiB | +| 同上 PDF 预览 | 实读 16 MiB | 实读 64 KiB + 5 字节头部 | + +查询耗时是同步函数时间;IMAP 使用模拟延迟,文件使用本地磁盘。上述数据不等同真实订单全流程、办公网络、实际邮箱或 SMB 的 SLA。 + +## 保留的后续空间 + +订单和任务仍在一次请求中整体读取一次,尚未引入数据库摘要投影;健康仍线性读取任务。页面仍载入现有脚本集合,尚未进行路由代码拆包。Office/图片因完整校验仍读取全文件。当前隔离 PDF 查看器仍由父页面传入完整 Blob,尚未改为渐进加载;Range 收益适用于实际发出 Range 的客户端,不能描述成当前查看器首屏已经只下载 64 KiB。PDF 浏览器池、渐进预览、异步 Git/修复执行器及数据库进程隔离需要独立的取消、崩溃和恢复设计。当前密码修改/创建账号的低频哈希仍是同步路径,普通登录已经移出主线程。 + +原始收据与抛弃式入口保存在忽略目录 `output/query-read-performance/` 和 `output/performance-refresh-20261028/`;不提交数据库副本、账号凭据、Cookie、密钥或真实订单内容。 diff --git a/package.json b/package.json index 05fc72d..a85bc2e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "service:stop": "node scripts/service.cjs stop", "service:restart": "node scripts/service.cjs restart", "test": "npm run test:business", - "test:business": "node --test --test-concurrency=1 tests/app/business-home-ui.test.cjs tests/order-rules/home-summary.test.cjs tests/order-rules/carry-forward-core.test.cjs tests/order-rules/carry-forward-integration.test.cjs tests/order-rules/dispatch-unsent-proof.test.cjs tests/order-rules/dismiss-task.test.cjs tests/app/carry-dismiss-ui.test.cjs tests/workspace/business-issues.test.cjs tests/mail/unified-account.test.cjs tests/mail/unified-account-ui.test.cjs tests/assistant/assistant.test.cjs tests/assistant/assistant-http-ui.test.cjs tests/assistant/controlled-operations.test.cjs tests/assistant/dsh-runtime.test.cjs tests/assistant/dsh-runtime-installer.test.cjs tests/assistant/repair-runner.test.cjs tests/app/automatic-pdf-ledger.test.cjs tests/app/job-records.test.cjs tests/order-rules/version-compatibility.test.cjs tests/bpm-display-policy.test.cjs tests/bpm-dynamicarea.test.cjs tests/bpm-readonly-form.test.cjs tests/bpm-form-contracts.test.cjs tests/bpm-obsolete-display-fields.test.cjs tests/order-rules/snapshot-read-context.test.cjs tests/order-rules/summary.test.cjs tests/order-rules/execution-single-flight.test.cjs tests/order-rules/execution-responsiveness.test.cjs tests/order-rules/readiness-pending-ui.test.cjs tests/dependency-compatibility.test.cjs tests/order-rules/slow-cutoff.test.cjs tests/order-rules/removed-discovery-barrier.test.cjs tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs tests/system-update/checker.test.cjs tests/system-update/system-update.test.cjs tests/order-rules/configuration.test.cjs tests/order-rules/configuration-ui.test.cjs tests/order-rules/workbench-ui.test.cjs", + "test:business": "node --test --test-concurrency=1 tests/app/business-home-ui.test.cjs tests/order-rules/home-summary.test.cjs tests/order-rules/carry-forward-core.test.cjs tests/order-rules/carry-forward-integration.test.cjs tests/order-rules/dispatch-unsent-proof.test.cjs tests/order-rules/dismiss-task.test.cjs tests/app/carry-dismiss-ui.test.cjs tests/workspace/business-issues.test.cjs tests/mail/unified-account.test.cjs tests/mail/unified-account-ui.test.cjs tests/assistant/assistant.test.cjs tests/assistant/assistant-http-ui.test.cjs tests/assistant/controlled-operations.test.cjs tests/assistant/dsh-runtime.test.cjs tests/assistant/dsh-runtime-installer.test.cjs tests/assistant/repair-runner.test.cjs tests/app/automatic-pdf-ledger.test.cjs tests/app/job-records.test.cjs tests/order-rules/version-compatibility.test.cjs tests/bpm-display-policy.test.cjs tests/bpm-dynamicarea.test.cjs tests/bpm-readonly-form.test.cjs tests/bpm-form-contracts.test.cjs tests/bpm-obsolete-display-fields.test.cjs tests/order-rules/snapshot-read-context.test.cjs tests/order-rules/summary.test.cjs tests/order-rules/execution-single-flight.test.cjs tests/order-rules/execution-responsiveness.test.cjs tests/order-rules/readiness-pending-ui.test.cjs tests/dependency-compatibility.test.cjs tests/order-rules/slow-cutoff.test.cjs tests/order-rules/removed-discovery-barrier.test.cjs tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs tests/system-update/checker.test.cjs tests/system-update/system-update.test.cjs tests/order-rules/configuration.test.cjs tests/order-rules/configuration-ui.test.cjs tests/order-rules/workbench-ui.test.cjs tests/app/asset-delivery.test.cjs tests/app/authentication-responsiveness.test.cjs tests/app/backend-refresh-performance.test.cjs tests/app/read-refresh-performance.test.cjs tests/app/polling-performance-ui.test.cjs tests/order-rules/query-read-performance.test.cjs tests/mail/history.test.cjs tests/storage/storage-range.test.cjs", "test:full": "node --test --test-concurrency=2 \"tests/**/*.test.cjs\"" }, "engines": { diff --git a/src/app/asset-delivery.cjs b/src/app/asset-delivery.cjs new file mode 100644 index 0000000..ed70946 --- /dev/null +++ b/src/app/asset-delivery.cjs @@ -0,0 +1,44 @@ +'use strict'; +const fs=require('node:fs/promises'),crypto=require('node:crypto'),zlib=require('node:zlib'),{promisify}=require('node:util'); +const brotli=promisify(zlib.brotliCompress),gzip=promisify(zlib.gzip); +function encodingFor(header=''){ + const weights=new Map(String(header).toLowerCase().split(',').map(value=>{const [name,...options]=value.trim().split(';');const q=options.find(item=>item.trim().startsWith('q='));return [name,q?Number(q.trim().slice(2)):1];})); + const weight=name=>{const value=weights.get(name)??(name==='identity'?(weights.get('*')===0?0:1):weights.get('*')??0);return Number.isFinite(value)&&value>=0&&value<=1?value:0;}; + const choices=['br','gzip'].map(name=>({name,q:weight(name)})).filter(item=>item.q>0).sort((a,b)=>b.q-a.q); + if(weights.has('identity')&&weight('identity')>(choices[0]?.q||0))return 'identity'; + return choices[0]?.name||(weight('identity')>0?'identity':null); +} +// Only public assets from createAssets enter this bounded cache; APIs and managed +// files retain no-store. Stat validation allows an edited installation to update. +function createAssetDelivery({maxBytes=32*1024*1024}={}){ + const cache=new Map(),pending=new Map();let size=0; + async function load(asset){ + const stat=await fs.stat(asset.path),version=[stat.size,stat.mtimeMs,stat.ctimeMs].join(':'),saved=cache.get(asset.path); + if(saved?.version===version){cache.delete(asset.path);cache.set(asset.path,saved);return saved;} + const key=asset.path+':'+version;if(pending.has(key))return pending.get(key); + const work=(async()=>{ + const bytes=await fs.readFile(asset.path),value={version,bytes,etag:'W/"'+crypto.createHash('sha256').update(bytes).digest('hex')+'"',encodings:new Map()}; + if(bytes.length<=maxBytes/2){const current=cache.get(asset.path);if(current){size-=current.size;cache.delete(asset.path);}value.size=bytes.length;cache.set(asset.path,value);size+=value.size;trim();} + return value; + })();pending.set(key,work);try{return await work;}finally{pending.delete(key);} + } + function trim(){while(size>maxBytes&&cache.size){const [key,value]=cache.entries().next().value;size-=value.size;cache.delete(key);}} + async function compressed(asset,value,encoding){ + if(!value.encodings.has(encoding))value.encodings.set(encoding,(async()=>{ + const bytes=encoding==='br'?await brotli(value.bytes,{params:{[zlib.constants.BROTLI_PARAM_QUALITY]:4}}):await gzip(value.bytes); + if(cache.get(asset.path)===value){value.size+=bytes.length;size+=bytes.length;trim();}return bytes; + })().catch(error=>{value.encodings.delete(encoding);throw error;})); + return value.encodings.get(encoding); + } + return async function deliver(request,response,asset){ + const value=await load(asset),encoding=encodingFor(request.headers['accept-encoding']); + response.setHeader('Cache-Control','public, max-age=0, must-revalidate');response.setHeader('ETag',value.etag);response.setHeader('Vary','Accept-Encoding'); + if(!encoding){response.writeHead(406);response.end();return;} + const tags=String(request.headers['if-none-match']||'').split(',').map(tag=>tag.trim().replace(/^W\//,'')); + if(tags.includes('*')||tags.includes(value.etag.replace(/^W\//,''))){response.writeHead(304);response.end();return;} + const bytes=encoding==='identity'?value.bytes:await compressed(asset,value,encoding); + if(encoding!=='identity')response.setHeader('Content-Encoding',encoding); + response.writeHead(200,{'Content-Type':asset.type+(asset.binary?'':'; charset=utf-8'),'Content-Length':bytes.length});response.end(request.method==='HEAD'?undefined:bytes); + }; +} +module.exports={createAssetDelivery}; diff --git a/src/app/dashboard.cjs b/src/app/dashboard.cjs index 0cc34c6..c222bea 100644 --- a/src/app/dashboard.cjs +++ b/src/app/dashboard.cjs @@ -1,4 +1,4 @@ -const http=require('node:http');const fs=require('node:fs'); +const http=require('node:http'); const {dashboardApi}=require('../modules/dashboard/api.cjs'); const {workspaceApi}=require('../modules/workspace/api.cjs'); const {bpmApi}=require('../modules/bpm/api.cjs'); @@ -13,6 +13,7 @@ const {orderExecutionApi}=require('../modules/order-execution/api.cjs'); const {assistantApi}=require('../modules/assistant/api.cjs'); const {respondToPing}=require('../platform/service/ping.cjs'); const {createAssets,PREVIEW_CSP}=require('./assets.cjs'); +const {createAssetDelivery}=require('./asset-delivery.cjs'); const {createAuth}=require('../modules/dashboard/auth.cjs'); const {prepareRequest,readBody}=require('./request.cjs'); const {BpmConnectionLifecycle}=require('../modules/bpm/connection-lifecycle.cjs'); @@ -21,6 +22,7 @@ function createDashboard({store,outputDir,workspace,bpmSessions,bpmMonitor,mail, const bpmLifecycle=workspace?new BpmConnectionLifecycle({workspace,manager:bpmSessions,monitor:bpmMonitor}):null; const auth=createAuth({store,workspace,bpmSessions,bpmMonitor,bpmLifecycle}); let assetFor;try{assetFor=createAssets();}catch(error){auth.close();throw error;} + const deliverAsset=createAssetDelivery(); const server=http.createServer(async(request,response)=>{ if(respondToPing(request,response,watchdog))return; const {encryptedTransport,reply,fail}=prepareRequest(request,response,trustedProxy); @@ -28,10 +30,9 @@ function createDashboard({store,outputDir,workspace,bpmSessions,bpmMonitor,mail, const url=new URL(request.url,'http://localhost');const route=url.pathname; const asset=assetFor(route); if(/^\/vendor\/(embedpdf|photoswipe|docx|jszip|exceljs)\//.test(route)&&!asset)fail(404,'资源不存在。'); - if(request.method==='GET' && asset) { - let bytes;try{bytes=await fs.promises.readFile(asset.path);}catch(error){if(error.code==='ENOENT')fail(404,'资源不存在。');throw error;} + if(['GET','HEAD'].includes(request.method) && asset) { if(asset.preview){response.setHeader('Content-Security-Policy',PREVIEW_CSP);response.setHeader('Access-Control-Allow-Origin','*');} - response.writeHead(200,{'Content-Type':asset.type+(asset.binary?'':'; charset=utf-8')});response.end(bytes);return; + try{await deliverAsset(request,response,asset);}catch(error){if(error.code==='ENOENT')fail(404,'资源不存在。');throw error;}return; } const body=await readBody(request,fail); const authResult=await auth.authenticate({request,response,route,body,reply,fail,encryptedTransport}); diff --git a/src/modules/dashboard/auth.cjs b/src/modules/dashboard/auth.cjs index 3ffafd9..7813f50 100644 --- a/src/modules/dashboard/auth.cjs +++ b/src/modules/dashboard/auth.cjs @@ -3,7 +3,7 @@ const {SessionStore,SESSION_MS}=require('./sessions.cjs'); const {isLoopback}=require('../../app/request.cjs'); const {validateChange}=require('./passwords.cjs'); function createAuth({store,workspace,bpmSessions,bpmMonitor,bpmLifecycle}){ - const sessions=new SessionStore(path.dirname(store.file));const failures=new Map(),passwordFailures=new Map(); + const sessions=new SessionStore(path.dirname(store.file));const failures=new Map(),passwordFailures=new Map(),pendingLogins=new Map(); const cleanup=require('./pending-cleanup.cjs').accessCleanup({store,workspace,bpmSessions,bpmMonitor,bpmLifecycle,sessions}); const sessionCookieName='order_session'; const sessionCookiePattern=new RegExp('(?:^|;\\s*)'+sessionCookieName+'=([a-f0-9]{64})(?:;|$)'); @@ -24,8 +24,12 @@ const handled=(...args)=>{reply(...args);return {handled:true};}; if(route==='/api/login' && request.method==='POST') { const address=request.socket.remoteAddress;const now=Date.now(); for(const [key,value] of failures)if(now-value.since>900000)failures.delete(key); - if(failures.get(address)?.count>=10)fail(429,'登录失败次数过多,请 15 分钟后重试。'); - const user=store.authenticate(body.username,body.password); + if((failures.get(address)?.count||0)+(pendingLogins.get(address)||0)>=10)fail(429,'登录失败次数过多,请 15 分钟后重试。'); + const candidate=typeof body.username==='string'?store.users().find(member=>member.username.toLowerCase()===body.username.toLowerCase()):null; + const passwordVersion=candidate?store.passwordVersion(candidate.id):null; + pendingLogins.set(address,(pendingLogins.get(address)||0)+1); + let user;try{user=await store.authenticateAsync(body.username,body.password);}finally{const pending=(pendingLogins.get(address)||1)-1;if(pending)pendingLogins.set(address,pending);else pendingLogins.delete(address);} + if(user&&(!candidate||user.id!==candidate.id||store.passwordVersion(user.id)!==passwordVersion||store.user(user.id)?.enabled===false))user=null; if(!user){if(failures.size>1000)failures.clear();const previous=failures.get(address);failures.set(address,{since:previous?.since || now,count:(previous?.count || 0)+1});fail(401,'账号或密码不正确。');} failures.delete(address);return handled(200,{user:signIn(user)}); } diff --git a/src/modules/dashboard/passwords.cjs b/src/modules/dashboard/passwords.cjs index fdd1451..36a513c 100644 --- a/src/modules/dashboard/passwords.cjs +++ b/src/modules/dashboard/passwords.cjs @@ -1,5 +1,14 @@ 'use strict'; const crypto=require('node:crypto'); +const {promisify}=require('node:util'); +const scrypt=promisify(crypto.scrypt),passwordQueue=[];let active=0; +function schedulePassword(work){ + if(active>=4&&passwordQueue.length>=32)return Promise.reject(Object.assign(Error('登录验证繁忙,请稍后重试。'),{status:429})); + return new Promise((resolve,reject)=>{ + const start=()=>{active++;Promise.resolve().then(work).then(resolve,reject).finally(()=>{active--;passwordQueue.shift()?.();});}; + if(active<4)start();else passwordQueue.push(start); + }); +} const fail=message=>{throw Object.assign(new Error(message),{status:400});}; function validatePassword(password){if(typeof password!=='string'||password.length<12||password.length>128)fail('密码长度需为 12–128 位。');} function hashPassword(password){validatePassword(password);const salt=crypto.randomBytes(16).toString('hex');return salt+':'+crypto.scryptSync(password,salt,32).toString('hex');} @@ -9,10 +18,15 @@ function matchesPassword(password,encoded){ const actual=crypto.scryptSync(password,salt,32),expected=Buffer.from(hash||'','hex'); return expected.length===actual.length&&crypto.timingSafeEqual(actual,expected); } +async function matchesPasswordAsync(password,encoded){ + if(typeof password!=='string'||password.length>128)return false; + const [salt,hash]=(encoded||'00000000000000000000000000000000:'+ '0'.repeat(64)).split(':'); + return schedulePassword(async()=>{const actual=await scrypt(password,salt,32),expected=Buffer.from(hash||'','hex');return expected.length===actual.length&&crypto.timingSafeEqual(actual,expected);}); +} function validateChange(body){ if(!body||Object.keys(body).some(key=>!['currentPassword','newPassword','confirmPassword'].includes(key)))fail('密码修改内容不正确。'); if(typeof body.currentPassword!=='string'||!body.currentPassword||body.currentPassword.length>128)fail('请填写当前密码。'); validatePassword(body.newPassword); if(body.confirmPassword!==body.newPassword)fail('两次输入的新密码不一致。'); } -module.exports={validatePassword,hashPassword,matchesPassword,validateChange}; +module.exports={validatePassword,hashPassword,matchesPassword,matchesPasswordAsync,validateChange}; diff --git a/src/modules/dashboard/store.cjs b/src/modules/dashboard/store.cjs index ded1df6..c5da4b2 100644 --- a/src/modules/dashboard/store.cjs +++ b/src/modules/dashboard/store.cjs @@ -2,7 +2,7 @@ const fs=require('node:fs'); const path=require('node:path'); const crypto=require('node:crypto'); const {DatabaseSync}=require('node:sqlite'); -const {validatePassword,hashPassword,matchesPassword}=require('./passwords.cjs'); +const {validatePassword,hashPassword,matchesPassword,matchesPasswordAsync}=require('./passwords.cjs'); const {JobStore}=require('./job-store.cjs'); const copy=value=>structuredClone(value); const safeUser=({id,username,role,createdAt,enabled=true,version=1})=>({id,username,role,createdAt,enabled,version}); @@ -93,6 +93,16 @@ class Store { return safeUser(user); } passwordVersion(id){return this.data.users.find(user=>user.id===id)?.passwordVersion||0;} + async authenticateAsync(username,password){ + if(typeof username!=='string'||typeof password!=='string'||password.length>128)return null; + const prior=this.data.users.find(user=>user.username.toLowerCase()===username.toLowerCase()); + const passwordHash=prior?.passwordHash,version=prior?.passwordVersion||0; + const matches=await matchesPasswordAsync(password,passwordHash); + // Password/role changes can commit while the worker pool verifies the hash. + const current=prior&&this.data.users.find(user=>user.id===prior.id); + if(!matches||!current||current.enabled===false||current.passwordHash!==passwordHash||(current.passwordVersion||0)!==version)return null; + return safeUser(current); + } validateUserChange(id,input,actor){ if(actor?.role!=='admin')fail('仅管理员可以调整账号。',403); const target=this.user(id);if(!target)fail('账号不存在。',404); diff --git a/src/modules/health/runtime-health.cjs b/src/modules/health/runtime-health.cjs index cf6317f..e9e9462 100644 --- a/src/modules/health/runtime-health.cjs +++ b/src/modules/health/runtime-health.cjs @@ -60,7 +60,7 @@ class RuntimeHealth { return {id:c.id,name:redact(c.name||'托管邮箱'),status,checkedAt,detail:redact(c.state?.message||'尚未检查 SMTP / IMAP。'),...this.remember('mail',c.id,{successAt:status==='healthy'?checkedAt:null,failureAt:status==='error'?checkedAt:null})}; })); if(this.sources.execution)safe('execution','分类订单执行','#notification-execution',()=>{ - const data=this.sources.execution.snapshot(),names={liveTodo:'真实待办',pdfExport:'PDF 导出',automaticArchive:'归档校验'}; + const execution=this.sources.execution,data=typeof execution.healthSnapshot==='function'?execution.healthSnapshot():execution.snapshot(),names={liveTodo:'真实待办',pdfExport:'PDF 导出',automaticArchive:'归档校验'}; const items=Object.entries(names).map(([id,name])=>({id,name,global:true,status:data.capabilities?.[id]===true?'healthy':'pending',detail:data.capabilities?.[id]===true?'实际检查已通过;各类别仍需现场核验。':'尚未通过实际接入检查,请在订单通知管理的订单执行查看阻塞原因。'})); for(const task of data.tasks||[]){const status=['blocked','failed'].includes(task.status)?'error':task.status==='unknown'?'unknown':['capturing','preparing','archiving','running','sending'].includes(task.status)?'running':['archived','sent','pending'].includes(task.status)?'healthy':'pending'; items.push({id:task.id,owner:connections.find(c=>c.id===task.connectionId)?.owner,name:redact(task.processName||'订单执行任务'),status,checkedAt:timestamp(task.updatedAt),detail:redact(task.error||task.reason||task.blockedReason||'任务进度已持久保存,请在订单通知管理查看。'),...this.remember('execution',task.id,{successAt:status==='healthy'?task.updatedAt:null,failureAt:status==='error'?task.updatedAt:null})});} diff --git a/src/modules/mail/history.cjs b/src/modules/mail/history.cjs index fad3d98..4a614aa 100644 --- a/src/modules/mail/history.cjs +++ b/src/modules/mail/history.cjs @@ -25,11 +25,13 @@ async function readHistory(client,input={}){ try{ const uidValidity=String(client.mailbox.uidValidity); if(input.action==='search'){ - const found=await client.search(query,{uid:true}),uids=(found||[]).filter(Number.isSafeInteger).sort((a,b)=>b-a),messages=[]; - for(const uid of uids.slice(0,limit)){ - const info=await client.fetchOne(uid,{envelope:true,size:true},{uid:true});if(!info)continue; - messages.push({uid,subject:info.envelope?.subject||'',date:info.envelope?.date?.toISOString()||null,to:addresses(info.envelope?.to),cc:addresses(info.envelope?.cc),size:info.size}); - } + const found=await client.search(query,{uid:true}),uids=(found||[]).filter(uid=>Number.isSafeInteger(uid)&&uid>0).sort((a,b)=>b-a),selected=uids.slice(0,limit),envelopes=new Map(); + // FETCH emits mailbox sequence order; retain the selected UID order even when + // messages disappear between SEARCH and FETCH. An empty set must never mean '*'. + if(selected.length)for await(const info of client.fetch(selected.join(','),{uid:true,envelope:true,size:true},{uid:true}))if(selected.includes(info.uid))envelopes.set(info.uid,{...envelopes.get(info.uid),...info}); + const messages=selected.flatMap(uid=>{ + const info=envelopes.get(uid);return info?[{uid,subject:info.envelope?.subject||'',date:info.envelope?.date?.toISOString()||null,to:addresses(info.envelope?.to),cc:addresses(info.envelope?.cc),size:info.size}]:[]; + }); return {folder:input.folder,uidValidity,messages,truncated:uids.length>limit}; } if(!Number.isSafeInteger(input.uid)||input.uid<=0)fail('邮件标识无效。'); diff --git a/src/modules/order-execution/coordinator.cjs b/src/modules/order-execution/coordinator.cjs index 0cbaf41..cda0498 100644 --- a/src/modules/order-execution/coordinator.cjs +++ b/src/modules/order-execution/coordinator.cjs @@ -141,6 +141,17 @@ class OrderExecutionCoordinator{ try{this.connection(task.connectionId,principal);return true;} catch{return false;} } + healthSnapshot(){ + // Health consumes persisted progress, never captured fields or discovery views. + const tasks=this.store.all('execution-tasks').map(task=>{ + const order=task.orderId&&this.store.get('orders',task.orderId); + const activeStatus=['failed','unknown','blocked','capturing','archiving'].includes(task.status); + return {id:task.id,connectionId:task.connectionId,processName:task.row?.processName, + status:activeStatus?task.status:order?.status||task.status,updatedAt:task.updatedAt, + error:task.error||order?.error||null,reason:task.reason,blockedReason:task.blockedReason}; + }).reverse(); + return {tasks,capabilities:clone(this.store.capabilities)}; + } snapshot(principal,{includeFieldEvidence=false}={}){ const allowed=id=>!principal||require('../order-rules/access.cjs').canReadConnection(this.workspace,principal.user,id); const fields=this.store.fields(); diff --git a/src/modules/order-rules/carry-forward.cjs b/src/modules/order-rules/carry-forward.cjs index cf1463f..d5613c8 100644 --- a/src/modules/order-rules/carry-forward.cjs +++ b/src/modules/order-rules/carry-forward.cjs @@ -11,7 +11,7 @@ function associated(store,order,mode){return store.all('batches').filter(b=>mode function safeHistory(batches){return batches.every(b=>proof(b)&&(b.status==='failed'||b.status==='cancelled'&&b.resolution?.resolution==='carry_forward'));} function qualified(store,order,{active=true}={}){ if(!order||order.removedAt||!order.categoryId||!order.sample||!receipt(order.archive)||!order.ruleSnapshot)return null; - const tasks=store.all('execution-tasks').filter(t=>t.orderId===order.id);if(tasks.length!==1)return null;const task=tasks[0]; + const tasks=require('./read-context.cjs').byOrder(store,'execution-tasks',order.id);if(tasks.length!==1)return null;const task=tasks[0]; if(task.removedAt||task.supersededBy||task.revisionIgnored||task.conflict||task.blockedByBatchId||!['complete','missed_window'].includes(task.step))return null; if(!identity.sameTask(task.row,order.sample)||['source','portalSource','taskId','instanceId','revision','processName','nodeName','receivedAt'].some(k=>String(task.row?.[k])!==String(order.sample[k])))return null; const captured=store.get('capture-samples',task.sampleId||'');if(captured?.provenance!=='server-provider'||captured.taskId!==task.id||typeof captured.snapshot?.html!=='string'||!captured.snapshot.html.trim()||!captured.sample||identity.fingerprint(captured.sample)!==identity.fingerprint(order.sample))return null; @@ -24,6 +24,11 @@ function qualified(store,order,{active=true}={}){ return {task,original}; } function windowForOrder(store,value,mode='normal'){ + const context=require('./read-context.cjs').state(store); + if(context&&value?.id){const key=JSON.stringify(['carry',value.id,mode]);if(!context.memo.has(key))context.memo.set(key,readWindow(store,value,mode));return context.memo.get(key);} + return readWindow(store,value,mode); +} +function readWindow(store,value,mode){ if(!['normal','huizhou'].includes(mode))return null; // A Hui projection replaces event/order numbers. Always validate the persisted source. const order=value?.id&&store.get('orders',value.id),stamp=order?.carryForward?.[mode];if(!stamp||stamp.basisHash!==basis(order)||!qualified(store,order,{active:false}))return null; @@ -37,11 +42,13 @@ function knownMissed(store,value,original,stamp){ return ['start','end','collectionStart','collectionEnd','collectionLeadMinutes','policyVersion','startInclusive','endInclusive'].every(key=>value[key]===expected[key]); } function candidate(store,order,mode){ - const q=qualified(store,order),state=delivery(order,mode);if(!q||!state||order.blockedByBatchId||state.blockedByBatchId||!['pending','blocked','archived'].includes(state.status))return null; + const state=delivery(order,mode);if(!state||order.blockedByBatchId||state.blockedByBatchId||!['pending','blocked','archived'].includes(state.status))return null; + if(mode==='huizhou'&&(order.ruleSnapshot?.huizhouEnabled!==true||!state.orderNos?.length||state.issues?.length||!['pending','blocked','archived','batched','sent','unknown'].includes(order.status)))return null; + const q=qualified(store,order);if(!q)return null; const batches=associated(store,order,mode);if(!safeHistory(batches))return null; const failed=batches.filter(b=>b.status==='failed');if(state.batchId&&!failed.some(b=>b.id===state.batchId))return null; if(mode==='normal'&&['unknown','sending','sent','ignored','archiving','capturing','failed'].includes(q.task.status))return null; - if(mode==='huizhou'&&(order.ruleSnapshot.huizhouEnabled!==true||!state.orderNos?.length||state.issues?.length||!['pending','blocked','archived','batched','sent','unknown'].includes(order.status)||q.task.step!=='complete'&&q.task.step!=='missed_window'))return null; + if(mode==='huizhou'&&q.task.step!=='complete'&&q.task.step!=='missed_window')return null; const stamp=order.carryForward?.[mode];if(stamp&&!windowForOrder(store,order,mode))return null; if(!knownMissed(store,mode==='normal'?order.missedWindow:state.missedWindow,q.original,stamp)||mode==='normal'&&!knownMissed(store,q.task.missedWindow,q.original,stamp))return null; return {...q,order,mode,state,stamp,failed,previous:stamp?.targetCutoff||q.original.end}; diff --git a/src/modules/order-rules/collecting-batches.cjs b/src/modules/order-rules/collecting-batches.cjs index 35049ba..28804da 100644 --- a/src/modules/order-rules/collecting-batches.cjs +++ b/src/modules/order-rules/collecting-batches.cjs @@ -14,18 +14,19 @@ function contentFor(store,rule,cutoff,mode,template){ if(template?.attachments?.length)fail('业务通知模板禁止附件,批次编辑不能覆盖此限制。',409); return {template:{...(template||{}),id:template?.id||rule.bodyTemplateId||id,version:template?.version||rule.version,notificationMode:mode,status:'active',attachments:[],subject:saved.subject,text:saved.text,html:saved.html},edit:{id,version:saved.version,updatedAt:saved.updatedAt,updatedBy:saved.updatedBy}}; } -function list(store,{cutoff}={}){ +function list(store,options={}){return structuredClone(readList(require('./read-context.cjs').readStore(store),options));} +function readList(store,{cutoff}={}){ if(typeof store.clock!=='function'||typeof store.schedule!=='function'||typeof store.calendar!=='function')return []; const window=cutoff?require('./window.cjs').windowForCutoff(cutoff,store.schedule(),store.calendar()):upcomingWindow(store.clock(),store.schedule(),store.calendar());if(!window)return []; - const groups=new Map(),frozen=store.all('batches'); + const groups=new Map(),frozen=new Set(store.all('batches').filter(b=>b.cutoff===window.end).map(b=>JSON.stringify([b.categoryId,b.notificationMode||'normal']))); for(const order of store.all('orders')){ const rule=order.ruleSnapshot;if(order.removedAt||!rule?.id||!rule.categoryId||!require('./scopes.cjs').matchesScope(rule,order.event||{}))continue; if(order.blockedByBatchId||order.status==='ignored')continue; for(const mode of ['normal','huizhou']){ - const carried=require('./carry-forward.cjs').windowForOrder(store,order,mode);if(order.missedWindow&&!carried||!require('./restricted-test.cjs').orderInWindow(store,order,window,mode))continue; const notice=delivery(order,mode);if(!notice||notice.batchId||!['identified','preparing','archived','pending','blocked','failed'].includes(notice.status))continue; if(mode==='huizhou'&&rule.huizhouEnabled!==true)continue; - if(frozen.some(b=>b.categoryId===rule.categoryId&&(b.notificationMode||'normal')===mode&&b.cutoff===window.end))continue; + if(frozen.has(JSON.stringify([rule.categoryId,mode])))continue; + const carried=require('./carry-forward.cjs').windowForOrder(store,order,mode);if(order.missedWindow&&!carried||!require('./restricted-test.cjs').orderInWindow(store,order,window,mode))continue; const id=idFor(rule,window.end,mode);if(!groups.has(id))groups.set(id,{id,status:'collecting',categoryId:rule.categoryId,notificationMode:mode,cutoff:window.end,window,windowStart:window.start,windowEnd:window.end,rule,orders:[],orderIds:[],attachments:[],createdAt:order.ingestedAt||order.createdAt,...(rule.testRunId?{testRunId:rule.testRunId}:{})});const group=groups.get(id);group.orders.push(order);group.orderIds.push(order.id); } } diff --git a/src/modules/order-rules/configuration.cjs b/src/modules/order-rules/configuration.cjs index a517fa2..3a1304d 100644 --- a/src/modules/order-rules/configuration.cjs +++ b/src/modules/order-rules/configuration.cjs @@ -39,14 +39,17 @@ function restrictedReceipt(orderRules,result){ const snapshot=orderRules.snapshot({includeRecords:false}); return {...result,rules:snapshot.rules,restrictedTest:snapshot.restrictedTest??null}; } +function templateUsage(rules){return rules.map(r=>({categoryId:r.published?.categoryId||r.draft?.categoryId,name:r.draft?.name,templateId:r.published?.bodyTemplateId||'',huizhouEnabled:r.published?.huizhouEnabled===true,huizhouTemplateId:r.published?.huizhouTemplateId||'',legacyBinding:!!r.published&&r.published.bodyTemplateId===undefined,publishedVersion:r.published?.version||null,status:r.published?.status||'draft'}));} function orderRuleConfigurationApi({orderRules,mail,storage,workspace,user,url,route,method,reply}){ - if(method!=='GET'||!['/api/order-rules/configuration','/api/order-rules/configuration/samples','/api/order-rules/status'].includes(route))return false; + if(method!=='GET'||!['/api/order-rules/configuration','/api/order-rules/configuration/samples','/api/order-rules/status','/api/order-rules/catalog','/api/order-rules/notification-settings'].includes(route))return false; if(!user)fail('请先登录。',401); if(!orderRules)fail('分类通知规则服务未启动。',503); if(route==='/api/order-rules/configuration')reply(200,configuration(orderRules,mail,storage)); else if(route==='/api/order-rules/status')reply(200,{settings:{enabled:orderRules.settings().enabled},capabilities:structuredClone(orderRules.capabilities)}); + else if(route==='/api/order-rules/catalog'){const rules=orderRules.all('rules');reply(200,{rules:rules.map(r=>pick(r.draft,['categoryId','name'])),templateUsage:templateUsage(rules)});} + else if(route==='/api/order-rules/notification-settings')reply(200,{settings:orderRules.settings(),restrictedTest:orderRules.restrictedTest()}); else reply(200,samples(orderRules,workspace,user,url.searchParams)); return true; } -module.exports={orderRuleConfigurationApi,ruleReceipt,restrictedReceipt}; +module.exports={orderRuleConfigurationApi,ruleReceipt,restrictedReceipt,templateUsage}; diff --git a/src/modules/order-rules/dispatcher.cjs b/src/modules/order-rules/dispatcher.cjs index a4c31db..310d169 100644 --- a/src/modules/order-rules/dispatcher.cjs +++ b/src/modules/order-rules/dispatcher.cjs @@ -24,7 +24,9 @@ class OrderRuleDispatcher{ this.attachmentReader=attachmentReader;if(templateResolver)store.templateResolver=templateResolver;if(mail?.store?.signature)store.signatureResolver=id=>mail.store.signature(id); } ready(){ - const config=this.store.settings(),cap=this.store.snapshot().capabilities; + // Real RuleStore exposes immutable capabilities directly; retain the small + // snapshot fallback for adapters and older test/runtime stores. + const config=this.store.settings(),cap=this.store.capabilities||this.store.snapshot?.().capabilities||{}; return !this.stopped&&config.enabled===true&&this.providersReady()===true&&cap?.liveTodo===true&&cap?.pdfExport===true&&cap?.automaticArchive===true; } tick(now=this.clock()){ @@ -35,7 +37,7 @@ class OrderRuleDispatcher{ } async perform(now){ this.store.expireIntakes?.(); - for(const batch of this.store.snapshot().batches||[])if(batch.status==='prepared'&&!batch.manual&&now-Date.parse(batch.cutoff)>1800000)this.store.finishSending(batch.id,'failed','冻结发送队列超过30分钟,请负责人核验后受控补发。',{outcome:'not_submitted',phase:'queue_expired',at:this.clock().toISOString()}); + for(const batch of this.store.all('batches').reverse())if(batch.status==='prepared'&&!batch.manual&&now-Date.parse(batch.cutoff)>1800000)this.store.finishSending(batch.id,'failed','冻结发送队列超过30分钟,请负责人核验后受控补发。',{outcome:'not_submitted',phase:'queue_expired',at:this.clock().toISOString()}); if(!this.ready())return; const config=freeze(structuredClone(this.store.settings())),schedule=this.settings()?.schedule,calendar=this.calendar(); if(!schedule?.times?.length)return; @@ -43,13 +45,13 @@ class OrderRuleDispatcher{ 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 resumed=this.store.pendingIntakeCutoffs?.().filter(cutoff=>now-Date.parse(cutoff)>60000)||[]; const cutoff=resumed[0]||this.schedule.next,canPrepare=cutoff&&now-Date.parse(cutoff)>=0&&(now-Date.parse(cutoff)<=60000||resumed.includes(cutoff)); - 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); + const queued=this.store.all('batches').some(b=>b.status==='prepared'&&!b.manual&&now-Date.parse(b.cutoff)>=0&&now-Date.parse(b.cutoff)<=1800000); if(!canPrepare&&!queued)return; try{await this.mail.exclusive(config.channelId,async()=>{ if(!this.ready())return; if(canPrepare&&!this.store.discoveryBlockers(cutoff).length){const window=windowForCutoff(cutoff,schedule,calendar);this.store.prepare(cutoff,'系统调度',window);} // A frozen collection is immutable. Queue time is distinct from collection time. - const batches=(this.store.snapshot().batches||[]).filter(b=>b.status==='prepared'&&!b.manual&&now-Date.parse(b.cutoff)>=0&&now-Date.parse(b.cutoff)<=1800000); + const batches=this.store.all('batches').reverse().filter(b=>b.status==='prepared'&&!b.manual&&now-Date.parse(b.cutoff)>=0&&now-Date.parse(b.cutoff)<=1800000); for(const batch of batches){if(!this.ready())break; let expected;try{expected=windowForCutoff(batch.cutoff,schedule,calendar);}catch{continue;} const legacyStart=new Date(Date.parse(batch.cutoff)+8*3600000).toISOString().slice(0,10)+'T00:00:00+08:00'; diff --git a/src/modules/order-rules/query.cjs b/src/modules/order-rules/query.cjs index f61208a..33ab192 100644 --- a/src/modules/order-rules/query.cjs +++ b/src/modules/order-rules/query.cjs @@ -3,15 +3,14 @@ const crypto=require('node:crypto'); const {canReadConnection,canReadOrder,canReadBatch}=require('./access.cjs'); const {fail}=require('./validation.cjs'); const {notifications,modeOf}=require('./delivery.cjs'); -const cache=new WeakMap(); +const {readStore,state:readState}=require('./read-context.cjs'); const orderStates=['candidate','identified','preparing','archived','pending','batched','blocked','unknown','sent','failed','capturing','archiving','queued','ignored']; const batchStates=['collecting','prepared','sending','unknown','failed','sent','cancelled']; function records(store){ const revision=store.queryRevision?.(); - const saved=cache.get(store); - if(revision!==undefined&&saved?.revision===revision)return saved; + const memo=readState(store)?.memo,saved=memo?.get('records');if(saved)return saved; const value={revision:revision??Date.now(),orders:store.all('orders'),batches:store.all('batches'),tasks:store.all('execution-tasks'),issues:store.all('business-issues')}; - if(revision!==undefined)cache.set(store,value); + memo?.set('records',value); return value; } function filters(input={},kind){ @@ -63,7 +62,8 @@ function visibleOrders(context,user,collectingGroups){ const rows=data.orders.filter(o=>classified(o,tasks.get(o.id))&&canReadOrder(context.workspace,user,o)).map(o=>orderRow(o,tasks.get(o.id))); for(const task of data.tasks)if(!task.orderId&&!task.supersededBy&&classified(null,task)&&canReadConnection(context.workspace,user,task.connectionId))rows.push(orderRow(null,task)); const collecting=(collectingGroups||require('./collecting-batches.cjs').list(context.orderRules)).filter(b=>canReadBatch(context.workspace,user,b,context.orderRules)); - for(const row of rows)row.collectingBatches=collecting.filter(b=>b.orderIds.includes(row.id)).map(b=>({id:b.id,subject:b.subject,cutoff:b.cutoff})); + const membership=new Map();for(const batch of collecting)for(const id of batch.orderIds){if(!membership.has(id))membership.set(id,[]);membership.get(id).push({id:batch.id,subject:batch.subject,cutoff:batch.cutoff});} + for(const row of rows)row.collectingBatches=membership.get(row.id)||[]; return rows; } function page(rows,input,revision){ @@ -112,14 +112,14 @@ function batchDetail(context,id,user){ return {...batchRow(context,batch),...pick(batch,['to','cc','text','html','window','sentAt','resolvedAt','resolution','manual','originalBatchId','template','signature','contentEdit','editor','edited','context','editable']),orders:(batch.orderIds||[]).map(id=>context.orderRules.get('orders',id)).filter(Boolean).map(o=>orderRow(o)),attachments:(batch.attachments||[]).map(a=>pick(a,['name','filename','size','sha256']))}; } async function readOrderFile(context,id,index,user){ - orderDetail(context,id,user); + orderDetail({...context,orderRules:readStore(context.orderRules)},id,user); if(!Number.isSafeInteger(index)||index<0)fail('文件编号无效。'); const file=context.orderRules.get('orders',id)?.archive?.files?.[index]; if(!file||!Number.isSafeInteger(file.size)||!/^[a-f0-9]{64}$/i.test(file.sha256||''))fail('归档文件证据不完整。',409); if(typeof context.execution?.archive?.read!=='function')fail('归档读取服务暂不可用。',503); const bytes=await context.execution.archive.read(structuredClone(file)); // Ownership may change while storage performs an asynchronous read. - orderDetail(context,id,user); + orderDetail({...context,orderRules:readStore(context.orderRules)},id,user); const current=context.orderRules.get('orders',id)?.archive?.files?.[index]; if(!current||current.sha256!==file.sha256||current.path!==file.path||current.size!==file.size)fail('归档证据已变化,请重新读取详情。',409); if(!Buffer.isBuffer(bytes)||bytes.length!==file.size||bytes.subarray(0,5).toString()!=='%PDF-'||crypto.createHash('sha256').update(bytes).digest('hex')!==file.sha256)fail('归档文件读回校验失败。',409); @@ -145,4 +145,5 @@ function summary(context,user){ result.revision=crypto.createHash('sha256').update(publicRevision(context,user)+JSON.stringify([result.window,result.issues])).digest('hex').slice(0,24); return result; } -module.exports={queryOrders,queryBatches,orderDetail,batchDetail,readOrderFile,summary}; +const scoped=fn=>(context,...args)=>structuredClone(fn({...context,orderRules:readStore(context.orderRules)},...args)); +module.exports={queryOrders:scoped(queryOrders),queryBatches:scoped(queryBatches),orderDetail:scoped(orderDetail),batchDetail:scoped(batchDetail),readOrderFile,summary:scoped(summary)}; diff --git a/src/modules/order-rules/read-context.cjs b/src/modules/order-rules/read-context.cjs new file mode 100644 index 0000000..500aa32 --- /dev/null +++ b/src/modules/order-rules/read-context.cjs @@ -0,0 +1,32 @@ +'use strict'; +const contextKey=Symbol('order-rules-read-context'); +// This facade lives for one synchronous read only. Cached rows are internal, +// read-only values; public query boundaries copy their result before returning. +function readStore(store){ + if(store[contextKey])return store; + const rows=new Map(),values=new Map(),indexes=new Map(),memo=new Map(),view=Object.create(store); + const state={memo,index(name,build){if(!indexes.has(name))indexes.set(name,build());return indexes.get(name);}}; + Object.defineProperty(view,contextKey,{value:state}); + view.all=function(kind){ + if(!rows.has(kind)){ + const result=store.all(kind);rows.set(kind,result); + let found=values.get(kind);if(!found)values.set(kind,found=new Map());for(const row of result)found.set(row.id,row); + } + // snapshot callers may reverse/sort the array, never the cached ordering. + return rows.get(kind).slice(); + }; + view.get=function(kind,id){ + let found=values.get(kind);if(!found)values.set(kind,found=new Map()); + if(!found.has(id))found.set(id,rows.has(kind)?null:store.get(kind,id)); + return found.get(id); + }; + for(const method of ['put','audit','transaction'])view[method]=()=>{throw new Error('Read context cannot write.');}; + return view; +} +function state(store){return store?.[contextKey];} +function byOrder(store,kind,id){ + const context=state(store);if(!context)return store.all(kind).filter(row=>row.orderId===id); + const index=context.index('order:'+kind,()=>{const map=new Map();for(const row of store.all(kind)){if(!map.has(row.orderId))map.set(row.orderId,[]);map.get(row.orderId).push(row);}return map;}); + return index.get(id)||[]; +} +module.exports={readStore,state,byOrder}; diff --git a/src/modules/order-rules/store.cjs b/src/modules/order-rules/store.cjs index 86e3023..16105d8 100644 --- a/src/modules/order-rules/store.cjs +++ b/src/modules/order-rules/store.cjs @@ -17,6 +17,7 @@ const digest=value=>crypto.createHash('sha256').update(JSON.stringify(canonical( const copy=value=>structuredClone(value); const BASE_CAPABILITIES={liveTodo:false,pdfExport:false,automaticArchive:false}; function validDate(value){return typeof value==='string'&&/^\d{4}-\d{2}-\d{2}T.*(?:Z|[+-]\d{2}:\d{2})$/.test(value)&&Number.isFinite(Date.parse(value));} +function pendingCompanionState(order){const hui=delivery(order,'huizhou');return !!order?.archive&&order.ruleSnapshot?.huizhouEnabled===true&&['batched','sending','sent','unknown'].includes(order.status)&&!!hui&&['pending','blocked'].includes(hui.status)&&!hui.batchId&&!hui.missedWindow;} class RuleStore{ constructor(dir,{clock=()=>new Date(),capabilities={},seedOverrides=[],schedule=()=>({times:['11:00','17:00'],weekends:false}),calendar=()=>[],desktopRoot=path.join(require('node:os').homedir(),'Desktop')}={}){ this.desktopRoot=desktopRoot; @@ -158,12 +159,17 @@ class RuleStore{ return [...new Set(cutoffs.filter(cutoff=>cutoff&&now>=Date.parse(cutoff)&&now<=Date.parse(cutoff)+1800000))].sort(); } pendingCompanion(order){ - const hui=delivery(order,'huizhou'),normal=order?.batchId&&this.get('batches',order.batchId); - return !!order?.archive&&order.ruleSnapshot?.huizhouEnabled===true&&['batched','sending','sent','unknown'].includes(order.status)&&!!hui&&['pending','blocked'].includes(hui.status)&&!hui.batchId&&!hui.missedWindow&&normal?.huizhouPlanned===true&&modeOf(normal)==='normal'&&normal.orderIds?.includes(order.id)&&normal.cutoff===this.intakeWindow(order.sample||order.event,{includeExpired:true})?.end; + if(!pendingCompanionState(order))return false; + const normal=order.batchId&&this.get('batches',order.batchId); + return normal?.huizhouPlanned===true&&modeOf(normal)==='normal'&&normal.orderIds?.includes(order.id)&&normal.cutoff===this.intakeWindow(order.sample||order.event,{includeExpired:true})?.end; } expireIntakes(){return this.transaction(()=>{ const carry=require('./carry-forward.cjs');carry.advance(this); for(const order of this.all('orders')){ + // Only uncompleted normal work or an independent Hui companion can expire. + // Do this before intakeWindow's task lookup; keep carry advancement above + // and the persisted evidence checks below on the ordinary writable store. + if(!(['identified','preparing','archived','pending','blocked'].includes(order.status)&&!order.batchId&&!order.missedWindow)&&!pendingCompanionState(order))continue; const window=this.intakeWindow(order.sample||order.event,{includeExpired:true}); if(!window||+this.clock()<=Date.parse(window.end)+1800000)continue; if(this.pendingCompanion(order)&&!carry.hasCarry(this,order,'huizhou')){ diff --git a/src/modules/order-rules/task-identity.cjs b/src/modules/order-rules/task-identity.cjs index 7df9b99..3a84318 100644 --- a/src/modules/order-rules/task-identity.cjs +++ b/src/modules/order-rules/task-identity.cjs @@ -9,7 +9,15 @@ function taskIdentity(value){const item=identity(value);if(!item.source||!item.t // A legacy row with no native portal source is ambiguous. Treat it as an // overlapping namespace, never guess v4/v8 and create a second notification. function sameTask(a,b){a=identity(a);b=identity(b);return !!a.source&&!!a.taskId&&a.source===b.source&&a.taskId===b.taskId&&(!a.portalSource||!b.portalSource||a.portalSource===b.portalSource);} -function records(store,kind,value){return store.all(kind).filter(row=>sameTask(row,value));} +function records(store,kind,value){ + const context=require('./read-context.cjs').state(store);if(!context)return store.all(kind).filter(row=>sameTask(row,value)); + const key=item=>JSON.stringify([item.source,item.taskId]),index=context.index('task:'+kind,()=>{ + const groups=new Map();for(const row of store.all(kind)){const item=identity(row);if(!item.source||!item.taskId)continue;const k=key(item);if(!groups.has(k))groups.set(k,[]);groups.get(k).push(row);}return groups; + }); + // Keep all portal variants: a legacy row without portalSource overlaps every + // native namespace, and lookup must still reject multiple matching records. + return (index.get(key(identity(value)))||[]).filter(row=>sameTask(row,value)); +} function lookup(store,kind,value){const rows=records(store,kind,value);if(rows.length>1)fail('同一通知任务存在多条旧记录,须人工核验,禁止新建或自动合并。',409);return rows[0]||null;} function normalize(value){const row=structuredClone(value);for(const key of ['connectionId','source','portalSource','instanceId','taskId','revision'])if(row[key]!==undefined&&row[key]!==null)row[key]=text(row[key]);if(!text(row.revision))delete row.revision;return row;} function fingerprint(value){const row=normalize(value);delete row.connectionId;return digest(row);} diff --git a/src/modules/storage/api.cjs b/src/modules/storage/api.cjs index 34320b1..ff0b864 100644 --- a/src/modules/storage/api.cjs +++ b/src/modules/storage/api.cjs @@ -1,5 +1,6 @@ 'use strict'; const {secureBpmTransport}=require('../bpm/api.cjs'); +const {byteRange}=require('./files.cjs'); const fail=(message,status=400)=>{throw Object.assign(new Error(message),{status});}; function payload(body,keys){if(!body||Object.keys(body).some(k=>!keys.includes(k)))fail('存储操作参数无效。');} async function storageApi({storage,workspace,user,url,route,method,body,request,response,reply,trustedProxy}){ @@ -25,14 +26,13 @@ async function storageApi({storage,workspace,user,url,route,method,body,request, if(action==='archive'&&method==='POST'){payload(body,['jobId','directory']);const result=await storage.archive(id,body.jobId,body.directory??'',user.username);audit('PDF 归档完成',result.relativePath);reply(200,result);return true;} if(action==='preview-info'&&method==='GET'){reply(200,await storage.previewInfo(id,url.searchParams.get('path')||''));return true;} if((action==='file'||action==='content')&&method==='GET'){ - const preview=action==='content',file=await storage[preview?'readPreview':'readFile'](id,url.searchParams.get('path')||''),total=file.bytes.length; + const preview=action==='content',range=request.headers.range,file=await storage[preview?'readPreview':'readFile'](id,url.searchParams.get('path')||'',range===undefined?{}:{range}),total=file.total??file.bytes.length; response.setHeader('Content-Type',preview?file.contentType:'application/octet-stream');response.setHeader('Content-Disposition',(preview?'inline':'attachment')+"; filename*=UTF-8''"+encodeURIComponent(file.filename));response.setHeader('Content-Security-Policy',"default-src 'none'; sandbox");response.setHeader('Cross-Origin-Resource-Policy','same-origin');response.setHeader('Accept-Ranges','bytes'); - let start=0,end=total-1,status=200; - if(request.headers.range){const range=/^bytes=(\d*)-(\d*)$/.exec(request.headers.range);if(!range||(!range[1]&&!range[2])){response.setHeader('Content-Range','bytes */'+total);response.writeHead(416);response.end();return true;} - if(range[1]){start=Number(range[1]);if(range[2])end=Math.min(Number(range[2]),end);}else start=Math.max(0,total-Number(range[2])); - if(!Number.isSafeInteger(start)||!Number.isSafeInteger(end)||start>end||start>=total){response.setHeader('Content-Range','bytes */'+total);response.writeHead(416);response.end();return true;}status=206;response.setHeader('Content-Range',`bytes ${start}-${end}/${total}`); - } - const bytes=file.bytes.subarray(start,end+1);response.setHeader('Content-Length',bytes.length);response.writeHead(status);response.end(bytes);return true; + const {start,end,status}=byteRange(range,total); + if(file.total!==undefined&&(file.start!==start||file.end!==end||file.status!==status||file.bytes.length!==(status===416?0:end-start+1)))fail('存储分段响应无效。',502); + if(status===416){response.setHeader('Content-Range','bytes */'+total);response.writeHead(416);response.end();return true;} + if(status===206)response.setHeader('Content-Range',`bytes ${start}-${end}/${total}`); + const bytes=file.total===undefined?file.bytes.subarray(start,end+1):file.bytes;response.setHeader('Content-Length',bytes.length);response.writeHead(status);response.end(bytes);return true; } } fail('没有找到此存储操作。',404); diff --git a/src/modules/storage/files.cjs b/src/modules/storage/files.cjs index 7df1c15..ab72ad3 100644 --- a/src/modules/storage/files.cjs +++ b/src/modules/storage/files.cjs @@ -15,6 +15,22 @@ function segments(relative=''){ } function inside(root,file){const rel=path.relative(root,file);return !path.isAbsolute(rel)&&rel!=='..'&&!rel.startsWith('..'+path.sep);} function digest(bytes){return crypto.createHash('sha256').update(bytes).digest('hex');} +function byteRange(value,total){ + if(!Number.isSafeInteger(total)||total<0)throw fail('存储文件大小无效。',502); + const invalid={status:416,start:0,end:-1}; + if(value===undefined)return {status:200,start:0,end:total-1}; + const match=typeof value==='string'&&/^bytes=(\d*)-(\d*)$/.exec(value);if(!match||!total||(!match[1]&&!match[2]))return invalid; + const first=match[1]?Number(match[1]):null,last=match[2]?Number(match[2]):null; + if(first!==null&&!Number.isSafeInteger(first)||last!==null&&!Number.isSafeInteger(last))return invalid; + const start=first===null?Math.max(0,total-last):first,end=first===null||last===null?total-1:Math.min(last,total-1); + return start<0||start>end||start>=total?invalid:{status:206,start,end}; +} +async function readExact(handle,start,length){ + const buffer=Buffer.alloc(length);let offset=0; + while(offset['dev','ino','size','mtimeNs','ctimeNs'].every(key=>a[key]===b[key]); async function pdf(file){const info=await fs.stat(file);if(!info.isFile()||info.size>MAX_FILE)throw fail('PDF 必须为不超过 64 MiB 的文件。');const bytes=await fs.readFile(file);if(bytes.length>MAX_FILE||bytes.subarray(0,5).toString()!=='%PDF-')throw fail('文件不是有效的 PDF。');return bytes;} class FileArea{ constructor(root,{boundary=root}={}){this.root=path.resolve(root);this.boundary=path.resolve(boundary);if(!inside(this.boundary,this.root))throw fail('归档根目录超出共享目录。');} @@ -45,16 +61,26 @@ class FileArea{ } async readPdf(relative){if(path.extname(relative).toLowerCase()!=='.pdf')throw fail('仅支持下载归档 PDF。');const file=await this.resolve(relative);return {bytes:await pdf(file),filename:path.basename(file)};} async previewInfo(relative){const file=await this.resolve(relative),stat=await fs.stat(file);if(!stat.isFile())throw fail('请选择文件进行预览。');return describePreview(path.basename(file),stat.size);} - async readFile(relative,limit=MAX_FILE){ + async readFile(relative,limit=MAX_FILE,{range,previewPdf=false}={}){ const file=await this.resolve(relative),handle=await fs.open(file,'r'); - try{const stat=await handle.stat();if(!stat.isFile())throw fail('请选择要读取的文件。');if(stat.size>limit)throw fail('文件超过工作台读取上限。',413); - const buffer=Buffer.alloc(stat.size+1);let length=0; - while(lengthstat.size)throw fail('文件正在更新,请稍后重试。',409); - return {filename:path.basename(file),bytes:buffer.subarray(0,length)}; + try{const stat=await handle.stat({bigint:true}),total=Number(stat.size),filename=path.basename(file);if(!stat.isFile())throw fail('请选择要读取的文件。');if(!Number.isSafeInteger(total)||total>limit)throw fail('文件超过工作台读取上限。',413); + if(previewPdf){const info=describePreview(filename,total);if(info.kind!=='pdf')throw fail('此格式不支持 PDF 分段预览。',415);await validatePreview(info,await readExact(handle,0,Math.min(5,total)));} + const selected=byteRange(range,total),bytes=selected.status===416?Buffer.alloc(0):await readExact(handle,selected.start,selected.end-selected.start+1); + // Validate both the opened file and its path after reading. Ranges and PDF + // headers use this same handle, and no successful short/growing read escapes. + const after=await handle.stat({bigint:true});await this.resolve(relative);const current=await fs.lstat(file,{bigint:true}); + if(current.isSymbolicLink()||!unchanged(stat,after)||!unchanged(stat,current))throw fail('文件正在更新,请稍后重试。',409); + return {filename,bytes,total,...selected}; }finally{await handle.close();} } - async readPreview(relative){const info=await this.previewInfo(relative);if(!info.canPreview)throw fail(info.reason,info.kind==='unsupported'?415:413);const file=await this.readFile(relative,info.limit);return {...info,bytes:await validatePreview({...info,bytes:file.bytes.length,canPreview:file.bytes.length<=info.limit},file.bytes)};} + async readPreview(relative,{range}={}){ + if(range!==undefined&&path.extname(relative).toLowerCase()==='.pdf'){ + const file=await this.readFile(relative,MAX_FILE,{range,previewPdf:true});return {...describePreview(file.filename,file.total),...file}; + } + const info=await this.previewInfo(relative);if(!info.canPreview)throw fail(info.reason,info.kind==='unsupported'?415:413); + const file=await this.readFile(relative,info.limit),bytes=await validatePreview({...info,bytes:file.bytes.length,canPreview:file.bytes.length<=info.limit},file.bytes),selected=byteRange(range,bytes.length); + return {...info,total:bytes.length,...selected,bytes:selected.status===416?Buffer.alloc(0):bytes.subarray(selected.start,selected.end+1)}; + } async archive(source,filename,relative=''){ if(segments(filename).length!==1||path.extname(filename).toLowerCase()!=='.pdf')throw fail('归档文件名必须为 PDF 文件名。'); const bytes=await pdf(source),sha256=digest(bytes),directory=await this.resolve(relative,true); @@ -79,4 +105,4 @@ class SmbClient{ async browse(server,options){return require('./smb-probe.cjs').probe(server,options);} async area(server){if(server.authMode!=='windows')await native.connect(server);const boundary=path.win32.join('\\\\'+server.host,server.share),root=path.win32.join(boundary,...segments(server.directory));return new FileArea(root,{boundary});} } -module.exports={FileArea,SmbClient,segments,inside,MAX_FILE}; +module.exports={FileArea,SmbClient,segments,inside,MAX_FILE,byteRange}; diff --git a/src/modules/storage/service.cjs b/src/modules/storage/service.cjs index 43dad45..0ab6b50 100644 --- a/src/modules/storage/service.cjs +++ b/src/modules/storage/service.cjs @@ -1,6 +1,6 @@ 'use strict'; const fs=require('node:fs/promises');const path=require('node:path'); -const {SmbClient,segments,inside}=require('./files.cjs'); +const {SmbClient,segments,inside,MAX_FILE}=require('./files.cjs'); const {orderFolder}=require('./order.cjs'); const fail=(message,status=400)=>Object.assign(new Error(message),{status}); const safe=e=>e.status?e:fail(({ENOENT:'找不到文件或归档目录,请检查路径。',EACCES:'没有共享目录访问权限。',EPERM:'没有共享目录操作权限。',ENOSPC:'存储服务器空间不足。',ENOTDIR:'指定路径不是目录。'})[e.code]||'存储操作未完成,请检查服务器与网络。',502); @@ -71,8 +71,8 @@ class StorageService{ mkdir(id,relative){return this.run(id,async (server,signal)=>this.operation(server,'mkdir',[relative],signal));} readPdf(id,relative){return this.run(id,async (server,signal)=>this.operation(server,'readPdf',[relative],signal));} previewInfo(id,relative){return this.run(id,async (server,signal)=>this.operation(server,'previewInfo',[relative],signal));} - readPreview(id,relative){return this.run(id,async (server,signal)=>this.operation(server,'readPreview',[relative],signal));} - readFile(id,relative){return this.run(id,async (server,signal)=>this.operation(server,'readFile',[relative],signal));} + readPreview(id,relative,options={}){return this.run(id,async (server,signal)=>this.operation(server,'readPreview',[relative,options],signal));} + readFile(id,relative,options={}){return this.run(id,async (server,signal)=>this.operation(server,'readFile',[relative,MAX_FILE,options],signal));} archive(id,jobId,directory='',actor='自动归档'){ return this.run(id,async (server,signal)=>{ segments(directory);if(typeof jobId!=='string'||!jobId||jobId.length>200)throw fail('请选择已完成的 PDF 导出任务。'); diff --git a/src/modules/storage/smb-operation.cjs b/src/modules/storage/smb-operation.cjs index 7b40d74..edcc75c 100644 --- a/src/modules/storage/smb-operation.cjs +++ b/src/modules/storage/smb-operation.cjs @@ -17,6 +17,13 @@ function validate(operation,value){ visit(value); if(!value||typeof value!=='object'||Array.isArray(value))throw fail('存储响应无效。',502); if(['readPdf','readPreview','readFile'].includes(operation)&&!Buffer.isBuffer(value.bytes))throw fail('存储文件响应无效。',502); + if(['readPreview','readFile'].includes(operation)&&value.total!==undefined){ + const {total,start,end,status,bytes}=value,valid=Number.isSafeInteger(total)&&total>=0&&total<=MAX_FILE&&Number.isSafeInteger(start)&&Number.isSafeInteger(end); + const layout=status===416?start===0&&end===-1&&bytes.length===0: + status===200?start===0&&end===total-1&&bytes.length===total: + status===206&&total>0&&start>=0&&start<=end&&end500||typeof value.path!=='string'||typeof value.truncated!=='boolean'||value.entries.some(e=>!e||typeof e.name!=='string'||!['directory','file','blocked'].includes(e.type))))throw fail('存储目录响应无效。',502); if(operation==='check'&&(value.readable!==true||value.writable!==true))throw fail('存储检查响应无效。',502); if(operation==='archive'&&(!Number.isSafeInteger(value.bytes)||value.bytes<0||value.bytes>MAX_FILE||!/^[a-f0-9]{64}$/.test(value.sha256)||typeof value.filename!=='string'||typeof value.relativePath!=='string'))throw fail('归档响应无效。',502); diff --git a/src/modules/system-update/checker.cjs b/src/modules/system-update/checker.cjs index 43be271..1730705 100644 --- a/src/modules/system-update/checker.cjs +++ b/src/modules/system-update/checker.cjs @@ -66,7 +66,8 @@ async function readRelease(response){ } function createUpdateChecker({currentVersion,fetchImpl=globalThis.fetch,apiUrl=RELEASES_API_URL,repositoryUrl=REPOSITORY_URL,timeoutMs=5000}={}){ if(!versionParts(currentVersion))throw new Error('当前版本必须是 x.y.z 格式。'); - return async function checkForUpdate(){ + let inFlight=null; + async function readUpdate(){ const base={currentVersion,latest:null}; if(typeof fetchImpl!=='function')return {...base,status:'unavailable'}; const controller=new AbortController(),timer=setTimeout(()=>controller.abort(),timeoutMs); @@ -76,6 +77,11 @@ function createUpdateChecker({currentVersion,fetchImpl=globalThis.fetch,apiUrl=R return parseRelease(await readRelease(response),currentVersion,{repositoryUrl}); }catch{return {...base,status:'unavailable'};} finally{clearTimeout(timer);} + } + return async function checkForUpdate(){ + // Share only work still in progress; a later manual check always revalidates. + if(!inFlight)inFlight=readUpdate().finally(()=>{inFlight=null;}); + return structuredClone(await inFlight); }; } module.exports={REPOSITORY_URL,RELEASES_API_URL,compareVersions,parseRelease,createUpdateChecker}; diff --git a/tests/app/account-password.test.cjs b/tests/app/account-password.test.cjs index 16beefd..fb70a3c 100644 --- a/tests/app/account-password.test.cjs +++ b/tests/app/account-password.test.cjs @@ -50,7 +50,7 @@ test('password version rejects old sessions even if eager session cleanup fails' test('password change closes only the target account BPM login windows',async t=>{ const crypto=require('node:crypto'),{BpmSessionManager}=require('../../src/modules/bpm/session-manager.cjs'); const f=await fixture(t),first=await f.login('viewer'),second=await f.login('viewer'),admin=await f.login(); - const cookies=[first,second,admin],manager={revokedSessionHashes:new Set(),sessions:new Map(cookies.map((cookie,i)=>[String(i),{id:String(i),sessionId:cookie.split('=')[1]}])),run:async(id,work)=>work(),async closeLease(id){this.sessions.delete(id);}}; + const cookies=[first,second,admin],manager={sessionState:new (require('../../src/modules/bpm/session-state.cjs').SessionState)(),revokedSessionHashes:new Set(),sessions:new Map(cookies.map((cookie,i)=>[String(i),{id:String(i),sessionId:cookie.split('=')[1]}])),run:async(id,work)=>work(),async closeLease(id){this.sessions.delete(id);}}; const hashes=new SessionStore(f.dir);const targetHashes=hashes.userSessionHashes(f.viewer.id);hashes.close(); assert.equal(targetHashes.length,2);await BpmSessionManager.prototype.releaseSessionHashes.call(manager,targetHashes);assert.deepEqual([...manager.sessions.keys()],['2']); assert.equal(targetHashes.includes(crypto.createHash('sha256').update(admin.split('=')[1]).digest('hex')),false); diff --git a/tests/app/asset-delivery.test.cjs b/tests/app/asset-delivery.test.cjs new file mode 100644 index 0000000..8dabd64 --- /dev/null +++ b/tests/app/asset-delivery.test.cjs @@ -0,0 +1,39 @@ +'use strict'; +const {test}=require('node:test'),assert=require('node:assert/strict'); +const fs=require('node:fs'),os=require('node:os'),path=require('node:path'),http=require('node:http'),zlib=require('node:zlib'); +const {Store}=require('../../src/modules/dashboard/store.cjs'); +const {createDashboard}=require('../../src/app/dashboard.cjs'); +const {createAssetDelivery}=require('../../src/app/asset-delivery.cjs'); +async function fixture(t){ + const dir=fs.mkdtempSync(path.join(os.tmpdir(),'asset-delivery-')),store=new Store(dir),server=createDashboard({store,outputDir:dir}); + await new Promise(r=>server.listen(0,'127.0.0.1',r)); + t.after(async()=>{server.closeAllConnections();await new Promise(r=>server.close(r));fs.rmSync(dir,{recursive:true,force:true});}); + return (route,headers={},method='GET')=>new Promise((resolve,reject)=>{const request=http.request({hostname:'127.0.0.1',port:server.address().port,path:route,headers,method},response=>{const parts=[];response.on('data',part=>parts.push(part));response.on('end',()=>resolve({status:response.statusCode,headers:response.headers,bytes:Buffer.concat(parts)}));});request.on('error',reject);request.end();}); +} +test('public assets compress losslessly and conditional reload sends no body while APIs stay private',async t=>{ + const get=await fixture(t),plain=await get('/app.js'),compressed=await get('/app.js',{'Accept-Encoding':'br, gzip'}); + assert.equal(compressed.status,200);assert.equal(compressed.headers['content-encoding'],'br'); + assert.deepEqual(zlib.brotliDecompressSync(compressed.bytes),plain.bytes);assert.ok(compressed.bytes.length'))); +}); +test('asset encoding negotiation honors q=0 and HEAD returns metadata without payload',async t=>{ + const get=await fixture(t),gzip=await get('/app.css',{'Accept-Encoding':'br;q=0, gzip;q=0.7'}); + assert.equal(gzip.headers['content-encoding'],'gzip');assert.ok(zlib.gunzipSync(gzip.bytes).length>gzip.bytes.length); + const plain=await get('/app.css',{'Accept-Encoding':'br;q=0, gzip;q=0'});assert.equal(plain.headers['content-encoding'],undefined); + const preferred=await get('/app.css',{'Accept-Encoding':'gzip;q=0.1, identity;q=1'});assert.equal(preferred.headers['content-encoding'],undefined); + const head=await get('/app.css',{'Accept-Encoding':'gzip'},'HEAD');assert.equal(head.status,200);assert.equal(head.bytes.length,0);assert.equal(Number(head.headers['content-length']),gzip.bytes.length); + const none=await get('/app.css',{'Accept-Encoding':'br;q=0,gzip;q=0,identity;q=0,*;q=0'});assert.equal(none.status,406); + const preview=await get('/storage-preview.js',{'Accept-Encoding':'gzip'});assert.match(preview.headers['content-security-policy'],/frame-ancestors 'self'/);assert.equal(preview.headers['access-control-allow-origin'],'*'); +}); +test('public asset cache revalidates changed files and concurrent reloads agree',async t=>{ + const dir=fs.mkdtempSync(path.join(os.tmpdir(),'asset-edit-')),file=path.join(dir,'app.js'),deliver=createAssetDelivery({maxBytes:4096});fs.writeFileSync(file,'old application');t.after(()=>fs.rmSync(dir,{recursive:true,force:true})); + async function get(etag){const headers={};let status,bytes;await deliver({method:'GET',headers:{'if-none-match':etag}},{setHeader:(key,value)=>headers[key]=value,writeHead:value=>status=value,end:value=>bytes=value},{path:file,type:'text/javascript'});return {headers,status,bytes};} + const first=await get();fs.writeFileSync(file,'new application with changed size'); + const results=await Promise.all(Array.from({length:8},()=>get(first.headers.ETag))); + for(const result of results){assert.equal(result.status,200);assert.equal(result.bytes.toString(),'new application with changed size');assert.notEqual(result.headers.ETag,first.headers.ETag);} + assert.equal((await get(results[0].headers.ETag)).status,304); +}); diff --git a/tests/app/authentication-responsiveness.test.cjs b/tests/app/authentication-responsiveness.test.cjs new file mode 100644 index 0000000..330fe54 --- /dev/null +++ b/tests/app/authentication-responsiveness.test.cjs @@ -0,0 +1,26 @@ +'use strict'; +const {test}=require('node:test'),assert=require('node:assert/strict'),crypto=require('node:crypto'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); +const {Store}=require('../../src/modules/dashboard/store.cjs'),{createDashboard}=require('../../src/app/dashboard.cjs'); +function fixture(t,cleanup=true){const dir=fs.mkdtempSync(path.join(os.tmpdir(),'async-auth-')),store=new Store(dir),admin=store.bootstrap('admin','Test-password-123');if(cleanup)t.after(()=>fs.rmSync(dir,{recursive:true,force:true}));return {store,dir,admin};} +test('HTTP login validates real stored credentials without synchronous password hashing',async t=>{ + const {store,dir}=fixture(t,false),server=createDashboard({store,outputDir:dir});await new Promise(r=>server.listen(0,'127.0.0.1',r));t.after(async()=>{server.closeAllConnections();await new Promise(r=>server.close(r));fs.rmSync(dir,{recursive:true,force:true});}); + const base='http://127.0.0.1:'+server.address().port; + const call=async(username,password)=>{const response=await fetch(base+'/api/login',{method:'POST',headers:{Origin:base,'Content-Type':'application/json'},body:JSON.stringify({username,password})});return {status:response.status,body:await response.json(),cookie:response.headers.get('set-cookie')};}; + t.mock.method(crypto,'scryptSync',()=>{throw Error('synchronous password computation blocks other pages');}); + const good=await call('ADMIN','Test-password-123');assert.equal(good.status,200);assert.equal(good.body.user.username,'admin');assert.ok(good.cookie); + assert.equal((await call('missing','Test-password-123')).status,401);assert.equal((await call('admin','Wrong-password-123')).status,401); + const authenticate=store.authenticateAsync.bind(store);store.authenticateAsync=async(...args)=>{const user=await authenticate(...args);store.updateUser(user.id,{version:user.version,enabled:true,role:user.role},user);return user;}; + const stale=await call('admin','Test-password-123');assert.equal(stale.status,401,'account revocation between validation and session issuance must win');assert.equal(stale.cookie,null); +}); +test('a disabled or changed account cannot complete a queued asynchronous login',async t=>{ + const {store,admin}=fixture(t),worker=store.addUser({username:'worker',password:'Test-password-123',role:'operator'},'admin'); + assert.equal(typeof store.authenticateAsync,'function'); + const pending=store.authenticateAsync('worker','Test-password-123');store.updateUser(worker.id,{version:1,enabled:false,role:'operator'},admin);assert.equal(await pending,null); + const reset=store.authenticateAsync('admin','Test-password-123');store.updatePassword(admin.id,'New-password-456',admin);assert.equal(await reset,null); +}); +test('asynchronous password jobs yield to the event loop and reject excessive queued work',async t=>{ + const {store}=fixture(t);assert.equal(typeof store.authenticateAsync,'function'); + let completed=0;const jobs=Array.from({length:60},()=>store.authenticateAsync('admin','Test-password-123').finally(()=>completed++)); + const settled=Promise.allSettled(jobs);await new Promise(r=>setImmediate(r));assert.ok(completed<60,'HTTP/event loop must run while scrypt works'); + const results=await settled;assert.ok(results.some(item=>item.status==='fulfilled'&&item.value?.username==='admin'));assert.ok(results.some(item=>item.status==='rejected'&&item.reason.status===429)); +}); diff --git a/tests/app/backend-refresh-performance.test.cjs b/tests/app/backend-refresh-performance.test.cjs new file mode 100644 index 0000000..c4e941e --- /dev/null +++ b/tests/app/backend-refresh-performance.test.cjs @@ -0,0 +1,48 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); +const {RuntimeHealth}=require('../../src/modules/health/runtime-health.cjs'); +const {OrderExecutionCoordinator}=require('../../src/modules/order-execution/coordinator.cjs'); +const {OrderRuleDispatcher}=require('../../src/modules/order-rules/dispatcher.cjs'); + +test('health reads execution progress without field evidence, candidates, scans or provider probes',t=>{ + const stateDir=fs.mkdtempSync(path.join(os.tmpdir(),'lean-health-')); + const tasks=[ + {id:'blocked',connectionId:'mine',row:{processName:'Current process'},status:'blocked',orderId:'o1',error:'Capture blocked',updatedAt:'2026-10-27T01:00:00Z'}, + {id:'complete',connectionId:'mine',row:{processName:'Completed process'},status:'archived',orderId:'o2',reason:'Archived progress',updatedAt:'2026-10-27T02:00:00Z'}, + {id:'private',connectionId:'other',row:{processName:'PRIVATE_OTHER'},status:'failed',updatedAt:'2026-10-27T03:00:00Z'} + ]; + const execution=Object.create(OrderExecutionCoordinator.prototype); + execution.store={capabilities:{liveTodo:true,pdfExport:false,automaticArchive:true}, + all(kind){assert.equal(kind,'execution-tasks','health must only enumerate execution tasks');return structuredClone(tasks);}, + get(kind,id){assert.equal(kind,'orders');return {status:id==='o1'?'pending':'sent',error:'Order detail'};}, + fields(){assert.fail('health must not decrypt captured fields');} + }; + execution.snapshot=()=>assert.fail('full execution snapshot is not a health read'); + execution.provider={capabilities:()=>assert.fail('must not probe')}; + const health=new RuntimeHealth({stateDir,execution,workspace:{snapshot:()=>({connections:[{id:'mine',owner:'worker'},{id:'other',owner:'other'}]})}}); + t.after(()=>{health.close();fs.rmSync(stateDir,{recursive:true,force:true});}); + const group=health.snapshot({username:'worker',role:'operator'}).groups.find(group=>group.key==='execution'); + assert.equal(group.status,'error'); + assert.deepEqual(group.items.filter(item=>!item.global).map(item=>[item.id,item.status,item.detail]),[['complete','healthy','Order detail'],['blocked','error','Capture blocked']]); + assert.doesNotMatch(JSON.stringify(group),/PRIVATE_OTHER/); + const first=execution.healthSnapshot();first.capabilities.liveTodo=false;first.tasks.find(task=>task.id==='complete').status='unknown'; + assert.equal(execution.healthSnapshot().capabilities.liveTodo,true); + assert.equal(execution.healthSnapshot().tasks.find(task=>task.id==='complete').status,'sent'); +}); + +test('paused dispatcher expires prepared automatic queues without assembling rules or execution snapshots',async()=>{ + const now=new Date('2026-10-27T04:00:00Z'),finished=[],batches=[ + {id:'expired',status:'prepared',cutoff:'2026-10-27T03:00:00Z'}, + {id:'boundary',status:'prepared',cutoff:'2026-10-27T03:30:00Z'}, + {id:'manual',status:'prepared',manual:true,cutoff:'2026-10-27T03:00:00Z'}, + {id:'unknown',status:'unknown',cutoff:'2026-10-27T03:00:00Z'} + ];let intakeChecks=0; + const dispatcher=new OrderRuleDispatcher({clock:()=>now,store:{ + capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true},settings:()=>({enabled:false}), + expireIntakes(){intakeChecks++;},all(kind){assert.equal(kind,'batches');return structuredClone(batches);}, + snapshot(){assert.fail('polling must not assemble a full rule snapshot');},finishSending(...args){finished.push(args);} + },mail:{exclusive:()=>assert.fail('paused dispatcher must not send')},providersReady:()=>true}); + await dispatcher.tick(); + assert.equal(intakeChecks,1);assert.equal(finished.length,1);assert.equal(finished[0][0],'expired');assert.equal(finished[0][1],'failed'); + assert.deepEqual(finished[0][3],{outcome:'not_submitted',phase:'queue_expired',at:'2026-10-27T04:00:00.000Z'}); +}); diff --git a/tests/app/final-auth-ownership.test.cjs b/tests/app/final-auth-ownership.test.cjs index cfa65d3..353fe34 100644 --- a/tests/app/final-auth-ownership.test.cjs +++ b/tests/app/final-auth-ownership.test.cjs @@ -1,7 +1,7 @@ 'use strict'; const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),vm=require('node:vm'); const source=fs.readFileSync('web/app.js','utf8'); -function fixture(){let resolve,requests=0,disposed=0,booted=0;const context={AbortController,AbortSignal,setTimeout:(fn,ms)=>{const timer=setTimeout(fn,ms);timer.unref();return timer;},clearTimeout,fetch:()=>{requests++;return new Promise(r=>resolve=r);},window:{PageLifecycle:{revision:1,dispose:async()=>{disposed++;},succeeded(){},failed(){}},BpmLogin:{dispose(){}}}};vm.createContext(context);vm.runInContext("let currentUser={username:'old'},viewGeneration=1;const pendingWrites=new Map();async function boot(){booted++;}",context);context.booted=0;vm.runInContext(source.slice(source.indexOf('async function api('),source.indexOf('async function verifyUncertainWrite(')),context);return {context,run:s=>vm.runInContext(s,context),resolve:r=>resolve(r),requests:()=>requests,disposed:()=>disposed};} +function fixture(){let resolve,requests=0,disposed=0,booted=0;const context={AbortController,AbortSignal,structuredClone,DOMException,setTimeout:(fn,ms)=>{const timer=setTimeout(fn,ms);timer.unref();return timer;},clearTimeout,fetch:()=>{requests++;return new Promise(r=>resolve=r);},window:{PageLifecycle:{revision:1,dispose:async()=>{disposed++;},succeeded(){},failed(){}},BpmLogin:{dispose(){}}}};vm.createContext(context);vm.runInContext("let currentUser={username:'old'},viewGeneration=1;async function boot(){booted++;}",context);context.booted=0;vm.runInContext(source.slice(source.indexOf('const pendingWrites='),source.indexOf('async function verifyUncertainWrite(')),context);return {context,run:s=>vm.runInContext(s,context),resolve:r=>resolve(r),requests:()=>requests,disposed:()=>disposed};} for(const change of ['viewGeneration++;window.PageLifecycle.revision++;','currentUser={username:"new"};viewGeneration++;window.PageLifecycle.revision++;'])test('obsolete 401 has no auth effects after '+change,async()=>{const f=fixture(),request=f.run("api('/old')");f.run(change);f.resolve({ok:false,status:401,json:async()=>({error:'expired'})});await assert.rejects(request,/expired/);assert.equal(f.run('currentUser!==null'),true);assert.equal(f.disposed(),0);assert.equal(f.context.booted,0);}); test('owned session 401 still disposes expired session',async()=>{const f=fixture(),request=f.run("api('/current')");f.resolve({ok:false,status:401,json:async()=>({error:'expired'})});await assert.rejects(request,/expired/);assert.equal(f.run('currentUser'),null);assert.equal(f.disposed(),1);assert.equal(f.context.booted,1);}); test('identical writes from a newer session never join old pending work',async()=>{const f=fixture();f.run("api('/write',{a:1})");f.run('currentUser={username:"new"};viewGeneration++;');const current=f.run("api('/write',{a:1})");assert.equal(f.requests(),2);f.resolve({ok:true,json:async()=>({version:2})});await current;}); diff --git a/tests/app/polling-performance-ui.test.cjs b/tests/app/polling-performance-ui.test.cjs new file mode 100644 index 0000000..4ffd37d --- /dev/null +++ b/tests/app/polling-performance-ui.test.cjs @@ -0,0 +1,14 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'); +const {orderDrivenUI}=require('../fixtures/order-driven-ui.cjs'); +async function visibility(page,hidden){await page.evaluate(value=>{Object.defineProperty(document,'hidden',{configurable:true,value});document.dispatchEvent(new Event('visibilitychange'));},hidden);} +test('home opens with one summary and lightweight topbar, pauses hidden reads and checks once on return',{timeout:60000},async t=>{const {page}=await orderDrivenUI(t,'#overview');await page.locator('[data-business-home]').waitFor();await page.clock.install();const requests=[];page.on('request',r=>{if(r.url().includes('/api/'))requests.push(new URL(r.url()).pathname+new URL(r.url()).search);});await page.reload();await page.locator('[data-business-home]').waitFor();assert.equal(requests.filter(r=>r==='/api/order-rules?view=summary').length,1);assert.equal(requests.filter(r=>r==='/api/order-rules/status').length,1);requests.length=0;await page.clock.fastForward(15001);await new Promise(r=>setTimeout(r,150));assert.equal(requests.filter(r=>r==='/api/order-rules?view=summary').length,1);assert.equal(requests.filter(r=>r==='/api/order-rules/status').length,1);requests.length=0;await visibility(page,true);await page.clock.fastForward(60001);await page.waitForTimeout(100);assert.deepEqual(requests,[]);await visibility(page,false);await page.waitForResponse(r=>r.url().endsWith('/api/order-rules?view=summary'));await page.waitForTimeout(100);assert.equal(requests.filter(r=>r==='/api/order-rules?view=summary').length,1);assert.equal(requests.filter(r=>r==='/api/order-rules/status').length,1);}); +test('health, BPM, ledger and business records stop background requests without replacing draft inputs',{timeout:60000},async t=>{const {page}=await orderDrivenUI(t,'#health');await page.clock.install();for(const [route,ready,endpoint] of [['health','#health-refresh','/api/health'],['bpm','[data-bpm-feedback]','/api/workspace'],['records-pdf','[data-pdf-list]','/api/jobs?'],['notification-orders','[data-arrival-list]','/api/order-rules/orders?'],['notification-batches','[data-arrival-list]','/api/order-rules/batches?']]){await visibility(page,false);await page.evaluate(hash=>location.hash=hash,route);await page.locator(ready).waitFor({state:'attached'});await page.waitForTimeout(200);const seen=[];const listen=r=>{if(r.url().includes(endpoint))seen.push(r.url());};const draft=page.locator('[name=q],#record-search').first();if(await draft.count())await draft.fill('未提交过滤词');page.on('request',listen);await visibility(page,true);await page.clock.fastForward(31001);await page.waitForTimeout(100);assert.equal(seen.length,0,route+' should not poll hidden');await visibility(page,false);if(await draft.count())assert.equal(await draft.inputValue(),'未提交过滤词');page.off('request',listen);} }); + +test('notification settings request only configuration and fetch mailbox in parallel',{timeout:60000},async t=>{const {page}=await orderDrivenUI(t,'#overview');await page.locator('[data-business-home]').waitFor();let release;const held=new Promise(resolve=>release=resolve);let mailRead=false,settingsRead=false,heavy=0;await page.route('**/api/order-rules/notification-settings',async route=>{settingsRead=true;await held;await route.fulfill({json:{settings:{enabled:false,processingEnabled:false,version:1}}});});await page.route('**/api/mail',route=>{mailRead=true;return route.fulfill({json:{channels:[]}});});page.on('request',r=>{if(r.url().endsWith('/api/order-rules?view=summary'))heavy++;});try{await page.evaluate(()=>location.hash='notification-settings');await page.waitForFunction(()=>document.querySelector('#view-title').textContent==='发送设置');await new Promise(r=>setTimeout(r,250));assert.equal(settingsRead,true);assert.equal(mailRead,true);assert.equal(heavy,0);}finally{release();}await page.locator('#order-rule-settings').waitFor();}); + +test('cold authentication reads bootstrap once and an authenticated reload skips bootstrap',{timeout:60000},async t=>{const {page,browser,base}=await orderDrivenUI(t,'#overview');await page.locator('[data-business-home]').waitFor();const context=await browser.newContext();try{const cold=await context.newPage(),bootstrap=[];cold.on('request',r=>{if(r.url().endsWith('/api/bootstrap/status'))bootstrap.push(r.url());});await cold.goto(base);await cold.locator('#login-form').waitFor();assert.equal(bootstrap.length,1);}finally{await context.close();}let bootstrap=0;page.on('request',r=>{if(r.url().endsWith('/api/bootstrap/status'))bootstrap++;});await page.reload();await page.locator('[data-business-home]').waitFor();assert.equal(bootstrap,0);}); + +test('field mapping directory starts while the independent connection catalog is still loading',{timeout:60000},async t=>{const {page}=await orderDrivenUI(t,'#overview');await page.locator('[data-business-home]').waitFor();let release;const held=new Promise(resolve=>release=resolve);let fieldRead=false;await page.route('**/api/workspace',async route=>{await held;await route.continue();});await page.route('**/api/order-rules/fields?view=scopes',route=>{fieldRead=true;return route.continue();});try{await page.evaluate(()=>location.hash='rule-fields');await page.waitForFunction(()=>document.querySelector('#view-title').textContent==='字段映射');await new Promise(r=>setTimeout(r,250));assert.equal(fieldRead,true);}finally{release();}await page.locator('#fm-count').waitFor();}); + +test('running assistant polling pauses hidden and resumes without clearing the next message draft',{timeout:60000},async t=>{const {page}=await orderDrivenUI(t,'#overview');await page.locator('[data-business-home]').waitFor();const conversation={id:'c1',title:'隔离会话',version:1,turns:[{id:'t1',status:'running',text:'只读检查',actions:[]}]};await page.route('**/api/assistant',r=>r.fulfill({json:{settings:{enabled:true,model:'fixture'},conversations:[conversation],usage:{calls:1,limit:30}}}));await page.route('**/api/assistant/conversations?*',r=>r.fulfill({json:{items:[conversation],total:1,page:1}}));await page.route('**/api/assistant/operations*',r=>r.fulfill({json:{events:[]}}));await page.route('**/api/assistant/conversations/c1',r=>r.fulfill({json:conversation}));await page.evaluate(()=>location.hash='assistant');await page.getByRole('button',{name:'停止回复',exact:true}).waitFor();await page.clock.install();await page.locator('#assistant-input').fill('保留下一条草稿');let reads=0;page.on('request',r=>{if(r.url().endsWith('/api/assistant/conversations/c1'))reads++;});await visibility(page,true);await page.clock.fastForward(10001);await new Promise(r=>setTimeout(r,100));assert.equal(reads,0);const response=page.waitForResponse(r=>r.url().endsWith('/api/assistant/conversations/c1'));await visibility(page,false);await response;assert.equal(reads,1);assert.equal(await page.locator('#assistant-input').inputValue(),'保留下一条草稿');}); diff --git a/tests/app/read-refresh-performance.test.cjs b/tests/app/read-refresh-performance.test.cjs new file mode 100644 index 0000000..d1c97e1 --- /dev/null +++ b/tests/app/read-refresh-performance.test.cjs @@ -0,0 +1,11 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),vm=require('node:vm'); +function apiFixture(){const requests=[],context=vm.createContext({document:{querySelector:()=>null},window:{PageLifecycle:{revision:1,succeeded(){},failed(){}}},AbortController,AbortSignal,DOMException,structuredClone,setTimeout,clearTimeout,fetch:(url,options)=>new Promise((resolve,reject)=>{const row={url,options,reply:(data)=>resolve({ok:true,status:200,json:async()=>data})};requests.push(row);options.signal.addEventListener('abort',()=>reject(new DOMException('Aborted','AbortError')),{once:true});})});vm.runInContext(fs.readFileSync('web/app.js','utf8').split('async function verifyUncertainWrite')[0],context);vm.runInContext("currentUser={id:'one'}",context);return {requests,run:code=>vm.runInContext(code,context),context};} +test('same-user in-flight reads share transport but retain independent abort and result objects',async()=>{const f=apiFixture();f.run('globalThis.a=new AbortController();globalThis.b=new AbortController()');const first=f.run("api('/test',undefined,{signal:a.signal})"),second=f.run("api('/test',undefined,{signal:b.signal})");const rejected=assert.rejects(first,{name:'AbortError'});f.run('a.abort()');await rejected;assert.equal(f.requests.length,1);assert.equal(f.requests[0].options.signal.aborted,false);f.requests[0].reply({rows:[1]});assert.deepEqual(await second,{rows:[1]});const third=f.run("api('/next')"),fourth=f.run("api('/next')");f.requests[1].reply({rows:[1]});const [x,y]=await Promise.all([third,fourth]);x.rows.push(2);assert.deepEqual(y,{rows:[1]});}); +test('mutations and identity changes prevent joining an older read',async()=>{const f=apiFixture();const old=f.run("api('/test')"),write=f.run("api('/settings',{})");f.requests[1].reply({ok:true});await write;const next=f.run("api('/test')");assert.equal(f.requests.length,3);f.run("currentUser={id:'two'}");const other=f.run("api('/test')");assert.equal(f.requests.length,4);for(const row of f.requests)row.reply({ok:true});await Promise.all([old,next,other]);}); +function pollFixture(){const listeners={},timers=new Map();let seq=0;const document={hidden:false,addEventListener:(name,fn)=>listeners[name]=fn,removeEventListener:(name,fn)=>{if(listeners[name]===fn)delete listeners[name];}};const context=vm.createContext({document,window:{addEventListener(){}},crypto,AbortController,DOMException,setTimeout:(fn)=>{timers.set(++seq,fn);return seq;},clearTimeout:id=>timers.delete(id)});vm.runInContext(fs.readFileSync('web/modules/navigation/lifecycle.js','utf8'),context);return {context,document,listeners,timers,run:code=>vm.runInContext(code,context),tick:async()=>{const rows=[...timers.values()];timers.clear();for(const fn of rows)fn();await Promise.resolve();}};} +test('background pollers pause hidden, resume once visible, serialize work and dispose',async()=>{const f=pollFixture();f.run('globalThis.calls=0;globalThis.finish=null;globalThis.poll=window.PageLifecycle.poll(()=>{calls++;return new Promise(resolve=>finish=resolve);},1000)');await f.tick();assert.equal(f.run('calls'),1);f.run('poll.run()');assert.equal(f.run('calls'),1);f.document.hidden=true;f.listeners.visibilitychange();await f.tick();assert.equal(f.run('calls'),1);f.document.hidden=false;f.listeners.visibilitychange();f.run('finish()');await new Promise(r=>setImmediate(r));await f.tick();assert.equal(f.run('calls'),2);f.run('poll.dispose();finish()');await new Promise(r=>setImmediate(r));assert.equal(f.timers.size,0);assert.equal(f.listeners.visibilitychange,undefined);}); + +test('manual poll refresh cancels an older request and waits for a fresh response',async()=>{const f=pollFixture();f.run("globalThis.calls=0;globalThis.poll=window.PageLifecycle.poll(signal=>{calls++;return new Promise((resolve,reject)=>signal.addEventListener('abort',()=>reject(new DOMException('Aborted','AbortError')),{once:true}));},1000)");await f.tick();assert.equal(f.run('calls'),1);const fresh=f.run('poll.refresh()');await new Promise(r=>setImmediate(r));assert.equal(f.run('calls'),2);f.run('poll.dispose()');await assert.rejects(fresh,{name:'AbortError'});}); + +test('a new navigation generation cannot join an older page read',async()=>{const f=apiFixture();const old=f.run("api('/test')");f.run('viewGeneration++;window.PageLifecycle.revision++');const fresh=f.run("api('/test')");try{assert.equal(f.requests.length,2);}finally{for(const row of f.requests)row.reply({ok:true});await Promise.all([old,fresh]);}}); diff --git a/tests/app/web-closure-review-ui.test.cjs b/tests/app/web-closure-review-ui.test.cjs index e84f5a2..fa24d02 100644 --- a/tests/app/web-closure-review-ui.test.cjs +++ b/tests/app/web-closure-review-ui.test.cjs @@ -3,7 +3,7 @@ const {test}=require('node:test'),assert=require('node:assert/strict'),fs=requir const {startTestDashboard,login}=require('../fixtures/dashboard-runtime.cjs'),{loadPlaywright,browserOptions}=require('../../src/platform/browser.cjs'); async function fixture(t,hash='schedule'){const dir=await fs.mkdtemp(path.join(os.tmpdir(),'closure-review-')),runtime=await startTestDashboard({stateDir:dir,mailHistory:true}),browser=await loadPlaywright().chromium.launch(browserOptions());t.after(async()=>{await browser.close();await runtime.close();await fs.rm(dir,{recursive:true,force:true});});const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(6000);await page.goto('http://127.0.0.1:'+runtime.server.address().port+'/#'+hash);await login(page);return {page,runtime};} test('a successful delayed save commits only submitted inputs and later edits remain dirty',{timeout:45000},async t=>{const {page}=await fixture(t);await page.locator('#schedule-form').waitFor();let release,arrive;const arrived=new Promise(r=>arrive=r),gate=new Promise(r=>release=r);await page.route('**/api/settings',async route=>{if(route.request().method()==='GET')return route.continue();const response=await route.fetch();arrive();await gate;return route.fulfill({response});});await page.locator('#time-first').fill('09:11');await page.getByRole('button',{name:'保存发送计划',exact:true}).click();await arrived;await page.locator('#time-first').fill('09:12');release();await page.getByText('发送计划已保存。',{exact:true}).waitFor();assert.equal(await page.evaluate(()=>PageLifecycle.dirty()),true);await page.getByRole('link',{name:'业务日历',exact:true}).first().click();await page.getByRole('dialog',{name:'未保存的修改'}).waitFor();assert.equal(await page.locator('#time-first').inputValue(),'09:12');}); -for(const destination of ['internal','route'])test('Save and Continue preserves currentTarget for rule settings: '+destination,{timeout:45000},async t=>{const {page}=await fixture(t,'order-rules');await openRuleRoute(page,'notification-settings');await page.locator('#order-rule-settings').waitFor();const input=page.locator('#order-rule-settings [name=maxSize]');await input.fill('12');const posts=[];await page.route('**/api/order-rules/settings',async route=>{posts.push(route.request().postDataJSON());return route.continue();});if(destination==='internal')await openRuleRoute(page,'order-notifications');else await page.getByRole('link',{name:'发送计划',exact:true}).first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();if(destination==='internal')await page.getByRole('heading',{name:'连续业务窗口',exact:true}).waitFor();else await page.locator('#schedule-form').waitFor();assert.equal(posts.length,1);assert.equal(posts[0].maxMessageBytes,12582912);}); +for(const destination of ['internal','route'])test('Save and Continue preserves currentTarget for rule settings: '+destination,{timeout:45000},async t=>{const {page}=await fixture(t,'order-rules');await openRuleRoute(page,'notification-settings');await page.locator('#order-rule-settings').waitFor();const input=page.locator('#order-rule-settings [name=maxSize]');await input.fill('12');const posts=[];await page.route('**/api/order-rules/settings',async route=>{posts.push(route.request().postDataJSON());return route.continue();});if(destination==='internal')await openRuleRoute(page,'order-notifications');else await page.getByRole('link',{name:'发送计划',exact:true}).first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();if(destination==='internal')await page.locator('[data-business-home]').waitFor();else await page.locator('#schedule-form').waitFor();assert.equal(posts.length,1);assert.equal(posts[0].maxMessageBytes,12582912);}); async function mailFixture(page){const drafts=['t1','t2'].map((id,i)=>({id,version:1,status:'pending',subject:'模板'+(i+1),scope:'',channelId:'mail1',sender:'fixture@example.test',attachmentCount:0,attachments:[],text:'正文'}));await page.route('**/api/mail',route=>route.fulfill({json:{channels:[],templates:drafts,receipts:[],sends:[]}}));await page.route('**/api/mail/templates/categories',route=>route.fulfill({json:{categories:[],bindings:[]}}));await page.route(/\/api\/mail\/templates\/t[12]$/,route=>route.fulfill({json:drafts.find(d=>route.request().url().endsWith('/'+d.id))}));await page.route('**/api/mail/templates/*/preview',route=>route.fulfill({contentType:'text/html',body:'

正文

'}));return drafts;} test('switching a template immediately retires its old editable form while the next detail loads',{timeout:45000},async t=>{ @@ -31,10 +31,10 @@ test('field mapping save retains returned version after followup GET fails',{tim await page.route('**/api/order-rules/fields*',route=>saved?route.fulfill({status:503,json:{error:'fields unavailable'}}):route.fulfill({json:{samples:[{id:'s1',processName:'测试流程',processVersion:'1',sample:{title:'订单号:A1'},fields:[{path:'order',label:'订单号',value:'A1'},{path:'brief',label:'摘要',value:'摘要'}]}],adapters:[]}})); await page.route('**/api/order-rules/field-mappings/draft',route=>{const input=route.request().postDataJSON();versions.push(input.version);saved=true;return route.fulfill({json:{...input,id:'a1',version:versions.length,sources:{...input.sources,receivedAt:{type:'metadata',key:'receivedAt'}}}});}); await openRuleRoute(page,'rule-fields');await page.locator('#fm-manual').evaluate(e=>e.open=true);await page.locator('#fm-orderNo').selectOption('order');await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText(/已保存.*刷新失败/).waitFor();assert.equal(await page.evaluate(()=>PageLifecycle.dirty()),false); - await page.getByText(/可选业务信息 ·/).evaluate(e=>e.parentElement.open=true);await page.locator('#fm-customer').selectOption('brief');await page.locator('a[href="#overview"]').first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.getByRole('heading',{name:'连续业务窗口',exact:true}).waitFor();assert.deepEqual(versions,[0,1]); + await page.getByText(/可选业务信息 ·/).evaluate(e=>e.parentElement.open=true);await page.locator('#fm-customer').selectOption('brief');await page.locator('a[href="#overview"]').first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.locator('[data-business-home]').waitFor();assert.deepEqual(versions,[0,1]); }); -test('template usage read failure never enables an alternate binding writer',{timeout:45000},async t=>{const {page}=await fixture(t);await mailFixture(page);await page.route('**/api/order-rules?view=summary',route=>route.fulfill({status:503,json:{error:'使用情况读取失败'}}));await page.getByRole('link',{name:'邮件模板',exact:true}).click();await page.locator('#content').getByText('使用情况读取失败',{exact:true}).waitFor();assert.equal(await page.getByRole('button',{name:'保存关联'}).count(),0);assert.equal(await page.getByRole('button',{name:'预览并确认',exact:true}).count(),2);await page.locator('[data-template=t1]').click();await page.getByLabel('发信标题',{exact:true}).waitFor();assert.equal(await page.getByLabel('发信标题',{exact:true}).inputValue(),'模板1');}); +test('template usage read failure never enables an alternate binding writer',{timeout:45000},async t=>{const {page}=await fixture(t);await mailFixture(page);await page.route('**/api/order-rules/catalog',route=>route.fulfill({status:503,json:{error:'使用情况读取失败'}}));await page.getByRole('link',{name:'邮件模板',exact:true}).click();await page.locator('#content').getByText('使用情况读取失败',{exact:true}).waitFor();assert.equal(await page.getByRole('button',{name:'保存关联'}).count(),0);assert.equal(await page.getByRole('button',{name:'预览并确认',exact:true}).count(),2);await page.locator('[data-template=t1]').click();await page.getByLabel('发信标题',{exact:true}).waitFor();assert.equal(await page.getByLabel('发信标题',{exact:true}).inputValue(),'模板1');}); test('unknown and conflicted task details cannot offer ordinary retry',{timeout:45000},async t=>{const {page,runtime}=await fixture(t,'order-rules');runtime.orderRules.put('execution-tasks',{id:'unknown',connectionId:'c1',status:'unknown',version:1,row:{orderNo:'UNKNOWN'}});await openRuleRoute(page,'notification-execution');await page.getByRole('button',{name:'查看详情'}).click();await page.getByRole('heading',{name:'处理进度'}).waitFor();assert.equal(await page.getByRole('button',{name:'重试失败任务',exact:true}).count(),0);}); diff --git a/tests/bpm/bpm-ui.test.cjs b/tests/bpm/bpm-ui.test.cjs index 60e78ee..e15418f 100644 --- a/tests/bpm/bpm-ui.test.cjs +++ b/tests/bpm/bpm-ui.test.cjs @@ -48,10 +48,11 @@ async function fixture(t,{user={username:'alice',role:'operator'},connections,ac }); await page.goto(base); await page.addStyleTag({path:path.join(__dirname,'../../web/app.css')}); + await page.addScriptTag({path:path.join(__dirname,'../../web/modules/navigation/lifecycle.js')}); if(fs.existsSync(source))await page.addScriptTag({path:source}); assert.equal(await page.evaluate(()=>typeof window.BpmLogin?.mount),'function','BPM page exposes a working mount function'); await page.evaluate(async user=>{ - const api=async(route,body)=>{const r=await fetch('/api'+route,{method:body===undefined?'GET':'POST',headers:{'Content-Type':'application/json'},body:body===undefined?undefined:JSON.stringify(body)});return r.json();}; + const api=async(route,body,{signal}={})=>{const r=await fetch('/api'+route,{signal,method:body===undefined?'GET':'POST',headers:{'Content-Type':'application/json'},body:body===undefined?undefined:JSON.stringify(body)});return r.json();}; await window.BpmLogin.mount(document.querySelector('#root'),{api,esc:v=>String(v??'').replaceAll('<','<'),formatDate:v=>v||'—',notify:()=>{},user,isActive:()=>true}); },user); return {page,calls,releaseOpen,releaseInput,releaseFrame,releaseSave,releaseAccount,releaseFill,releaseAccountSave,maxFrames:()=>maxFrames}; @@ -286,8 +287,9 @@ for(const pendingAction of ['open','save'])test(`document unload sends authentic const appSource=fs.readFileSync(path.join(__dirname,'../../web/app.js'),'utf8').replace(/boot\(\)\.catch[\s\S]*$/,''); const fixtureServer=http.createServer(async(req,res)=>{ const requestPath=new URL(req.url,'http://localhost').pathname; + if(requestPath==='/lifecycle.js'){res.setHeader('Content-Type','application/javascript; charset=utf-8');return res.end(fs.readFileSync(path.join(__dirname,'../../web/modules/navigation/lifecycle.js')));} if(requestPath==='/bpm.js'||requestPath==='/app.js'){res.setHeader('Content-Type','application/javascript; charset=utf-8');return res.end(requestPath==='/bpm.js'?fs.readFileSync(source):appSource);} - if(!requestPath.startsWith('/api/')){res.setHeader('Content-Type','text/html; charset=utf-8');return res.end('
');} + if(!requestPath.startsWith('/api/')){res.setHeader('Content-Type','text/html; charset=utf-8');return res.end('
');} let body='';for await(const chunk of req)body+=chunk; calls.push({path:requestPath,body,cookie:req.headers.cookie,origin:req.headers.origin}); res.setHeader('Content-Type','application/json'); @@ -364,3 +366,5 @@ test('UI renders backend conclusions without reinterpreting raw connection flags assert.equal(await f.page.locator('[data-sync-status] .bpm-status-yellow').count(),1); await f.page.getByText('后端已核实会话',{exact:true}).waitFor(); }); + +test('remote login frames pause hidden and resume a single frame without replacing the session',async t=>{const f=await fixture(t);await f.page.getByRole('button',{name:'远程登录',exact:true}).click();await f.page.locator('[data-bpm-frame]').waitFor();await f.page.clock.install();const frames=()=>f.calls.filter(c=>c.path.endsWith('/frame')).length,before=frames();await f.page.evaluate(()=>{Object.defineProperty(document,'hidden',{value:true,configurable:true});document.dispatchEvent(new Event('visibilitychange'));});await f.page.clock.fastForward(10001);await delay(100);assert.equal(frames(),before);const response=f.page.waitForResponse(r=>r.url().endsWith('/login/frame'));await f.page.evaluate(()=>{Object.defineProperty(document,'hidden',{value:false,configurable:true});document.dispatchEvent(new Event('visibilitychange'));});await response;assert.equal(frames(),before+1);assert.equal(f.calls.filter(c=>c.path.endsWith('/open')).length,1);assert.equal(f.calls.filter(c=>c.path.endsWith('/close')).length,0);}); diff --git a/tests/fixtures/dashboard-runtime.cjs b/tests/fixtures/dashboard-runtime.cjs index a16e657..f7abaf3 100644 --- a/tests/fixtures/dashboard-runtime.cjs +++ b/tests/fixtures/dashboard-runtime.cjs @@ -18,5 +18,5 @@ async function startTestDashboard({stateDir,mailHistory=false,executionFactory}) await new Promise((resolve,reject)=>{server.once('error',reject);server.listen(0,'127.0.0.1',resolve);}); return {server,store,workspace,orderRules,mail,orderExecution,async close(){await orderExecution?.stop();await mail?.stop();server.closeAllConnections();await new Promise(r=>server.close(r));workspace.close();orderRules.close();mailStore?.close();}}; } -async function login(page){await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click();} +async function login(page){await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await Promise.all([page.waitForResponse(response=>response.url().endsWith('/api/login')&&response.request().method()==='POST'),page.getByRole('button',{name:'登录',exact:true}).click()]);await page.locator('#logout').waitFor();} module.exports={startTestDashboard,login}; diff --git a/tests/fixtures/query-performance.cjs b/tests/fixtures/query-performance.cjs new file mode 100644 index 0000000..75a66fa --- /dev/null +++ b/tests/fixtures/query-performance.cjs @@ -0,0 +1,24 @@ +'use strict'; +const crypto=require('node:crypto'); +const {DatabaseSync}=require('node:sqlite'); +const {RuleStore}=require('../../src/modules/order-rules/store.cjs'); +const {BpmVault}=require('../../src/platform/security/vault.cjs'); +function fixture(n,{status='pending',huizhou=false}={}){ + const db=new DatabaseSync(':memory:');db.exec('CREATE TABLE records(kind TEXT,id TEXT,payload BLOB,PRIMARY KEY(kind,id))'); + const vault=Object.assign(Object.create(BpmVault.prototype),{key:crypto.randomBytes(32)}),counts={all:{},get:{},decode:0};let now=new Date('2026-10-26T01:00:00Z'); + const store=Object.assign(Object.create(RuleStore.prototype),{db,vault,clock:()=>new Date(now),schedule:()=>({times:['11:00','17:00'],weekends:false}),calendar:()=>[],capabilities:{}}); + store.put('settings',{id:'main',version:1,enabled:false,processingEnabled:false,channelId:'',maxMessageBytes:20971520}); + for(const draft of require('../../src/modules/order-rules/catalog.cjs').seedRules())store.put('rules',{id:draft.id,draft,published:null}); + const rule={id:'bs-change',categoryId:'bs-change',name:'Synthetic',version:1,processNames:['Synthetic'],nodeNames:['Node'],scopes:[{processName:'Synthetic',nodeName:'Node'}],huizhouEnabled:huizhou,to:['fixture@example.invalid']}; + for(let i=0;i[{id:'a',owner:'alice'}],businessIssue:()=>null}},actor:{username:'alice',role:'operator'},reset(){counts.all={};counts.get={};counts.decode=0;},setNow(value){now=new Date(value);},close(){db.close();vault.key.fill(0);}}; +} +module.exports={fixture}; diff --git a/tests/fixtures/records-app.cjs b/tests/fixtures/records-app.cjs index 40b8e4b..99d8405 100644 --- a/tests/fixtures/records-app.cjs +++ b/tests/fixtures/records-app.cjs @@ -2,5 +2,5 @@ const fs=require('node:fs'),os=require('node:os'),path=require('node:path'); const {Store}=require('../../src/modules/dashboard/store.cjs'),{WorkspaceStore}=require('../../src/modules/workspace/store.cjs'),{BpmScanStore}=require('../../src/modules/bpm/scan-store.cjs'),{BpmScanner}=require('../../src/modules/bpm/scanner.cjs'),{createDashboard}=require('../../src/app/dashboard.cjs'),{loadPlaywright,browserOptions}=require('../../src/platform/browser.cjs'); async function setup(t){const dir=fs.mkdtempSync(path.join(os.tmpdir(),'record-nav-')),store=new Store(path.join(dir,'dashboard')),workspace=new WorkspaceStore(path.join(dir,'workspace')),scan=new BpmScanStore(path.join(dir,'scan')),password='Record-nav-test-123',actor={username:'admin',role:'admin'};store.bootstrap('admin',password);for(const role of ['viewer','operator'])store.addUser({username:role,password,role},'admin');const connection=workspace.createConnection({name:'隔离测试来源',owner:'admin'},actor,store.users());scan.saveConfig({enabled:false,intervalMinutes:9});scan.complete(scan.begin(connection.id,'admin'),connection.id,Array.from({length:105},(_,i)=>({taskId:String(i).padStart(3,'0'),serialNum:'TEST-'+String(i).padStart(3,'0'),source:'portal-v4',processName:'海外运营订单评审',activityName:'通知节点',subject:'订单样例 '+String(i).padStart(3,'0'),arrivalDay:'2026-10-20',arrivedAt:'2026-10-20T01:00:00Z'})),connection);for(let i=0;i<105;i++)store.recordJob({jobId:'job-'+String(i).padStart(3,'0'),status:'error',metadata:{order:'PDF-'+String(i).padStart(3,'0')},error:'隔离导出失败'});const scanner=new BpmScanner({store:scan,workspace,manager:{scanArrivals:async()=>[]},settings:()=>store.settings()}),server=createDashboard({store,workspace,scanner,outputDir:dir});await new Promise(r=>server.listen(0,'127.0.0.1',r));const browser=await loadPlaywright().chromium.launch(browserOptions()),base='http://127.0.0.1:'+server.address().port; -t.after(async()=>{await browser.close();await scanner.stop();server.closeAllConnections();await new Promise(r=>server.close(r));scan.close();workspace.close();fs.rmSync(dir,{recursive:true,force:true});});return {store,workspace,scan,connection,browser,base,password,async page(route='#records',username='admin',clock=false){const page=await browser.newPage({viewport:{width:1280,height:900}});if(clock)await page.clock.install();await page.goto(base+'/'+route);await page.locator('#username').fill(username);await page.locator('#password').fill(password);await page.locator('#login-form button').click();return page;}};} +t.after(async()=>{await browser.close();await scanner.stop();server.closeAllConnections();await new Promise(r=>server.close(r));scan.close();workspace.close();fs.rmSync(dir,{recursive:true,force:true});});return {store,workspace,scan,connection,browser,base,password,async page(route='#records',username='admin',clock=false){const page=await browser.newPage({viewport:{width:1280,height:900}});if(clock)await page.clock.install();await page.goto(base+'/'+route);await page.locator('#username').fill(username);await page.locator('#password').fill(password);await Promise.all([page.waitForResponse(response=>response.url().endsWith('/api/login')&&response.request().method()==='POST'),page.locator('#login-form button').click()]);await page.locator('#logout').waitFor();return page;}};} module.exports={setup}; diff --git a/tests/mail/history-ui.test.cjs b/tests/mail/history-ui.test.cjs index d1f1482..c7d816f 100644 --- a/tests/mail/history-ui.test.cjs +++ b/tests/mail/history-ui.test.cjs @@ -6,7 +6,7 @@ test('history UI saves IMAP-only credentials locally, explicitly queries sent ma t.after(async()=>{await browser?.close();await runtime.close();fs.rmSync(dir,{recursive:true,force:true});}); let connects=0; const raw=Buffer.from('From: sender@example.test\r\nTo: orders@example.test\r\nSubject: Test notice\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n Huizhou evidence'); - runtime.mail.imapFactory=()=>({mailbox:{uidValidity:1n},on(){},async connect(){connects++;},async list(){return [{path:'Sent',specialUse:'\\Sent'}];},async getMailboxLock(_path,opts){assert.equal(opts.readOnly,true);return {release(){}};},async search(){return [1];},async fetchOne(uid,q){return q.source?{source:raw}:{uid,size:raw.length,envelope:{subject:'Test notice'}};},async logout(){},close(){}}); + runtime.mail.imapFactory=()=>({mailbox:{uidValidity:1n},on(){},async connect(){connects++;},async list(){return [{path:'Sent',specialUse:'\\Sent'}];},async getMailboxLock(_path,opts){assert.equal(opts.readOnly,true);return {release(){}};},async search(){return [1];},async *fetch(){yield {uid:1,size:raw.length,envelope:{subject:'Test notice'}};},async fetchOne(uid,q){return q.source?{source:raw}:{uid,size:raw.length,envelope:{subject:'Test notice'}};},async logout(){},close(){}}); browser=await loadPlaywright().chromium.launch(browserOptions());const page=await browser.newPage();const requests=[];page.on('request',r=>requests.push(r.url())); await page.goto('http://127.0.0.1:'+runtime.server.address().port+'/#mail');await login(page);await page.getByRole('button',{name:'只读查阅已发送邮件',exact:true}).click(); await page.getByRole('button',{name:'添加只读邮箱',exact:true}).click({timeout:5000}); diff --git a/tests/mail/history.test.cjs b/tests/mail/history.test.cjs index fad5cbf..a256cee 100644 --- a/tests/mail/history.test.cjs +++ b/tests/mail/history.test.cjs @@ -3,13 +3,42 @@ const {test}=require('node:test');const assert=require('node:assert/strict'); const {MailService}=require('../../src/modules/mail/service.cjs'); const fs=require('node:fs'),os=require('node:os'),path=require('node:path'); const {MailStore}=require('../../src/modules/mail/store.cjs'); +const {readHistory}=require('../../src/modules/mail/history.cjs'); const raw=Buffer.from('From: sender@example.test\r\nTo: orders@example.test\r\nCc: factory@example.test\r\nSubject: Order notice\r\nDate: Sun, 18 Oct 2026 10:00:00 +0800\r\nMessage-ID: \r\nContent-Type: text/plain; charset=utf-8\r\n\r\nOrder body'); function fixture(){ const calls=[],store={channelSecret:()=>({version:1,imap:{}}),guard(){}}; const client={mailbox:{uidValidity:9n},on(){},async connect(){},async logout(){},close(){},async list(){return [{path:'Sent',specialUse:'\\Sent',flags:new Set()},{path:'INBOX',flags:new Set()}];},async getMailboxLock(folder,options){calls.push({folder,...options});return {release(){}};},async search(query,options){calls.push({query,...options});return [1,2,3];},async fetchOne(uid,query,options){calls.push({uid,query,...options});return query.source?{source:raw}:{uid,size:raw.length,envelope:{subject:'Order notice',date:new Date('2026-10-18T02:00:00Z'),to:[{address:'orders@example.test'}]}};}}; + client.fetch=async function*(range,query,options){for(const uid of range.split(',').map(Number))yield await client.fetchOne(uid,query,options);}; const service=new MailService({store,imapFactory:()=>client,smtpFactory:()=>{throw Error('SMTP must not be used');}}); return {service,calls,client}; } + +test('history batches bounded UID envelopes, keeps descending order and releases its read lock',async()=>{ + let locked=false,released=0,batches=0; + const client={mailbox:{uidValidity:42n},list:async()=>[{path:'Sent',specialUse:'\\Sent'}], + async getMailboxLock(folder,options){assert.equal(folder,'Sent');assert.equal(options.readOnly,true);locked=true;return {release(){locked=false;released++;}};}, + async search(query,options){assert.equal(locked,true);assert.equal(options.uid,true);return [3,8,5,10,2];}, + fetchOne(){assert.fail('search must not fetch each message separately');}, + async *fetch(range,query,options){batches++;assert.equal(locked,true);assert.equal(range,'10,8,5');assert.deepEqual(query,{uid:true,envelope:true,size:true});assert.deepEqual(options,{uid:true}); + // An expunged UID is absent; sequence order need not equal the requested order. + yield {uid:5,size:100,envelope:{subject:'Five'}};yield {uid:10,envelope:{subject:'Ten'}}; + yield {uid:10,size:200};yield {uid:99,size:1,envelope:{subject:'Unrequested'}};yield {seq:1,flags:new Set()}; + } + }; + const result=await readHistory(client,{action:'search',folder:'Sent',since:'2026-10-01',before:'2026-10-02',limit:3}); + assert.deepEqual(result.messages.map(item=>[item.uid,item.subject,item.size]),[[10,'Ten',200],[5,'Five',100]]);assert.equal(result.uidValidity,'42');assert.equal(result.truncated,true);assert.equal(batches,1);assert.equal(released,1);assert.equal(locked,false); +}); + +test('empty history search never FETCHes and an interrupted batch always releases its lock',async()=>{ + let released=0; + const client={mailbox:{uidValidity:9n},list:async()=>[{path:'Sent',specialUse:'\\Sent'}],getMailboxLock:async()=>({release(){released++;}}),search:async()=>[], + fetchOne:()=>assert.fail('no per-message fetch'),async *fetch(){assert.fail('empty results must not become a wildcard fetch');} + }; + const input={action:'search',folder:'Sent',since:'2026-10-01',before:'2026-10-02'}; + assert.deepEqual((await readHistory(client,input)).messages,[]);assert.equal(released,1); + client.search=async()=>[4];client.fetch=async function*(){throw Error('batch interrupted');}; + await assert.rejects(readHistory(client,input),/batch interrupted/);assert.equal(released,2); +}); test('an IMAP-only history account stores no SMTP credential and rejects all sending or template polling',async t=>{ const dir=fs.mkdtempSync(path.join(os.tmpdir(),'history-account-')),store=new MailStore(dir); const service=new MailService({store,smtpFactory:()=>{throw Error('SMTP should be unreachable');}}); diff --git a/tests/order-rules/batches.test.cjs b/tests/order-rules/batches.test.cjs index 16f0bca..9da717b 100644 --- a/tests/order-rules/batches.test.cjs +++ b/tests/order-rules/batches.test.cjs @@ -102,7 +102,7 @@ function dispatchFixture(t,{ready=true,capabilities=true,enabled=true,verify,sen const record={prepared:0,begun:0,smtp:0,locked:0,status:'prepared',messages:[],sent:[]}; const config={version:1,enabled,channelId:'channel1'}; const caps={liveTodo:capabilities,pdfExport:capabilities,automaticArchive:capabilities}; - const store={discoveryBlockers:()=>[],batchIncomplete:()=>false,settings:()=>({...config}),snapshot:()=>({capabilities:{...caps},batches:[structuredClone({...batch,status:record.status})]}),prepare:(date,actor,window)=>{record.prepared++;assert.equal(date,dispatchCutoff);assert.equal(actor,'系统调度');assert.equal(window.start,'2026-10-19T09:00:00.000Z');assert.equal(window.end,dispatchCutoff);assert.equal(window.startInclusive,true);assert.equal(window.endInclusive,false);return [batch];},beginSending:id=>{assert.equal(id,'batch1');record.begun++;record.status='sending';},finishSending:(id,status,message)=>{assert.equal(id,'batch1');record.status=status;record.messages.push(message);}}; + const store={discoveryBlockers:()=>[],batchIncomplete:()=>false,settings:()=>({...config}),capabilities:caps,all:kind=>kind==='batches'?[structuredClone({...batch,status:record.status})]:[],prepare:(date,actor,window)=>{record.prepared++;assert.equal(date,dispatchCutoff);assert.equal(actor,'系统调度');assert.equal(window.start,'2026-10-19T09:00:00.000Z');assert.equal(window.end,dispatchCutoff);assert.equal(window.startInclusive,true);assert.equal(window.endInclusive,false);return [batch];},beginSending:id=>{assert.equal(id,'batch1');record.begun++;record.status='sending';},finishSending:(id,status,message)=>{assert.equal(id,'batch1');record.status=status;record.messages.push(message);}}; const mail={exclusive:async(id,fn)=>{assert.equal(id,'channel1');record.locked++;return fn();},store:{channelSecret:id=>({id,version:2,email:'sender@example.com',name:'通知',smtp:{host:'unused.invalid'}}),guard:(id,version)=>{assert.equal(id,'channel1');assert.equal(version,2);}},smtpFactory:()=>{record.smtp++;return {verify:async()=>{if(verify)await verify({batch,config,caps,file});},sendMail:async message=>{record.sent.push(message);if(send)return send(message);return result||{accepted:['2639266652@qq.com'],rejected:[]};},close:()=>{}};}}; const schedule={times:['09:00','17:00'],timezone:'Asia/Shanghai',weekends:false,mode:'product_line',missed:'next_window'}; let now=new Date('2026-10-20T00:59:00.000Z'); diff --git a/tests/order-rules/configuration.test.cjs b/tests/order-rules/configuration.test.cjs index 035d676..8e831f9 100644 --- a/tests/order-rules/configuration.test.cjs +++ b/tests/order-rules/configuration.test.cjs @@ -88,6 +88,19 @@ test('status reads only effective settings and in-memory capabilities',async t=> assert.deepEqual(await response.json(),{settings:{enabled:false},capabilities:{liveTodo:true,pdfExport:false,automaticArchive:false}}); }); +test('catalog and notification settings avoid history and unrelated configuration resources',async t=>{ + const rules=memoryRules(t);poisonHistory(rules); + for(const kind of ['field-adapters','scope-catalog','scope-process-catalog'])rules.db.prepare('INSERT OR REPLACE INTO records VALUES(?,?,?)').run(kind,'corrupt',Buffer.from('not encrypted')); + const f=await dashboard(t,{rules}); + const catalogResponse=await f.request('/api/order-rules/catalog');assert.equal(catalogResponse.status,200); + const catalog=await catalogResponse.json();assert.equal(catalog.rules.length,15);assert.equal(catalog.templateUsage.length,15); + assert.deepEqual(Object.keys(catalog.rules[0]).sort(),['categoryId','name']);assert.equal(catalog.templateUsage[0].status,'draft'); + assert.doesNotMatch(JSON.stringify(catalog),/"orders":|"fields":|"adapters":|"draft":/); + const settingsResponse=await f.request('/api/order-rules/notification-settings');assert.equal(settingsResponse.status,200); + assert.deepEqual(await settingsResponse.json(),{settings:rules.settings(),restrictedTest:null}); + for(const route of ['/api/order-rules/catalog','/api/order-rules/notification-settings'])assert.equal((await f.request(route,{role:'anonymous'})).status,401); +}); + test('rule write receipts retain complete editor versions without historic reads or relaxing stale-version validation',async t=>{ const rules=memoryRules(t),{captured}=activateReferenceMapping(rules,'bs-change',{connectionId:'own',instanceId:'i',taskId:'t',revision:'1'}); const draft=rules.saveRule({...rules.get('rules','bs-change').draft,to:['admin@example.test'],attachPdf:false,archiveDirectory:'\\\\server\\orders',filenameDate:'appDate'},'admin');rules.capturedPreview(captured.id); diff --git a/tests/order-rules/dispatch-unsent-proof.test.cjs b/tests/order-rules/dispatch-unsent-proof.test.cjs index b782b83..9b52d45 100644 --- a/tests/order-rules/dispatch-unsent-proof.test.cjs +++ b/tests/order-rules/dispatch-unsent-proof.test.cjs @@ -6,7 +6,7 @@ const at='2026-10-27T03:30:00.000Z'; function fixture({verifyError,sendError,result,channelId='mail',expired=false}={}){ const batch={id:'batch',status:'prepared',cutoff:expired?'2026-10-27T02:00:00.000Z':at,channelId,to:['2639266652@qq.com'],cc:[],attachments:[],orderIds:['order'],ruleSnapshot:{}}; const completions=[];let submissions=0,begun=0; - const store={get:()=>null,now:()=>at,settings:()=>({enabled:true,channelId:'mail'}),snapshot:()=>({batches:[batch],capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true}}),discoveryBlockers:()=>[],batchIncomplete:()=>false,beginSending:()=>{begun++;},finishSending:(...args)=>completions.push(args)}; + const store={get:()=>null,now:()=>at,settings:()=>({enabled:true,channelId:'mail'}),all:kind=>kind==='batches'?[structuredClone(batch)]:[],capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true},discoveryBlockers:()=>[],batchIncomplete:()=>false,beginSending:()=>{begun++;},finishSending:(...args)=>completions.push(args)}; const mail={store:{channelSecret:()=>({id:'mail',version:1,email:'sender@example.com',smtp:{}}),guard:()=>{}},smtpFactory:()=>({verify:async()=>{if(verifyError)throw verifyError;},sendMail:async()=>{submissions++;if(sendError)throw sendError;return result||{accepted:['2639266652@qq.com'],rejected:[]};},close:()=>{}})}; const dispatcher=new OrderRuleDispatcher({store,mail,settings:()=>({}),clock:()=>new Date(at),providersReady:()=>true}); return {dispatcher,batch,store,completions,counts:()=>({submissions,begun})}; diff --git a/tests/order-rules/failure-evidence-ui.test.cjs b/tests/order-rules/failure-evidence-ui.test.cjs index 59f2a11..6b8f78b 100644 --- a/tests/order-rules/failure-evidence-ui.test.cjs +++ b/tests/order-rules/failure-evidence-ui.test.cjs @@ -19,7 +19,7 @@ test('authorized users can explicitly revalidate only the original departed task }); test('test settings and rule editor name uncovered flows even when all categories are ready',{timeout:90000},async t=>{ const {page}=await orderDrivenUI(t,'#notification-orders'),name='零售国内返工订单更改评审<待适配>'; - await page.route('**/api/order-rules?view=summary',async route=>{const response=await route.fetch(),data=await response.json();data.restrictedTest={id:'coverage-test',version:1,enabled:true,ruleCount:15,readyCount:15,recipient:'2639266652@qq.com',archiveRoot:'C:\\isolated',since:'2026-10-26T00:00:00Z',uncovered:[{categoryId:'domestic-change',processName:name}]};await route.fulfill({json:data});}); + await page.route(/\/api\/order-rules\/(notification-settings|configuration)$/,async route=>{const response=await route.fetch(),data=await response.json();data.restrictedTest={id:'coverage-test',version:1,enabled:true,ruleCount:15,readyCount:15,recipient:'2639266652@qq.com',archiveRoot:'C:\\isolated',since:'2026-10-26T00:00:00Z',uncovered:[{categoryId:'domestic-change',processName:name}]};await route.fulfill({json:data});}); for(const hash of ['notification-settings','order-rules']){await page.goto(new URL('/#'+hash,page.url()).href);await page.getByText(name,{exact:true}).waitFor();assert.equal(await page.locator('待适配').count(),0);assert.match(await page.locator('#content').innerText(),/domestic-change/);} }); test('failure modal shows field sources and actionable diagnosis without offering an unsafe immediate retry',{timeout:90000},async t=>{ diff --git a/tests/order-rules/query-read-performance.test.cjs b/tests/order-rules/query-read-performance.test.cjs new file mode 100644 index 0000000..eb1bbfd --- /dev/null +++ b/tests/order-rules/query-read-performance.test.cjs @@ -0,0 +1,68 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'); +const {fixture}=require('../fixtures/query-performance.cjs'); +const query=require('../../src/modules/order-rules/query.cjs'); +for(const operation of ['queryOrders','queryBatches','summary'])test(operation+' decrypts each task set once per read, including window checks',t=>{ + const f=fixture(40);t.after(()=>f.close()); + const result=operation==='summary'?query.summary(f.context,f.actor):query[operation](f.context,{},f.actor); + if(operation==='queryOrders'){assert.equal(result.total,40);assert.equal(result.items.length,25);} + if(operation==='queryBatches'){assert.equal(result.total,1);assert.equal(result.items[0].orderCount,40);} + if(operation==='summary'){assert.equal(result.counts.orders,40);assert.equal(result.home.pendingOrders,40);} + assert.ok((f.counts.all['execution-tasks']||0)<=1,JSON.stringify(f.counts)); + assert.ok((f.counts.all.orders||0)<=1,JSON.stringify(f.counts)); + assert.ok(f.counts.decode<200,JSON.stringify(f.counts)); +}); +test('completed modes perform no intake eligibility reads',t=>{ + const f=fixture(40,{status:'sent'});t.after(()=>f.close()); + const groups=require('../../src/modules/order-rules/collecting-batches.cjs').list(f.store);assert.deepEqual(groups,[]); + assert.equal(f.counts.all['execution-tasks']||0,0); +}); +test('a frozen normal category excludes eligibility while a pending Hui mode remains independent',t=>{ + const f=fixture(1,{status:'sent',huizhou:true});t.after(()=>f.close()); + f.store.put('batches',{id:'frozen',categoryId:'bs-change',status:'unknown',cutoff:'2026-10-26T03:00:00.000Z',orderIds:['o0']}); + const collecting=require('../../src/modules/order-rules/collecting-batches.cjs'); + assert.deepEqual(collecting.list(f.store).map(b=>[b.notificationMode,b.orderIds]),[['huizhou',['o0']]]); + const order=f.store.get('orders','o0');order.status='pending';order.notifications.huizhou.status='unknown';f.store.put('orders',order);f.reset(); + assert.deepEqual(collecting.list(f.store),[]);assert.equal(f.counts.all['execution-tasks']||0,0); +}); +test('queries see writes even when the connection-local change counter is unchanged',t=>{ + const f=fixture(1);t.after(()=>f.close());f.store.queryRevision=()=>1; + assert.equal(query.queryOrders(f.context,{},f.actor).items[0].status,'pending'); + const order=f.store.get('orders','o0');order.status='sent';f.store.put('orders',order); + assert.equal(query.queryOrders(f.context,{},f.actor).items[0].status,'sent'); +}); +test('a later read rechecks window time and returned objects cannot change durable notices',t=>{ + const f=fixture(1,{huizhou:true});t.after(()=>f.close()); + const first=query.queryOrders(f.context,{},f.actor);assert.equal(first.items[0].collectingBatches.length,2); + first.items[0].notifications.huizhou.status='sent'; + assert.equal(f.store.get('orders','o0').notifications.huizhou.status,'pending'); + f.setNow('2026-10-26T04:00:00Z');assert.deepEqual(query.queryOrders(f.context,{},f.actor).items[0].collectingBatches,[]); +}); +test('identity candidates scale with matching tasks while legacy portal overlap remains ambiguous',()=>{ + const identity=require('../../src/modules/order-rules/task-identity.cjs'),{readStore}=require('../../src/modules/order-rules/read-context.cjs');let visits=0; + const tasks=Array.from({length:100},(_,i)=>({id:'t'+i,row:{get source(){visits++;return 'todo';},taskId:String(i),portalSource:'v4'}})); + const store=readStore({all:()=>tasks,get:()=>null}); + for(let i=0;i<100;i++)assert.equal(identity.lookup(store,'execution-tasks',{source:'todo',taskId:String(i),portalSource:'v4'}).id,'t'+i); + assert.ok(visits<=400,'identity lookup revisited '+visits+' task sources'); + const legacy=readStore({all:()=>[{id:'native',row:{source:'todo',taskId:'1',portalSource:'v4'}},{id:'legacy',row:{source:'todo',taskId:'1'}}],get:()=>null}); + assert.throws(()=>identity.lookup(legacy,'execution-tasks',{source:'todo',taskId:'1',portalSource:'v4'}),e=>e.status===409); + assert.deepEqual(identity.records(legacy,'execution-tasks',{source:'todo',taskId:'1',portalSource:'v8'}).map(row=>row.id),['legacy']); +}); +for(const status of ['sent','unknown','ignored','failed'])test('intake expiry skips inactive '+status+' history without scanning task eligibility',t=>{ + const f=fixture(40,{status});t.after(()=>f.close());const before=f.store.queryRevision(); + f.store.expireIntakes(); + assert.equal(f.store.queryRevision(),before,'history must remain untouched'); + assert.equal(f.counts.all['execution-tasks']||0,0,JSON.stringify(f.counts)); + assert.equal(f.counts.get.batches||0,0,JSON.stringify(f.counts)); +}); + +for(const huizhou of [false,true])test('active carry advancement skips eligibility for 300 archived sent orders '+(huizhou?'with disabled Hui records':'without a Hui notice'),t=>{ + const f=fixture(300,{status:'sent',huizhou});t.after(()=>f.close()); + const settings=f.store.get('settings','main');f.store.put('settings',{...settings,enabled:true,processingEnabled:true}); + for(const order of f.store.all('orders'))f.store.put('orders',{...order,ruleSnapshot:{...order.ruleSnapshot,huizhouEnabled:false},archive:{archivedAt:'2026-10-26T00:45:00Z',files:[{name:'notice.pdf',path:'C:\\fixture\\notice.pdf',sha256:'a'.repeat(64),size:128,kind:'pdf'}]}}); + const revision=f.store.queryRevision();f.reset(); + assert.deepEqual(require('../../src/modules/order-rules/carry-forward.cjs').advance(f.store),{moved:[]}); + assert.equal(f.counts.all['execution-tasks']||0,0,JSON.stringify(f.counts)); + assert.equal(f.counts.get['capture-samples']||0,0,JSON.stringify(f.counts)); + assert.equal(f.store.queryRevision(),revision,'completed and disabled modes must stay untouched'); +}); diff --git a/tests/order-rules/readiness-pending-ui.test.cjs b/tests/order-rules/readiness-pending-ui.test.cjs index 4107809..a8c1657 100644 --- a/tests/order-rules/readiness-pending-ui.test.cjs +++ b/tests/order-rules/readiness-pending-ui.test.cjs @@ -4,9 +4,9 @@ const {orderDrivenUI}=require('../fixtures/order-driven-ui.cjs'); test('healthy todo without matched orders shows pending verification without loosening capability gates',{timeout:60000},async t=>{ const {page,runtime}=await orderDrivenUI(t,'#notification-settings'),s=runtime.orderRules; s.put('settings',{...s.get('settings','main'),enabled:true,processingEnabled:true});s.capabilities={liveTodo:true,pdfExport:false,automaticArchive:false}; - await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('link',{name:'自动通知待验证',exact:true}).waitFor(); + await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('link',{name:'自动通知待核验',exact:true}).waitFor(); assert.equal(s.providersReady(),false);assert.equal(s.settings().enabled,true); s.put('execution-scans',{id:'failed-source',status:'failed',error:'fixture failure'}); - await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('link',{name:'自动通知受阻',exact:true}).waitFor(); + await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('link',{name:'自动通知待核验',exact:true}).waitFor(); assert.equal(s.providersReady(),false); }); diff --git a/tests/order-rules/section-ui.test.cjs b/tests/order-rules/section-ui.test.cjs index 79136e5..cfa5491 100644 --- a/tests/order-rules/section-ui.test.cjs +++ b/tests/order-rules/section-ui.test.cjs @@ -3,11 +3,11 @@ const test=require('node:test'),assert=require('node:assert/strict'),fs=require( const {loadPlaywright,browserOptions}=require('../../src/platform/browser.cjs'); async function setup(t,section,owner='OrderNotificationViews',mailFailure=false){ const browser=await loadPlaywright().chromium.launch(browserOptions());t.after(()=>browser.close());const page=await browser.newPage();page.setDefaultTimeout(5000);await page.setContent('
'); - for(const file of ['order-notifications/shared.js','order-rules/view.js','order-notifications/view.js'])await page.addScriptTag({content:await fs.readFile(path.resolve('web/modules',file),'utf8')}); - await page.evaluate(async({section,owner,mailFailure})=>{window.calls=[];window.active=true;window.PageLifecycle={requestKey:()=> 'key',dirty:()=>false,onDispose:()=>{},afterSave:async reload=>reload(),guard:fn=>fn()};window.BusinessRecordViews={render:async(host,options,kind)=>{host.textContent='授权分页 '+kind;}};window.OrderExecutionViews={fields:async panel=>{panel.textContent='字段映射';}};const snapshot={rules:[],adapters:[],settings:{enabled:false,processingEnabled:false,version:1},counts:{orders:3,blocked:1,unknown:1,activeBatches:2},capabilities:{},window:{available:true,start:'2026-10-19T00:00:00Z',end:'2026-10-19T11:00:00Z'}};window[owner].configure(window.viewHelpers={api:async(url,body)=>{window.calls.push(url);if(body)return new Promise(r=>window.releaseAction=()=>r({version:2}));if(url==='/mail'&&mailFailure)throw Error('SMTP目录暂不可读');return url==='/mail'?{channels:[]}:snapshot;},esc:value=>String(value??'').replaceAll('&','&').replaceAll('<','<'),formatDate:v=>v||'—',user:{role:'admin'}});await window[owner].render(document.querySelector('#root'),()=>window.active,section);},{section,owner,mailFailure});return page; + for(const file of ['navigation/lifecycle.js','order-notifications/home.js','order-notifications/shared.js','order-rules/view.js','order-notifications/view.js'])await page.addScriptTag({content:await fs.readFile(path.resolve('web/modules',file),'utf8')}); + await page.evaluate(async({section,owner,mailFailure})=>{window.calls=[];window.active=true;window.BusinessRecordViews={render:async(host,options,kind)=>{host.textContent='授权分页 '+kind;}};window.OrderExecutionViews={fields:async panel=>{panel.textContent='字段映射';}};const snapshot={rules:[],adapters:[],settings:{enabled:false,processingEnabled:false,version:1},counts:{orders:3,blocked:1,unknown:1,activeBatches:2},capabilities:{},window:{available:true,start:'2026-10-19T00:00:00Z',end:'2026-10-19T11:00:00Z'}};window[owner].configure(window.viewHelpers={api:async(url,body)=>{window.calls.push(url);if(body)return new Promise(r=>window.releaseAction=()=>r({version:2}));if(url==='/mail'&&mailFailure)throw Error('SMTP目录暂不可读');return url==='/mail'?{channels:[]}:snapshot;},esc:value=>String(value??'').replaceAll('&','&').replaceAll('<','<'),formatDate:v=>v||'—',user:{role:'admin'}});await window[owner].render(document.querySelector('#root'),()=>window.active,section);},{section,owner,mailFailure});return page; } test('order and batch sections delegate to bounded query views without loading full snapshots',async t=>{const page=await setup(t,'orders');assert.equal(await page.locator('main').innerText(),'授权分页 orders');assert.deepEqual(await page.evaluate(()=>calls),[]);await page.evaluate(()=>OrderNotificationViews.render(document.querySelector('#root'),()=>active,'pending'));assert.equal(await page.locator('main').innerText(),'授权分页 batches');assert.deepEqual(await page.evaluate(()=>calls),[]);}); test('fields delegate their lifecycle without notification runtime reads',async t=>{const page=await setup(t,'fields','OrderRuleViews');await page.getByText('字段映射',{exact:true}).waitFor();assert.deepEqual(await page.evaluate(()=>calls),[]);}); -test('business homepage uses bounded summary and concrete remediation links',async t=>{const page=await setup(t,'workbench');assert.match(await page.locator('main').innerText(),/2026-10-19T11:00:00Z/);for(const hash of ['#rule-fields','#bpm','#storage','#notification-orders'])assert.ok(await page.locator('a[href="'+hash+'"]').count());assert.deepEqual(await page.evaluate(()=>calls),['/order-rules?view=summary']);}); -test('mailbox failure is explicit and cannot save an empty catalog',async t=>{const page=await setup(t,'settings','OrderNotificationViews',true);assert.match(await page.locator('main').innerText(),/邮箱目录读取失败/);await page.getByRole('button',{name:'保存设置'}).click();assert.deepEqual(await page.evaluate(()=>calls),['/order-rules?view=summary','/mail']);}); -test('late settings action after departure starts no readback or saved feedback',async t=>{const page=await setup(t,'settings');await page.getByRole('button',{name:'保存设置'}).click();await page.waitForFunction(()=>typeof releaseAction==='function');await page.evaluate(()=>{active=false;releaseAction();});await page.waitForFunction(()=>!document.querySelector('#order-rule-settings button').disabled);assert.deepEqual(await page.evaluate(()=>calls),['/order-rules?view=summary','/mail','/order-rules/settings']);assert.equal(await page.locator('form [role=alert]').innerText(),'');}); +test('business homepage uses bounded summary and concrete remediation links',async t=>{const page=await setup(t,'workbench');assert.equal(await page.locator('[data-home-next-send]').innerText(),'19:00');for(const hash of ['#rule-fields','#bpm','#storage','#notification-orders'])assert.ok(await page.locator('a[href="'+hash+'"]').count());assert.deepEqual(await page.evaluate(()=>calls),['/order-rules?view=summary']);}); +test('mailbox failure is explicit and cannot save an empty catalog',async t=>{const page=await setup(t,'settings','OrderNotificationViews',true);assert.match(await page.locator('main').innerText(),/邮箱目录读取失败/);await page.getByRole('button',{name:'保存设置'}).click();assert.deepEqual(await page.evaluate(()=>calls),['/order-rules/notification-settings','/mail']);}); +test('late settings action after departure starts no readback or saved feedback',async t=>{const page=await setup(t,'settings');await page.getByRole('button',{name:'保存设置'}).click();await page.waitForFunction(()=>typeof releaseAction==='function');await page.evaluate(()=>{active=false;releaseAction();});await page.waitForFunction(()=>!document.querySelector('#order-rule-settings button').disabled);assert.deepEqual(await page.evaluate(()=>calls),['/order-rules/notification-settings','/mail','/order-rules/settings']);assert.equal(await page.locator('form [role=alert]').innerText(),'');}); diff --git a/tests/storage/storage-range.test.cjs b/tests/storage/storage-range.test.cjs new file mode 100644 index 0000000..0baf42f --- /dev/null +++ b/tests/storage/storage-range.test.cjs @@ -0,0 +1,79 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs/promises'),os=require('node:os'),path=require('node:path'); +const {FileArea,SmbClient,MAX_FILE}=require('../../src/modules/storage/files.cjs'); +const {StorageService}=require('../../src/modules/storage/service.cjs'); +const {storageApi}=require('../../src/modules/storage/api.cjs'); +const {validate}=require('../../src/modules/storage/smb-operation.cjs'); +const {makePreviewFiles}=require('../fixtures/storage-preview-files.cjs'); +async function fixture(t){const root=await fs.mkdtemp(path.join(os.tmpdir(),'storage-range-'));t.after(()=>fs.rm(root,{recursive:true,force:true}));return {root,area:new FileArea(root)};} +async function request(storage,range,{action='file',relative='large.bin',role='operator'}={}){ + const headers={},url=new URL('http://localhost/api/storage/servers/local/'+action+'?path='+encodeURIComponent(relative));let status,bytes; + await storageApi({storage,user:{username:'tester',role},url,route:url.pathname,method:'GET',request:{headers:range===undefined?{}:{range}},response:{setHeader(name,value){headers[name]=value;},writeHead(value){status=value;},end(value){bytes=value||Buffer.alloc(0);}}});return {headers,status,bytes}; +} +function countReads(t){let bytes=0,opens=0;const original=fs.open;t.mock.method(fs,'open',async(...args)=>{const handle=await original(...args),read=handle.read.bind(handle);opens++;handle.read=async(...args)=>{const value=await read(...args);bytes+=value.bytesRead;return value;};return handle;});return {get bytes(){return bytes;},get opens(){return opens;}};} + +for(const preview of [false,true])test(`64 KiB ${preview?'PDF preview':'download'} range reads bounded bytes through the real route, service and FileArea`,async t=>{ + const {root,area}=await fixture(t),relative=preview?'large.pdf':'large.bin',source=Buffer.alloc(16*1024*1024,7);if(preview)source.write('%PDF-1.7');await fs.writeFile(path.join(root,relative),source); + const storage=new StorageService({store:{secret:()=>({enabled:true})},client:{area:async()=>area}});t.after(()=>storage.stop());const reads=countReads(t); + const result=await request(storage,'bytes=1048576-1114111',{action:preview?'content':'file',relative}); + assert.equal(result.status,206);assert.equal(result.headers['Content-Range'],'bytes 1048576-1114111/16777216');assert.equal(result.bytes.length,65536);assert.deepEqual(result.bytes,source.subarray(1048576,1114112)); + assert.ok(reads.bytes<100*1024,`range must not read the full file: ${reads.bytes}`);assert.equal(reads.opens,1,'header and requested content must use the same handle'); +}); + +test('suffixes, open ends, invalid ranges and empty downloads preserve complete-size HTTP metadata',async t=>{ + const {root,area}=await fixture(t);await fs.writeFile(path.join(root,'large.bin'),'0123456789');const storage=new StorageService({store:{secret:()=>({enabled:true})},client:{area:async()=>area}});t.after(()=>storage.stop()); + for(const [range,want,contentRange] of [['bytes=-3','789','bytes 7-9/10'],['bytes=7-','789','bytes 7-9/10'],['bytes=7-99','789','bytes 7-9/10'],['bytes=-99','0123456789','bytes 0-9/10']]){const result=await request(storage,range);assert.equal(result.status,206);assert.equal(result.bytes.toString(),want);assert.equal(result.headers['Content-Range'],contentRange);} + for(const range of ['bytes=-0','bytes=10-','bytes=9-8','bytes=-','bytes=0-1,3-4','items=0-1','bytes=9007199254740992-','bytes=-9007199254740992']){const result=await request(storage,range);assert.equal(result.status,416,range);assert.equal(result.headers['Content-Range'],'bytes */10');assert.equal(result.bytes.length,0);} + await fs.writeFile(path.join(root,'empty.bin'),'');const empty=await request(storage,undefined,{relative:'empty.bin'});assert.equal(empty.status,200);assert.equal(empty.bytes.length,0);assert.equal((await request(storage,'bytes=0-',{relative:'empty.bin'})).status,416); +}); + +test('PDF ranges still validate the header and whole-file limits before reading content',async t=>{ + const {root,area}=await fixture(t);await fs.writeFile(path.join(root,'fake.pdf'),'Not a PDF body');await assert.rejects(area.readPreview('fake.pdf',{range:'bytes=5-7'}),error=>error.status===415); + await fs.writeFile(path.join(root,'huge.bin'),'');await fs.truncate(path.join(root,'huge.bin'),MAX_FILE+1);await assert.rejects(area.readFile('huge.bin',MAX_FILE,{range:'bytes=0-1'}),error=>error.status===413); + await fs.writeFile(path.join(root,'huge.pdf'),'%PDF-');await fs.truncate(path.join(root,'huge.pdf'),MAX_FILE+1);await assert.rejects(area.readPreview('huge.pdf',{range:'bytes=0-1'}),error=>error.status===413); +}); + +test('a source that shrinks during range reading is rejected instead of returning partial success',async t=>{ + const {root,area}=await fixture(t),file=path.join(root,'large.bin');await fs.writeFile(file,Buffer.alloc(1024,1));const original=fs.open;let changed=false; + t.mock.method(fs,'open',async(...args)=>{const handle=await original(...args),read=handle.read.bind(handle);handle.read=async(...args)=>{if(!changed){changed=true;await fs.truncate(file,100);}return read(...args);};return handle;}); + await assert.rejects(area.readFile('large.bin',MAX_FILE,{range:'bytes=512-767'}),error=>error.status===409); +}); + +for(const change of ['grow','replace'])test(`a source that ${change==='grow'?'grows':'is replaced'} between PDF header and content is rejected`,async t=>{ + const {root,area}=await fixture(t),file=path.join(root,'sample.pdf');await fs.writeFile(file,Buffer.from('%PDF-'+'.'.repeat(1019)));const original=fs.open;let changed=false; + t.mock.method(fs,'open',async(...args)=>{const handle=await original(...args),read=handle.read.bind(handle);handle.read=async(...args)=>{const result=await read(...args);if(!changed){changed=true;if(change==='grow')await fs.appendFile(file,'x');else{await fs.rename(file,file+'.old');await fs.writeFile(file,Buffer.alloc(1024,1));}}return result;};return handle;}); + await assert.rejects(area.readPreview('sample.pdf',{range:'bytes=100-199'}),error=>error.status===409); +}); + +test('Office and image ranges retain whole-file validation and text ranges address decoded UTF-8 bytes',async t=>{ + const {root,area}=await fixture(t);await makePreviewFiles(root); + for(const relative of ['sample.docx','sample.xlsx','sample.png']){ + const full=await area.readPreview(relative),part=await area.readPreview(relative,{range:'bytes=0-7'}); + assert.equal(part.total,full.bytes.length);assert.equal(part.status,206);assert.deepEqual(part.bytes,full.bytes.subarray(0,8)); + } + const full=await area.readPreview('gbk.txt'),part=await area.readPreview('gbk.txt',{range:'bytes=-3'});assert.equal(part.total,6);assert.deepEqual(part.bytes,full.bytes.subarray(3));assert.equal(part.bytes.toString(),'文'); + await assert.rejects(area.readPreview('bad.png',{range:'bytes=0-1'}),error=>error.status===415); + const office=await fs.readFile(path.join(root,'sample.docx')),central=office.indexOf(Buffer.from([0x50,0x4b,0x01,0x02]));office.writeUInt32LE(70*1024*1024,central+24);await fs.writeFile(path.join(root,'bomb.docx'),office); + await assert.rejects(area.readPreview('bomb.docx',{range:'bytes=0-1'}),error=>error.status===413); +}); + +test('range access keeps relative-path, link, and role restrictions',async t=>{ + const {root,area}=await fixture(t),outside=await fs.mkdtemp(path.join(os.tmpdir(),'storage-range-outside-'));t.after(()=>fs.rm(outside,{recursive:true,force:true}));await fs.writeFile(path.join(outside,'secret.bin'),'private');await fs.symlink(outside,path.join(root,'link'),'junction'); + for(const relative of ['../secret.bin','link/secret.bin','x:stream'])await assert.rejects(area.readFile(relative,MAX_FILE,{range:'bytes=0-1'}),error=>error.status===400); + const storage={readFile:()=>assert.fail('viewers must not reach storage')};await assert.rejects(request(storage,'bytes=0-1',{role:'viewer'}),error=>error.status===403); +}); + +test('range metadata and bounded buffers survive real worker IPC while malformed offsets are rejected',async t=>{ + const {root}=await fixture(t);await fs.writeFile(path.join(root,'large.bin'),Buffer.alloc(16*1024*1024,8));const server={root,pidFile:path.join(root,'worker.pid'),enabled:true,version:1},client=new SmbClient({workerPath:path.join(__dirname,'worker-fixture.cjs')}),storage=new StorageService({store:{secret:()=>server},client,operationTimeoutMs:5000});t.after(()=>storage.stop()); + const result=await storage.readFile('local','large.bin',{range:'bytes=-65536'});assert.equal(result.total,16777216);assert.equal(result.start,16711680);assert.equal(result.end,16777215);assert.equal(result.status,206);assert.equal(result.bytes.length,65536);assert.ok(result.bytes.every(byte=>byte===8)); + assert.throws(()=>validate('readFile',{filename:'x',total:10,start:5,end:7,status:206,bytes:Buffer.alloc(1)}),error=>error.status===502); + const invalid=await storage.readFile('local','large.bin',{range:'bytes=16777216-'});assert.equal(invalid.status,416);assert.equal(invalid.total,16777216);assert.equal(invalid.bytes.length,0); +}); + +test('production worker dispatch preserves range options and returns unsatisfied totals as metadata',async t=>{ + const {root,area}=await fixture(t);await fs.writeFile(path.join(root,'sample.pdf'),'%PDF-1.7 data'); + let handle,message,exitCode;const vm=require('node:vm'),source=await fs.readFile(path.join(__dirname,'../../src/modules/storage/smb-operation-worker.cjs'),'utf8'); + vm.runInNewContext(source,{require:specifier=>specifier==='./files.cjs'?{SmbClient:class{async area(){return area;}}}:{validate},process:{once(event,handler){assert.equal(event,'message');handle=handler;},send(value,callback){message=value;callback();},exit(code){exitCode=code;}}}); + await handle({server:{},operation:'readPreview',args:['sample.pdf',{range:'bytes=5-7'}]});assert.equal(message.ok,true);assert.equal(message.value.status,206);assert.equal(message.value.total,13);assert.equal(message.value.bytes.toString(),'1.7');assert.equal(exitCode,0); + await handle({server:{},operation:'readFile',args:['sample.pdf',MAX_FILE,{range:'bytes=99-'}]});assert.equal(message.ok,true);assert.equal(message.value.status,416);assert.equal(message.value.total,13);assert.equal(message.value.bytes.length,0); +}); diff --git a/tests/system-update/checker.test.cjs b/tests/system-update/checker.test.cjs index 47f42fd..ec82dc9 100644 --- a/tests/system-update/checker.test.cjs +++ b/tests/system-update/checker.test.cjs @@ -65,3 +65,25 @@ test('network timeout returns unavailable and preserves the current version',asy const checker=createUpdateChecker({currentVersion:'0.1.0',timeoutMs:25,fetchImpl:async(url,{signal})=>new Promise((resolve,reject)=>signal.addEventListener('abort',()=>reject(signal.reason),{once:true}))}); assert.deepEqual(await checker(),{status:'unavailable',currentVersion:'0.1.0',latest:null}); }); + +test('concurrent update checks share one upstream read and the next manual check is fresh',async()=>{ + let requests=0,release; + const gate=new Promise(resolve=>{release=resolve;}); + const checker=createUpdateChecker({currentVersion:'0.1.0',fetchImpl:async()=>{requests++;await gate;return new Response(JSON.stringify({tag_name:'v0.2.0'}));}}); + const pending=Array.from({length:8},()=>checker()); + assert.equal(requests,1,'simultaneous readers must share the in-flight request'); + release();const results=await Promise.all(pending); + assert.ok(results.every(result=>result.status==='update-available')); + results[0].latest.version='caller-mutation';assert.equal(results[1].latest.version,'0.2.0'); + assert.equal((await checker()).latest.version,'0.2.0');assert.equal(requests,2,'a completed check must not mask a later manual refresh'); +}); + +test('a coalesced failed check clears in-flight state and a new check can recover',async()=>{ + let requests=0,reject; + const failed=new Promise((resolve,rejectPromise)=>{reject=rejectPromise;}); + const checker=createUpdateChecker({currentVersion:'0.1.0',fetchImpl:async()=>{requests++;if(requests===1)return failed;return new Response('',{status:404});}}); + const first=checker(),second=checker();assert.equal(requests,1); + reject(Error('offline')); + assert.deepEqual(await first,{status:'unavailable',currentVersion:'0.1.0',latest:null});assert.equal((await second).status,'unavailable'); + assert.equal((await checker()).status,'none');assert.equal(requests,2); +}); diff --git a/web/app.js b/web/app.js index b231213..22c8717 100644 --- a/web/app.js +++ b/web/app.js @@ -7,14 +7,34 @@ const statusMap={running:['处理中','blue'],success:['已完成','green'],erro let currentUser=null,settings=null,currentView='overview',overview=null,refreshTimer=null,viewGeneration=0,historyIndex=0,historyTransition=null,automationRevision=0,overviewRevision=0,updateRevision=0; let updateState={status:'unavailable',currentVersion:'—',latest:null}; const views={tools:['工具','手工导出、文件查看与助手'],'records-pdf':['订单与导出记录','查询PDF导出结果、文件可用性与存储归档记录'],'order-notifications':['通知总览','查看当前发送时段、待发订单及接入阻塞'],'notification-execution':['订单执行','扫描真实待办,查看归档进度与受控恢复'],'notification-orders':['订单中心','查看订单分类、归档证据及所属邮件批次'],'notification-batches':['邮件批次','按发送时段检查分类汇总和冻结内容'],'notification-history':['发送记录','核对发送结果、冻结内容和人工恢复记录'],'notification-settings':['发送设置','维护发件邮箱、邮件限制与自动通知开关'],'rule-fields':['字段映射','采集BPM流程和节点,供分类规则选择匹配项'],'assistant-settings':['助手设置','配置 DSH 运行包、模型与受控操作权限'],'business-settings':['业务设置','维护Excel分类规则、收件人和BPM流程节点目录'],'system-settings':['系统设置','集中管理服务连接、运行维护和团队权限'],account:['个人账号','维护自己的登录密码与访问安全'],'order-rules':['分类通知规则','按 Excel 类别维护匹配、归档、收件人与通知正文'],health:['系统健康','查看服务守护、登录自启和各模块最近检查结果'],assistant:['DSH 助手','对话查询运行状态、分析异常与执行受控恢复'],storage:['存储服务器','配置 SMB 共享目录、检查连接与管理 PDF 归档'],notifications:['兼容业务通知','原来源映射、产业接口人与通知队列'],overview:['业务首页','订单处理、邮件窗口、业务阻塞与待核验'],calendar:['业务日历','按公司实际安排设置工作日、休息日与暂停日期'],exceptions:['异常待办','认领、转交和跟进异常'],bpm:['BPM 连接','管理连接及负责人'],supervisor:['运行监管','配置负责人、通知方式与重试上限'],records:['订单与导出记录','查询已经采集的订单,下载已完成的 PDF'],rules:['分类通知规则','按 Excel 类别维护匹配、归档、收件人与通知正文'],schedule:['发送计划','设置每日两个发送时间及周末安排'],templates:['邮件模板','管理模板及 Excel 类别关联;收件名单在分类规则维护'],mail:['邮箱管理','维护托管邮箱、模板收信与连接状态'],connections:['服务接入','查看各个环节的接入情况'],users:['团队账号','为局域网内的同事分配访问权限'],audit:['操作记录','查看配置变更和导出任务的处理记录']}; -const pendingWrites=new Map(); +const pendingWrites=new Map(),pendingReads=new Map(); +// Share transport only while a read is pending; each caller owns cancellation and its result. +function readRequest(route,signal,user,scope){ + if(signal?.aborted)return Promise.reject(signal.reason||new DOMException('Aborted','AbortError')); + let entry=pendingReads.get(route); + if(!entry||entry.user!==user||entry.scope!==scope){ + const controller=new AbortController(),timeout=setTimeout(()=>controller.abort(),30000); + entry={user,scope,controller,subscribers:0,work:null}; + entry.work=fetch('/api'+route,{signal:controller.signal,credentials:'same-origin',method:'GET',headers:{}}).then(async response=>({ok:response.ok,status:response.status,result:await response.json()})).finally(()=>{clearTimeout(timeout);if(pendingReads.get(route)===entry)pendingReads.delete(route);}); + pendingReads.set(route,entry); + } + entry.subscribers++; + return new Promise((resolve,reject)=>{ + let settled=false; + const finish=(work,value)=>{if(settled)return;settled=true;signal?.removeEventListener('abort',abort);entry.subscribers--;if(!entry.subscribers){if(pendingReads.get(route)===entry)pendingReads.delete(route);entry.controller.abort();}work(value);}; + const abort=()=>finish(reject,signal.reason||new DOMException('Aborted','AbortError')); + signal?.addEventListener('abort',abort,{once:true}); + entry.work.then(value=>finish(resolve,structuredClone(value)),error=>finish(reject,error)); + }); +} async function api(route,body,{signal,ownerCheck,managedOutcome=false}={}) { const originGeneration=viewGeneration,originUser=currentUser,originRevision=window.PageLifecycle?.revision;const originActive=()=>viewGeneration===originGeneration&¤tUser===originUser&&window.PageLifecycle?.revision===originRevision;const submission=window.PageLifecycle?.submission,hasBody=body!==undefined,write=hasBody&&route!=='/order-rules/field-mappings/propose',key=originGeneration+':'+originRevision+':'+route+':'+JSON.stringify(body);const pending=pendingWrites.get(key);if(write&&pending?.user===originUser)return pending.work; + if(write)pendingReads.clear(); const work=(async()=>{const controller=new AbortController(),timeout=setTimeout(()=>controller.abort(),30000);const combined=signal?AbortSignal.any([signal,controller.signal]):controller.signal; - try {const response=await fetch('/api'+route,{signal:combined,credentials:'same-origin',keepalive:route.endsWith('/login/close'),method:hasBody?'POST':'GET',headers:hasBody?{'Content-Type':'application/json'}:{},body:hasBody?JSON.stringify(body):undefined});const result=await response.json(); + try {const response=hasBody?await fetch('/api'+route,{signal:combined,credentials:'same-origin',keepalive:route.endsWith('/login/close'),method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}):await readRequest(route,combined,originUser,originGeneration+':'+originRevision);const result=hasBody?await response.json():response.result; if(!response.ok){if(response.status===401&¤tUser&&originActive()&&(!ownerCheck||ownerCheck())){window.RecordState?.clear();currentUser=null;++viewGeneration;await window.PageLifecycle?.dispose();window.BpmLogin?.dispose();await boot();}throw Object.assign(Error(result.error||'操作失败,请核对输入。'),{status:response.status,outcome:'rejected'});}if(write&&originActive())window.PageLifecycle?.succeeded(submission);return result; }catch(error){if(write&&originActive())window.PageLifecycle?.failed(submission);if(write&&(error.name==='AbortError'||error instanceof TypeError)){if(originActive()&&!managedOutcome)void verifyUncertainWrite(route,originActive);throw Object.assign(Error('结果待核实:请求超时或连接中断,正在查询状态;不会自动重试。'),{outcome:'uncertain'});}throw error; - }finally{clearTimeout(timeout);}})();if(write)pendingWrites.set(key,{user:originUser,work});try{return await work;}finally{if(write&&pendingWrites.get(key)?.work===work)pendingWrites.delete(key);} + }finally{clearTimeout(timeout);if(write)pendingReads.clear();}})();if(write)pendingWrites.set(key,{user:originUser,work});try{return await work;}finally{if(write&&pendingWrites.get(key)?.work===work)pendingWrites.delete(key);} } async function verifyUncertainWrite(route,isActive){ @@ -65,7 +85,7 @@ async function checkSystemUpdate(isActive=()=>!!currentUser,{manual=false}={}){ function shell() { root.innerHTML=`
`; renderUpdateStatus(updateState); - document.querySelector('#logout').onclick=()=>window.PageLifecycle.guard(async()=>{++viewGeneration;await window.BpmLogin?.dispose();await api('/logout',{});window.RecordState.clear();currentUser=null;clearInterval(refreshTimer);await window.PageLifecycle.dispose();await boot();}); + document.querySelector('#logout').onclick=()=>window.PageLifecycle.guard(async()=>{++viewGeneration;await window.BpmLogin?.dispose();await api('/logout',{});window.RecordState.clear();currentUser=null;refreshTimer?.dispose();await window.PageLifecycle.dispose();await boot();}); document.querySelector('#check-updates').onclick=()=>checkSystemUpdate(()=>!!currentUser,{manual:true}); document.querySelector('#refresh').onclick=()=>window.PageLifecycle.guard(()=>{const generation=viewGeneration;void updateAutomationStatus(()=>generation===viewGeneration&&!!currentUser);return window.RecordTable?.active?window.RecordTable.active.refresh():renderView();}).catch(error=>notify(error.message,'danger')); document.querySelectorAll('[data-view]').forEach(link=>link.onclick=()=>{const menu=document.querySelector('#sidebar-menu');menu.classList.remove('show');if(menu.classList.contains('collapsing'))menu.addEventListener('shown.bs.collapse',()=>menu.classList.remove('show'),{once:true});document.querySelector('.navbar-toggler').setAttribute('aria-expanded','false');}); @@ -90,8 +110,9 @@ async function viewSchedule(container,isActive=()=>true) { } async function viewTemplates(container,isActive=()=>true){ container.innerHTML='
模板仅维护内容。有效模板选择统一在 分类规则 保存并发布。
'; + const usageRead=api('/order-rules/catalog').then(data=>({data}),error=>({error})); const mail=await window.MailViews.templates(container.querySelector('#mail-templates'),isActive);if(!isActive())return; - let data;try{data=await api('/order-rules?view=summary');}catch(error){if(isActive())container.querySelector('#category-templates').innerHTML='
模板使用情况读取失败
'+esc(error.message)+'
';return;}if(!isActive())return; + let data;try{const result=await usageRead;if(result.error)throw result.error;data=result.data;}catch(error){if(isActive())container.querySelector('#category-templates').innerHTML='
模板使用情况读取失败
'+esc(error.message)+'
';return;}if(!isActive())return; const usage=data.templateUsage||[]; if(usage.some(r=>r.legacyBinding)){ try{const legacy=await api('/mail/templates/categories');if(!isActive())return;for(const row of usage)if(row.legacyBinding)row.templateId=legacy.bindings.find(b=>b.categoryId===row.categoryId)?.templateId||'';} @@ -102,19 +123,17 @@ async function viewTemplates(container,isActive=()=>true){ } async function viewAudit(container,isActive=()=>true){const [legacy,workspace]=await Promise.all([api('/audit'),api('/workspace')]);if(!isActive())return;const audit=[...legacy.audit,...workspace.audit].sort((a,b)=>new Date(b.at)-new Date(a.at));container.innerHTML=`

最近操作记录

按时间展示最近 200 条
${audit.length?`
${audit.slice(0,200).map(item=>``).join('')}
时间(北京时间)操作人操作详情
${formatDate(item.at)}${esc(item.actor)}${esc(window.WorkspaceViews.activityText(item.action))}${esc(item.detail)}
`:empty('暂无操作记录','保存设置或导出订单后,可在这里查看。')}
`;} function viewRules(container,isActive){return window.OrderRuleViews.render(container,isActive,'rules');} -async function updateAutomationStatus(isActive){ +async function updateAutomationStatus(isActive,{signal}={}){ const request=++automationRevision,node=document.querySelector('#automation-status');if(!node||!isActive())return; const apply=(label,color,detail)=>{if(!isActive()||request!==automationRevision||!node.isConnected)return;node.textContent=label;node.className='badge bg-'+color+'-lt text-decoration-none';node.title=detail;}; try{ - const lightweight=currentView==='order-rules',data=await api(lightweight?'/order-rules/status':'/order-rules?view=summary',undefined,{ownerCheck:isActive});if(!isActive())return; + const data=await api('/order-rules/status',undefined,{signal,ownerCheck:isActive});if(!isActive())return; if(typeof data?.settings?.enabled!=='boolean')throw Error('服务端未返回有效通知开关'); const missing=Object.entries({liveTodo:'实时待办接入',pdfExport:'PDF 导出',automaticArchive:'自动归档'}).filter(([key])=>data.capabilities?.[key]!==true).map(([,label])=>label); if(!data.settings.enabled)apply('自动通知已暂停','secondary','自动发信保持暂停;请完成类别字段、目录、邮箱与预览核验。'+(missing.length?' 待检查:'+missing.join('、'):' 点击查看发送设置。')); - else if(missing.length&&lightweight)apply('自动通知待核验','yellow','部分接入能力尚待核验,请到通知总览查看实际订单和阻塞详情。'); - else if(missing.length&&data.capabilities?.liveTodo===true&&data.counts?.orders===0&&!(data.scans||[]).some(scan=>scan.status==='failed'))apply('自动通知待验证','yellow','当前没有匹配订单;'+missing.join('、')+'尚待实际业务验证。匹配订单到达后按流程核验。'); - else if(missing.length)apply('自动通知受阻','yellow','未通过实际检查:'+missing.join('、')+'。点击查看发送设置。'); + else if(missing.length)apply('自动通知待核验','yellow','部分接入能力尚待核验,请到通知总览查看实际订单和阻塞详情。'); else apply('自动通知已启用','green','通知开关已启用;实际任务、类别及批次仍按各自检查结果执行。'); - }catch(error){apply('通知状态待确认','yellow',error.message+';请刷新重试。');} + }catch(error){if(signal?.aborted)return;apply('通知状态待确认','yellow',error.message+';请刷新重试。');} } function configurationHost(container){ container.innerHTML='
'; @@ -156,9 +175,9 @@ async function authScreen() { document.querySelector('#login-form').onsubmit=async event=>{event.preventDefault();const button=event.target.querySelector('button[type="submit"]');button.disabled=true;try{const result=await api(initialize?'/bootstrap':'/login',{username:document.querySelector('#username').value,password:document.querySelector('#password').value});currentUser=result.user;enter();}catch(error){document.querySelector('#auth-error').textContent=error.message;}finally{button.disabled=false;}}; } -async function passwordChanged(actorId){if(currentUser&¤tUser.id!==actorId)return false;currentUser=null;++viewGeneration;clearInterval(refreshTimer);await window.PageLifecycle?.dispose();await window.BpmLogin?.dispose().catch(()=>{});await boot();return true;} -function enter(){window.RecordState.configure(currentUser,({hash,push})=>{if(push&&location.hash!==hash)history.pushState({appIndex:++historyIndex},'',hash);else history.replaceState({...history.state,appIndex:historyIndex},'',hash);});window.PdfRecordViews?.configure({api,esc,formatDate,notify,user:currentUser});window.AccountViews?.configure({api,esc,formatDate,notify,user:currentUser,onPasswordChanged:passwordChanged});window.OrderRuleViews?.configure({api,esc,formatDate,notify,user:currentUser});window.OrderNotificationViews?.configure({api,esc,formatDate,notify,user:currentUser});window.HealthViews?.configure({api,esc,formatDate,user:currentUser});window.AssistantViews?.configure({api,esc,formatDate,notify,user:currentUser});window.StorageViews?.configure({api,esc,formatDate,notify,user:currentUser});window.NotificationViews?.configure({api,esc,formatDate,notify,user:currentUser});window.OrderViews?.configure({api,esc,formatDate,notify,user:currentUser});window.MailViews?.configure({api,esc,formatDate,notify,user:currentUser});window.WorkspaceViews?.configure({api,esc,formatDate,notify,user:currentUser});shell();renderView();void checkSystemUpdate(()=>!!currentUser);clearInterval(refreshTimer);refreshTimer=setInterval(()=>{if(currentUser&&!document.hidden){const statusGeneration=viewGeneration,statusUser=currentUser;void updateAutomationStatus(()=>statusGeneration===viewGeneration&&statusUser===currentUser);}},15000);} -async function boot(){try{const setup=await api('/bootstrap/status');currentUser=(await api('/me')).user;enter();}catch{await authScreen();}} +async function passwordChanged(actorId){if(currentUser&¤tUser.id!==actorId)return false;currentUser=null;++viewGeneration;refreshTimer?.dispose();await window.PageLifecycle?.dispose();await window.BpmLogin?.dispose().catch(()=>{});await boot();return true;} +function enter(){window.RecordState.configure(currentUser,({hash,push})=>{if(push&&location.hash!==hash)history.pushState({appIndex:++historyIndex},'',hash);else history.replaceState({...history.state,appIndex:historyIndex},'',hash);});window.PdfRecordViews?.configure({api,esc,formatDate,notify,user:currentUser});window.AccountViews?.configure({api,esc,formatDate,notify,user:currentUser,onPasswordChanged:passwordChanged});window.OrderRuleViews?.configure({api,esc,formatDate,notify,user:currentUser});window.OrderNotificationViews?.configure({api,esc,formatDate,notify,user:currentUser});window.HealthViews?.configure({api,esc,formatDate,user:currentUser});window.AssistantViews?.configure({api,esc,formatDate,notify,user:currentUser});window.StorageViews?.configure({api,esc,formatDate,notify,user:currentUser});window.NotificationViews?.configure({api,esc,formatDate,notify,user:currentUser});window.OrderViews?.configure({api,esc,formatDate,notify,user:currentUser});window.MailViews?.configure({api,esc,formatDate,notify,user:currentUser});window.WorkspaceViews?.configure({api,esc,formatDate,notify,user:currentUser});shell();renderView();void checkSystemUpdate(()=>!!currentUser);refreshTimer?.dispose();refreshTimer=window.PageLifecycle.poll(signal=>{const statusGeneration=viewGeneration,statusUser=currentUser;return updateAutomationStatus(()=>statusGeneration===viewGeneration&&statusUser===currentUser,{signal});},15000,{isActive:()=>!!currentUser,owned:false});} +async function boot(){try{currentUser=(await api('/me')).user;enter();}catch{await authScreen();}} window.addEventListener('page-operation-error',event=>notify(event.detail.message,'danger')); window.addEventListener('pagehide',()=>{window.BpmLogin?.dispose({unload:true});}); document.addEventListener('click',event=>{const link=event.target.closest('a[href^="#"]');if(!currentUser||!link||event.ctrlKey||event.metaKey)return;event.preventDefault();if(location.hash===link.hash&&window.RecordState.isRecord(link.hash))return;window.PageLifecycle.guard(()=>{if(location.hash!==link.hash){history.pushState({appIndex:++historyIndex},'',link.hash);}return renderView();});}); diff --git a/web/modules/assistant/view.js b/web/modules/assistant/view.js index 0a1a2a5..9411617 100644 --- a/web/modules/assistant/view.js +++ b/web/modules/assistant/view.js @@ -22,8 +22,9 @@ messages.querySelectorAll('[data-assistant-action]').forEach(button=>button.onclick=async()=>{const id=currentId,at=revision,actionId=button.dataset.assistantAction,owned=()=>live()&&id===currentId&&at===revision;if(pendingActions.has(actionId))return;pendingActions.set(actionId,id);button.disabled=true;error.textContent='';watch();try{await api('/assistant/conversations/'+id+'/actions/'+actionId+'/execute',{});if(owned())await loadCurrent();}catch(e){if(owned()){showError(e);await loadCurrent();}}finally{pendingActions.delete(actionId);}}); if(running||[...pendingActions.values()].includes(currentId)||turns.some(t=>t.actions?.some(a=>a.status==='running')))watch(); } - async function loadCurrent(){if(!currentId)return;const id=currentId,at=revision,c=await api('/assistant/conversations/'+id);if(!live()||id!==currentId||at!==revision)return;conversation=c;drawMessages();} - function watch(){if(polling)return;polling=true;setTimeout(async()=>{polling=false;if(!live())return;try{await loadCurrent();}catch(e){showError(e);}},1200);} + async function loadCurrent(signal){if(!currentId)return;const id=currentId,at=revision,c=await api('/assistant/conversations/'+id,undefined,{signal,ownerCheck:live});if(!live()||id!==currentId||at!==revision)return;conversation=c;drawMessages();} + const watcher=window.PageLifecycle.poll(async signal=>{if(!polling)return;polling=false;try{await loadCurrent(signal);}catch(e){if(signal.aborted)polling=true;else showError(e);}},1200,{isActive:live}); + function watch(){polling=true;watcher.schedule();} async function select(id){currentId=id;conversation=null;revision++;sessionStorage.setItem(key,id);drawList();if(id)await loadCurrent();else drawMessages();} function drawPager(){container.querySelector('#assistant-page').textContent=listPage+' / '+Math.max(1,Math.ceil(listTotal/25));container.querySelector('#assistant-prev').disabled=listPage<=1;container.querySelector('#assistant-next').disabled=listPage*25>=listTotal;} async function refreshList(page=listPage,requestedScope=scope){ diff --git a/web/modules/bpm/arrivals.js b/web/modules/bpm/arrivals.js index 08e442d..b375426 100644 --- a/web/modules/bpm/arrivals.js +++ b/web/modules/bpm/arrivals.js @@ -4,8 +4,8 @@ window.OrderViews=(()=>{ const defaults=()=>({scope:'current',business:'orders',kind:'all',q:'',connectionId:'',from:'',to:'',page:1}); function configure(options){if(user?.username!==options.user.username)filters=defaults();({api,esc,formatDate,notify,user}=options);} async function records(container,isActive){ - filters=window.RecordState.read('records');let disposed=false,status=null,timer,statusController;const live=()=>!disposed&&isActive(),get=id=>container.querySelector('#'+id); - window.PageLifecycle?.onDispose(()=>{disposed=true;clearTimeout(timer);statusController?.abort();}); + filters=window.RecordState.read('records');let disposed=false,status=null,statusController;const live=()=>!disposed&&isActive(),get=id=>container.querySelector('#'+id); + window.PageLifecycle?.onDispose(()=>{disposed=true;statusController?.abort();}); const option=(value,label,current)=>''; container.innerHTML='
正在读取监听状态…

流程到达台账

管理连接'+(user.role!=='viewer'?'':'')+'
更多筛选:来源与日期
'+window.RecordUi.footer+'
按北京时间记录到达历史 · 分类与邮件批次见 通知订单
'; const detail=window.RecordUi.details(container,'流程到达详情'); @@ -16,9 +16,10 @@ window.OrderViews=(()=>{ function open(row,trigger){const f=(label,value)=>window.RecordUi.field(esc,label,value);detail.show('
'+f('流水号',row.serialNum)+f('流程',row.processName)+f('流程版本',row.processVersion)+f('节点',row.activityName)+f('到达类型',row.kind==='todo'?'待办到达记录':'待阅到达记录')+f('到达时间',formatDate(row.arrivedAt))+f('来源连接',row.origin.name)+f('来源账号',row.origin.identity||'账号未记录')+f('负责人',row.origin.owner)+f('来源状态',row.origin.status==='archived'?'历史归档':row.origin.enabled?'现有连接':'现有连接 · 已停用')+f('来源归档时间',row.origin.archivedAt?formatDate(row.origin.archivedAt):row.origin.status==='archived'?'未记录':'—')+(row.origin.missing?f('来源说明','来源信息缺失,保留原连接标识:'+row.connectionId):'')+f('首次采集',formatDate(row.firstSeenAt))+f('最近观察',formatDate(row.lastSeenAt))+f('任务标识',row.taskId)+f('完整标题',row.subject)+'
',trigger);} function draw(data){const host=container.querySelector('[data-arrival-list]');host.innerHTML=data.items.length?'
'+data.items.map((row,index)=>'').join('')+'
流水号/流程节点/类型标题摘要来源到达时间详情
'+esc(row.serialNum||'—')+'
'+esc(row.processName)+'
'+esc(row.origin.name)+(row.origin.status==='archived'?' · 历史归档':row.origin.enabled?'':' · 已停用')+'
'+esc(formatDate(row.arrivedAt))+'
'+esc(row.subject||'—')+'
'+esc(row.activityName==='sysInform'?'知会':row.activityName||'—')+'
'+(row.kind==='todo'?'待办到达':'待阅到达')+'
'+esc(row.subject||'—')+'
'+esc(row.origin.name)+'
'+(row.origin.status==='archived'?'历史归档':row.origin.enabled?'现有连接':'已停用')+'
'+esc(formatDate(row.arrivedAt))+'
':'

暂无匹配的到达记录

可调整日期、业务范围或查看历史归档。

';host.querySelectorAll('[data-arrival-detail]').forEach(button=>button.onclick=()=>open(data.items[Number(button.dataset.arrivalDetail)],button));sourceOptions(data.sources);monitor();} const table=window.RecordTable.mount({view:'records',container,isActive:live,api,onCommit:next=>{filters=next;},render:draw,readDraft(){const scope=get('arrival-scope').value;return {q:get('arrival-query').value.trim(),scope,business:get('arrival-business').value,kind:get('arrival-kind').value,connectionId:filters.scope!==scope?'':get('arrival-connection').value,from:get('arrival-from').value,to:get('arrival-to').value};},writeDraft(next){for(const [field,id]of Object.entries({q:'arrival-query',scope:'arrival-scope',business:'arrival-business',kind:'arrival-kind',connectionId:'arrival-connection',from:'arrival-from',to:'arrival-to'}))get(id).value=next[field];}}); - async function refresh(){clearTimeout(timer);try{statusController?.abort();statusController=new AbortController();const next=await api('/bpm-scan',undefined,{signal:statusController.signal});if(!live())return;status=next;monitor();const runs=status.runs.filter(r=>(filters.kind==='all'||(r.kind||'inform')===filters.kind)&&(!filters.connectionId||r.connectionId===filters.connectionId));if(runs[0]?.status==='error')container.querySelector('[data-monitor]').textContent+=' · 最近同步失败:'+runs[0].message;else if(runs[0]?.status==='success')container.querySelector('[data-monitor]').textContent+=' · 同步完成 '+formatDate(runs[0].finishedAt);}catch(e){if(live())error('监听状态读取失败:'+e.message);}finally{if(live())timer=setTimeout(refresh,10000);}} - if(get('scan-now'))get('scan-now').onclick=async()=>{const button=get('scan-now');button.disabled=true;try{for(const c of candidates())for(const kind of filters.kind==='all'?['todo','inform']:[filters.kind])await api('/bpm-scan/run',{connectionId:c.id,kind});if(live()){notify('只读同步已启动。');clearTimeout(timer);await refresh();}}catch(e){if(live())error(e.message+';已接受的同步请查看最新结果。');}finally{if(live())monitor();}}; - await table.ready;if(!live())return;await refresh(); + async function refresh(signal){try{statusController?.abort();statusController=new AbortController();const next=await api('/bpm-scan',undefined,{signal:AbortSignal.any([signal,statusController.signal]),ownerCheck:live});if(!live())return;status=next;monitor();const runs=status.runs.filter(r=>(filters.kind==='all'||(r.kind||'inform')===filters.kind)&&(!filters.connectionId||r.connectionId===filters.connectionId));if(runs[0]?.status==='error')container.querySelector('[data-monitor]').textContent+=' · 最近同步失败:'+runs[0].message;else if(runs[0]?.status==='success')container.querySelector('[data-monitor]').textContent+=' · 同步完成 '+formatDate(runs[0].finishedAt);}catch(e){if(!signal.aborted&&live())error('监听状态读取失败:'+e.message);}} + const polling=window.PageLifecycle.poll(refresh,10000,{isActive:live}); + if(get('scan-now'))get('scan-now').onclick=async()=>{const button=get('scan-now');button.disabled=true;try{for(const c of candidates())for(const kind of filters.kind==='all'?['todo','inform']:[filters.kind])await api('/bpm-scan/run',{connectionId:c.id,kind});if(live()){notify('只读同步已启动。');await polling.refresh();}}catch(e){if(live())error(e.message+';已接受的同步请查看最新结果。');}finally{if(live())monitor();}}; + await Promise.all([table.ready,polling.run()]); } return {configure,records}; })(); diff --git a/web/modules/bpm/view.js b/web/modules/bpm/view.js index c3fe5b1..73444b1 100644 --- a/web/modules/bpm/view.js +++ b/web/modules/bpm/view.js @@ -15,12 +15,12 @@ window.BpmLogin=(()=>{ const status=(c,kind='account')=>{const state=observation(c,kind),[color,label]=({healthy:['green','健康'],error:['red','异常'],pending:['yellow','警告'],paused:['yellow','已暂停']})[state.status]||['yellow','待确认'];return ``;}; function feedback(message,type='danger'){if(!live())return;const el=$('[data-bpm-feedback]');if(el){el.hidden=false;el.className=`alert alert-${type}`;el.textContent=message;}notify(message,type);} function release(r,{unload=false}={}){ - r.closed=true;clearTimeout(r.timer);r.controller?.abort();if(r.url){URL.revokeObjectURL(r.url);r.url=null;} + r.closed=true;r.polling?.dispose();r.controller?.abort();if(r.url){URL.revokeObjectURL(r.url);r.url=null;} if(unload){if(!r.closeRequest)r.closeRequest=fetch('/api'+route(r.id,'login/close'),{method:'POST',credentials:'same-origin',keepalive:true,headers:{'Content-Type':'application/json'},body:'{}'}).then(()=>{}).catch(()=>{});return r.closeRequest;} if(r.release)return r.release; r.release=(async()=>{await r.opening.catch(()=>{});await r.queue.catch(()=>{});await r.operation?.catch(()=>{});if(!r.closeRequest)r.closeRequest=api(route(r.id,'login/close'),{}).catch(()=>{});await r.closeRequest;})();return r.release; } - const handle={dispose(options){disposed=true;++statusRevision;clearTimeout(statusTimer);container.querySelectorAll('[data-account-form]').forEach(form=>form.reset());return remote?release(remote,options):Promise.resolve();}}; + const handle={dispose(options){disposed=true;++statusRevision;statusTimer?.dispose();container.querySelectorAll('[data-account-form]').forEach(form=>form.reset());return remote?release(remote,options):Promise.resolve();}}; active=handle; const valid=r=>live()&&remote===r&&!r.closed; function controls(r){if(!valid(r))return;container.querySelectorAll('[data-bpm-control]').forEach(el=>el.disabled=!!r.busy);const input=$('[data-bpm-input]');if(input)input.disabled=!!r.busy;} @@ -94,14 +94,14 @@ window.BpmLogin=(()=>{ +row('投递重试',delivery.retryAt?formatDate(delivery.retryAt):'无') +(delivery.message?row('投递说明',delivery.message):'')+''; } - async function refreshStatus(){ + async function refreshStatus(signal){ if(!live())return; try{ - if(accountBusy||mutationBusy)return;const request=statusRevision,next=await api('/workspace');if(!live()||request!==statusRevision)return; + if(accountBusy||mutationBusy)return;const request=statusRevision,next=await api('/workspace',undefined,{signal,ownerCheck:live});if(!live()||request!==statusRevision)return; const rows=next.connections||[],changed=JSON.stringify(connections.map(c=>[c.id,c.status,c.version,c.owner]))!==JSON.stringify(rows.map(c=>[c.id,c.status,c.version,c.owner]));connections=rows; if(changed&&!remote&&!container.querySelector('[data-account-form]')&&!window.PageLifecycle?.dirty())drawCards(); else for(const c of connections){const badge=container.querySelector('[data-connection-status="'+c.id+'"]'),health=container.querySelector('[data-connection-health="'+c.id+'"]');if(badge)badge.innerHTML=status(c);if(health){const expanded=health.querySelector('details')?.open;health.innerHTML=observations(c);if(expanded)health.querySelector('details').open=true;}} - }catch{}finally{if(live())statusTimer=setTimeout(refreshStatus,5000);} + }catch{} } function ownerForm(c){ if(user.role!=='admin')return ''; @@ -138,21 +138,21 @@ window.BpmLogin=(()=>{ catch(error){feedback(error.message);}finally{accountControls(false);} } async function mutate(button,action,message){++statusRevision;mutationBusy=true;button.disabled=true;try{const id=button.dataset[action],connection=connections.find(c=>c.id===id);const result=await api(route(id,action),['enable','disable'].includes(action)?{version:connection.version||0}:{});if(!live())return;update(result,button.dataset[action]);feedback(message,'success');}catch(error){feedback(error.message);}finally{mutationBusy=false;if(live())button.disabled=false;}} - async function frame(r){ + async function frame(r,signal){ if(!valid(r))return; try{ r.controller=new AbortController(); - const response=await fetch('/api'+route(r.id,'login/frame'),{credentials:'same-origin',cache:'no-store',signal:r.controller.signal}); + const response=await fetch('/api'+route(r.id,'login/frame'),{credentials:'same-origin',cache:'no-store',signal:AbortSignal.any([signal,r.controller.signal])}); if(!response.ok){let message='登录画面加载失败,请重新打开窗口。';try{message=(await response.json()).error||message;}catch{}throw new Error(message);} const blob=await response.blob();if(!valid(r))return; const url=URL.createObjectURL(blob),old=r.url;r.url=url;const image=$('[data-bpm-frame]');image.src=url;image.hidden=false;const loading=$('[data-bpm-loading]');if(loading)loading.hidden=true;if(old)URL.revokeObjectURL(old); }catch(error){if(valid(r)&&error.name!=='AbortError'){feedback(error.message);await close(r);return;}} - if(valid(r))r.timer=setTimeout(()=>frame(r),650); + } async function close(r){if(remote===r)remote=null;await release(r);if(live()){$('#bpm-remote').innerHTML='';drawCards();}} async function open(id){ if(remote||accountBusy||!live())return; - const r={id,closed:false,queue:Promise.resolve(),busy:false,failed:false,url:null,timer:null};remote=r;drawCards(); + const r={id,closed:false,queue:Promise.resolve(),busy:false,failed:false,url:null};remote=r;drawCards(); r.opening=api(route(id,'login/open'),{}); try{ const session=await r.opening;if(!valid(r)){await release(r);return;} @@ -171,7 +171,7 @@ window.BpmLogin=(()=>{ try{await r.queue;if(!valid(r))return;if(r.failed)throw Error('输入未送达,请关闭后重新打开登录窗口。');r.operation=api(route(id,'login/save'),{});const result=await r.operation;if(!valid(r))return;update(result,id);const saved=result.connection||result;feedback(saved.status==='connected'?'连接已检查并保存。':'请完成登录后再次检查。',saved.status==='connected'?'success':'warning');} catch(error){feedback(error.message);}finally{r.busy=false;if(valid(r)){controls(r);$('[data-bpm-close]').disabled=false;$('[data-bpm-save-state]').textContent='完成登录后保存连接';}} }; - frame(r); + r.polling=window.PageLifecycle.poll(signal=>frame(r,signal),650,{isActive:()=>valid(r)});void r.polling.run(); }catch(error){if(valid(r)){remote=null;drawCards();feedback(error.message);}} } function bindInput(r){ @@ -199,7 +199,7 @@ window.BpmLogin=(()=>{ if(user.role==='admin')$('#connection-create').onsubmit=async event=>{event.preventDefault();const button=event.target.querySelector('button[type=submit]');button.disabled=true;try{const result=await api('/connections',{name:$('#connection-name').value.trim(),owner:$('#connection-owner').value});if(!live())return;++statusRevision;connections.unshift(result.connection||result);event.target.reset();drawCards();feedback('连接已创建。','success');}catch(error){feedback(error.message);}finally{if(live())button.disabled=false;}}; drawCards(); connections.filter(c=>c.status!=='disabled'&&authorized(c)).forEach(c=>loadAccount(c.id).then(refreshAccountSummary).catch(error=>feedback(error.message))); - statusTimer=setTimeout(refreshStatus,5000); + statusTimer=window.PageLifecycle.poll(refreshStatus,5000,{isActive:live}); await window.BpmSyncSettings?.mount($('#bpm-sync-settings'),{api,user,notify,isActive:live}); }catch(error){if(live())throw error;} } diff --git a/web/modules/field-mappings/view.js b/web/modules/field-mappings/view.js index 595b237..d1666f4 100644 --- a/web/modules/field-mappings/view.js +++ b/web/modules/field-mappings/view.js @@ -24,7 +24,7 @@ lock(busy); } window.PageLifecycle.onDispose(()=>{disposed=true;revision++;}); - try{if(admin){const workspace=await api('/workspace');if(!live())return;connections=(workspace.connections||[]).filter(c=>c.status!=='disabled'&&c.enabled!==false);}await load();}catch(e){if(live())host.innerHTML='
字段映射加载失败:'+esc(e.message)+'。请重新进入此页重试。
';} + try{const [workspace,fresh]=await Promise.all([admin?api('/workspace'):null,api('/order-rules/fields?view=scopes')]);if(!live())return;if(admin)connections=(workspace.connections||[]).filter(c=>c.status!=='disabled'&&c.enabled!==false);data=fresh;draw();}catch(e){if(live())host.innerHTML='
字段映射加载失败:'+esc(e.message)+'。请重新进入此页重试。
';} return {dispose(){disposed=true;revision++;}}; } window.FieldMappingViews={render}; diff --git a/web/modules/health/view.js b/web/modules/health/view.js index 3c066c2..8a2ad94 100644 --- a/web/modules/health/view.js +++ b/web/modules/health/view.js @@ -8,7 +8,7 @@ function duration(seconds){seconds=Math.max(0,Math.floor(seconds));const days=Math.floor(seconds/86400),hours=Math.floor(seconds%86400/3600),minutes=Math.floor(seconds%3600/60);return (days?days+' 天 ':'')+(hours?hours+' 小时 ':'')+(minutes?minutes+' 分钟 ':seconds%60+' 秒');} function badge(status,map=statuses){const [label,color]=map[status]||['状态未知','secondary'];return `${label}`;} async function render(container,isActive=()=>true){ - const live=()=>isActive()&&container.isConnected;let pending=false,timer; + const live=()=>isActive()&&container.isConnected;let pending=false; container.innerHTML=`

服务守护与健康状态

上次检查结果,非实时连通性检测
`; const button=container.querySelector('#health-refresh'),notice=container.querySelector('#health-refresh-state'); function draw(data){ @@ -17,14 +17,14 @@ container.querySelector('#health-groups').innerHTML=data.groups.map(group=>`

${esc(group.title)}

${badge(group.status)}
${group.message?`
${esc(group.message)}
`:group.items.length?group.items.map(item=>`
${esc(item.name)}${badge(item.status)}
${esc(item.detail)}
最近检查
${esc(formatDate(item.checkedAt))}
最近成功
${esc(formatDate(item.lastSuccessAt))}
最近失败
${esc(formatDate(item.lastFailureAt))}
`).join(''):'
尚无可查看的配置。
'}
`).join(''); container.querySelector('#health-events').innerHTML=`

最近守护事件

${guard.events?.length?guard.events.slice(0,12).map(event=>`
${esc(formatDate(event.at))}${esc(events[event.kind]||'运行状态变化')}${event.code!==undefined&&event.code!==null?'(退出码 '+esc(event.code)+')':''}${event.delayMs?','+Math.ceil(event.delayMs/1000)+' 秒后尝试':''}
`).join(''):'暂无守护事件。'}
`; } - async function refresh(){ - if(pending||!live())return;pending=true;button.disabled=true;clearTimeout(timer); - try{const data=await api('/health',undefined,{signal:AbortSignal.timeout(8000)});if(!live())return;draw(data);notice.className='card-footer small text-secondary';notice.innerHTML=`健康状态已更新${esc(formatDate(data.at))}`;} - catch{if(live()){const access=container.querySelector('#health-access');if(access){access.className='badge bg-red-lt ms-auto';access.textContent='连接中断';}notice.className='card-footer small text-danger';notice.textContent='暂时无法连接服务,保留上次状态;恢复后会自动更新。';}} - finally{pending=false;if(live()){button.disabled=false;timer=setTimeout(refresh,10000);}} + async function refresh(signal){ + if(pending||!live())return;pending=true;button.disabled=true; + try{const data=await api('/health',undefined,{signal:AbortSignal.any([signal,AbortSignal.timeout(8000)]),ownerCheck:live});if(!live())return;draw(data);notice.className='card-footer small text-secondary';notice.innerHTML=`健康状态已更新${esc(formatDate(data.at))}`;} + catch{if(!signal.aborted&&live()){const access=container.querySelector('#health-access');if(access){access.className='badge bg-red-lt ms-auto';access.textContent='连接中断';}notice.className='card-footer small text-danger';notice.textContent='暂时无法连接服务,保留上次状态;恢复后会自动更新。';}} + finally{pending=false;if(live()){button.disabled=false;}} } if(user?.role==='admin'){const box=container.querySelector('#health-maintenance');box.innerHTML='

数据容量与保留

正在读取…
';const load=async()=>{const b=container.querySelector('#capacity-refresh');b.disabled=true;try{const d=await api('/maintenance');if(live())container.querySelector('#capacity-content').innerHTML='

默认永久保留;会话归档及异常退役保留原证据。

状态数据 '+(d.state.bytes/1048576).toFixed(2)+' MiB · PDF '+d.pdf.files+' 份 / '+(d.pdf.bytes/1048576).toFixed(2)+' MiB · 导出台账 '+d.jobs.total+' 条

导出 PDF 历史

备份与恢复按停服操作指南执行;只恢复到新空目录。

';}catch(e){if(live())container.querySelector('#capacity-content').textContent=e.message;}finally{if(live())b.disabled=false;}};container.querySelector('#capacity-refresh').onclick=load;void load();} - button.onclick=refresh;await refresh(); + const polling=window.PageLifecycle.poll(refresh,10000,{isActive:live});button.onclick=()=>polling.run();await polling.run(); } window.HealthViews={configure:options=>({api,esc,formatDate,user}=options),render}; })(); diff --git a/web/modules/navigation/lifecycle.js b/web/modules/navigation/lifecycle.js index 49b4bdd..68af01d 100644 --- a/web/modules/navigation/lifecycle.js +++ b/web/modules/navigation/lifecycle.js @@ -33,6 +33,21 @@ window.PageLifecycle=(()=>{ window.addEventListener('beforeunload',event=>{if(dirty()){event.preventDefault();event.returnValue='';}}); // Existing editor cancellation and selection changes pass through the same guard. document.addEventListener('click',event=>{const button=event.target.closest('button');if(!button||button.id==='storage-operation-cancel'||button.dataset.lifecycleApproved||!host?.contains(button))return;if(!/cancel|close|reset$/.test(button.id)&&!button.matches('[data-account-cancel],[data-account-manage],[data-edit],[data-storage-edit],[data-exception],#exception-new,#mail-add'))return;if(!dirty())return;event.preventDefault();event.stopImmediatePropagation();guard(()=>{button.dataset.lifecycleApproved='1';button.click();delete button.dataset.lifecycleApproved;});},true); + // Visibility changes check freshness without rebuilding editors or starting overlapping reads. + function poll(work,interval,{isActive=()=>true,owned=true}={}){ + let disposed=false,timer,running=null,controller,resume=false; + const live=()=>!disposed&&isActive(); + function schedule(delay=interval){clearTimeout(timer);if(live()&&!document.hidden&&!running)timer=setTimeout(()=>void run().catch(()=>{}),delay);} + async function run(){ + clearTimeout(timer);if(!live()||document.hidden)return;if(running)return running; + controller=new AbortController();running=Promise.resolve().then(()=>work(controller.signal)); + try{return await running;}finally{running=null;if(resume){resume=false;schedule(0);}else schedule();} + } + function visibility(){clearTimeout(timer);if(document.hidden)controller?.abort();else if(live()){if(running)resume=true;else void run().catch(()=>{});}} + async function cancel(){controller?.abort();if(running)try{await running;}catch{}} + const handle={run,schedule,cancel,async refresh(){await cancel();return run();},dispose(){if(disposed)return;disposed=true;clearTimeout(timer);controller?.abort();document.removeEventListener('visibilitychange',visibility);}}; + document.addEventListener('visibilitychange',visibility);if(owned)onDispose(()=>handle.dispose());schedule();return handle; + } const requestKey=()=>typeof crypto.randomUUID==='function'?crypto.randomUUID():'request-'+[...crypto.getRandomValues(new Uint8Array(16))].map(v=>v.toString(16).padStart(2,'0')).join(''); - return {afterSave,requestKey,attach,bind,register,onDispose,dispose,guard,dirty,failed,succeeded,get submission(){return activeSubmission;},get revision(){return revision;}}; + return {poll,afterSave,requestKey,attach,bind,register,onDispose,dispose,guard,dirty,failed,succeeded,get submission(){return activeSubmission;},get revision(){return revision;}}; })(); diff --git a/web/modules/order-notifications/home.js b/web/modules/order-notifications/home.js index 24d834f..c3b42d2 100644 --- a/web/modules/order-notifications/home.js +++ b/web/modules/order-notifications/home.js @@ -18,10 +18,10 @@ window.BusinessHome=(()=>{ const metric=(key,title,value,symbol,tone,href,note)=>'
'+title+''+icon(symbol)+'
'+number(value)+'项
'+note+icon('arrow-right')+'
'; const scene=''; container.innerHTML='
'+icon('clock-hour-4')+' 下一批通知
'+time(w?.end)+'
·

到达截止 '+time(w?.collectionEnd||w?.end)+' 北京时间

'+scene+'
'+metric('pending','本轮待汇总订单',h.pendingOrders,'file-type-pdf','blue',collectingLink,'查看本轮订单')+metric('batches','收集中批次',h.collectingBatches,'mail-forward','cyan',collectingLink,'按分类汇总')+metric('blocked','受阻 / 失败订单',c.blocked,'alert-circle','amber','#notification-orders','查看处理状态')+metric('unknown','结果待核实批次',c.unknown,'shield-check','violet','#notification-batches?scope=active&status=unknown','核对发送结果')+'

'+icon('mail-forward')+'本轮批次

到达收集时段,按北京时间计算

查看全部批次 '+icon('arrow-right')+'
'+short(w?.collectionStart||w?.start)+''+short(w?.collectionEnd||w?.end)+' 截止
发送前 5 分钟截止到达收集'+(h.carriedOrders?'含 '+number(h.carriedOrders)+' 单顺延,原到达时间保留':'')+'

'+icon('shield-check')+'运行条件

依据最近一次实际检查

详情
'+[['liveTodo','BPM 待办读取','route','#bpm'],['pdfExport','通知书 PDF 生成','file-type-pdf','#rule-fields'],['automaticArchive','文件自动归档','database','#storage']].map(([key,label,symbol,href])=>''+icon(symbol)+''+label+''+(caps[key]===true?'已就绪':'待验证')+'').join('')+'
最近成功扫描
'+esc(h.lastScanAt?formatDate(h.lastScanAt):'尚无成功扫描记录')+'
BPM 节点仍由人工办理。
处理与邮件设置 '+icon('arrow-right')+'

'+icon('alert-circle')+'待处理事项 '+issues.length+'

受阻原因与需要人工核验的结果

异常待办 '+icon('arrow-right')+'
'+(issues.length?'
'+issues.map(i=>'
'+icon('alert-circle')+'
'+esc(i.error||i.message||i.type||'业务受阻')+'

'+esc(({open:'待处理',unassigned:'待分配',awaiting_verification:'待人工核验',in_progress:'处理中',verifying:'待核验'})[i.status]||'待处理')+' · 负责人:'+esc(i.owner||(i.owners||[]).join('、')||'未分配')+'

处理 / 核验异常'+(i.batchId?' · 查看原批次':'')+'
').join('')+'
':'
'+icon(ready?'shield-check':'clock-hour-4')+'

暂无待处理的业务异常

订单持续按分类积累,运行能力以检查结果为准。

查看订单中心
')+'
'; - const root=container.querySelector('[data-business-home]');let disposed=false,timer; - function tick(){if(disposed||!isActive()||!root.isConnected)return;const now=Date.now(),end=valid(w?.end)?Date.parse(w.end):NaN,start=Date.parse(w?.collectionStart||w?.start),cut=Date.parse(w?.collectionEnd||w?.end);const next=root.querySelector('[data-home-send-day]');next.textContent=Number.isFinite(end)?(day(end)===day(now)?'今天':new Intl.DateTimeFormat('zh-CN',{timeZone:'Asia/Shanghai',month:'numeric',day:'numeric'}).format(new Date(end)))+'计划发送':'暂无可用时点';let phase='等待发送窗口',countdown='请检查发送计划';if(Number.isFinite(end)){phase=now>=end?'已到计划发送时间':now>=cut?'本轮到达收集已截止':'本轮收集中';const minutes=Math.max(1,Math.ceil((end-now)/60000));countdown=now>=end?'请刷新确认发送结果':'距计划发送 '+(minutes>=60?Math.floor(minutes/60)+' 小时 ':'')+(minutes%60)+' 分钟';}if(s.enabled===false){phase='等待恢复';countdown='恢复后按已配置计划执行';}root.querySelector('[data-home-phase]').textContent=phase;root.querySelector('[data-home-countdown]').textContent=countdown;const progress=root.querySelector('[data-home-progress]'),ratio=Number.isFinite(start)&&Number.isFinite(cut)&&cut>start?Math.min(100,Math.max(0,(now-start)/(cut-start)*100)):0;progress.setAttribute('aria-valuenow',String(Math.round(ratio)));progress.querySelector('.progress-bar').style.width=ratio+'%';timer=setTimeout(tick,30000);} + const root=container.querySelector('[data-business-home]');let disposed=false;const timer=window.PageLifecycle.poll(tick,30000,{isActive:()=>!disposed&&isActive()}); + function tick(){if(disposed||!isActive()||!root.isConnected)return;const now=Date.now(),end=valid(w?.end)?Date.parse(w.end):NaN,start=Date.parse(w?.collectionStart||w?.start),cut=Date.parse(w?.collectionEnd||w?.end);const next=root.querySelector('[data-home-send-day]');next.textContent=Number.isFinite(end)?(day(end)===day(now)?'今天':new Intl.DateTimeFormat('zh-CN',{timeZone:'Asia/Shanghai',month:'numeric',day:'numeric'}).format(new Date(end)))+'计划发送':'暂无可用时点';let phase='等待发送窗口',countdown='请检查发送计划';if(Number.isFinite(end)){phase=now>=end?'已到计划发送时间':now>=cut?'本轮到达收集已截止':'本轮收集中';const minutes=Math.max(1,Math.ceil((end-now)/60000));countdown=now>=end?'请刷新确认发送结果':'距计划发送 '+(minutes>=60?Math.floor(minutes/60)+' 小时 ':'')+(minutes%60)+' 分钟';}if(s.enabled===false){phase='等待恢复';countdown='恢复后按已配置计划执行';}root.querySelector('[data-home-phase]').textContent=phase;root.querySelector('[data-home-countdown]').textContent=countdown;const progress=root.querySelector('[data-home-progress]'),ratio=Number.isFinite(start)&&Number.isFinite(cut)&&cut>start?Math.min(100,Math.max(0,(now-start)/(cut-start)*100)):0;progress.setAttribute('aria-valuenow',String(Math.round(ratio)));progress.querySelector('.progress-bar').style.width=ratio+'%';} root.classList.toggle('is-scanning',s.processingEnabled===true&&(data.scans||[]).some(scan=>scan.status==='scanning'));tick(); - return {setStale(stale,failed=false){root.classList.toggle('home-stale',stale);root.querySelector('[data-home-live-label]').textContent=stale?(failed?'状态读取失败,显示上次结果':'有新状态待刷新'):state;},dispose(){disposed=true;clearTimeout(timer);}}; + return {setStale(stale,failed=false){root.classList.toggle('home-stale',stale);root.querySelector('[data-home-live-label]').textContent=stale?(failed?'状态读取失败,显示上次结果':'有新状态待刷新'):state;},dispose(){disposed=true;timer.dispose();}}; } return {mount,loading}; })(); diff --git a/web/modules/order-notifications/records.js b/web/modules/order-notifications/records.js index deb02a5..b3b30bb 100644 --- a/web/modules/order-notifications/records.js +++ b/web/modules/order-notifications/records.js @@ -22,7 +22,7 @@ window.BusinessRecordViews=(()=>{ const names=Object.keys(filters).filter(k=>!['page','pageSize'].includes(k)); table=window.RecordTable.mount({view,container,isActive,api,endpoint:'/order-rules/'+kind,onCommit:next=>{if(kind==='batches'){tabs(next);container.querySelector('[name="scope"]').value=next.scope;}},render:draw,readDraft:()=>Object.fromEntries(names.map(k=>[k,container.querySelector('[name="'+k+'"]').value.trim()])),writeDraft(next){for(const k of names)container.querySelector('[name="'+k+'"]').value=next[k];}}); const workspaceRead=api('/workspace'); - const summaryRead=api('/order-rules?view=summary'); + const summaryRead=api('/order-rules/catalog'); function fillOptions(name,entries){ const field=container.querySelector('[name="'+name+'"]'),current=field.value; const options=new Map(entries);if(current&&!options.has(current))options.set(current,current+'(历史来源)'); diff --git a/web/modules/order-notifications/view.js b/web/modules/order-notifications/view.js index 17bf5ba..607a8f9 100644 --- a/web/modules/order-notifications/view.js +++ b/web/modules/order-notifications/view.js @@ -6,16 +6,16 @@ window.OrderNotificationViews=(()=>{ const {api,esc,formatDate,user}=helpers; if(['execution','orders','pending','history'].includes(section))return window.BusinessRecordViews.render(container,{...helpers,isActive},['execution','orders'].includes(section)?'orders':'batches'); if(section!=='settings')container.innerHTML=window.BusinessHome.loading(); - const data=prepared||await api('/order-rules?view=summary');if(!isActive())return; - if(section==='settings')return settings(container,data,isActive); + const [data,mail]=section==='settings'?await Promise.all([api('/order-rules/notification-settings'),api('/mail').catch(error=>({channels:[],error:error.message}))]):[prepared||await api('/order-rules?view=summary')];if(!isActive())return; + if(section==='settings')return settings(container,data,isActive,mail); const home=window.BusinessHome.mount(container,data,{esc,formatDate,isActive}); - let disposed=false,timer,controller,refreshController;const notice=container.querySelector('[data-business-updates]'),signature=JSON.stringify(data); - notice.querySelector('button').onclick=async event=>{const button=event.currentTarget;if(button.disabled)return;button.disabled=true;refreshController=new AbortController();try{const fresh=await api('/order-rules?view=summary',undefined,{signal:refreshController.signal});if(!disposed&&isActive())await render(container,isActive,'workbench',fresh);}catch(error){if(!disposed&&isActive()){notice.hidden=false;notice.querySelector('[data-update-text]').textContent='刷新失败:'+error.message+';仍显示上次结果。';home.setStale(true,true);}}finally{if(button.isConnected)button.disabled=false;}}; - async function poll(){if(disposed||!isActive())return;try{controller=new AbortController();const fresh=await api('/order-rules?view=summary',undefined,{signal:controller.signal});if(!disposed&&isActive()){const changed=JSON.stringify(fresh)!==signature;notice.hidden=!changed;notice.querySelector('[data-update-text]').textContent='业务状态有更新。';home.setStale(changed);}}catch{if(!disposed&&isActive()){notice.hidden=false;notice.querySelector('[data-update-text]').textContent='状态读取失败,仍显示上次结果。';home.setStale(true,true);}}finally{if(!disposed&&isActive())timer=setTimeout(poll,15000);}} - timer=setTimeout(poll,15000);homeDispose=()=>{disposed=true;clearTimeout(timer);controller?.abort();refreshController?.abort();home.dispose();};window.PageLifecycle.onDispose(homeDispose); + let disposed=false,refreshController;const notice=container.querySelector('[data-business-updates]'),signature=JSON.stringify(data); + notice.querySelector('button').onclick=async event=>{const button=event.currentTarget;if(button.disabled)return;button.disabled=true;refreshController=new AbortController();try{await polling.cancel();const fresh=await api('/order-rules?view=summary',undefined,{signal:refreshController.signal});if(!disposed&&isActive())await render(container,isActive,'workbench',fresh);}catch(error){if(!disposed&&isActive()){notice.hidden=false;notice.querySelector('[data-update-text]').textContent='刷新失败:'+error.message+';仍显示上次结果。';home.setStale(true,true);}}finally{if(button.isConnected)button.disabled=false;}}; + async function poll(signal){if(disposed||!isActive())return;try{const fresh=await api('/order-rules?view=summary',undefined,{signal,ownerCheck:isActive});if(!disposed&&isActive()){const changed=JSON.stringify(fresh)!==signature;notice.hidden=!changed;notice.querySelector('[data-update-text]').textContent='业务状态有更新。';home.setStale(changed);}}catch{if(!signal.aborted&&!disposed&&isActive()){notice.hidden=false;notice.querySelector('[data-update-text]').textContent='状态读取失败,仍显示上次结果。';home.setStale(true,true);}}} + const polling=window.PageLifecycle.poll(poll,15000,{isActive:()=>!disposed&&isActive()});homeDispose=()=>{disposed=true;polling.dispose();refreshController?.abort();home.dispose();};window.PageLifecycle.onDispose(homeDispose); } - async function settings(container,data,isActive){ - const {api,esc,user,formatDate}=helpers,config=data.settings,admin=user.role==='admin',mail=await api('/mail').catch(error=>({channels:[],error:error.message}));if(!isActive())return; + async function settings(container,data,isActive,mail){ + const {api,esc,user,formatDate}=helpers,config=data.settings,admin=user.role==='admin';if(!isActive())return; container.innerHTML=`

处理与邮件设置

${mail.error?'
邮箱目录读取失败:'+esc(mail.error)+'。请刷新重试。
':''}

启用时建立接收时间基线,早于基线的未处理历史不会自动入队。无需先启用邮件。当前启用基线:${esc(formatDate(config.processingSince))}。

两个开关独立暂停。邮箱、类别与归档条件未通过时,服务端拒绝启用邮件。

${admin?'':''}
`; const form=container.querySelector('form');if(admin)form.onsubmit=async event=>{event.preventDefault();const button=form.querySelector('button');button.disabled=true;try{if(mail.error)throw Error('邮箱目录读取失败,请刷新后再保存。');const saved=await api('/order-rules/settings',{version:config.version,processingEnabled:form.elements.processingEnabled.checked,enabled:form.elements.enabled.checked,channelId:form.elements.channelId.value,maxMessageBytes:Math.round(Number(form.elements.maxSize.value)*1048576)});if(isActive()){Object.assign(config,saved);form.querySelector('[role=alert]').textContent='设置已保存。';}}catch(error){if(isActive())form.querySelector('[role=alert]').textContent=error.message;}finally{if(button.isConnected)button.disabled=false;}}; if(data.restrictedTest){ diff --git a/web/modules/records/controller.js b/web/modules/records/controller.js index ae6a3a0..dbd4274 100644 --- a/web/modules/records/controller.js +++ b/web/modules/records/controller.js @@ -1,7 +1,7 @@ 'use strict'; window.RecordTable=(()=>{ function mount({view,container,isActive,api,readDraft,writeDraft,render,onCommit=()=>{},endpoint=null}){ - let disposed=false,busy=false,requestId=0,controller,pollController,timer,scrollTimer,applied=window.RecordState.read(view),data=null,signature='',retry=null; + let disposed=false,busy=false,requestId=0,controller,pollController,scrollTimer,applied=window.RecordState.read(view),data=null,signature='',retry=null; const live=()=>!disposed&&isActive(),get=selector=>container.querySelector(selector),list=get('[data-arrival-list],[data-pdf-list]'),error=get('[data-record-error]'); const notice=document.createElement('div');notice.className='alert alert-info mt-2';notice.hidden=true;notice.innerHTML='记录有更新。 ';list.before(notice); const loading=document.createElement('div');loading.className='small text-secondary px-3 py-2';loading.setAttribute('role','status');loading.hidden=true;loading.textContent='正在加载记录…';list.before(loading); @@ -20,11 +20,12 @@ window.RecordTable=(()=>{ function apply(){if(busy)return;void load({...applied,...readDraft(),page:1},{push:true,scroll:'top'});} container.querySelectorAll('[data-record-query]').forEach(button=>button.onclick=apply); const inputs=container.querySelectorAll('.record-filters input,.record-filters select,#record-search,#record-status');for(const input of inputs)input.addEventListener('keydown',event=>{if(event.key==='Enter'){event.preventDefault();apply();}}); - async function check(){if(!live())return;try{if(data&&!busy){pollController=new AbortController();const result=await api((endpoint|| (view==='records'?'/arrivals':'/jobs'))+'?'+new URLSearchParams({...(!endpoint?{view:'ledger'}:{}),...applied}),undefined,{signal:pollController.signal});if(live()&&!busy)notice.hidden=snapshot(result)===signature;}}catch{}finally{if(live())timer=setTimeout(check,10000);}} + async function check(signal){if(!live())return;try{if(data&&!busy){pollController=new AbortController();const result=await api((endpoint|| (view==='records'?'/arrivals':'/jobs'))+'?'+new URLSearchParams({...(!endpoint?{view:'ledger'}:{}),...applied}),undefined,{signal:AbortSignal.any([signal,pollController.signal]),ownerCheck:live});if(!signal.aborted&&live()&&!busy)notice.hidden=snapshot(result)===signature;}}catch{}} + const polling=window.PageLifecycle.poll(check,10000,{isActive:live}); refresh.onclick=notice.querySelector('button').onclick=()=>{if(!busy)void load(applied,{scroll:'keep'});}; const scroll=()=>{clearTimeout(scrollTimer);scrollTimer=setTimeout(()=>{if(live()&&data&&!busy)window.RecordState.capture(view,applied);},150);},pagehide=()=>{if(data)window.RecordState.capture(view,applied);};window.addEventListener('scroll',scroll,{passive:true});window.addEventListener('pagehide',pagehide); - const handle={view,refresh:()=>load(applied,{scroll:'keep'}),navigate(){return load(window.RecordState.read(view),{draft:true,scroll:'restore',y:window.RecordState.position(view)});},get busy(){return busy;},dispose(){if(disposed)return;disposed=true;controller?.abort();pollController?.abort();clearTimeout(timer);clearTimeout(scrollTimer);window.removeEventListener('scroll',scroll);window.removeEventListener('pagehide',pagehide);if(data)window.RecordState.capture(view,applied);if(window.RecordTable.active===handle)window.RecordTable.active=null;}}; - window.RecordTable.active=handle;window.PageLifecycle?.onDispose(()=>handle.dispose());handle.ready=load(applied,{scroll:'restore',y:initialScroll}).finally(()=>{if(live())timer=setTimeout(check,10000);});return handle; + const handle={view,refresh:()=>load(applied,{scroll:'keep'}),navigate(){return load(window.RecordState.read(view),{draft:true,scroll:'restore',y:window.RecordState.position(view)});},get busy(){return busy;},dispose(){if(disposed)return;disposed=true;controller?.abort();pollController?.abort();polling.dispose();clearTimeout(scrollTimer);window.removeEventListener('scroll',scroll);window.removeEventListener('pagehide',pagehide);if(data)window.RecordState.capture(view,applied);if(window.RecordTable.active===handle)window.RecordTable.active=null;}}; + window.RecordTable.active=handle;window.PageLifecycle?.onDispose(()=>handle.dispose());handle.ready=load(applied,{scroll:'restore',y:initialScroll}).finally(()=>{if(live())polling.schedule();});return handle; } return {mount,active:null}; })();