diff --git a/storage.js b/storage.js index a2c8c6b..2190f94 100644 --- a/storage.js +++ b/storage.js @@ -5,9 +5,19 @@ const API_BASE = '/api/storage'; +// 每个键记住读到的版本号;保存时带上,服务器发现版本对不上(别的页面 / 设备已经改过)就拒绝覆盖 +const versions = {}; +// 同一个键的保存排队执行,只发最新的值:连续修改时不会因为上一次还没返回就拿着旧版本号去保存 +const saveState = {}; +// 服务器上当前的内容:要保存的值和它一样就不发请求(打开页面时不会白白"保存"一遍、把版本号顶上去, +// 否则只是多开一个页面,前一个页面就会被判定为过期) +const lastSaved = {}; + export async function storageGet(key) { const res = await fetch(`${API_BASE}/${encodeURIComponent(key)}`); if (res.status === 404) { + const body = await res.json().catch(() => ({})); + versions[key] = Number(body.version) || 0; const e = new Error(`key not found: ${key}`); e.notFound = true; // 这个键还没存过数据(正常情况),和"读取失败"区分开 throw e; @@ -16,19 +26,54 @@ export async function storageGet(key) { throw new Error(`storage get failed: ${res.status}`); } const data = await res.json(); + if (data.version !== undefined) versions[key] = Number(data.version) || 0; + lastSaved[key] = data.value; return { key, value: data.value }; } -export async function storageSet(key, value) { +async function putNow(key, value) { const res = await fetch(`${API_BASE}/${encodeURIComponent(key)}`, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ value }), + body: JSON.stringify({ value, baseVersion: versions[key] }), }); + const body = await res.json().catch(() => ({})); if (!res.ok) { - throw new Error(`storage set failed: ${res.status}`); + const e = new Error(body.error || `storage set failed: ${res.status}`); + e.key = key; + e.status = res.status; + e.conflict = !!body.conflict; + throw e; } - return res.json(); + if (body.version !== undefined) versions[key] = Number(body.version); + lastSaved[key] = value; + return body; +} + +async function pump(key) { + const st = saveState[key]; + if (st.running || !st.next) return; + st.running = true; + const job = st.next; + st.next = null; + try { + const r = job.value === lastSaved[key] ? { ok: true, unchanged: true } : await putNow(key, job.value); + job.waiters.forEach((w) => w.resolve(r)); + } catch (e) { + job.waiters.forEach((w) => w.reject(e)); + } finally { + st.running = false; + pump(key); + } +} + +export function storageSet(key, value) { + return new Promise((resolve, reject) => { + const st = saveState[key] || (saveState[key] = { running: false, next: null }); + if (st.next) { st.next.value = value; st.next.waiters.push({ resolve, reject }); } + else st.next = { value, waiters: [{ resolve, reject }] }; + pump(key); + }); } // 上传一个与客户相关的沟通附件(文件本身存到磁盘,元数据由调用方存进客户记录)