@c9up/echo 0.2.3 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (109) hide show
  1. package/README.md +1 -1
  2. package/dist/CacheManager.d.ts +13 -2
  3. package/dist/CacheManager.d.ts.map +1 -1
  4. package/dist/CacheManager.js +309 -56
  5. package/dist/CacheManager.js.map +1 -1
  6. package/dist/EchoProvider.d.ts.map +1 -1
  7. package/dist/EchoProvider.js +32 -3
  8. package/dist/EchoProvider.js.map +1 -1
  9. package/dist/StoreManager.d.ts +38 -11
  10. package/dist/StoreManager.d.ts.map +1 -1
  11. package/dist/StoreManager.js +80 -22
  12. package/dist/StoreManager.js.map +1 -1
  13. package/dist/bytes.d.ts +13 -0
  14. package/dist/bytes.d.ts.map +1 -0
  15. package/dist/bytes.js +35 -0
  16. package/dist/bytes.js.map +1 -0
  17. package/dist/claim.d.ts +15 -0
  18. package/dist/claim.d.ts.map +1 -0
  19. package/dist/claim.js +10 -0
  20. package/dist/claim.js.map +1 -0
  21. package/dist/configure.d.ts +1 -0
  22. package/dist/configure.d.ts.map +1 -1
  23. package/dist/configure.js +3 -0
  24. package/dist/configure.js.map +1 -1
  25. package/dist/console/cacheClear.d.ts +13 -0
  26. package/dist/console/cacheClear.d.ts.map +1 -0
  27. package/dist/console/cacheClear.js +69 -0
  28. package/dist/console/cacheClear.js.map +1 -0
  29. package/dist/console/cacheDelete.d.ts +11 -0
  30. package/dist/console/cacheDelete.d.ts.map +1 -0
  31. package/dist/console/cacheDelete.js +42 -0
  32. package/dist/console/cacheDelete.js.map +1 -0
  33. package/dist/console/cachePrune.d.ts +9 -0
  34. package/dist/console/cachePrune.d.ts.map +1 -0
  35. package/dist/console/cachePrune.js +35 -0
  36. package/dist/console/cachePrune.js.map +1 -0
  37. package/dist/console/contract.d.ts +64 -0
  38. package/dist/console/contract.d.ts.map +1 -0
  39. package/dist/console/contract.js +32 -0
  40. package/dist/console/contract.js.map +1 -0
  41. package/dist/console/index.d.ts +25 -0
  42. package/dist/console/index.d.ts.map +1 -0
  43. package/dist/console/index.js +38 -0
  44. package/dist/console/index.js.map +1 -0
  45. package/dist/console/store.d.ts +14 -0
  46. package/dist/console/store.d.ts.map +1 -0
  47. package/dist/console/store.js +35 -0
  48. package/dist/console/store.js.map +1 -0
  49. package/dist/drivers/MemoryDriver.d.ts +37 -1
  50. package/dist/drivers/MemoryDriver.d.ts.map +1 -1
  51. package/dist/drivers/MemoryDriver.js +170 -72
  52. package/dist/drivers/MemoryDriver.js.map +1 -1
  53. package/dist/drivers/RedisDriver.d.ts +15 -8
  54. package/dist/drivers/RedisDriver.d.ts.map +1 -1
  55. package/dist/drivers/RedisDriver.js +198 -97
  56. package/dist/drivers/RedisDriver.js.map +1 -1
  57. package/dist/drivers/TieredDriver.d.ts +42 -0
  58. package/dist/drivers/TieredDriver.d.ts.map +1 -1
  59. package/dist/drivers/TieredDriver.js +114 -9
  60. package/dist/drivers/TieredDriver.js.map +1 -1
  61. package/dist/duration.d.ts +13 -3
  62. package/dist/duration.d.ts.map +1 -1
  63. package/dist/duration.js +22 -7
  64. package/dist/duration.js.map +1 -1
  65. package/dist/errors.d.ts +60 -2
  66. package/dist/errors.d.ts.map +1 -1
  67. package/dist/errors.js +81 -6
  68. package/dist/errors.js.map +1 -1
  69. package/dist/index.d.ts +4 -4
  70. package/dist/index.d.ts.map +1 -1
  71. package/dist/index.js +3 -3
  72. package/dist/index.js.map +1 -1
  73. package/dist/quasar.d.ts +1 -1
  74. package/dist/quasar.d.ts.map +1 -1
  75. package/dist/quasar.js +106 -19
  76. package/dist/quasar.js.map +1 -1
  77. package/dist/services/main.d.ts +1 -1
  78. package/dist/services/main.d.ts.map +1 -1
  79. package/dist/services/main.js +22 -5
  80. package/dist/services/main.js.map +1 -1
  81. package/dist/types.d.ts +44 -2
  82. package/dist/types.d.ts.map +1 -1
  83. package/dist/vendor/quasarConnection.d.ts +44 -3
  84. package/dist/vendor/quasarConnection.d.ts.map +1 -1
  85. package/dist/vendor/quasarConnection.js +64 -23
  86. package/dist/vendor/quasarConnection.js.map +1 -1
  87. package/package.json +5 -1
  88. package/src/CacheManager.ts +367 -69
  89. package/src/EchoProvider.ts +45 -4
  90. package/src/StoreManager.ts +131 -35
  91. package/src/bytes.ts +38 -0
  92. package/src/claim.ts +22 -0
  93. package/src/configure.ts +4 -0
  94. package/src/console/cacheClear.ts +96 -0
  95. package/src/console/cacheDelete.ts +65 -0
  96. package/src/console/cachePrune.ts +57 -0
  97. package/src/console/contract.ts +93 -0
  98. package/src/console/index.ts +61 -0
  99. package/src/console/store.ts +47 -0
  100. package/src/drivers/MemoryDriver.ts +221 -69
  101. package/src/drivers/RedisDriver.ts +234 -104
  102. package/src/drivers/TieredDriver.ts +169 -9
  103. package/src/duration.ts +28 -7
  104. package/src/errors.ts +103 -6
  105. package/src/index.ts +17 -3
  106. package/src/quasar.ts +145 -30
  107. package/src/services/main.ts +26 -8
  108. package/src/types.ts +46 -7
  109. package/src/vendor/quasarConnection.ts +105 -22
@@ -3,14 +3,35 @@
3
3
  * (stale-while-revalidate) and tags. Suitable as the L2 tier of
4
4
  * {@link TieredDriver}.
5
5
  *
6
- * Requires a Redis client instance implementing the minimal interface below.
7
- * Compatible with ioredis and redis (node-redis) clients.
6
+ * Requires a Redis client implementing the minimal interface below, which a
7
+ * raw ioredis client satisfies.
8
8
  *
9
- * STORAGE FORMAT (breaking vs echo <=0.1.5): values are stored as a JSON
10
- * envelope `{ "v": <value>, "e": <logicalExpiryEpochMs> }`. The physical Redis
11
- * TTL (`EX`) covers `ttl + grace` so a logically-expired value survives for the
12
- * grace window; `e` records the logical expiry so reads can flag it stale.
9
+ * STORAGE FORMAT: values live at `<prefix>v:<key>` as a JSON envelope
10
+ * `{ "v": <value>, "e": <logicalExpiryEpochMs> }`; tag sets at `<prefix>t:<tag>`
11
+ * and per-key reverse indexes at `<prefix>m:<key>`. The physical Redis TTL
12
+ * covers `ttl + grace` so a logically-expired value survives for the grace
13
+ * window; `e` records the logical expiry so reads can flag it stale.
13
14
  */
15
+ import { claimed } from "../claim.js";
16
+ import { checkTtlSeconds } from "../duration.js";
17
+ import { EchoError } from "../errors.js";
18
+ import { hasEnded } from "../vendor/quasarConnection.js";
19
+ /** Escape Redis MATCH glob metacharacters so the pattern matches literally. */
20
+ function escapeGlob(literal) {
21
+ return literal.replace(/[*?[\]\\]/g, "\\$&");
22
+ }
23
+ /** JSON, or `undefined` when the text is not JSON at all. */
24
+ function parseJson(raw) {
25
+ try {
26
+ return JSON.parse(raw);
27
+ }
28
+ catch {
29
+ return undefined;
30
+ }
31
+ }
32
+ function isStringArray(x) {
33
+ return Array.isArray(x) && x.every((item) => typeof item === "string");
34
+ }
14
35
  function isEnvelope(x) {
15
36
  return (typeof x === "object" &&
16
37
  x !== null &&
@@ -23,15 +44,30 @@ export class RedisDriver {
23
44
  #resolved;
24
45
  #pending;
25
46
  #prefix;
26
- constructor(source, prefix = "cache:") {
47
+ /** Reported once per driver: the condition, not each key, is the news. */
48
+ #foreignReported = false;
49
+ constructor(source, prefix) {
27
50
  this.#source = source;
28
- this.#prefix = prefix;
51
+ // `||`, not a default parameter: an empty prefix made clear() scan
52
+ // `MATCH *` and delete every key in the database. Upstream falls back
53
+ // the same way (`config.prefix || "bentocache"`).
54
+ this.#prefix = prefix || "cache:";
29
55
  }
30
56
  /**
31
57
  * The client, resolved once. Two commands racing on a cold store must not
32
58
  * each open their own connection, so the in-flight promise is shared.
59
+ *
60
+ * Resolved AGAIN once the client it holds has ended for good: quasar
61
+ * retires a connection whose retry strategy gave up and hands out a fresh
62
+ * one, and keeping the dead client made a three-second Redis blip a
63
+ * permanent cache outage. NAMED DEVIATION, better than upstream, whose
64
+ * Redis driver captures `ioConnection` once. A client handed in directly is
65
+ * kept whatever its state.
33
66
  */
34
67
  async #client() {
68
+ if (typeof this.#source === "function" && hasEnded(this.#resolved)) {
69
+ this.#resolved = undefined;
70
+ }
35
71
  if (this.#resolved)
36
72
  return this.#resolved;
37
73
  if (typeof this.#source !== "function") {
@@ -55,32 +91,40 @@ export class RedisDriver {
55
91
  }
56
92
  return this.#pending;
57
93
  }
58
- #key(k) {
59
- return `${this.#prefix}${k}`;
94
+ /*
95
+ * Three disjoint sub-spaces under the store prefix: values (`v:`), tag
96
+ * sets (`t:`) and per-key reverse indexes (`m:`). They shared one keyspace
97
+ * before, so a cache key `tag:<t>` overwrote a tag SET with a string and a
98
+ * root key `meta:tags:<k>` sat in another entry's index slot: every
99
+ * invalidation through them then failed with WRONGTYPE, and the entry it
100
+ * was meant to drop kept being served. Any user key lands under `v:`, so
101
+ * none can reach the bookkeeping.
102
+ */
103
+ #valueKey(key) {
104
+ return `${this.#prefix}v:${key}`;
105
+ }
106
+ #tagKey(tag) {
107
+ return `${this.#prefix}t:${tag}`;
60
108
  }
61
109
  /**
62
- * Reverse-index for per-key tag membership. Lets tag writes clean stale
63
- * memberships on retag, and `delete()` drop the key from every tag-set it
64
- * belongs to.
110
+ * Reverse index of the tags `key` carries. Lets a retag clean stale
111
+ * memberships, and `delete()` drop the key from every tag set it is in.
65
112
  */
66
- #metaKey(k) {
67
- return `${this.#prefix}meta:tags:${k}`;
113
+ #metaKey(key) {
114
+ return `${this.#prefix}m:${key}`;
68
115
  }
69
116
  async delete(key) {
70
117
  const client = await this.#client();
71
- const fullKey = this.#key(key);
72
- const metaKey = this.#metaKey(key);
73
- const tags = await client.smembers(metaKey);
74
- for (const tag of tags) {
75
- const tagKey = `${this.#prefix}tag:${tag}`;
76
- await client.srem(tagKey, fullKey);
77
- }
78
- if (tags.length > 0) {
79
- await client.del(metaKey);
80
- }
81
- const count = await client.del(fullKey);
118
+ await this.#dropTags(key);
119
+ const count = await client.del(this.#valueKey(key));
82
120
  return count > 0;
83
121
  }
122
+ #reportForeign() {
123
+ if (this.#foreignReported)
124
+ return;
125
+ this.#foreignReported = true;
126
+ process.stderr.write(`[echo] a value under the Redis prefix "${this.#prefix}" is not one echo wrote; it reads as a miss and the next write replaces it\n`);
127
+ }
84
128
  async get(key) {
85
129
  const entry = await this.getEntry(key);
86
130
  if (entry === null || entry.stale)
@@ -89,21 +133,30 @@ export class RedisDriver {
89
133
  }
90
134
  async getEntry(key) {
91
135
  const client = await this.#client();
92
- const raw = await client.get(this.#key(key));
136
+ const raw = await client.get(this.#valueKey(key));
93
137
  if (raw === null)
94
138
  return null;
95
- const parsed = JSON.parse(raw);
96
- if (!isEnvelope(parsed))
139
+ const parsed = parseJson(raw);
140
+ if (!isEnvelope(parsed)) {
141
+ // Not something this driver wrote — another application on the
142
+ // prefix, a manual SET, a torn write. A miss, so getOrSet computes
143
+ // and overwrites it; it used to throw on every read of the key,
144
+ // and getOrSet reads before it computes, so it never healed.
145
+ this.#reportForeign();
97
146
  return null;
147
+ }
98
148
  const stale = parsed.e > 0 && parsed.e < Date.now();
99
- // Deserialize boundary: the on-the-wire value is genuinely `unknown`; the
100
- // caller's generic `T` is the assertion. This is the single unavoidable
101
- // cast site (mirrors echo <=0.1.5 `JSON.parse(raw) as T`).
102
- const value = parsed.v;
103
- return { value, stale, expiresAt: parsed.e };
149
+ const value = claimed(parsed.v);
150
+ const tags = Reflect.get(parsed, "t");
151
+ return {
152
+ value,
153
+ stale,
154
+ expiresAt: parsed.e,
155
+ ...(isStringArray(tags) && tags.length > 0 ? { tags } : {}),
156
+ };
104
157
  }
105
158
  /** Write the value envelope with a physical (grace-inclusive) TTL in seconds. */
106
- async #writeEnvelope(fullKey, value, logicalTtlSeconds, physicalTtlSeconds, logicalExpiresAtOverride) {
159
+ async #writeEnvelope(key, value, logicalTtlSeconds, physicalTtlSeconds, logicalExpiresAtOverride, tags = []) {
107
160
  const client = await this.#client();
108
161
  // An absolute override (e.g. `expire()` marking stale-now) wins over the
109
162
  // ttl-derived logical expiry; a past value flags the entry stale on read.
@@ -112,72 +165,117 @@ export class RedisDriver {
112
165
  : logicalTtlSeconds > 0
113
166
  ? Date.now() + logicalTtlSeconds * 1000
114
167
  : 0;
115
- const envelope = { v: value, e: expiresAt };
168
+ const envelope = tags.length > 0
169
+ ? { v: value, e: expiresAt, t: tags }
170
+ : { v: value, e: expiresAt };
116
171
  const serialized = JSON.stringify(envelope);
117
172
  if (physicalTtlSeconds > 0) {
118
- await client.set(fullKey, serialized, "EX", physicalTtlSeconds);
173
+ // Milliseconds, as upstream writes them (`PX`): `EX` takes whole
174
+ // seconds, so a '500ms' or '1.5s' TTL failed every write.
175
+ await client.set(this.#valueKey(key), serialized, "PX", Math.ceil(physicalTtlSeconds * 1000));
119
176
  }
120
177
  else {
121
- await client.set(fullKey, serialized);
178
+ await client.set(this.#valueKey(key), serialized);
122
179
  }
123
180
  }
124
- /** Drop a key from its previous tag memberships (reconcile before re-tagging). */
125
- async #dropTags(fullKey, metaKey) {
181
+ /** Drop a key from every tag set it is in, and its reverse index. */
182
+ async #dropTags(key) {
126
183
  const client = await this.#client();
184
+ const metaKey = this.#metaKey(key);
127
185
  const prevTags = await client.smembers(metaKey);
128
186
  for (const tag of prevTags) {
129
- await client.srem(`${this.#prefix}tag:${tag}`, fullKey);
187
+ await client.srem(this.#tagKey(tag), key);
130
188
  }
131
189
  if (prevTags.length > 0)
132
190
  await client.del(metaKey);
133
- return prevTags;
134
191
  }
135
192
  async set(key, value, ttlSeconds) {
136
- const fullKey = this.#key(key);
137
- await this.#dropTags(fullKey, this.#metaKey(key));
138
- const ttl = ttlSeconds && ttlSeconds > 0 ? ttlSeconds : 0;
139
- await this.#writeEnvelope(fullKey, value, ttl, ttl);
193
+ await this.setEntry(key, value, { ttlSeconds });
140
194
  }
141
195
  async setEntry(key, value, options) {
142
- const fullKey = this.#key(key);
143
- const metaKey = this.#metaKey(key);
144
- const ttl = options.ttlSeconds && options.ttlSeconds > 0 ? options.ttlSeconds : 0;
196
+ const ttl = options.ttlSeconds === undefined
197
+ ? 0
198
+ : checkTtlSeconds(options.ttlSeconds);
145
199
  const grace = options.graceSeconds && options.graceSeconds > 0
146
200
  ? options.graceSeconds
147
201
  : 0;
148
202
  // With an absolute logical expiry (e.g. `expire()` marking stale-now), the
149
203
  // ttl no longer drives physical retention — keep the value for the grace
150
204
  // window measured from now so a stale-but-graced read still finds it.
151
- const override = options.expiresAt;
205
+ // A negative TTL is the same thing: already expired, never immortal.
206
+ const override = options.expiresAt ?? (ttl < 0 ? Date.now() - 1 : undefined);
152
207
  const physical = override !== undefined ? grace : ttl > 0 ? ttl + grace : 0;
208
+ if (override !== undefined && physical === 0 && override <= Date.now()) {
209
+ // Expired, with no grace to keep it for. Written without a PX it
210
+ // would never leave; and the previous value must not survive it.
211
+ await this.delete(key);
212
+ return;
213
+ }
153
214
  const tags = options.tags ?? [];
154
215
  if (tags.length === 0) {
155
- await this.#dropTags(fullKey, metaKey);
156
- await this.#writeEnvelope(fullKey, value, ttl, physical, override);
216
+ await this.#dropTags(key);
217
+ await this.#writeEnvelope(key, value, ttl, physical, override);
157
218
  return;
158
219
  }
159
- await this.#writeEnvelope(fullKey, value, ttl, physical, override);
220
+ await this.#writeEnvelope(key, value, ttl, physical, override, tags);
160
221
  await this.#applyTags(key, tags, physical);
161
222
  }
162
223
  async flush(prefix) {
224
+ if (prefix === undefined) {
225
+ // The whole store: everything under its prefix, bookkeeping included.
226
+ await this.#deleteUnder(this.#prefix);
227
+ return;
228
+ }
229
+ // A namespace: its keys leave the tag sets they are in first — those
230
+ // sets are shared with whatever else carries the same tag — then its
231
+ // values and reverse indexes go. Scanning values alone left the
232
+ // indexes behind, immortal when the entries were.
163
233
  const client = await this.#client();
164
- const scan = client.scan;
165
- if (typeof scan === "function") {
166
- // The driver's own prefix scopes it to this store; `prefix` scopes
167
- // it further, to the namespace that asked.
168
- const match = `${this.#prefix}${prefix ?? ""}`;
169
- let cursor = "0";
170
- do {
171
- const [nextCursor, keys] = await scan(cursor, "MATCH", `${match}*`, "COUNT", 100);
172
- cursor = nextCursor;
173
- if (keys.length > 0) {
174
- await client.del(keys);
234
+ const metaPrefix = this.#metaKey(prefix);
235
+ await this.#scan(metaPrefix, async (metaKeys) => {
236
+ for (const metaKey of metaKeys) {
237
+ const key = metaKey.slice(this.#metaKey("").length);
238
+ for (const tag of await client.smembers(metaKey)) {
239
+ await client.srem(this.#tagKey(tag), key);
175
240
  }
176
- } while (cursor !== "0");
177
- }
178
- else {
179
- throw new Error("Echo: RedisDriver.flush() requires a client with scan() support. KEYS is not safe for production use.");
241
+ }
242
+ await client.del(...metaKeys);
243
+ });
244
+ await this.#deleteUnder(this.#valueKey(prefix));
245
+ }
246
+ /**
247
+ * Delete every key that starts with `literal`, walking a SCAN cursor.
248
+ *
249
+ * The prefix is escaped before it becomes a MATCH pattern: MATCH is a glob,
250
+ * so a namespace like `tenant-*` matched every tenant and a clear of it
251
+ * wiped them all. Each returned key is checked against the literal prefix
252
+ * as well, so a pattern the server reads differently still deletes nothing
253
+ * outside it. Upstream interpolates the prefix unescaped; this is stricter
254
+ * on purpose.
255
+ */
256
+ async #deleteUnder(literal) {
257
+ const client = await this.#client();
258
+ await this.#scan(literal, async (keys) => {
259
+ await client.del(...keys);
260
+ });
261
+ }
262
+ /** Walk a SCAN cursor over the keys starting with `literal`, a page at a time. */
263
+ async #scan(literal, onPage) {
264
+ const client = await this.#client();
265
+ if (typeof client.scan !== "function") {
266
+ throw new EchoError("E_ECHO_SCAN_UNSUPPORTED", "Echo: RedisDriver.flush() requires a client with scan() support. KEYS is not safe for production use.");
180
267
  }
268
+ const pattern = `${escapeGlob(literal)}*`;
269
+ let cursor = "0";
270
+ do {
271
+ // Called ON the client: ioredis reads `this` inside scan(), so a
272
+ // detached reference threw and left every key in place.
273
+ const [nextCursor, keys] = await client.scan(cursor, "MATCH", pattern, "COUNT", 100);
274
+ cursor = nextCursor;
275
+ const owned = keys.filter((key) => key.startsWith(literal));
276
+ if (owned.length > 0)
277
+ await onPage(owned);
278
+ } while (cursor !== "0");
181
279
  }
182
280
  async has(key) {
183
281
  return (await this.get(key)) !== null;
@@ -188,7 +286,9 @@ export class RedisDriver {
188
286
  */
189
287
  async #applyTags(key, tags, physicalTtlSeconds) {
190
288
  const client = await this.#client();
191
- const fullKey = this.#key(key);
289
+ // EXPIRE takes whole seconds. Rounded UP, so an index never dies
290
+ // before the entry it points at.
291
+ const indexTtl = Math.ceil(physicalTtlSeconds);
192
292
  const metaKey = this.#metaKey(key);
193
293
  const oldTags = await client.smembers(metaKey);
194
294
  const newTagSet = new Set(tags);
@@ -196,18 +296,31 @@ export class RedisDriver {
196
296
  const removedTags = oldTags.filter((t) => !newTagSet.has(t));
197
297
  const addedTags = tags.filter((t) => !oldTagSet.has(t));
198
298
  for (const tag of removedTags) {
199
- await client.srem(`${this.#prefix}tag:${tag}`, fullKey);
299
+ await client.srem(this.#tagKey(tag), key);
200
300
  }
201
301
  for (const tag of tags) {
202
- const tagKey = `${this.#prefix}tag:${tag}`;
302
+ const tagKey = this.#tagKey(tag);
303
+ // Read BEFORE the SADD. Redis answers -2 for no such key and -1 for
304
+ // a key with no expiry, and a set the SADD has just created reads
305
+ // -1 too: only this order tells a new set from a persistent one.
306
+ const currentTtl = await client.ttl(tagKey);
203
307
  if (addedTags.includes(tag)) {
204
- await client.sadd(tagKey, fullKey);
308
+ await client.sadd(tagKey, key);
205
309
  }
206
- if (physicalTtlSeconds > 0) {
207
- const currentTtl = await client.ttl(tagKey);
208
- if (currentTtl < 0 || physicalTtlSeconds > currentTtl) {
209
- await client.expire(tagKey, physicalTtlSeconds);
210
- }
310
+ // A tag set must outlive every member it indexes. It took the TTL
311
+ // of the last member written with one, and an immortal member never
312
+ // cleared that TTL: once the set lapsed, deleteByTag found nobody
313
+ // and the immortal entry kept being served. So an immortal member
314
+ // makes the set persistent, and a finite member never puts an
315
+ // expiry back on a persistent set. A persistent set left holding
316
+ // only lapsed members is emptied by the next deleteByTag of its tag.
317
+ if (physicalTtlSeconds === 0) {
318
+ if (currentTtl >= 0)
319
+ await client.persist(tagKey);
320
+ }
321
+ else if (currentTtl === -2 ||
322
+ (currentTtl >= 0 && indexTtl > currentTtl)) {
323
+ await client.expire(tagKey, indexTtl);
211
324
  }
212
325
  }
213
326
  if (oldTags.length > 0) {
@@ -216,15 +329,13 @@ export class RedisDriver {
216
329
  if (tags.length > 0) {
217
330
  await client.sadd(metaKey, ...tags);
218
331
  if (physicalTtlSeconds > 0) {
219
- await client.expire(metaKey, physicalTtlSeconds);
332
+ await client.expire(metaKey, indexTtl);
220
333
  }
221
334
  }
222
335
  }
223
336
  /** Set a value with tag memberships for group invalidation (no grace). */
224
337
  async setWithTags(key, value, tags, ttlSeconds) {
225
- const ttl = ttlSeconds && ttlSeconds > 0 ? ttlSeconds : 0;
226
- await this.#writeEnvelope(this.#key(key), value, ttl, ttl);
227
- await this.#applyTags(key, tags, ttl);
338
+ await this.setEntry(key, value, { ttlSeconds, tags });
228
339
  }
229
340
  /**
230
341
  * Invalidate all entries tagged with any of the given tags. Cleans the
@@ -234,26 +345,16 @@ export class RedisDriver {
234
345
  async deleteByTag(tags) {
235
346
  const client = await this.#client();
236
347
  for (const tag of tags) {
237
- const tagKey = `${this.#prefix}tag:${tag}`;
348
+ const tagKey = this.#tagKey(tag);
238
349
  const members = await client.smembers(tagKey);
239
- for (const fullKey of members) {
240
- const userKey = fullKey.startsWith(this.#prefix)
241
- ? fullKey.slice(this.#prefix.length)
242
- : fullKey;
243
- const metaKey = this.#metaKey(userKey);
244
- const allTags = await client.smembers(metaKey);
245
- for (const otherTag of allTags) {
350
+ for (const key of members) {
351
+ const metaKey = this.#metaKey(key);
352
+ for (const otherTag of await client.smembers(metaKey)) {
246
353
  if (otherTag === tag)
247
354
  continue;
248
- const otherTagKey = `${this.#prefix}tag:${otherTag}`;
249
- await client.srem(otherTagKey, fullKey);
355
+ await client.srem(this.#tagKey(otherTag), key);
250
356
  }
251
- if (allTags.length > 0) {
252
- await client.del(metaKey);
253
- }
254
- }
255
- if (members.length > 0) {
256
- await client.del(members);
357
+ await client.del(metaKey, this.#valueKey(key));
257
358
  }
258
359
  await client.del(tagKey);
259
360
  }
@@ -1 +1 @@
1
- {"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA8BH,SAAS,UAAU,CAAC,CAAU;IAC7B,OAAO,CACN,OAAO,CAAC,KAAK,QAAQ;QACrB,CAAC,KAAK,IAAI;QACV,GAAG,IAAI,CAAC;QACR,GAAG,IAAI,CAAC;QACR,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,QAAQ,CACvC,CAAC;AACH,CAAC;AAYD,MAAM,OAAO,WAAW;IACvB,OAAO,CAAoB;IAC3B,SAAS,CAA0B;IACnC,QAAQ,CAAmC;IAC3C,OAAO,CAAS;IAEhB,YAAY,MAAyB,EAAE,MAAM,GAAG,QAAQ;QACvD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO;QACZ,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1C,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;YAC9B,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;YAC9B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;iBACzC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBAChB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;gBACxB,OAAO,MAAM,CAAC;YACf,CAAC,CAAC;gBACF,4DAA4D;gBAC5D,8DAA8D;gBAC9D,+DAA+D;gBAC/D,8DAA8D;iBAC7D,OAAO,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,CAAS;QACb,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,CAAS;QACjB,OAAO,GAAG,IAAI,CAAC,OAAO,aAAa,CAAC,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,OAAO,GAAG,EAAE,CAAC;YAC3C,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,KAAK,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,GAAG,CAAc,GAAW;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAI,GAAG,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAC/C,OAAO,KAAK,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAc,GAAW;QACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACpD,0EAA0E;QAC1E,wEAAwE;QACxE,2DAA2D;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAM,CAAC;QAC5B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;IAC9C,CAAC;IAED,iFAAiF;IACjF,KAAK,CAAC,cAAc,CACnB,OAAe,EACf,KAAc,EACd,iBAAyB,EACzB,kBAA0B,EAC1B,wBAAiC;QAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,yEAAyE;QACzE,0EAA0E;QAC1E,MAAM,SAAS,GACd,wBAAwB,KAAK,SAAS;YACrC,CAAC,CAAC,wBAAwB;YAC1B,CAAC,CAAC,iBAAiB,GAAG,CAAC;gBACtB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,iBAAiB,GAAG,IAAI;gBACvC,CAAC,CAAC,CAAC,CAAC;QACP,MAAM,QAAQ,GAAa,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,kBAAkB,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACP,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,kFAAkF;IAClF,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,OAAe;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC5B,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,OAAO,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAc,EAAE,UAAmB;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,UAAU,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,QAAQ,CACb,GAAW,EACX,KAAc,EACd,OAAyB;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,GAAG,GACR,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,KAAK,GACV,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,GAAG,CAAC;YAC/C,CAAC,CAAC,OAAO,CAAC,YAAY;YACtB,CAAC,CAAC,CAAC,CAAC;QACN,2EAA2E;QAC3E,yEAAyE;QACzE,sEAAsE;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,MAAM,QAAQ,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACnE,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAe;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAChC,mEAAmE;YACnE,2CAA2C;YAC3C,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,EAAE,CAAC;YAC/C,IAAI,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC;gBACH,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,IAAI,CACpC,MAAM,EACN,OAAO,EACP,GAAG,KAAK,GAAG,EACX,OAAO,EACP,GAAG,CACH,CAAC;gBACF,MAAM,GAAG,UAAU,CAAC;gBACpB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC;YACF,CAAC,QAAQ,MAAM,KAAK,GAAG,EAAE;QAC1B,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACd,uGAAuG,CACvG,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;IACvC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,UAAU,CACf,GAAW,EACX,IAAc,EACd,kBAA0B;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAExD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC/B,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,OAAO,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,OAAO,GAAG,EAAE,CAAC;YAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACpC,CAAC;YACD,IAAI,kBAAkB,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC5C,IAAI,UAAU,GAAG,CAAC,IAAI,kBAAkB,GAAG,UAAU,EAAE,CAAC;oBACvD,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;gBACjD,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;YACpC,IAAI,kBAAkB,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAClD,CAAC;QACF,CAAC;IACF,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,WAAW,CAChB,GAAW,EACX,KAAc,EACd,IAAc,EACd,UAAmB;QAEnB,MAAM,GAAG,GAAG,UAAU,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,IAAc;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,OAAO,GAAG,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;oBAC/C,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBACpC,CAAC,CAAC,OAAO,CAAC;gBACX,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC/C,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;oBAChC,IAAI,QAAQ,KAAK,GAAG;wBAAE,SAAS;oBAC/B,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,OAAO,OAAO,QAAQ,EAAE,CAAC;oBACrD,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACzC,CAAC;gBACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxB,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC3B,CAAC;YACF,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;YACD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,gDAAgD;IAChD,KAAK,CAAC,SAAS,CAAC,IAAc;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;CACD"}
1
+ {"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@
7
7
  * invalidations so peer instances drop their (now stale) L1 copies — the L2 is
8
8
  * shared, so only L1 needs cross-instance invalidation.
9
9
  */
10
+ import { type Duration } from "../duration.js";
10
11
  import type { CacheDriver, CacheEntry, DriverSetOptions, TaggableDriver } from "../types.js";
11
12
  /** A cross-instance invalidation message. */
12
13
  export interface BusMessage {
@@ -38,7 +39,24 @@ export interface BusMessage {
38
39
  * already did.
39
40
  */
40
41
  senderId?: string;
42
+ /**
43
+ * The store that published it. Several stores — and several applications
44
+ * — can share one channel, and a message carried no store: one store's
45
+ * write dropped another store's L1 copy of the same key, and its
46
+ * deleteByTag flushed every other store's L1. A tier with a store name
47
+ * acts only on messages carrying the same one, as upstream drops messages
48
+ * for caches it does not manage.
49
+ */
50
+ store?: string;
41
51
  }
52
+ /**
53
+ * Whether a received frame is an invalidation message, field by field.
54
+ *
55
+ * A bus hands over whatever arrived on the channel. Trusted as is, a string
56
+ * `keys` was iterated character by character, any unknown `type` read as a
57
+ * delete, and a missing `keys` threw inside the handler.
58
+ */
59
+ export declare function isBusMessage(value: unknown): value is BusMessage;
42
60
  /** Duck-typed pub/sub bus for cross-instance L1 invalidation (e.g. Redis pub/sub). */
43
61
  export interface CacheBus {
44
62
  publish(message: BusMessage): void | Promise<void>;
@@ -72,6 +90,30 @@ export interface TieredDriverOptions {
72
90
  l1: CacheDriver;
73
91
  l2: CacheDriver;
74
92
  bus?: CacheBus;
93
+ /**
94
+ * Treat a failed L2 read as a miss and a failed L2 write as skipped,
95
+ * rather than failing the call (upstream `suppressL2Errors`). Default
96
+ * `true`: there is an L1 to serve from, so a Redis outage costs hit rate,
97
+ * not every request. `false` surfaces each failure as an
98
+ * {@link L2CacheError}.
99
+ *
100
+ * Invalidations — `delete`, `flush`, `deleteByTag` — report a failed L2
101
+ * either way: a removal that did not reach the shared tier leaves the
102
+ * value served to every other instance, and the caller has to know.
103
+ */
104
+ suppressL2Errors?: boolean;
105
+ /**
106
+ * After an L2 failure, skip the L2 for this long instead of waiting on a
107
+ * dead server for every call (upstream `l2CircuitBreakerDuration`).
108
+ * Off by default.
109
+ */
110
+ l2CircuitBreakerDuration?: Duration;
111
+ /**
112
+ * The store this tier belongs to, stamped on what it publishes and
113
+ * required on what it acts on. Set by the store manager from the config
114
+ * key; a tier without one acts on every well-formed message.
115
+ */
116
+ store?: string;
75
117
  }
76
118
  export declare class TieredDriver implements TaggableDriver {
77
119
  #private;
@@ -1 +1 @@
1
- {"version":3,"file":"TieredDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/TieredDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACX,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,MAAM,aAAa,CAAC;AAErB,6CAA6C;AAC7C,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,sFAAsF;AACtF,MAAM,WAAW,QAAQ;IACxB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD;;;;;;;;;OASG;IACH,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE;;;;;;;;;;;;OAYG;IACH,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,mBAAmB;IACnC,EAAE,EAAE,WAAW,CAAC;IAChB,EAAE,EAAE,WAAW,CAAC;IAChB,GAAG,CAAC,EAAE,QAAQ,CAAC;CACf;AA0DD,qBAAa,YAAa,YAAW,cAAc;;gBAStC,OAAO,EAAE,mBAAmB;IAwBxC;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8CxB,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IA+BjE,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAMhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,QAAQ,CACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC;IAkBV,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAerC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIlC,WAAW,CAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,EAAE,EACd,UAAU,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAIV,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBhD,gDAAgD;IAC1C,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG9C,8CAA8C;IACxC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5B,iEAAiE;IAC3D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBjC"}
1
+ {"version":3,"file":"TieredDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/TieredDriver.ts"],"names":[],"mappings":"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"}