mirror of
https://github.com/dtzp555-max/olp.git
synced 2026-07-21 21:15:10 +00:00
ADR 0005 Amendment 6 (D34) deferred streaming-path D4 singleflight to v1.x with the note "the design alone warrants a dedicated ADR." Round-6 cold-audit F13 (issue #16) raised the sibling TOCTOU window between server.mjs's preCheckHit peek and the streaming-branch spawn. D42 fulfils Amendment 6's deferral note by ratifying the v1.x design as ADR 0005 Amendment 8 — design only, no implementation. **Design ratified (ADR 0005 Amendment 8, 14 sections):** 1. New `cacheStore.getOrComputeStreaming(keyId, cacheKey, sourceFactory)` API with `{ stream, isFirst }` return shape. Mirrors the buffered path's `getOrCompute` to keep the cache API surface coherent. 2. `StreamingInflightEntry` shape — source iterator + AbortController + accumulated-chunks replay buffer + attached-clients Set + state flags + D38 spawn-slot tracker. 3. `AttachedClient` shape — per-client tee buffer + byte-size meter + late-joiner replay flag + done/resolveNext/rejectNext for the single-reader-multi-writer tee. 4. Tee fan-out loop (one reader drains source, fans chunks to all attached clients). 5. Late-joiner replay policy — accumulated chunks burst-drained on attach. 6. Cache TTL race during inflight — late joiners see the inflight entry and join; expired cache slot is overwritten by inflight completion. 7. D38 maxConcurrent coordination — only first caller acquires; release fires once on source-complete/error/abort. 8. New `STREAM_BACKPRESSURE` error code. NOT a hard trigger. Affected client gets synthetic `{ type: 'stop', finish_reason: 'length' }` + `[DONE]` (matches D35 #10 truncation marker). 9. Mid-stream disconnect — remove from attached set; if 0 remaining, abort source via AbortController. 10. Replay buffer cap (10 MB, matches D23 cache-entry cap) — over cap marks entry not cacheable, late joiners get backpressure error. 11. Observability — 4 new log events (streaming_inflight_join / source_done / abort, stream_backpressure_disconnect) + new `X-OLP-Streaming-Inflight: source | attached | solo` header. 12. Server.mjs wiring — replaces the current peek+spawn pattern; TOCTOU window closes because Map check+insert is synchronous. 13. Test surface (when implementation lands) — 10 scenarios covering single-client / 2-concurrent / 3-concurrent / mid-stream join / first-disconnect / all-disconnect / source-error / backpressure / D38 coordination / TTL race / replay cap / X-OLP-* header values. 14. Defaults — PER_CLIENT_QUEUE_CAP=1MB, ACCUMULATED_REPLAY_CAP=10MB, STREAM_BACKPRESSURE not in HARD_TRIGGER_CODES. **Multi-layer safeguards (the maintainer asked: "保证后面这一块会被处理而不会被忽略"):** 1. **`docs/v1x-roadmap.md` (NEW)** — single living landing page for every Phase-1 deferral. 7 items at D42: - #1 Streaming SF (this amendment) - #2 Multi-key auth (lib/keys.mjs) - #3 Soft trigger reactivation (ADR 0004 Amendment 2) - #4 /health activeSpawns integration (D38) - #5 Provider-level cacheKeyFields mask (ADR 0005 Amendment 7) - #6 Streaming-path SPAWN_FAILED salvage - #7 AUTH_MISSING tuple test coverage (D40 follow-up) Each entry names the ratifying ADR, load-bearing code anchor (file:line), GitHub issue (if any), concrete start trigger, and estimated effort. Maintainer's session-startup discipline grep this file at sprint kickoff. 2. **Issue #16 STAYS OPEN** — not closed in D42. Body updated post- commit to reference Amendment 8 with status "design ratified; implementation pending." Do not close until §13 test surface is green on actual implementation. 3. **`lib/cache/store.mjs#getOrCompute` JSDoc** — TODO comment for the sibling streaming API pointing at Amendment 8 + v1x-roadmap.md #1. 4. **`server.mjs` streaming-branch entry (~line 810)** — TODO comment block citing Amendment 8 + issue #16 + roadmap.md #1, naming the exact code lines the v1.x impl will replace. 5. **`README.md § Known limitations` section** — new subsection surfaces 4 limitations to users (streaming SF / soft triggers / multi-key auth / cacheKeyFields mask), each linking to the v1x-roadmap.md entry. 6. **Amendment 8 § "Cross-references and safeguards"** — explicit cross-link block enumerating the above 4 anchors so a future ADR-only reader knows every breadcrumb. **Maintainer decision recorded:** Option 1 (design ADR only) chosen over Option 2 (design + implementation now). Rationale: 200-400 lines of concurrency primitives + 15-20 tests is not "pre-Phase-2 cleanup" in shape — it is real v1.x feature work. Shipping streaming SF in a v0.1.1 patch release would muddy the Phase 1 / Phase 2 contract that v0.1.0 ratified. Personal/family-scale load makes the deferral safe at v0.1. Changes (6 files, +165 / -0): - `docs/adr/0005-cache-cross-provider.md` — Amendment 8 prepended (133 lines). - `docs/v1x-roadmap.md` — NEW file (148 lines). - `lib/cache/store.mjs` — getOrCompute JSDoc gains TODO block (8 lines). - `server.mjs` — streaming-branch entry gains TODO block (6 lines). - `README.md` — Known limitations section (9 lines). - `CHANGELOG.md` — D42 sub-entry under Unreleased (9 lines). No code-behavior change. No new tests. No package.json bump (phase_rolling_mode). Authority: - ADR 0005 Amendment 8 (this commit) — design ratification - ADR 0005 Amendment 6 (D34) — original deferral with "design ADR needed" note that this commit fulfils - GitHub issue #16 (round-6 F13) — sibling TOCTOU; STAYS OPEN - ADR 0002 Amendment 6 (D38) — tryAcquireSpawn semantics - ADR 0004 Amendment 5 (D40) — observability pattern extension - CC 开发铁律 v1.6 § 10.x — design-only amendment; fresh-context reviewer not required per Iron Rule 10 implementation-phase scope - CLAUDE.md release_kit_overlay phase_rolling_mode — under Unreleased Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
407 lines
15 KiB
JavaScript
407 lines
15 KiB
JavaScript
/**
|
|
* lib/cache/store.mjs — In-process cache store with per-key isolation + singleflight
|
|
*
|
|
* Authority: ADR 0005 § D1 (per-key isolation) + D4 (singleflight)
|
|
*
|
|
* This module implements the OLP response cache. At D5 the backing store is
|
|
* an in-memory Map (not file-backed). File backing lands in a later Phase.
|
|
* The architecture mirrors OCP v3.13.0 (D1+D4) generalized to OLP's
|
|
* (provider, model) keyed cache key space.
|
|
*
|
|
* D1 — Per-key isolation:
|
|
* Outer Map: keyId → inner Map
|
|
* Inner Map: cacheKey (SHA-256 hex) → CacheEntry
|
|
*
|
|
* keyId is the OLP API key identifier (Phase 2 multi-key). At D5, the server
|
|
* passes '__anonymous__' as keyId for all requests.
|
|
*
|
|
* D4 — Singleflight:
|
|
* Concurrent requests with the same (keyId, cacheKey) share one compute
|
|
* invocation. The first caller triggers computeFn(); subsequent callers
|
|
* await the same Promise. After completion, all callers receive the same
|
|
* value, and the result is cached for future callers.
|
|
*
|
|
* D2/D3 are placeholders at D5:
|
|
* D2 (cache_control bypass) — checked in server.mjs before entering getOrCompute.
|
|
* D3 (chunked stream replay with timing fidelity) — at D5 the cache stores
|
|
* full collected chunks and replays them sequentially without timing.
|
|
* Full D3 (timing-accurate replay) lands in a later Phase.
|
|
*
|
|
* Per OCP learning (MEMORY.md learnings/concurrency_dedup_test_signals.md):
|
|
* Singleflight is verified by observing that N concurrent requests for the
|
|
* same key return within ~0ms of each other (not by counting spawn log lines).
|
|
* The content-hash for the cache key must NOT include randomUUID or any
|
|
* per-request random component — only the semantic content that affects output.
|
|
*/
|
|
|
|
// ── Types ─────────────────────────────────────────────────────────────────
|
|
|
|
/**
|
|
* @typedef {Object} CacheEntry
|
|
* @property {*} value - the cached response (IR chunk array for streaming, response object for non-streaming)
|
|
* @property {number} createdAt - epoch ms (Date.now()) when the entry was created
|
|
* @property {number} ttlMs - time-to-live in milliseconds
|
|
*/
|
|
|
|
/**
|
|
* @typedef {Object} CacheStats
|
|
* @property {number} hits
|
|
* @property {number} misses
|
|
* @property {number} size
|
|
* @property {number} inflightCount
|
|
*/
|
|
|
|
// ── CacheStore ────────────────────────────────────────────────────────────
|
|
|
|
export class CacheStore {
|
|
/**
|
|
* @param {object} [opts]
|
|
* @param {number} [opts.maxEntriesPerKey=1000] — evict oldest entries when exceeded
|
|
* @param {number} [opts.maxAgeMs=86400000] — default TTL: 24 hours
|
|
* @param {number} [opts.maxEntryBytes=10485760] — max serialized size per entry (default 10 MB).
|
|
* Entries whose JSON.stringify serialization exceeds this limit are not persisted.
|
|
* ADR 0005 § "Cache write conditions" item 4 (D23). Cache is for hot-path repeat
|
|
* requests, not bulk archive. Configurable so tests can exercise the cap cheaply.
|
|
* @param {() => number} [opts._nowFn=Date.now] — injectable for TTL testing
|
|
* @param {(msg: string, meta?: object) => void} [opts._warnFn] — injectable for warn testing
|
|
*/
|
|
constructor(opts = {}) {
|
|
this._maxEntriesPerKey = opts.maxEntriesPerKey ?? 1000;
|
|
this._maxAgeMs = opts.maxAgeMs ?? 24 * 60 * 60 * 1000; // 24 hours
|
|
// ADR 0005 § "Cache write conditions" item 4 (D23): default 10 MB = 10 * 1024 * 1024 bytes.
|
|
this._maxEntryBytes = opts.maxEntryBytes ?? 10 * 1024 * 1024;
|
|
this._nowFn = opts._nowFn ?? (() => Date.now());
|
|
// Injectable warn function for testing (defaults to console.warn).
|
|
this._warnFn = opts._warnFn ?? ((msg, meta) => console.warn(msg, meta ?? ''));
|
|
|
|
// D1 per-key isolation: keyId → Map<cacheKey, CacheEntry>
|
|
/** @type {Map<string, Map<string, CacheEntry>>} */
|
|
this._store = new Map();
|
|
|
|
// D4 singleflight: `${keyId}:${cacheKey}` → Promise<value>
|
|
/** @type {Map<string, Promise<*>>} */
|
|
this._inflight = new Map();
|
|
|
|
// Stats per keyId
|
|
/** @type {Map<string, { hits: number, misses: number }>} */
|
|
this._stats = new Map();
|
|
}
|
|
|
|
// ── Internal helpers ──────────────────────────────────────────────────
|
|
|
|
/**
|
|
* Returns or creates the inner Map for a given keyId.
|
|
* @param {string} keyId
|
|
* @returns {Map<string, CacheEntry>}
|
|
*/
|
|
_getNamespace(keyId) {
|
|
if (!this._store.has(keyId)) {
|
|
this._store.set(keyId, new Map());
|
|
}
|
|
return this._store.get(keyId);
|
|
}
|
|
|
|
/**
|
|
* Returns or creates the stats object for a given keyId.
|
|
* @param {string} keyId
|
|
* @returns {{ hits: number, misses: number }}
|
|
*/
|
|
_getStats(keyId) {
|
|
if (!this._stats.has(keyId)) {
|
|
this._stats.set(keyId, { hits: 0, misses: 0 });
|
|
}
|
|
return this._stats.get(keyId);
|
|
}
|
|
|
|
/**
|
|
* Returns true if entry has not yet expired.
|
|
* @param {CacheEntry} entry
|
|
* @returns {boolean}
|
|
*/
|
|
_isAlive(entry) {
|
|
const age = this._nowFn() - entry.createdAt;
|
|
return age < entry.ttlMs;
|
|
}
|
|
|
|
/**
|
|
* Evicts oldest entries in a namespace when it exceeds maxEntriesPerKey.
|
|
* @param {Map<string, CacheEntry>} ns
|
|
*/
|
|
_evictIfNeeded(ns) {
|
|
if (ns.size <= this._maxEntriesPerKey) return;
|
|
|
|
// Collect entries sorted by createdAt ascending (oldest first)
|
|
const entries = [...ns.entries()].sort((a, b) => a[1].createdAt - b[1].createdAt);
|
|
const toEvict = ns.size - this._maxEntriesPerKey;
|
|
for (let i = 0; i < toEvict; i++) {
|
|
ns.delete(entries[i][0]);
|
|
}
|
|
}
|
|
|
|
// ── Public API ────────────────────────────────────────────────────────
|
|
|
|
/**
|
|
* Retrieves a cached entry. Returns null on miss or TTL expiry.
|
|
* Updates stats.
|
|
*
|
|
* @param {string} keyId - OLP API key namespace (use '__anonymous__' at D5)
|
|
* @param {string} cacheKey - SHA-256 hex from computeCacheKey()
|
|
* @returns {Promise<CacheEntry|null>}
|
|
*/
|
|
async get(keyId, cacheKey) {
|
|
const ns = this._getNamespace(keyId);
|
|
const entry = ns.get(cacheKey);
|
|
|
|
if (!entry) {
|
|
this._getStats(keyId).misses++;
|
|
return null;
|
|
}
|
|
|
|
if (!this._isAlive(entry)) {
|
|
ns.delete(cacheKey);
|
|
this._getStats(keyId).misses++;
|
|
return null;
|
|
}
|
|
|
|
this._getStats(keyId).hits++;
|
|
return entry;
|
|
}
|
|
|
|
/**
|
|
* Stores a value in the cache.
|
|
*
|
|
* ADR 0005 § "Cache write conditions" item 4 (D23): if the serialized size of `value`
|
|
* exceeds `maxEntryBytes`, the entry is NOT persisted. A `cache_skip_oversize` warn
|
|
* event is logged. The caller still receives the value (this method returns undefined
|
|
* either way); only persistent caching is skipped.
|
|
*
|
|
* @param {string} keyId
|
|
* @param {string} cacheKey
|
|
* @param {*} value
|
|
* @param {number} [ttlMs] - overrides default maxAgeMs
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async set(keyId, cacheKey, value, ttlMs) {
|
|
// ADR 0005 § "Cache write conditions" item 4 (D23): size cap check.
|
|
const byteLength = Buffer.byteLength(JSON.stringify(value));
|
|
if (byteLength > this._maxEntryBytes) {
|
|
this._warnFn('cache_skip_oversize', {
|
|
byteLength,
|
|
maxEntryBytes: this._maxEntryBytes,
|
|
keyId,
|
|
cacheKey,
|
|
});
|
|
return; // Do not persist; caller still receives the value from computeFn.
|
|
}
|
|
|
|
const ns = this._getNamespace(keyId);
|
|
const entry = {
|
|
value,
|
|
createdAt: this._nowFn(),
|
|
ttlMs: ttlMs ?? this._maxAgeMs,
|
|
};
|
|
ns.set(cacheKey, entry);
|
|
this._evictIfNeeded(ns);
|
|
}
|
|
|
|
/**
|
|
* Returns true if a valid (non-expired) entry exists for (keyId, cacheKey).
|
|
*
|
|
* Stats side-effect: this method calls get(), which increments hit/miss
|
|
* counters. Callers that need to peek WITHOUT touching stats should use
|
|
* peek() instead. Server-side cache-status reporting MUST use peek() to
|
|
* avoid double-counting when getOrCompute() is called immediately after.
|
|
*
|
|
* @param {string} keyId
|
|
* @param {string} cacheKey
|
|
* @returns {Promise<boolean>}
|
|
*/
|
|
async has(keyId, cacheKey) {
|
|
const entry = await this.get(keyId, cacheKey);
|
|
return entry !== null;
|
|
}
|
|
|
|
/**
|
|
* Stats-neutral cache peek. Returns true if a valid entry exists without
|
|
* incrementing hit/miss counters. Use this from server.mjs for pre-check
|
|
* cache-status reporting; the subsequent getOrCompute() call is the one
|
|
* that increments the canonical stats counter at the semantic boundary.
|
|
*
|
|
* Fixes the codex-flagged double-count bug where has() + getOrCompute()
|
|
* both incremented the same counter on the same logical request.
|
|
*
|
|
* @param {string} keyId
|
|
* @param {string} cacheKey
|
|
* @returns {Promise<boolean>}
|
|
*/
|
|
async peek(keyId, cacheKey) {
|
|
const ns = this._getNamespace(keyId);
|
|
const entry = ns.get(cacheKey);
|
|
if (!entry) return false;
|
|
if (!this._isAlive(entry)) {
|
|
ns.delete(cacheKey);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* D4 singleflight: get from cache or compute exactly once for concurrent callers.
|
|
*
|
|
* - Cache hit: return cached value immediately (no computeFn invocation).
|
|
* - Inflight hit: await the existing inflight Promise (singleflight — computeFn
|
|
* runs exactly once for N concurrent callers with the same key).
|
|
* - Miss: register inflight promise, invoke computeFn(), cache the result,
|
|
* release the inflight promise, return the value.
|
|
* - On computeFn error: release the inflight promise (so subsequent calls retry),
|
|
* rethrow the error to all awaiting callers.
|
|
*
|
|
* Per OCP MEMORY.md learning (concurrency_dedup_test_signals.md):
|
|
* Singleflight is verified by timing: N concurrent calls return within ~ms
|
|
* of each other, and computeFn is called exactly once.
|
|
*
|
|
* @param {string} keyId
|
|
* @param {string} cacheKey
|
|
* @param {() => Promise<*>} computeFn - async function producing the value
|
|
* @param {number} [ttlMs]
|
|
* @returns {Promise<*>}
|
|
*
|
|
* TODO(v1.x — ADR 0005 Amendment 8 / issue #16): add a sibling
|
|
* `getOrComputeStreaming(keyId, cacheKey, sourceFactory)` for the streaming
|
|
* path. This API handles buffered responses only; the streaming branch in
|
|
* server.mjs currently uses a peek+spawn pattern with a TOCTOU window.
|
|
* The streaming sibling will mirror this method's shape but with a tee
|
|
* fan-out and per-client backpressure queues. See docs/v1x-roadmap.md #1
|
|
* for the design contract and acceptance criteria.
|
|
*/
|
|
async getOrCompute(keyId, cacheKey, computeFn, ttlMs) {
|
|
// 1. Cache hit — return immediately, no singleflight overhead
|
|
const ns = this._getNamespace(keyId);
|
|
const existing = ns.get(cacheKey);
|
|
if (existing && this._isAlive(existing)) {
|
|
this._getStats(keyId).hits++;
|
|
return existing.value;
|
|
}
|
|
|
|
// 2. Inflight hit — singleflight: await the in-progress compute
|
|
const inflightKey = `${keyId}:${cacheKey}`;
|
|
const inFlight = this._inflight.get(inflightKey);
|
|
if (inFlight) {
|
|
// Another caller is already computing this key. Await their result.
|
|
// The first caller will cache the result; we return the same value.
|
|
return inFlight;
|
|
}
|
|
|
|
// 3. Miss — we are the first caller; register inflight promise
|
|
const computePromise = (async () => {
|
|
try {
|
|
const value = await computeFn();
|
|
// Cache the result so future calls are cache hits
|
|
await this.set(keyId, cacheKey, value, ttlMs);
|
|
this._getStats(keyId).misses++;
|
|
return value;
|
|
} finally {
|
|
// Always release the inflight slot, even on error
|
|
this._inflight.delete(inflightKey);
|
|
}
|
|
})();
|
|
|
|
this._inflight.set(inflightKey, computePromise);
|
|
|
|
return computePromise;
|
|
}
|
|
|
|
/**
|
|
* Returns stats for a specific keyId, or aggregate stats across all keyIds.
|
|
*
|
|
* @param {string} [keyId] - if omitted, returns aggregate across all keys
|
|
* @returns {CacheStats}
|
|
*/
|
|
stats(keyId) {
|
|
if (keyId !== undefined) {
|
|
const s = this._stats.get(keyId) ?? { hits: 0, misses: 0 };
|
|
const ns = this._store.get(keyId);
|
|
const size = ns ? ns.size : 0;
|
|
return {
|
|
hits: s.hits,
|
|
misses: s.misses,
|
|
size,
|
|
inflightCount: this._inflight.size,
|
|
};
|
|
}
|
|
|
|
// Aggregate
|
|
let totalHits = 0;
|
|
let totalMisses = 0;
|
|
let totalSize = 0;
|
|
for (const s of this._stats.values()) {
|
|
totalHits += s.hits;
|
|
totalMisses += s.misses;
|
|
}
|
|
for (const ns of this._store.values()) {
|
|
totalSize += ns.size;
|
|
}
|
|
return {
|
|
hits: totalHits,
|
|
misses: totalMisses,
|
|
size: totalSize,
|
|
inflightCount: this._inflight.size,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Removes a specific (keyId, cacheKey) entry immediately.
|
|
*
|
|
* ADR 0005 § "Cache write conditions" item 1 (D39, issue #3 Part 1):
|
|
* D16 truncation-eviction previously used `set(..., ttlMs=0)` to leave a
|
|
* tombstone that the next `get`/`peek` would lazily purge. That pattern
|
|
* left dead entries in the namespace Map until next access, accruing
|
|
* memory if no follow-up read ever fires. `delete(keyId, cacheKey)` makes
|
|
* the eviction explicit and immediate.
|
|
*
|
|
* Memory hygiene: if the per-keyId namespace becomes empty after delete,
|
|
* the namespace Map entry itself is removed (mirrors the pattern in D38
|
|
* `_activeSpawns` so empty namespaces don't accumulate in `_store`).
|
|
*
|
|
* Stats: this method does NOT touch hit/miss counters — it is an eviction
|
|
* primitive, not a read. Aggregate `size` reported by `stats()` reflects
|
|
* the removal on the next call.
|
|
*
|
|
* @param {string} keyId
|
|
* @param {string} cacheKey
|
|
* @returns {boolean} true if the entry was present and removed; false if absent.
|
|
*/
|
|
delete(keyId, cacheKey) {
|
|
const ns = this._store.get(keyId);
|
|
if (!ns) return false;
|
|
const had = ns.delete(cacheKey);
|
|
// Memory hygiene: drop empty namespace Map entries.
|
|
if (had && ns.size === 0) {
|
|
this._store.delete(keyId);
|
|
}
|
|
return had;
|
|
}
|
|
|
|
/**
|
|
* Clears cache entries (and stats) for a specific keyId, or ALL entries.
|
|
*
|
|
* @param {string} [keyId] - if omitted, clears all namespaces
|
|
*/
|
|
clear(keyId) {
|
|
if (keyId !== undefined) {
|
|
this._store.delete(keyId);
|
|
this._stats.delete(keyId);
|
|
// Also remove any inflight entries for this keyId
|
|
for (const k of this._inflight.keys()) {
|
|
if (k.startsWith(`${keyId}:`)) {
|
|
this._inflight.delete(k);
|
|
}
|
|
}
|
|
} else {
|
|
this._store.clear();
|
|
this._stats.clear();
|
|
this._inflight.clear();
|
|
}
|
|
}
|
|
}
|