diff --git a/README.md b/README.md index 0969536..165df9c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ 界面复用 [Tabler](https://tabler.io/admin-template) 免费开源版(@tabler/core 1.6.1),CSS/JS 全部在本机提供;MIT 原文见 licenses/Tabler-MIT.txt。青龙已有独立部署准备和 CLI,尚未接通业务,本次不启动它或复制其内部源码。 -工作台账号、群组设置和原 PDF 记录保存在 `%LOCALAPPDATA%\OrderNotificationAutomation\dashboard\state.sqlite`;业务日历、异常、连接与监管草稿保存在同级 `workspace` 目录的 SQLite 数据库中。邮箱、模板版本、原邮件、收信游标和测试发送记录保存在 `mail\mail.sqlite`,密码、原邮件和完整正文附件加密保存。BPM 会话加密保存在 `bpm-sessions`,主密钥经 Windows 当前运行用户 DPAPI 保护。数据留在运行机本地磁盘,不放项目所在的 Z: 共享盘。备份前停止服务并保护整个本地状态目录。旧版 `dashboard\state.json` 会首次导入 SQLite 并原样保留为迁移备份;后续以 `state.sqlite` 为准。工作台登录有效期为 30 天,每日活动自动续期;令牌哈希保存在 `dashboard\auth.sqlite`,服务重启后继续有效,退出登录立即撤销。已保存的 BPM 会话在同一 Windows 运行账号下恢复。 +工作台账号、群组设置和原 PDF 记录保存在 `%LOCALAPPDATA%\OrderNotificationAutomation\dashboard\state.sqlite`;业务日历、异常、连接与监管草稿保存在同级 `workspace` 目录的 SQLite 数据库中。邮箱、模板版本、原邮件、收信游标和测试发送记录保存在 `mail\mail.sqlite`,密码、原邮件和完整正文附件加密保存。BPM 会话与托管账号加密保存在 `bpm-sessions/accounts.sqlite`,旧 `.enc` 会话按读取迁移;主密钥经 Windows 当前运行用户 DPAPI 保护。数据留在运行机本地磁盘,不放项目所在的 Z: 共享盘。备份前停止服务并保护整个本地状态目录。旧版 `dashboard\state.json` 会首次导入 SQLite 并原样保留为迁移备份;后续以 `state.sqlite` 为准。工作台登录有效期为 30 天,每日活动自动续期;令牌哈希保存在 `dashboard\auth.sqlite`,服务重启后继续有效,退出登录立即撤销。已保存的 BPM 会话在同一 Windows 运行账号下恢复。 ## 邮箱与邮件模板 @@ -41,7 +41,7 @@ - **存储服务器**:管理员可先填写服务器 IP / 主机名,点击“浏览”列出共享并逐层选择目录,也可粘贴完整 Windows 共享路径(例如 `\\210服务器\订单\归档`),自动识别主机、共享和子目录;名称可留空自动生成。默认“免填账号密码(使用 Windows 权限)”,直接复用部署机现有 SMB 会话或运行服务账号的共享访问权限,适用于已获授权和系统允许的免密共享。需要独立凭据时选择“指定账号”;无密码账号勾选“此账号无密码”。密码加密保存在部署机,编辑留空保留原密码;更换主机、共享或账号需重新录入。旧配置按指定账号方式继续使用。添加前先点击“检查连接”,能读取目录后才能保存;修改连接或重新启用时需重新检查,保存接口会再次确认可读取。服务器入口只用于选择共享,不会直接保存为文件目录。草稿检查不保存配置、不创建文件;检查/目录选择使用独立进程,15 秒超时并提供“取消操作”,取消后终止工作进程,避免网络目录等待占住工作台;“检查读写”用于归档前的写权限验证,会创建、读取并清理随机探测文件。配置维护要求部署机回环地址或可信 HTTPS。 - **免填模式说明**:使用服务部署机上的权限及既有 SMB 会话,不是网页访问者电脑的身份。切换模式会清除托管凭据、重置检查状态并暂停该服务器的自动归档,但不会强制断开 Windows 已有共享会话;若已有其他账号连接,实际访问可能继续使用该会话,需由部署机管理员处理。服务器要求认证或 Windows 禁止来宾/空密码访问时仍可能被拒绝,本工具不自动更改这些系统设置。 -- **文件管理**:管理员与操作员可浏览归档目录、创建子目录、下载文件和内嵌预览,将已有成功导出的 PDF 归档。目标存在相同内容时幂等完成;不同内容保留新文件,原件不覆盖。只读成员查看服务器和归档记录。启用自动归档后仅处理新导出的 PDF,历史文件由人选择归档;失败记录可通过重新选择同一任务重试。 +- **文件管理**:管理员与操作员可浏览归档目录、创建子目录、下载文件和内嵌预览,将已有成功导出的 PDF 归档。归档读取 BPM 表单订单号,使用明确的完整 6/7 位订单号建立同名子目录,保留前导零;已有订单目录直接复用,在同名订单目录内手动归档也不会重复嵌套。订单号缺失、冲突、含后缀或长度尚不明确时记录失败,不自动截取,也不从 PDF 文件名推断。目标存在相同内容时幂等完成;不同内容保留新文件,原件不覆盖。只读成员查看服务器和归档记录。启用自动归档后仅处理新导出的 PDF,历史文件由人选择归档;失败记录可通过重新选择同一任务重试。 - **文件预览**:在已托管服务器的目录中点击“预览”,支持 PDF、PNG/JPEG/GIF/WebP/BMP、文本(含 UTF-8、UTF-16 与 GB18030)、DOCX 和 XLSX。支持全屏、图片缩放与工作表切换;文本仅按原文显示。单文件预览及下载上限 64 MiB,文本预览上限 2 MiB;Office 展开内容最多 64 MiB、4096 个条目,Excel 每张表最多预览前 500 行、50 列。旧 DOC/XLS 与其他未支持格式可下载原文件。Office 预览以内容阅读为主,不保证与桌面 Office 排版完全一致,Excel 数值按原始值展示,不执行宏或重新计算公式。PDF 已关闭公网补充字体,缺少内嵌字体的文档可能出现字体替代。 - **开源预览组件**:适配 [OpenList Frontend](https://github.com/OpenListTeam/OpenList-Frontend/tree/v4.2.7) 的 DOCX/XLSX 预览思路,采用 EmbedPDF、docx-preview、ExcelJS 与 PhotoSwipe;脚本和 PDFium WASM 由本机提供,界面使用系统字体,不调用公网 Office 在线服务。文件经现有登录权限读取,在独立沙箱中渲染。选型及许可见 [预览选型记录](docs/storage-preview-open-source-research-2026-10-17.md) 和 [第三方许可](licenses/storage-preview-NOTICES.md)。 - **Windows SMB**:使用原生协议,不映射盘符、不强行断开已有共享连接。同一主机已有其他账号连接而产生 1219 冲突时,由部署机管理员处理。共享及所配置归档根目录需已存在并授予读写权限。PDF 上限 64 MiB,单层浏览最多 500 项。 diff --git a/docs/storage-order-folders-2026-10-17.md b/docs/storage-order-folders-2026-10-17.md new file mode 100644 index 0000000..3d9237e --- /dev/null +++ b/docs/storage-order-folders-2026-10-17.md @@ -0,0 +1,38 @@ +# 按 BPM 订单号归档与登录修复 + +归档使用 BPM 订单详情表单中的当前订单号建立同名子目录;不配置默认截取长度,也不从标题、通知书编号或 PDF 文件名推断。完整字段是明确的 6 或 7 位数字时直接使用,保留前导零。缺失、可见值冲突、含后缀或尚未确认的格式记录失败,等待核实后重新导出。 + +## 真实字段核验 + +2026-10-17 使用用户授权的账号进入新版门户,查看待阅中的五类订单详情。五个当前样本均为完整 6 位数字;本次未发现真实 7 位或带后缀样本。业务编号、认证参数及订单正文不写入此记录。 + +| 表单 | 当前订单号绑定 | 观察 | +| --- | --- | --- | +| 零售 V12 | `OFR_LSCP_Applicant.OrderNum` | 同页还有 `OrderNum_Original`,应排除 | +| 备损 V5 | `OFR_BS_Applicant.OrderNum` | 当前订单号为独立字段 | +| 宽带 V16 | `OFR_KD_Applicant.OrderNum` | 同页还有原订单号,列表摘要还含其他编号,均不作为当前订单号 | +| 海外更改 V7 | `OFR_WY_Applicant.OrderNum` | 原导出所用字段 | +| 海外新单 V13 | `OFR_WY_Applicant.OrderNum` | 同页原订单号字段为空 | + +采集同时返回字段名和值作为 `bpmOrder`,随导出任务保存。有证据的任务须校验字段白名单与订单值一致;历史版本直接读取海外订单字段形成的 `metadata.order` 保留兼容。隐藏输入、隐藏父节点、隐藏文本及 `OrderNum_Original` 不参与识别;同值重复字段可接受,多个不同值要求核实。 + +这里只扩展订单号读取;零售、备损、宽带的其他导出必填字段仍需后续单独适配,不将本次订单号核验当作这些表单完整 PDF 导出已经通过。 + +## 目录与失败处理 + +- 自动归档在服务器配置目录下建立订单目录,手动归档在所选目录下建立订单目录;目标本身已是该订单目录时直接复用。 +- 同订单文档共用目录。已存在目录内的其他文件保留;相同内容重试幂等,不同内容的同名文件保留新版本。 +- 使用已有路径约束及链接检查。订单号无效时先失败,不创建错误目录;不会追溯移动历史文件。 +- 存档不触发邮件。 + +## 登录故障根因 + +本机 `bpm-sessions` 目录对同目录文件重命名也报 `EXDEV`,导致旧 `.enc` 会话无法落盘。改为在现有 `bpm-sessions/accounts.sqlite` 中增加 `sessions` 表,以事务保存 AES-GCM 密文;密钥继续由 Windows 当前用户 DPAPI 保护。旧会话按读取迁移,数据库已提交的会话优先,迁移成功后删除旧密文文件。部署仍使用单服务实例维护状态目录。 + +实机还发现门户账号标识在 DOM 就绪后约 4.4 秒出现,原 4 秒探测误报未登录;等待扩大到 15 秒,明确的公司 SSO 登录表单直接返回待登录。导航同步在主文档 DOMContentLoaded 时完成,不再等待卡住的图片。域名限制不变;详情核验使用独立的一次性诊断浏览器,未将旧域名加入工作台远程登录白名单。 + +## 验证 + +自动化测试覆盖四种订单号绑定、隐藏及冲突、字段证据保存、前导零、6/7 位、目录复用、同目录重试、路径及链接拒绝、HTTP 权限和界面归档。登录测试覆盖拒绝 rename 的目录、密文损坏和连接隔离、旧会话迁移、延迟账号标识以及图片卡住时的导航。 + +本机真实 SMB `127.0.0.1` 共享内用独立临时目录验证了已有订单目录复用、多个 PDF 汇入、前导零、7 位独立目录和重复归档,测试目录已清理。真实 BPM 账号已完成登录和加密保存;公司 210 服务器及业务邮件不在本次实机验证范围。 diff --git a/extension/capture.js b/extension/capture.js index 518a7ff..deb972e 100644 --- a/extension/capture.js +++ b/extension/capture.js @@ -4,10 +4,23 @@ function captureOrder() { if (!source) throw new Error('当前页面没有订单表单,请进入 BPM 订单详情。'); const bindings = { order:'OFR_WY_Applicant.OrderNum', project:'OFR_WY_BInfo.ProductNum', model:'OFR_WY_BInfo.ProductModelNEW', serial:'OFR_WY_Applicant.SN' }; const labels = { order:'订单号', project:'项目编号', model:'产品型号', serial:'通知书编号' }; - const metadata = {}; + const metadata = {}, warnings = []; + const orderBindings = ['OFR_LSCP_Applicant.OrderNum', 'OFR_BS_Applicant.OrderNum', 'OFR_KD_Applicant.OrderNum', 'OFR_WY_Applicant.OrderNum']; + function visibleValue(el) { + for (let node = el; node; node = node.parentElement) { + const style = getComputedStyle(node), type = (node.getAttribute('type') || '').toLowerCase(); + if (node.hidden || ['hidden','password'].includes(type) || style.display === 'none' || ['hidden','collapse'].includes(style.visibility)) return ''; + } + return (['INPUT','TEXTAREA','SELECT'].includes(el.tagName) ? el.value : el.innerText).trim(); + } + let bpmOrder = null; for (const [key, binding] of Object.entries(bindings)) { - const el = source.querySelector(`[xdatabind="${binding}"]`); - metadata[key] = (el?.value ?? el?.textContent ?? '').trim(); + const candidates = (key === 'order' ? orderBindings : [binding]).flatMap(field => + [...source.querySelectorAll(`[xdatabind="${field}"]`)].map(el => ({field, value:visibleValue(el)})).filter(item => item.value)); + const values = [...new Set(candidates.map(item => item.value))]; + metadata[key] = values.length === 1 ? values[0] : ''; + if (values.length > 1) warnings.push(`BPM 表单中有多个不同的${labels[key]},请核实后重新导出。`); + if (key === 'order' && metadata.order) bpmOrder = candidates[0]; } const clone = source.cloneNode(true); const originals = [source, ...source.querySelectorAll('*')]; @@ -41,6 +54,6 @@ function captureOrder() { const stylesheetUrls = [...document.querySelectorAll('link[rel="stylesheet"][href]')].map(el => el.href); const styleSources = [...document.querySelectorAll('style,link[rel="stylesheet"][href]')].map(el => el.tagName.toLowerCase() === 'style' ? {text:el.textContent} : {url:el.href}); const imageUrls = [...clone.querySelectorAll('img[src]')].map(el => el.getAttribute('src')); - return { metadata, html:clone.outerHTML, styles, styleSources, stylesheetUrls, imageUrls:[...new Set(imageUrls)], width:1264, missing:Object.keys(bindings).filter(key => !metadata[key]).map(key => labels[key]), warnings:[] }; + return { metadata, bpmOrder, html:clone.outerHTML, styles, styleSources, stylesheetUrls, imageUrls:[...new Set(imageUrls)], width:1264, missing:Object.keys(bindings).filter(key => !metadata[key]).map(key => labels[key]), warnings }; } if (typeof module !== 'undefined') module.exports = { captureOrder }; diff --git a/src/exporter.cjs b/src/exporter.cjs index 4627e31..919474a 100644 --- a/src/exporter.cjs +++ b/src/exporter.cjs @@ -16,6 +16,11 @@ function buildFilename(metadata = {}) { function validateSnapshot(snapshot) { if (!snapshot || typeof snapshot.html !== 'string' || !snapshot.html.trim() || snapshot.html.length > 12_000_000) throw new Error('页面内容为空或超过大小限制。'); buildFilename(snapshot.metadata); + if (snapshot.bpmOrder != null && ( + typeof snapshot.bpmOrder !== 'object' || Array.isArray(snapshot.bpmOrder) || + !/^OFR_(?:LSCP|BS|KD|WY)_Applicant\.OrderNum$/.test(snapshot.bpmOrder.field) || + typeof snapshot.bpmOrder.value !== 'string' || snapshot.bpmOrder.value !== snapshot.metadata.order + )) throw new Error('BPM 订单号字段与导出订单号不一致,请重新采集。'); if (snapshot.styles !== undefined && (!Array.isArray(snapshot.styles) || snapshot.styles.some(s => typeof s !== 'string'))) throw new Error('页面样式格式不正确。'); if (snapshot.images !== undefined && (!Array.isArray(snapshot.images) || snapshot.images.length > 200)) throw new Error('页面图片格式不正确。'); } diff --git a/src/server.cjs b/src/server.cjs index 7047b35..ea79cd3 100644 --- a/src/server.cjs +++ b/src/server.cjs @@ -57,7 +57,7 @@ function createServer(options) { const jobId = crypto.randomBytes(16).toString('hex'); if (jobs.size >= 20) jobs.delete(jobs.keys().next().value); jobs.set(jobId,{status:'running',jobId}); - try { options.store?.recordJob({jobId,status:'running',metadata:snapshot.metadata}); } + try { options.store?.recordJob({jobId,status:'running',metadata:snapshot.metadata,...(snapshot.bpmOrder?{bpmOrder:{field:snapshot.bpmOrder.field,value:snapshot.bpmOrder.value}}:{})}); } catch(error) {busy=false;jobs.delete(jobId);throw error;} reply(202,{status:'running',jobId}); renderSnapshot(snapshot, options).then(result => { diff --git a/src/storage-order.cjs b/src/storage-order.cjs new file mode 100644 index 0000000..023bab1 --- /dev/null +++ b/src/storage-order.cjs @@ -0,0 +1,13 @@ +'use strict'; +const fail=message=>Object.assign(new Error(message),{status:400}); +function orderFolder(job){ + const raw=job.metadata?.order; + if(typeof raw!=='string'||!raw.trim())throw fail('缺少从 BPM 表单识别的订单号,请核实订单详情后重新导出。'); + const order=raw.trim(); + if(job.bpmOrder!=null&&(!/^OFR_(?:LSCP|BS|KD|WY)_Applicant\.OrderNum$/.test(job.bpmOrder.field)||job.bpmOrder.value!==raw))throw fail('BPM 订单号字段与归档订单号不一致,请重新导出。'); + // The full BPM order field determines whether the order is six or seven digits. + // Never truncate a longer identifier or infer an order from a PDF filename. + if(!/^\d{6,7}$/.test(order))throw fail('BPM 订单号不是明确的 6 位或 7 位,请核实主订单号,暂不自动截取或归档。'); + return {orderNumber:order,orderFolder:order,orderNumberLength:order.length}; +} +module.exports={orderFolder}; diff --git a/src/storage-service.cjs b/src/storage-service.cjs index af5f9b3..cf55286 100644 --- a/src/storage-service.cjs +++ b/src/storage-service.cjs @@ -1,6 +1,7 @@ 'use strict'; const fs=require('node:fs/promises');const path=require('node:path'); const {SmbClient,segments,inside}=require('./storage-files.cjs'); +const {orderFolder}=require('./storage-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); class StorageService{ @@ -58,7 +59,14 @@ class StorageService{ segments(directory);if(typeof jobId!=='string'||!jobId||jobId.length>200)throw fail('请选择已完成的 PDF 导出任务。'); const job=this.jobs.jobs().find(j=>j.jobId===jobId);if(!job||job.status!=='success'||typeof job.path!=='string')throw fail('请选择已完成且存在的 PDF。'); const record=this.store.beginArchive(id,jobId,actor,directory); - try{const [root,file]=await Promise.all([fs.realpath(this.outputDir),fs.realpath(job.path)]);if(!inside(root,file)||file===root||path.extname(file).toLowerCase()!=='.pdf')throw fail('PDF 不在本工具输出目录内。');const area=await this.client.area(server),result=await area.archive(file,path.basename(file),directory);return this.store.finishArchive(record.id,'success',{...result,serverName:server.name});} + try{ + const [root,file]=await Promise.all([fs.realpath(this.outputDir),fs.realpath(job.path)]); + if(!inside(root,file)||file===root||path.extname(file).toLowerCase()!=='.pdf')throw fail('PDF 不在本工具输出目录内。'); + const grouping=orderFolder(job),base=segments(directory),current=base.at(-1)||segments(server.directory).at(-1); + const target=(current===grouping.orderFolder?base:[...base,grouping.orderFolder]).join('/');segments(target); + const area=await this.client.area(server),result=await area.archive(file,path.basename(file),target); + return this.store.finishArchive(record.id,'success',{...result,...grouping,baseDirectory:directory,directory:target,serverName:server.name}); + } catch(e){const error=safe(e);this.store.finishArchive(record.id,'error',{error:error.message,serverName:server.name});throw error;} }); } diff --git a/tests/capture.test.cjs b/tests/capture.test.cjs index 97fd3ca..547bce6 100644 --- a/tests/capture.test.cjs +++ b/tests/capture.test.cjs @@ -23,3 +23,25 @@ test('capture keeps live values and names while excluding hidden secrets and act assert.deepEqual((await page.evaluate(captureOrder)).missing, ['项目编号']); } finally { await browser.close(); } }); + + +test('capture identifies the BPM order field for each known form and rejects conflicting order IDs',async()=>{ + const {captureOrder}=load(),{loadPlaywright,browserOptions}=require('../src/runtime.cjs');const browser=await loadPlaywright().chromium.launch(browserOptions()); + try{const page=await browser.newPage(); + for(const [binding,value]of [['OFR_LSCP_Applicant.OrderNum','1234567'],['OFR_BS_Applicant.OrderNum','001234'],['OFR_KD_Applicant.OrderNum','7654321'],['OFR_WY_Applicant.OrderNum','123456']]){ + await page.setContent(`
`); + await page.locator('label').evaluate(el=>{el.value='';}); + const result=await page.evaluate(captureOrder);assert.equal(result.metadata.order,value);assert.equal(result.bpmOrder.field,binding);assert.equal(result.bpmOrder.value,value); + } + await page.setContent(''); + const conflict=await page.evaluate(captureOrder);assert.equal(conflict.metadata.order,'');assert.ok(conflict.missing.includes('订单号'));assert.match(conflict.warnings.join(' '),/多个不同/); + await page.setContent(''); + assert.equal((await page.evaluate(captureOrder)).metadata.order,'001234'); + await page.setContent(''); + assert.equal((await page.evaluate(captureOrder)).metadata.order,''); + await page.setContent(''); + assert.equal((await page.evaluate(captureOrder)).metadata.order,'123456-01'); + await page.setContent(''); + assert.equal((await page.evaluate(captureOrder)).metadata.order,''); + }finally{await browser.close();} +}); diff --git a/tests/server.test.cjs b/tests/server.test.cjs index dbaec57..1ee5d91 100644 --- a/tests/server.test.cjs +++ b/tests/server.test.cjs @@ -6,6 +6,13 @@ const path = require('node:path'); const net = require('node:net'); const serverModule = (() => { try { return require('../src/server.cjs'); } catch(e) { if(e.code === 'MODULE_NOT_FOUND') return {}; throw e; } })(); const origin = 'chrome-extension://' + 'a'.repeat(32); +test('BPM field evidence must match the current order binding and captured value',()=>{ + const {validateSnapshot}=require('../src/exporter.cjs'); + const snapshot={html:'',metadata:{order:'001234',project:'project',model:'model',serial:'notice'}}; + assert.doesNotThrow(()=>validateSnapshot(snapshot)); + for(const field of ['OFR_LSCP_Applicant.OrderNum','OFR_BS_Applicant.OrderNum','OFR_KD_Applicant.OrderNum','OFR_WY_Applicant.OrderNum'])assert.doesNotThrow(()=>validateSnapshot({...snapshot,bpmOrder:{field,value:'001234'}})); + for(const bpmOrder of [{field:'OFR_KD_Applicant.OrderNum_Original',value:'001234'},{field:'OFR_WY_Applicant.OrderNum',value:'123456'},[],{value:'001234'}])assert.throws(()=>validateSnapshot({...snapshot,bpmOrder}),/订单号字段/); +}); test('loopback API rejects web origins, unpaired callers and oversized bodies', async () => { assert.equal(typeof serverModule.createServer, 'function', 'local API is not implemented'); const server = serverModule.createServer({ token: 'test-pairing-key', maxBodyBytes: 1024, outputDir: 'unused' }); @@ -26,10 +33,13 @@ test('loopback API rejects web origins, unpaired callers and oversized bodies', test('paired HTTP export returns a readable PDF saved to the configured directory', async () => { const dir=await fs.mkdtemp(path.join(os.tmpdir(),'order-http-test-')); - const server=serverModule.createServer({token:'test-pairing-key',outputDir:dir}); + const {Store}=require('../src/dashboard-store.cjs'); + const store=new Store(path.join(dir,'state')); + const bpmOrder={field:'OFR_WY_Applicant.OrderNum',value:'900001'}; + const server=serverModule.createServer({token:'test-pairing-key',outputDir:dir,store}); await new Promise(resolve=>server.listen(0,'127.0.0.1',resolve)); try { - const response=await fetch(`http://127.0.0.1:${server.address().port}/export`,{method:'POST',headers:{Origin:origin,'X-Order-Token':'test-pairing-key','Content-Type':'application/json'},body:JSON.stringify({metadata:{order:'900001',project:'DEMO-PROJECT-001',model:'DEMO-MODEL',serial:'DEMO-CHANGE-001'},html:'',styles:[]})}); + const response=await fetch(`http://127.0.0.1:${server.address().port}/export`,{method:'POST',headers:{Origin:origin,'X-Order-Token':'test-pairing-key','Content-Type':'application/json'},body:JSON.stringify({metadata:{order:'900001',project:'DEMO-PROJECT-001',model:'DEMO-MODEL',serial:'DEMO-CHANGE-001'},bpmOrder,html:'',styles:[]})}); assert.equal(response.status,202); const accepted=await response.json(); assert.match(accepted.jobId,/^[a-f0-9]{32}$/); @@ -45,6 +55,8 @@ test('paired HTTP export returns a readable PDF saved to the configured director assert.equal(result.filename,'900001_DEMO-PROJECT-001_DEMO-MODEL_DEMO-CHANGE-001.pdf'); assert.equal(path.dirname(result.path),dir); assert.equal((await fs.readFile(result.path)).subarray(0,5).toString(),'%PDF-'); + assert.equal(store.jobs()[0].metadata.order,'900001'); + assert.deepEqual(store.jobs()[0].bpmOrder,bpmOrder); } finally {await new Promise(resolve=>server.close(resolve));await fs.rm(dir,{recursive:true,force:true});} }); diff --git a/tests/storage-http.test.cjs b/tests/storage-http.test.cjs index 364f968..c6f9c94 100644 --- a/tests/storage-http.test.cjs +++ b/tests/storage-http.test.cjs @@ -15,11 +15,11 @@ test('storage HTTP enforces roles, redacts passwords and archives only successfu assert.equal((await call(`/api/storage/servers/${server.id}/files`,undefined,viewer)).status,403); assert.equal((await call(`/api/storage/servers/${server.id}/check`,{},admin)).status,200); const overview=await(await call('/api/overview',undefined,admin)).json();assert.equal(overview.connections.find(c=>c.name==='存储服务器').ready,true); - await fs.writeFile(path.join(outputDir,'order.pdf'),'%PDF-1.7\nHTTP document');store.recordJob({jobId:'job-1',status:'success',path:path.join(outputDir,'order.pdf'),filename:'order.pdf'}); + await fs.writeFile(path.join(outputDir,'order.pdf'),'%PDF-1.7\nHTTP document');store.recordJob({jobId:'job-1',status:'success',path:path.join(outputDir,'order.pdf'),filename:'order.pdf',metadata:{order:'001234'}}); assert.equal((await call(`/api/storage/servers/${server.id}/archive`,{jobId:'job-1',directory:'产业A'},viewer)).status,403); const archived=await call(`/api/storage/servers/${server.id}/archive`,{jobId:'job-1',directory:'产业A'},operator);assert.equal(archived.status,200);assert.equal((await archived.json()).status,'success'); assert.equal(storageStore.archives().length,1); - const downloaded=await call(`/api/storage/servers/${server.id}/file?path=${encodeURIComponent('产业A/order.pdf')}`,undefined,operator);assert.equal(downloaded.status,200);assert.equal(await downloaded.text(),'%PDF-1.7\nHTTP document'); + const downloaded=await call(`/api/storage/servers/${server.id}/file?path=${encodeURIComponent('产业A/001234/order.pdf')}`,undefined,operator);assert.equal(downloaded.status,200);assert.equal(await downloaded.text(),'%PDF-1.7\nHTTP document'); store.recordJob({jobId:'outside',status:'success',path:path.join(dir,'outside.pdf'),filename:'outside.pdf'});await fs.writeFile(path.join(dir,'outside.pdf'),'%PDF-1.7\noutside'); assert.equal((await call(`/api/storage/servers/${server.id}/archive`,{jobId:'outside',directory:''},admin)).status,400); }); @@ -30,8 +30,8 @@ test('automatic storage is opt-in, starts with new jobs and never queues mail',a await storage.automatic(old);assert.deepEqual(await fs.readdir(remote),[]); await assert.rejects(Promise.resolve().then(()=>storage.saveSettings({serverId:server.id,enabled:true})),e=>e.status===409); await storage.check(server.id);storage.saveSettings({serverId:server.id,enabled:true});await storage.automatic(old);assert.deepEqual(await fs.readdir(remote),[]); - const job=store.recordJob({jobId:'new-job',status:'success',path:path.join(outputDir,'new.pdf'),filename:'new.pdf',createdAt:new Date(Date.now()+1).toISOString()});await storage.automatic(job); - assert.deepEqual(await fs.readdir(remote),['new.pdf']);assert.equal(storageStore.archives()[0].status,'success'); + const job=store.recordJob({jobId:'new-job',status:'success',path:path.join(outputDir,'new.pdf'),filename:'new.pdf',metadata:{order:'7654321'},createdAt:new Date(Date.now()+1).toISOString()});await storage.automatic(job); + assert.deepEqual(await fs.readdir(remote),['7654321']);assert.deepEqual(await fs.readdir(path.join(remote,'7654321')),['new.pdf']);assert.equal(storageStore.archives()[0].status,'success'); }); diff --git a/tests/storage-order-folders.test.cjs b/tests/storage-order-folders.test.cjs new file mode 100644 index 0000000..e851afa --- /dev/null +++ b/tests/storage-order-folders.test.cjs @@ -0,0 +1,34 @@ +const {test}=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs/promises'),os=require('node:os'),path=require('node:path'); +const {Store}=require('../src/dashboard-store.cjs'),{StorageStore}=require('../src/storage-store.cjs'),{StorageService}=require('../src/storage-service.cjs'),{FileArea}=require('../src/storage-files.cjs'); +async function fixture(t){ + const dir=await fs.mkdtemp(path.join(os.tmpdir(),'order-group-')),remote=path.join(dir,'remote'),output=path.join(dir,'pdf');await fs.mkdir(remote);await fs.mkdir(output); + const jobs=new Store(path.join(dir,'users')),store=new StorageStore(path.join(dir,'storage')),service=new StorageService({store,jobs,outputDir:output,client:{area:async()=>new FileArea(remote)}}); + t.after(async()=>{await service.stop();store.close();await fs.rm(dir,{recursive:true,force:true});});const server=await service.saveServer({address:String.fromCharCode(92).repeat(2)+'files.test'+String.fromCharCode(92)+'orders',authMode:'windows',enabled:true}); + const add=async(id,order,filename=id+'.pdf')=>{const file=path.join(output,filename);await fs.writeFile(file,'%PDF-1.7\n'+id);return jobs.recordJob({jobId:id,status:'success',filename,path:file,...(order===undefined?{}:{metadata:{order}}),createdAt:new Date(Date.now()+1000).toISOString()});};return {dir,remote,output,jobs,store,service,server,add}; +} +test('BPM six digit order creates one folder and reuses an existing folder for all order documents',async t=>{ + const {remote,store,service,server,add}=await fixture(t);assert.equal(store.settings().orderPrefixLength,undefined); + await fs.mkdir(path.join(remote,'001234'));await fs.writeFile(path.join(remote,'001234','keep.txt'),'preserve'); + await Promise.all([add('first','001234'),add('second','001234'),add('third','001234')]); + const results=await Promise.all(['first','second','third'].map(id=>service.archive(server.id,id)));assert.deepEqual(await fs.readdir(remote),['001234']);assert.deepEqual((await fs.readdir(path.join(remote,'001234'))).sort(),['first.pdf','keep.txt','second.pdf','third.pdf']);assert.equal(results[0].relativePath,'001234/first.pdf');assert.equal(results[0].orderNumber,'001234');assert.equal(results[0].orderNumberLength,6); + const again=await service.archive(server.id,'first');assert.equal(again.relativePath,results[0].relativePath);assert.equal((await fs.readdir(path.join(remote,'001234'))).length,4); + const inOrder=await service.archive(server.id,'first','001234');assert.equal(inOrder.relativePath,'001234/first.pdf');assert.deepEqual((await fs.readdir(path.join(remote,'001234'))).sort(),['first.pdf','keep.txt','second.pdf','third.pdf']); +}); +test('BPM seven digit orders stay seven digits for automatic and manual archives',async t=>{ + const {remote,store,service,server,add}=await fixture(t);await service.check(server.id);service.saveSettings({serverId:server.id,enabled:true}); + const automatic=await add('automatic','7654321');assert.equal((await service.automatic(automatic)).relativePath,'7654321/automatic.pdf'); + await add('manual','7654321');assert.equal((await service.archive(server.id,'manual','归档')).relativePath,'归档/7654321/manual.pdf'); + assert.deepEqual((await fs.readdir(remote)).sort(),['7654321','归档']);assert.equal(store.settings().orderPrefixLength,undefined); +}); +test('missing, short or unsafe order IDs fail visibly and do not create misplaced folders',async t=>{ + const {remote,store,service,server,add,jobs}=await fixture(t); + for(const [id,order]of [['missing',undefined],['short','12345'],['path','../123456789'],['invalid','123456:bad'],['long','1234567890'],['ambiguous','123456/7654321']]){await add(id,order);await assert.rejects(service.archive(server.id,id),e=>e.status===400);assert.equal(store.archives().find(a=>a.jobId===id).status,'error');} + assert.deepEqual(await fs.readdir(remote),[]); + await add('legacy',undefined,'0098765432_PROJECT_MODEL_NOTICE.pdf');await assert.rejects(service.archive(server.id,'legacy'),e=>e.status===400);assert.deepEqual(await fs.readdir(remote),[]); + await add('metadata','1234567','9999999999_PROJECT_MODEL_NOTICE.pdf');assert.equal((await service.archive(server.id,'metadata')).relativePath,'1234567/9999999999_PROJECT_MODEL_NOTICE.pdf'); + await add('conflict','123456');jobs.recordJob({jobId:'conflict',bpmOrder:{field:'OFR_WY_Applicant.OrderNum',value:'654321'}});await assert.rejects(service.archive(server.id,'conflict'),e=>e.status===400); +}); +test('an order folder that is a file or link is rejected without overwriting it',async t=>{ + const {dir,remote,service,server,add}=await fixture(t);await add('collision','123456');await fs.writeFile(path.join(remote,'123456'),'keep');await assert.rejects(service.archive(server.id,'collision'));assert.equal(await fs.readFile(path.join(remote,'123456'),'utf8'),'keep'); + const outside=path.join(dir,'outside');await fs.mkdir(outside);await fs.symlink(outside,path.join(remote,'654321'),'junction');await add('link','654321');await assert.rejects(service.archive(server.id,'link'));assert.deepEqual(await fs.readdir(outside),[]); +}); diff --git a/tests/storage-ui.test.cjs b/tests/storage-ui.test.cjs index 4c42374..92777fe 100644 --- a/tests/storage-ui.test.cjs +++ b/tests/storage-ui.test.cjs @@ -2,9 +2,9 @@ const {test}=require('node:test');const assert=require('node:assert/strict');const fs=require('node:fs/promises');const os=require('node:os');const path=require('node:path'); const {Store}=require('../src/dashboard-store.cjs');const {StorageStore}=require('../src/storage-store.cjs');const {StorageService}=require('../src/storage-service.cjs');const {FileArea}=require('../src/storage-files.cjs');const {createDashboard}=require('../src/dashboard.cjs');const {loadPlaywright,browserOptions}=require('../src/runtime.cjs'); test('storage page edits redacted credentials, checks files and archives an exported PDF', {timeout:150000}, async t=>{ - const dir=await fs.mkdtemp(path.join(os.tmpdir(),'storage-ui-')),remote=path.join(dir,'remote'),output=path.join(dir,'output');await fs.mkdir(remote);await fs.mkdir(output);const store=new Store(path.join(dir,'users'));store.bootstrap('admin','Test-password-123');await fs.writeFile(path.join(output,'order.pdf'),'%PDF-1.7\nUI test');store.recordJob({jobId:'ui-job',filename:'order.pdf',path:path.join(output,'order.pdf'),status:'success'});const storageStore=new StorageStore(path.join(dir,'storage')),storage=new StorageService({store:storageStore,jobs:store,outputDir:output,client:{area:async()=>new FileArea(remote)}}),server=createDashboard({store,storage,outputDir:output});await new Promise(r=>server.listen(0,'127.0.0.1',r));let browser;t.after(async()=>{await browser?.close();await storage.stop();server.closeAllConnections();await new Promise(r=>server.close(r));storageStore.close();await fs.rm(dir,{recursive:true,force:true});});browser=await loadPlaywright().chromium.launch(browserOptions());const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(30000);const errors=[];page.on('pageerror',e=>errors.push(e.message));await page.goto('http://127.0.0.1:'+server.address().port+'/#storage');await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click();await page.getByRole('button',{name:'添加服务器',exact:true}).click(); + const dir=await fs.mkdtemp(path.join(os.tmpdir(),'storage-ui-')),remote=path.join(dir,'remote'),output=path.join(dir,'output');await fs.mkdir(remote);await fs.mkdir(output);const store=new Store(path.join(dir,'users'));store.bootstrap('admin','Test-password-123');await fs.writeFile(path.join(output,'order.pdf'),'%PDF-1.7\nUI test');store.recordJob({jobId:'ui-job',filename:'order.pdf',path:path.join(output,'order.pdf'),status:'success',metadata:{order:'001234'}});const storageStore=new StorageStore(path.join(dir,'storage')),storage=new StorageService({store:storageStore,jobs:store,outputDir:output,client:{area:async()=>new FileArea(remote)}}),server=createDashboard({store,storage,outputDir:output});await new Promise(r=>server.listen(0,'127.0.0.1',r));let browser;t.after(async()=>{await browser?.close();await storage.stop();server.closeAllConnections();await new Promise(r=>server.close(r));storageStore.close();await fs.rm(dir,{recursive:true,force:true});});browser=await loadPlaywright().chromium.launch(browserOptions());const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(30000);const errors=[];page.on('pageerror',e=>errors.push(e.message));await page.goto('http://127.0.0.1:'+server.address().port+'/#storage');await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click();await page.getByRole('button',{name:'添加服务器',exact:true}).click(); assert.equal(await page.getByLabel('访问方式',{exact:true}).inputValue(),'windows');assert.equal(await page.getByLabel('登录账号',{exact:true}).isVisible(),false);await page.getByLabel('访问方式',{exact:true}).selectOption('credentials'); for(const [label,value]of Object.entries({'服务器名称':'210 归档','共享路径':String.raw`\\storage.company.test\orders`,'登录账号':'archive','SMB 密码':'UI-test-password'}))await page.getByLabel(label,{exact:true}).fill(value); assert.equal(await page.getByRole('button',{name:'保存服务器',exact:true}).isDisabled(),true);await page.getByRole('button',{name:'检查连接',exact:true}).click();await page.getByText('连接成功,目标目录可读取。',{exact:true}).waitFor();await page.getByLabel('共享路径',{exact:true}).fill(String.raw`\\storage.company.test\orders\new`);assert.equal(await page.getByRole('button',{name:'保存服务器',exact:true}).isDisabled(),true);await page.getByLabel('共享路径',{exact:true}).fill(String.raw`\\storage.company.test\orders`);await page.getByRole('button',{name:'检查连接',exact:true}).click();await page.getByText('连接成功,目标目录可读取。',{exact:true}).waitFor(); - const saveResponse=page.waitForResponse(r=>r.url().endsWith('/api/storage/servers')&&r.request().method()==='POST',{timeout:45000});await page.getByRole('button',{name:'保存服务器',exact:true}).click();const savedResponse=await saveResponse;assert.equal(savedResponse.status(),201,await savedResponse.text());await page.getByRole('button',{name:'检查读写',exact:true}).click();await page.getByText('共享目录读写正常',{exact:true}).waitFor();await page.getByRole('button',{name:'管理服务器',exact:true}).click();assert.equal(await page.getByLabel('SMB 密码',{exact:true}).inputValue(),'');await page.getByLabel('此账号无密码',{exact:true}).check();await page.getByRole('button',{name:'检查连接',exact:true}).click();await page.getByText('连接成功,目标目录可读取。',{exact:true}).waitFor();await page.getByRole('button',{name:'保存服务器',exact:true}).click();await page.getByRole('button',{name:'管理服务器',exact:true}).waitFor();assert.equal(storageStore.secret(storageStore.servers()[0].id).password,'');await page.getByRole('button',{name:'管理服务器',exact:true}).click();await page.getByLabel('访问方式',{exact:true}).selectOption('windows');await page.getByRole('button',{name:'检查连接',exact:true}).click();await page.getByText('连接成功,目标目录可读取。',{exact:true}).waitFor();await page.getByRole('button',{name:'保存服务器',exact:true}).click();await page.getByRole('button',{name:'管理服务器',exact:true}).waitFor();assert.equal(storageStore.servers()[0].authMode,'windows');await page.getByRole('button',{name:'浏览目录',exact:true}).click();await page.getByLabel('新目录名称',{exact:true}).fill('产业A');await page.getByRole('button',{name:'创建目录',exact:true}).click();await page.getByText('产业A',{exact:true}).waitFor();await page.getByLabel('归档 PDF',{exact:true}).selectOption('ui-job');await page.getByRole('button',{name:'归档到当前目录',exact:true}).click();await page.getByText('PDF 已归档。',{exact:true}).waitFor();assert.equal(await fs.readFile(path.join(remote,'order.pdf'),'utf8'),'%PDF-1.7\nUI test');await fs.mkdir(path.resolve('output/verification'),{recursive:true});await page.evaluate(()=>window.scrollTo(0,0));await page.screenshot({path:path.resolve('output/verification/storage-desktop.png'),fullPage:true});await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);assert.deepEqual(errors,[]); + const saveResponse=page.waitForResponse(r=>r.url().endsWith('/api/storage/servers')&&r.request().method()==='POST',{timeout:45000});await page.getByRole('button',{name:'保存服务器',exact:true}).click();const savedResponse=await saveResponse;assert.equal(savedResponse.status(),201,await savedResponse.text());await page.getByRole('button',{name:'检查读写',exact:true}).click();await page.getByText('共享目录读写正常',{exact:true}).waitFor();await page.getByRole('button',{name:'管理服务器',exact:true}).click();assert.equal(await page.getByLabel('SMB 密码',{exact:true}).inputValue(),'');await page.getByLabel('此账号无密码',{exact:true}).check();await page.getByRole('button',{name:'检查连接',exact:true}).click();await page.getByText('连接成功,目标目录可读取。',{exact:true}).waitFor();await page.getByRole('button',{name:'保存服务器',exact:true}).click();await page.getByRole('button',{name:'管理服务器',exact:true}).waitFor();assert.equal(storageStore.secret(storageStore.servers()[0].id).password,'');await page.getByRole('button',{name:'管理服务器',exact:true}).click();await page.getByLabel('访问方式',{exact:true}).selectOption('windows');await page.getByRole('button',{name:'检查连接',exact:true}).click();await page.getByText('连接成功,目标目录可读取。',{exact:true}).waitFor();await page.getByRole('button',{name:'保存服务器',exact:true}).click();await page.getByRole('button',{name:'管理服务器',exact:true}).waitFor();assert.equal(storageStore.servers()[0].authMode,'windows');await page.getByRole('button',{name:'浏览目录',exact:true}).click();await page.getByLabel('新目录名称',{exact:true}).fill('产业A');await page.getByRole('button',{name:'创建目录',exact:true}).click();await page.getByText('产业A',{exact:true}).waitFor();await page.getByLabel('归档 PDF',{exact:true}).selectOption('ui-job');await page.getByText('将按 BPM 订单号自动创建或复用子目录。',{exact:true}).waitFor();await page.getByRole('button',{name:'归档到当前目录',exact:true}).click();await page.getByText('PDF 已归档。',{exact:true}).waitFor();assert.equal(await fs.readFile(path.join(remote,'001234','order.pdf'),'utf8'),'%PDF-1.7\nUI test');await fs.mkdir(path.resolve('output/verification'),{recursive:true});await page.evaluate(()=>window.scrollTo(0,0));await page.screenshot({path:path.resolve('output/verification/storage-desktop.png'),fullPage:true});await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);assert.deepEqual(errors,[]); }); diff --git a/web/storage.js b/web/storage.js index 8f0a597..3fef2e6 100644 --- a/web/storage.js +++ b/web/storage.js @@ -6,7 +6,7 @@ async function render(container,isActive=()=>true){ const [data,jobs]=await Promise.all([api('/storage'),api('/jobs')]);if(!isActive())return; const admin=user.role==='admin',canFiles=user.role!=='viewer'; - container.innerHTML=`| 文件 / 服务器 | 状态 | 时间 |
|---|---|---|
| ${esc(a.relativePath||a.jobId)} ${esc(a.serverName||data.servers.find(s=>s.id===a.serverId)?.name||'—')} | ${esc(labels[a.status]||a.status)}${a.error?` ${esc(a.error)} `:''} | ${formatDate(a.finishedAt||a.startedAt)} |
| 暂无归档记录 | ||
| 文件 / 服务器 | 状态 | 时间 |
|---|---|---|
| ${esc(a.relativePath||a.jobId)} ${esc(a.serverName||data.servers.find(s=>s.id===a.serverId)?.name||'—')} ${a.orderNumber?`BPM 订单号:${esc(a.orderNumber)} `:''} | ${esc(labels[a.status]||a.status)}${a.error?` ${esc(a.error)} `:''} | ${formatDate(a.finishedAt||a.startedAt)} |
| 暂无归档记录 | ||