From f3e43f2664c1fe1236925c36e90ea040315d99af Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 21 Oct 2026 14:50:41 +0800 Subject: [PATCH] Update server.js via upload script - 2026-10-21 14:50:40 --- server.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/server.js b/server.js index c99d773..fa1fa24 100644 --- a/server.js +++ b/server.js @@ -483,15 +483,26 @@ app.post('/api/auth/change-password', requireAuth, (req, res) => { app.get('/api/storage/:key', requireAuth, (req, res) => { const data = readData(); const key = req.params.key; - if (!(key in data)) return res.status(404).json({ error: 'not found' }); - res.json({ value: data[key] }); + const version = (data.__versions && data.__versions[key]) || 0; + if (!(key in data)) return res.status(404).json({ error: 'not found', version }); + res.json({ value: data[key], version }); }); // 防误清空:列表类数据(客户、产品等)一次从 ≥3 条变成 0 条,或者少掉八成以上,拒绝保存(多半是页面没读到数据就自动保存了)。 // 真要一次删很多,请求头带 x-allow-shrink: 1。 const listLen = (v) => { try { const x = typeof v === 'string' ? JSON.parse(v) : v; return Array.isArray(x) ? x.length : -1; } catch (e) { return -1; } }; +// 版本号:每个键保存一次加 1。页面保存时带上它读到的版本(baseVersion), +// 对不上说明这份数据已经被别的页面 / 设备改过,拒绝覆盖(409 conflict),页面提示刷新。 app.put('/api/storage/:key', requireAuth, (req, res) => { const data = readData(); + const key = req.params.key; + if (key === '__versions') return res.status(400).json({ error: 'reserved key' }); + const versions = data.__versions || (data.__versions = {}); + const current = versions[key] || 0; + if (req.body.baseVersion !== undefined && req.body.baseVersion !== null && Number(req.body.baseVersion) !== current) { + console.warn(`[storage] 版本冲突 ${key}:页面版本 ${req.body.baseVersion},服务器版本 ${current}`); + return res.status(409).json({ error: 'conflict', conflict: true, version: current }); + } const before = listLen(data[req.params.key]); const after = listLen(req.body.value); if (before >= 3 && after >= 0 && (after === 0 || after < before * 0.2) && req.get('x-allow-shrink') !== '1') { @@ -499,9 +510,10 @@ app.put('/api/storage/:key', requireAuth, (req, res) => { backupData(true); return res.status(409).json({ error: `refused: ${req.params.key} would shrink from ${before} to ${after}` }); } - data[req.params.key] = req.body.value; + data[key] = req.body.value; + versions[key] = current + 1; writeData(data); - res.json({ ok: true }); + res.json({ ok: true, version: versions[key] }); }); /* --------------------------------- ai api --------------------------------- */