@brust/cache-redis 2.0.0-alpha.34 → 2.0.0-alpha.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brust/cache-redis",
-  "version": "2.0.0-alpha.34",
+  "version": "2.0.0-alpha.35",
   "description": "brust cache adapter for Redis and Dragonfly (Bun RedisClient, no npm dependency)",
   "license": "MIT",
   "homepage": "https://brust.dev",
@@ -29,10 +29,10 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "@brust/core": "2.0.0-alpha.34"
+    "@brust/core": "2.0.0-alpha.35"
   },
   "devDependencies": {
-    "@brust/core": "2.0.0-alpha.34",
+    "@brust/core": "2.0.0-alpha.35",
     "@types/bun": "^1.4.4",
     "typescript": "^7.0.2"
   },

package/src/adapter.ts

@@ -55,8 +55,10 @@ export function createAdapter(name: 'redis' | 'dragonfly', raw: Record<string, u
       const method = meta.method.toUpperCase()
       const tags = [...new Set(meta.tags)]
       const stage = K.stage(crypto.randomUUID())
-      const idx = [...tags.map((t) => K.tag(t)), K.path(method, meta.path)]
-      const marks = [...tags.map((t) => K.markTag(t)), K.markPath(method, meta.path)]
+      // F493: every page joins its prefix's set (one more SADD, one more marker GET per store).
+      const prefix = meta.prefix ?? ''
+      const idx = [...tags.map((t) => K.tag(t)), K.path(method, meta.path), K.pfx(prefix)]
+      const marks = [...tags.map((t) => K.markTag(t)), K.markPath(method, meta.path), K.markPfx(prefix)]
       const frame = encodeFrame(page, { entryStamp: meta.stamp, storedAt: Date.now(), tags, method, path: meta.path })
       // Both commands go out on the one auto-pipelined connection: one round trip.
       const staged = c.set(stage, frame, 'PX', STAGE_TTL_MS)

package/src/keys.ts

@@ -7,8 +7,11 @@ export interface Keys {
   page(l2Key: string): string
   tag(tag: string): string
   path(method: string | undefined, path: string): string
+  /** F493: every page of one route-cache key prefix (the prefix is JSON-quoted: `:` in a host is safe). */
+  pfx(prefix: string): string
   markTag(tag: string): string
   markPath(method: string | undefined, path: string): string
+  markPfx(prefix: string): string
   seq: string
   stage(id: string): string
   channel: string
@@ -24,8 +27,10 @@ export function keys(ns: string): Keys {
     page: (k) => `${p}:page:${k}`,
     tag: (t) => `${p}:tag:${t}`,
     path: (m, path) => `${p}:path:${pathName(m, path)}`,
+    pfx: (x) => `${p}:pfx:${JSON.stringify(x)}`,
     markTag: (t) => `${p}:inval:tag:${t}`,
     markPath: (m, path) => `${p}:inval:path:${pathName(m, path)}`,
+    markPfx: (x) => `${p}:inval:pfx:${JSON.stringify(x)}`,
     seq: `${p}:seq`,
     stage: (id) => `${p}:stage:${id}`,
     channel: `brust:${ns}:inval`,
@@ -38,10 +43,11 @@ export function canonical(a: InvalidateArgs): string {
   return JSON.stringify({
     tags: [...new Set(a.tags ?? [])].sort(),
     ...(a.path !== undefined ? { path: a.path, method: (a.method ?? 'GET').toUpperCase() } : {}),
+    ...(a.prefix !== undefined ? { prefix: a.prefix, ...(a.path === undefined && a.method !== undefined ? { method: a.method.toUpperCase() } : {}) } : {}),
   })
 }
 
 /** Does the invalidation touch pages? (A key-only one is tier 1's business: the store holds none by key.) */
 export function hasStoreWork(a: InvalidateArgs): boolean {
-  return (a.tags?.length ?? 0) > 0 || a.path !== undefined
+  return (a.tags?.length ?? 0) > 0 || a.path !== undefined || a.prefix !== undefined
 }

package/src/lua.ts

@@ -20,8 +20,10 @@ for i = 1, n do
 end
 return 1`
 
-// INVAL_LUA  KEYS = [seq, idx_1..idx_n, mark_1..mark_n]
-//            ARGV = [mode ('both'|'delete'|'publish'), n, marker_ttl_ms, channel, origin_json, args_json]
+// INVAL_LUA  KEYS = [seq, idx_1..idx_n, mark_1..mark_n, filter?]
+//            ARGV = [mode ('both'|'delete'|'publish'), n, marker_ttl_ms, channel, origin_json, args_json, has_filter ('1'|'')]
+// F493: with a filter (one prefix's member set) only the members of each idx set that are also in the filter are
+// returned and SREM'd from both (the other prefixes' members stay indexed); without one, SUNION + DEL as before.
 // The `publish` and `both` modes PUBLISH {seq, origin, args} from INSIDE the script (N1): scripts run one at a time, so
 // the order of events on the channel is the order of seq, however many processes invalidate at once.
 export const INVAL_LUA = `local unpack = table.unpack or unpack  -- Lua 5.1 (Redis) and 5.4 (Dragonfly)
@@ -34,9 +36,21 @@ for i = 1, n do
 end
 local out = { mode == 'delete' and v - 1 or v }
 if mode ~= 'publish' and n > 0 then
-  local idx = {}; for i = 1, n do idx[i] = KEYS[1 + i] end
-  for _, m in ipairs(redis.call('SUNION', unpack(idx))) do out[#out + 1] = m end
-  redis.call('DEL', unpack(idx))
+  if ARGV[7] == '1' then
+    local f = KEYS[2 + 2 * n]; local seen = {}
+    for i = 1, n do
+      local ms = redis.call('SINTER', KEYS[1 + i], f)
+      for j = 1, #ms, 1000 do
+        redis.call('SREM', KEYS[1 + i], unpack(ms, j, math.min(j + 999, #ms)))
+        redis.call('SREM', f, unpack(ms, j, math.min(j + 999, #ms)))
+      end
+      for _, m in ipairs(ms) do if not seen[m] then seen[m] = true; out[#out + 1] = m end end
+    end
+  else
+    local idx = {}; for i = 1, n do idx[i] = KEYS[1 + i] end
+    for _, m in ipairs(redis.call('SUNION', unpack(idx))) do out[#out + 1] = m end
+    redis.call('DEL', unpack(idx))
+  end
 end
 if mode ~= 'delete' then
   redis.call('PUBLISH', ARGV[4], '{"seq":' .. string.format('%d', v) .. ',"origin":' .. ARGV[5] .. ',"args":' .. ARGV[6] .. '}')

package/src/pairing.ts

@@ -74,7 +74,18 @@ export class Pairing {
       idx.push(K.path(method, args.path))
       marks.push(K.markPath(method, args.path))
     }
-    const r = (await evalsha(this.c(), INVAL_SCRIPT, [K.seq, ...idx, ...marks], [mode, idx.length, this.markerTtlMs, this.channel(), JSON.stringify(origin), JSON.stringify(args)])) as (number | string)[]
+    // F493: `prefix` + tags/path deletes only that prefix's members (the prefix set filters), and marks the unscoped
+    // tag/path markers (conservative: a racing set of another prefix is refused, a later miss). `prefix` alone deletes the
+    // prefix's set and marks its marker. The store holds GET pages only: `{prefix, method: <not GET>}` deletes nothing.
+    const filter: string[] = []
+    if (args.prefix !== undefined) {
+      if (idx.length) filter.push(K.pfx(args.prefix))
+      else if (method === undefined || method.toUpperCase() === 'GET') {
+        idx.push(K.pfx(args.prefix))
+        marks.push(K.markPfx(args.prefix))
+      }
+    }
+    const r = (await evalsha(this.c(), INVAL_SCRIPT, [K.seq, ...idx, ...marks, ...filter], [mode, idx.length, this.markerTtlMs, this.channel(), JSON.stringify(origin), JSON.stringify(args), filter.length ? '1' : ''])) as (number | string)[]
     return { seq: Number(r[0]), members: r.slice(1).map(String) }
   }
 }