valkyries 0.1.2 → 0.1.4
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.
- package/dist/bloom-filter/batching.d.mts +1 -0
- package/dist/bloom-filter/batching.d.mts.map +1 -1
- package/dist/bloom-filter/batching.mjs +1 -0
- package/dist/bloom-filter/batching.mjs.map +1 -1
- package/dist/bloom-filter/rebuilds.d.mts.map +1 -1
- package/dist/bloom-filter/rebuilds.mjs +35 -8
- package/dist/bloom-filter/rebuilds.mjs.map +1 -1
- package/dist/bloom-filter/writes.d.mts.map +1 -1
- package/dist/bloom-filter/writes.mjs +38 -12
- package/dist/bloom-filter/writes.mjs.map +1 -1
- package/dist/cache/batch-read.d.mts +1 -0
- package/dist/cache/batch-read.d.mts.map +1 -1
- package/dist/cache/batch-read.mjs +12 -16
- package/dist/cache/batch-read.mjs.map +1 -1
- package/dist/cache/deletes.d.mts.map +1 -1
- package/dist/cache/deletes.mjs +12 -7
- package/dist/cache/deletes.mjs.map +1 -1
- package/dist/cache/mutations.d.mts.map +1 -1
- package/dist/cache/mutations.mjs +38 -14
- package/dist/cache/mutations.mjs.map +1 -1
- package/dist/cache/set-if-not-invalidated-events.d.mts.map +1 -1
- package/dist/cache/set-if-not-invalidated-events.mjs +27 -12
- package/dist/cache/set-if-not-invalidated-events.mjs.map +1 -1
- package/dist/dynamic-config/storage.d.mts +6 -5
- package/dist/dynamic-config/storage.d.mts.map +1 -1
- package/dist/dynamic-config/storage.mjs +21 -8
- package/dist/dynamic-config/storage.mjs.map +1 -1
- package/dist/dynamic-config.d.mts +2 -0
- package/dist/dynamic-config.d.mts.map +1 -1
- package/dist/dynamic-config.mjs +33 -10
- package/dist/dynamic-config.mjs.map +1 -1
- package/dist/rate-limiter.d.mts.map +1 -1
- package/dist/rate-limiter.mjs +19 -2
- package/dist/rate-limiter.mjs.map +1 -1
- package/dist/shutdown.d.mts.map +1 -1
- package/dist/shutdown.mjs +15 -2
- package/dist/shutdown.mjs.map +1 -1
- package/docs/testing-and-ci.md +4 -0
- package/package.json +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batching.d.mts","sourceRoot":"","sources":["../../bloom-filter/batching.mts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAiB,UAAU,CACzB,KAAK,EAAE,MAAM,EAAE,EACf,SAAS,GAAE,MAAmC,GAC7C,SAAS,CAAC,MAAM,EAAE,CAAC,CAUrB"}
|
|
1
|
+
{"version":3,"file":"batching.d.mts","sourceRoot":"","sources":["../../bloom-filter/batching.mts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sCAAsC,KAAK,CAAC;AAEzD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAiB,UAAU,CACzB,KAAK,EAAE,MAAM,EAAE,EACf,SAAS,GAAE,MAAmC,GAC7C,SAAS,CAAC,MAAM,EAAE,CAAC,CAUrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batching.mjs","sourceRoot":"","sources":["../../bloom-filter/batching.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,UAAU,YAAY,CAAC,SAAiB;IAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,UAAU,CACzB,KAAe,EACf,YAAoB,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;IAE9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC/B,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,KAAK,CAAC;QACZ,OAAO;IACT,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,KAAK,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"batching.mjs","sourceRoot":"","sources":["../../bloom-filter/batching.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,CAAC,MAAM,sCAAsC,GAAG,EAAE,CAAC;AAEzD,MAAM,UAAU,YAAY,CAAC,SAAiB;IAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,UAAU,CACzB,KAAe,EACf,YAAoB,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;IAE9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC/B,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,KAAK,CAAC;QACZ,OAAO;IACT,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,KAAK,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebuilds.d.mts","sourceRoot":"","sources":["../../bloom-filter/rebuilds.mts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAsB,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAUrF;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,EAChC,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"rebuilds.d.mts","sourceRoot":"","sources":["../../bloom-filter/rebuilds.mts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAsB,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAUrF;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,EAChC,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CAuDf;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E;AAED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,gBAAgB,EACvB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,SAAS,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAGzE;AAED,wBAAsB,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGzF;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5F"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { emitValkeyEvent } from "../events.mjs";
|
|
2
2
|
import { handleValkeyError } from "../errors.mjs";
|
|
3
|
-
import { chunkItems } from "./batching.mjs";
|
|
3
|
+
import { chunkItems, DEFAULT_BLOOM_FILTER_CONCURRENCY_LIMIT } from "./batching.mjs";
|
|
4
4
|
import { bloomFilterEnsureExistsScript, bloomFilterReserveScript } from "./scripts.mjs";
|
|
5
5
|
export async function rebuild(state, items) {
|
|
6
6
|
const { batchSize } = state;
|
|
@@ -18,14 +18,41 @@ export async function rebuildFromStream(state, batches, capacityOverride) {
|
|
|
18
18
|
});
|
|
19
19
|
try {
|
|
20
20
|
for await (const batch of batches) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
21
|
+
// ⚡ Bolt Optimization:
|
|
22
|
+
// What: Concurrent BF.MADD chunk processing
|
|
23
|
+
// Why: Chunks are commutative. Sending them concurrently reduces wall-clock latency via pipelining/overlap.
|
|
24
|
+
// Impact: Performance improvement proportional to batch size by fanning out chunked additions.
|
|
25
|
+
const chunks = Array.from(chunkItems(batch, state.batchSize));
|
|
26
|
+
const results = Array.from({ length: chunks.length }, () => false);
|
|
27
|
+
let firstError;
|
|
28
|
+
// We process chunks with a fixed concurrency limit to avoid overloading the client/network.
|
|
29
|
+
// We must also wait for all in-flight commands in a concurrent set to settle before
|
|
30
|
+
// potentially cleaning up or throwing, ensuring no "late" writes recreate the buildingKey.
|
|
31
|
+
const concurrencyLimit = DEFAULT_BLOOM_FILTER_CONCURRENCY_LIMIT;
|
|
32
|
+
for (let i = 0; i < chunks.length; i += concurrencyLimit) {
|
|
33
|
+
const slice = chunks.slice(i, i + concurrencyLimit);
|
|
34
|
+
const settled = await Promise.allSettled(slice.map((chunk) => state.client.customCommand(["BF.MADD", state.buildingKey, ...chunk])));
|
|
35
|
+
for (let j = 0; j < settled.length; j++) {
|
|
36
|
+
const res = settled[j];
|
|
37
|
+
if (res.status === "fulfilled") {
|
|
38
|
+
results[i + j] = true;
|
|
39
|
+
}
|
|
40
|
+
else if (firstError === undefined) {
|
|
41
|
+
firstError = res.reason;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
// Emit events for this concurrent slice in order before moving to the next slice
|
|
45
|
+
// or throwing an error, maintaining sequential event ordering for consumers.
|
|
46
|
+
for (let j = 0; j < settled.length; j++) {
|
|
47
|
+
if (results[i + j]) {
|
|
48
|
+
emitValkeyEvent("bloom-filter:add", { name: state.name, items: slice[j] });
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
if (firstError !== undefined)
|
|
52
|
+
break;
|
|
27
53
|
}
|
|
28
|
-
|
|
54
|
+
if (firstError !== undefined)
|
|
55
|
+
throw firstError;
|
|
29
56
|
}
|
|
30
57
|
await state.client.rename(state.buildingKey, state.liveKey);
|
|
31
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebuilds.mjs","sourceRoot":"","sources":["../../bloom-filter/rebuilds.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"rebuilds.mjs","sourceRoot":"","sources":["../../bloom-filter/rebuilds.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writes.d.mts","sourceRoot":"","sources":["../../bloom-filter/writes.mts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3E;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMxF;AAED,wBAAsB,SAAS,CAC7B,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"writes.d.mts","sourceRoot":"","sources":["../../bloom-filter/writes.mts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3E;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMxF;AAED,wBAAsB,SAAS,CAC7B,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAiDf"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { emitValkeyEvent } from "../events.mjs";
|
|
2
2
|
import { handleValkeyError } from "../errors.mjs";
|
|
3
|
-
import { chunkItems, luaBatchSize } from "./batching.mjs";
|
|
3
|
+
import { chunkItems, DEFAULT_BLOOM_FILTER_CONCURRENCY_LIMIT, luaBatchSize } from "./batching.mjs";
|
|
4
4
|
import { bloomFilterAddScript } from "./scripts.mjs";
|
|
5
5
|
export function add(state, items) {
|
|
6
6
|
if (items.length === 0)
|
|
@@ -23,19 +23,45 @@ export async function addOrThrow(state, items) {
|
|
|
23
23
|
}
|
|
24
24
|
export async function addStream(state, batches) {
|
|
25
25
|
for await (const batch of batches) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
26
|
+
// ⚡ Bolt Optimization:
|
|
27
|
+
// What: Concurrent BF.MADD chunk processing
|
|
28
|
+
// Why: Chunks are commutative. Sending them concurrently reduces wall-clock latency via pipelining/overlap.
|
|
29
|
+
// Impact: Performance improvement proportional to batch size by fanning out chunked additions.
|
|
30
|
+
const chunks = Array.from(chunkItems(batch, luaBatchSize(state.batchSize)));
|
|
31
|
+
const results = Array.from({ length: chunks.length });
|
|
32
|
+
let firstError;
|
|
33
|
+
// We process chunks with a fixed concurrency limit to avoid overloading the client/network.
|
|
34
|
+
// We must also wait for all in-flight commands in a concurrent set to settle before
|
|
35
|
+
// potentially throwing, ensuring no "late" writes happen after the method returns.
|
|
36
|
+
const concurrencyLimit = DEFAULT_BLOOM_FILTER_CONCURRENCY_LIMIT;
|
|
37
|
+
for (let i = 0; i < chunks.length; i += concurrencyLimit) {
|
|
38
|
+
const slice = chunks.slice(i, i + concurrencyLimit);
|
|
39
|
+
const settled = await Promise.allSettled(slice.map((chunk) => state.client.invokeScript(bloomFilterAddScript, {
|
|
40
|
+
keys: [state.liveKey, state.buildingKey],
|
|
41
|
+
args: chunk,
|
|
42
|
+
})));
|
|
43
|
+
for (let j = 0; j < settled.length; j++) {
|
|
44
|
+
const res = settled[j];
|
|
45
|
+
if (res.status === "fulfilled") {
|
|
46
|
+
results[i + j] = res.value;
|
|
35
47
|
}
|
|
36
|
-
|
|
48
|
+
else if (firstError === undefined) {
|
|
49
|
+
firstError = res.reason;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
// Emit events for this concurrent slice in order before moving to the next slice
|
|
53
|
+
// or throwing an error, maintaining sequential event ordering for consumers.
|
|
54
|
+
for (let j = 0; j < settled.length; j++) {
|
|
55
|
+
if (wroteFilter(results[i + j])) {
|
|
56
|
+
emitValkeyEvent("bloom-filter:add", { name: state.name, items: slice[j] });
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
if (firstError !== undefined)
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
if (firstError !== undefined) {
|
|
63
|
+
throw firstError;
|
|
37
64
|
}
|
|
38
|
-
await previous;
|
|
39
65
|
}
|
|
40
66
|
}
|
|
41
67
|
function addCommands(state, items) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writes.mjs","sourceRoot":"","sources":["../../bloom-filter/writes.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"writes.mjs","sourceRoot":"","sources":["../../bloom-filter/writes.mts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { ValkeyCacheSingleRead } from "./single-read.mts";
|
|
|
2
2
|
export declare abstract class ValkeyCacheBatchRead<K = string> extends ValkeyCacheSingleRead<K> {
|
|
3
3
|
cacheGetByAnyBatch<T>(batchFn: (keys: K[]) => Promise<Array<T | null | undefined>>): (keys: K[]) => Promise<Array<T | null>>;
|
|
4
4
|
getBatch(keys: K[]): Promise<Array<string | Buffer | Record<string, unknown> | null>>;
|
|
5
|
+
private trackEmptyBatchRead;
|
|
5
6
|
private trackBatchRead;
|
|
6
7
|
}
|
|
7
8
|
//# sourceMappingURL=batch-read.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-read.d.mts","sourceRoot":"","sources":["../../cache/batch-read.mts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAW1D,8BAAsB,oBAAoB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB,CAAC,CAAC,CAAC;IACrF,kBAAkB,CAAC,CAAC,EAClB,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,GAC3D,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"batch-read.d.mts","sourceRoot":"","sources":["../../cache/batch-read.mts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAW1D,8BAAsB,oBAAoB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB,CAAC,CAAC,CAAC;IACrF,kBAAkB,CAAC,CAAC,EAClB,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,GAC3D,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IA4CpC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IAgC3F,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,cAAc;CAWvB"}
|
|
@@ -15,14 +15,7 @@ export class ValkeyCacheBatchRead extends ValkeyCacheSingleRead {
|
|
|
15
15
|
return async (keys) => {
|
|
16
16
|
const { validKeys: normalizedKeys, serializedKeys, outputIndices, } = this.deduplicateKeys(keys);
|
|
17
17
|
if (normalizedKeys.length === 0) {
|
|
18
|
-
|
|
19
|
-
cacheName: this.prefix,
|
|
20
|
-
batch: true,
|
|
21
|
-
hits: 0,
|
|
22
|
-
misses: 0,
|
|
23
|
-
bloomMisses: 0,
|
|
24
|
-
duration: 0,
|
|
25
|
-
});
|
|
18
|
+
this.trackEmptyBatchRead();
|
|
26
19
|
return Array(keys.length).fill(null);
|
|
27
20
|
}
|
|
28
21
|
const scatter = (normalized) => outputIndices.map((idx) => (idx === -1 ? null : normalized[idx]));
|
|
@@ -55,14 +48,7 @@ export class ValkeyCacheBatchRead extends ValkeyCacheSingleRead {
|
|
|
55
48
|
async getBatch(keys) {
|
|
56
49
|
const { serializedKeys, outputIndices } = this.deduplicateKeys(keys);
|
|
57
50
|
if (serializedKeys.length === 0) {
|
|
58
|
-
|
|
59
|
-
cacheName: this.prefix,
|
|
60
|
-
batch: true,
|
|
61
|
-
hits: 0,
|
|
62
|
-
misses: 0,
|
|
63
|
-
bloomMisses: 0,
|
|
64
|
-
duration: 0,
|
|
65
|
-
});
|
|
51
|
+
this.trackEmptyBatchRead();
|
|
66
52
|
return Array(keys.length).fill(null);
|
|
67
53
|
}
|
|
68
54
|
const stats = new BatchReadStats();
|
|
@@ -92,6 +78,16 @@ export class ValkeyCacheBatchRead extends ValkeyCacheSingleRead {
|
|
|
92
78
|
this.trackBatchRead(start, stats);
|
|
93
79
|
}
|
|
94
80
|
}
|
|
81
|
+
trackEmptyBatchRead() {
|
|
82
|
+
trackCacheCall({
|
|
83
|
+
cacheName: this.prefix,
|
|
84
|
+
batch: true,
|
|
85
|
+
hits: 0,
|
|
86
|
+
misses: 0,
|
|
87
|
+
bloomMisses: 0,
|
|
88
|
+
duration: 0,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
95
91
|
trackBatchRead(start, stats) {
|
|
96
92
|
trackCacheCall({
|
|
97
93
|
cacheName: this.prefix,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-read.mjs","sourceRoot":"","sources":["../../cache/batch-read.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,MAAM,cAAc;IAClB,IAAI,GAAG,CAAC,CAAC;IACT,MAAM,GAAG,CAAC,CAAC;IACX,WAAW,GAAG,CAAC,CAAC;IAChB,OAAO,GAAa,EAAE,CAAC;IACvB,QAAQ,GAAa,EAAE,CAAC;IACxB,aAAa,GAAa,EAAE,CAAC;CAC9B;AAED,MAAM,OAAgB,oBAAiC,SAAQ,qBAAwB;IACrF,kBAAkB,CAChB,OAA4D;QAE5D,OAAO,KAAK,EAAE,IAAS,EAA4B,EAAE;YACnD,MAAM,EACJ,SAAS,EAAE,cAAc,EACzB,cAAc,EACd,aAAa,GACd,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,
|
|
1
|
+
{"version":3,"file":"batch-read.mjs","sourceRoot":"","sources":["../../cache/batch-read.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deletes.d.mts","sourceRoot":"","sources":["../../cache/deletes.mts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,qBAAa,kBAAkB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACnE,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"deletes.d.mts","sourceRoot":"","sources":["../../cache/deletes.mts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,qBAAa,kBAAkB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACnE,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;cA2B3B,qBAAqB,CAAC,GAAG,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAQnF,UAAU;WAIG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,6CAAoB;CAOnE"}
|
package/dist/cache/deletes.mjs
CHANGED
|
@@ -7,13 +7,18 @@ import { ValkeyCacheMutations } from "./mutations.mjs";
|
|
|
7
7
|
export class ValkeyCacheDeletes extends ValkeyCacheMutations {
|
|
8
8
|
async delete(...keys) {
|
|
9
9
|
const serializedKeys = [];
|
|
10
|
-
const keyArray =
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
const keyArray = [];
|
|
11
|
+
// ⚡ Bolt Optimization:
|
|
12
|
+
// What: Use an indexed loop for the delete key transform.
|
|
13
|
+
// Why: Avoids iterator overhead while preserving the single-pass batch path.
|
|
14
|
+
// Impact: Reduces allocation pressure and improves throughput for batch operations.
|
|
15
|
+
for (let i = 0; i < keys.length; i++) {
|
|
16
|
+
const serialized = this.toSerializedKey(keys[i]);
|
|
17
|
+
if (serialized !== null) {
|
|
18
|
+
serializedKeys.push(serialized);
|
|
19
|
+
keyArray.push(this.getSerializedCacheKey(serialized));
|
|
20
|
+
}
|
|
21
|
+
}
|
|
17
22
|
if (keyArray.length === 0)
|
|
18
23
|
return 0;
|
|
19
24
|
const invalidationKeys = serializedKeys.map((key) => this.getSerializedInvalidationKey(key));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deletes.mjs","sourceRoot":"","sources":["../../cache/deletes.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,iCAAiC,GAClC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,MAAM,OAAO,kBAA+B,SAAQ,oBAAuB;IACzE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAS;QACvB,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"deletes.mjs","sourceRoot":"","sources":["../../cache/deletes.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutations.d.mts","sourceRoot":"","sources":["../../cache/mutations.mts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"mutations.d.mts","sourceRoot":"","sources":["../../cache/mutations.mts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAKxD,8BAAsB,oBAAoB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC9E,WAAW,CAAC,CAAC,EACjB,OAAO,EAAE,CAAC,EAAE,EACZ,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,GACpD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAkCpB,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM;IAMlC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cA8BvE,kBAAkB,CAChC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;cAUA,kCAAkC,CAChD,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;cASA,wBAAwB,CACtC,OAAO,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GACvD,OAAO,CAAC,IAAI,CAAC;IAuBhB,OAAO,CAAC,kBAAkB;YAMZ,oCAAoC;IAoBlD,OAAO,CAAC,qBAAqB;YAsBf,sBAAsB;IASpC,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,0BAA0B;CAInC"}
|
package/dist/cache/mutations.mjs
CHANGED
|
@@ -6,6 +6,7 @@ import { trackCacheCall } from "../cache-metrics.mjs";
|
|
|
6
6
|
import { cacheSetIfNotInvalidatedScript } from "./constants.mjs";
|
|
7
7
|
import { ValkeyCacheBatchRead } from "./batch-read.mjs";
|
|
8
8
|
import { emitSetIfNotInvalidatedEvents } from "./set-if-not-invalidated-events.mjs";
|
|
9
|
+
const REFRESH_ALIAS_DEDUPE_THRESHOLD = 30;
|
|
9
10
|
export class ValkeyCacheMutations extends ValkeyCacheBatchRead {
|
|
10
11
|
async refreshById(aliases, fetchByKey) {
|
|
11
12
|
const aliasState = this.collectRefreshAliases(aliases);
|
|
@@ -23,12 +24,13 @@ export class ValkeyCacheMutations extends ValkeyCacheBatchRead {
|
|
|
23
24
|
expiry: { type: TimeUnit.Seconds, count: ttl },
|
|
24
25
|
});
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
.exec(batch,
|
|
28
|
-
.then(() => {
|
|
27
|
+
try {
|
|
28
|
+
await this.client.exec(batch, true);
|
|
29
29
|
emitValkeyEvent("cache:set", { cacheName: this.prefix, keys: aliasState.serializedKeys });
|
|
30
|
-
}
|
|
31
|
-
|
|
30
|
+
}
|
|
31
|
+
catch (cause) {
|
|
32
|
+
handleValkeyError(cause);
|
|
33
|
+
}
|
|
32
34
|
return normalizedResult;
|
|
33
35
|
}
|
|
34
36
|
finally {
|
|
@@ -70,7 +72,7 @@ export class ValkeyCacheMutations extends ValkeyCacheBatchRead {
|
|
|
70
72
|
if (writtenKeys.length === 0)
|
|
71
73
|
return;
|
|
72
74
|
try {
|
|
73
|
-
await this.client.exec(batch,
|
|
75
|
+
await this.client.exec(batch, true);
|
|
74
76
|
}
|
|
75
77
|
catch (cause) {
|
|
76
78
|
handleValkeyError(cause);
|
|
@@ -143,15 +145,28 @@ export class ValkeyCacheMutations extends ValkeyCacheBatchRead {
|
|
|
143
145
|
}
|
|
144
146
|
collectRefreshAliases(aliases) {
|
|
145
147
|
let firstValidAlias = null;
|
|
146
|
-
const
|
|
147
|
-
|
|
148
|
+
const serializedKeys = [];
|
|
149
|
+
const len = aliases.length;
|
|
150
|
+
const useSet = len > REFRESH_ALIAS_DEDUPE_THRESHOLD;
|
|
151
|
+
const seenSet = useSet ? new Set() : null;
|
|
152
|
+
for (let i = 0; i < len; i++) {
|
|
153
|
+
const key = aliases[i];
|
|
148
154
|
const serialized = this.toSerializedKey(key);
|
|
149
155
|
if (serialized === null)
|
|
150
156
|
continue;
|
|
151
|
-
firstValidAlias
|
|
152
|
-
|
|
157
|
+
if (firstValidAlias === null)
|
|
158
|
+
firstValidAlias = key;
|
|
159
|
+
if (seenSet !== null) {
|
|
160
|
+
if (seenSet.has(serialized))
|
|
161
|
+
continue;
|
|
162
|
+
seenSet.add(serialized);
|
|
163
|
+
serializedKeys.push(serialized);
|
|
164
|
+
}
|
|
165
|
+
else if (!serializedKeys.includes(serialized)) {
|
|
166
|
+
serializedKeys.push(serialized);
|
|
167
|
+
}
|
|
153
168
|
}
|
|
154
|
-
return { firstValidAlias, serializedKeys
|
|
169
|
+
return { firstValidAlias, serializedKeys };
|
|
155
170
|
}
|
|
156
171
|
async serializeRefreshResult(value) {
|
|
157
172
|
try {
|
|
@@ -164,10 +179,19 @@ export class ValkeyCacheMutations extends ValkeyCacheBatchRead {
|
|
|
164
179
|
}
|
|
165
180
|
}
|
|
166
181
|
withSerializedKeys(entries) {
|
|
167
|
-
|
|
182
|
+
const result = [];
|
|
183
|
+
// ⚡ Bolt Optimization:
|
|
184
|
+
// What: Use an indexed loop for serialized-key filtering.
|
|
185
|
+
// Why: Avoids iterator overhead in this dense-array hot path.
|
|
186
|
+
// Impact: Reduces GC pressure and improves throughput for batch operations.
|
|
187
|
+
for (let i = 0; i < entries.length; i++) {
|
|
188
|
+
const entry = entries[i];
|
|
168
189
|
const serializedKey = this.toSerializedKey(entry.key);
|
|
169
|
-
|
|
170
|
-
|
|
190
|
+
if (serializedKey !== null) {
|
|
191
|
+
result.push({ ...entry, serializedKey });
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
return result;
|
|
171
195
|
}
|
|
172
196
|
entryTtl(entry) {
|
|
173
197
|
if (entry.ttl != null && entry.ttl > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutations.mjs","sourceRoot":"","sources":["../../cache/mutations.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAoB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF,MAAM,OAAgB,oBAAiC,SAAQ,oBAAuB;IACpF,KAAK,CAAC,WAAW,CACf,OAAY,EACZ,UAAqD;QAErD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACvD,IAAI,UAAU,CAAC,eAAe,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QACrD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;YAC5D,MAAM,gBAAgB,GAAG,MAAM,IAAI,IAAI,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;YACvE,MAAM,GAAG,GAAG,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAChE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,cAAc,EAAE,CAAC;gBAC5C,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE;oBACrD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE;iBAC/C,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,MAAM
|
|
1
|
+
{"version":3,"file":"mutations.mjs","sourceRoot":"","sources":["../../cache/mutations.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-if-not-invalidated-events.d.mts","sourceRoot":"","sources":["../../cache/set-if-not-invalidated-events.mts"],"names":[],"mappings":"AAEA,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,KAAK,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,EACzC,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"set-if-not-invalidated-events.d.mts","sourceRoot":"","sources":["../../cache/set-if-not-invalidated-events.mts"],"names":[],"mappings":"AAEA,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,KAAK,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,EACzC,OAAO,EAAE,OAAO,QAgCjB"}
|
|
@@ -1,17 +1,32 @@
|
|
|
1
1
|
import { emitValkeyEvent } from "../events.mjs";
|
|
2
2
|
export function emitSetIfNotInvalidatedEvents(prefix, entries, results) {
|
|
3
|
-
const writtenKeys =
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
3
|
+
const writtenKeys = [];
|
|
4
|
+
const skippedKeys = [];
|
|
5
|
+
// ⚡ Bolt Optimization:
|
|
6
|
+
// What: Use indexed loops for set/invalidation event routing.
|
|
7
|
+
// Why: Avoids iterator overhead while keeping result and entry indexes aligned.
|
|
8
|
+
// Impact: Reduces GC pressure and improves throughput for batch operations.
|
|
9
|
+
if (Array.isArray(results)) {
|
|
10
|
+
const isCompleteResult = results.length === entries.length;
|
|
11
|
+
for (let i = 0; i < entries.length; i++) {
|
|
12
|
+
const entry = entries[i];
|
|
13
|
+
const result = results[i];
|
|
14
|
+
if (result == null)
|
|
15
|
+
continue;
|
|
16
|
+
if (result === 1 || result === 1n) {
|
|
17
|
+
writtenKeys.push(entry.serializedKey);
|
|
18
|
+
}
|
|
19
|
+
else if (isCompleteResult && (result === 0 || result === 0n)) {
|
|
20
|
+
skippedKeys.push(entry.serializedKey);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
for (let i = 0; i < entries.length; i++) {
|
|
26
|
+
const entry = entries[i];
|
|
27
|
+
writtenKeys.push(entry.serializedKey);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
15
30
|
if (writtenKeys.length > 0)
|
|
16
31
|
emitValkeyEvent("cache:set", { cacheName: prefix, keys: writtenKeys });
|
|
17
32
|
if (skippedKeys.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-if-not-invalidated-events.mjs","sourceRoot":"","sources":["../../cache/set-if-not-invalidated-events.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,UAAU,6BAA6B,CAC3C,MAAc,EACd,OAAyC,EACzC,OAAgB;IAEhB,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"set-if-not-invalidated-events.mjs","sourceRoot":"","sources":["../../cache/set-if-not-invalidated-events.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,UAAU,6BAA6B,CAC3C,MAAc,EACd,OAAyC,EACzC,OAAgB;IAEhB,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,uBAAuB;IACvB,8DAA8D;IAC9D,gFAAgF;IAChF,4EAA4E;IAC5E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;QAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,MAAM,IAAI,IAAI;gBAAE,SAAS;YAC7B,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;gBAClC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACxC,CAAC;iBAAM,IAAI,gBAAgB,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;gBAC/D,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QACxB,eAAe,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IACzE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,eAAe,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IACjF,CAAC;AACH,CAAC"}
|
|
@@ -1,26 +1,27 @@
|
|
|
1
1
|
import type { DynamicConfigField, DynamicConfigFieldType } from "../types.mts";
|
|
2
2
|
import type { GlideClient } from "@valkey/valkey-glide";
|
|
3
3
|
export declare const dynamicConfigSetFieldsScript: import("@valkey/valkey-glide").Script;
|
|
4
|
-
export declare function getDynamicConfigFieldsMap(key: string, client?: GlideClient): Promise<
|
|
4
|
+
export declare function getDynamicConfigFieldsMap(key: string, client?: GlideClient): Promise<Record<string, {
|
|
5
5
|
field: unknown;
|
|
6
6
|
value: unknown;
|
|
7
7
|
}>>;
|
|
8
|
-
export declare function applyFieldsFromMap({ fields, fieldsMap, fieldTypes, defaultFields, }: {
|
|
8
|
+
export declare function applyFieldsFromMap({ fields, fieldsMap, fieldTypes, defaultFields, skipFieldNames, }: {
|
|
9
9
|
fields: Map<string, DynamicConfigField>;
|
|
10
|
-
fieldsMap:
|
|
10
|
+
fieldsMap: Record<string, {
|
|
11
11
|
field: unknown;
|
|
12
12
|
value: unknown;
|
|
13
13
|
}>;
|
|
14
14
|
fieldTypes: Record<string, DynamicConfigFieldType>;
|
|
15
15
|
defaultFields: Record<string, DynamicConfigField>;
|
|
16
|
-
|
|
16
|
+
skipFieldNames?: ReadonlySet<string>;
|
|
17
|
+
}): Promise<void>;
|
|
17
18
|
export declare function writeDynamicConfigFields({ key, args, client, }: {
|
|
18
19
|
key: string;
|
|
19
20
|
args: string[];
|
|
20
21
|
client?: GlideClient;
|
|
21
22
|
}): Promise<void>;
|
|
22
23
|
export declare function buildMissingDefaultWrites({ fieldsMap, fieldTypes, defaultFields, }: {
|
|
23
|
-
fieldsMap:
|
|
24
|
+
fieldsMap: Record<string, {
|
|
24
25
|
field: unknown;
|
|
25
26
|
value: unknown;
|
|
26
27
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.mts","sourceRoot":"","sources":["../../dynamic-config/storage.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,4BAA4B,uCAExC,CAAC;AAEF,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,WAAuC,GAC9C,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"storage.d.mts","sourceRoot":"","sources":["../../dynamic-config/storage.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,4BAA4B,uCAExC,CAAC;AAEF,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,WAAuC,GAC9C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,CAW7D;AAED,wBAAsB,kBAAkB,CAAC,EACvC,MAAM,EACN,SAAS,EACT,UAAU,EACV,aAAa,EACb,cAAc,GACf,EAAE;IACD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACxC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAClD,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACtC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,GAAG,EACH,IAAI,EACJ,MAAkC,GACnC,EAAE;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,iBAGA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,SAAS,EACT,UAAU,EACV,aAAa,GACd,EAAE;IACD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CACnD;;;EAaA"}
|
|
@@ -4,23 +4,33 @@ import { parseField, stringifyField } from "./fields.mjs";
|
|
|
4
4
|
export const dynamicConfigSetFieldsScript = registerScript(loadScript("dynamic-config-set-fields.lua", new URL("../", import.meta.url)));
|
|
5
5
|
export async function getDynamicConfigFieldsMap(key, client = dynamicConfigValkeyClient) {
|
|
6
6
|
const fields = await client.hgetall(key);
|
|
7
|
-
const fieldsMap =
|
|
7
|
+
const fieldsMap = {};
|
|
8
8
|
if (Array.isArray(fields)) {
|
|
9
9
|
for (const entry of fields) {
|
|
10
|
-
if (entry &&
|
|
11
|
-
fieldsMap
|
|
10
|
+
if (isFieldEntry(entry) && entry.field != null) {
|
|
11
|
+
fieldsMap[entry.field.toString()] = entry;
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
return fieldsMap;
|
|
16
16
|
}
|
|
17
|
-
export function applyFieldsFromMap({ fields, fieldsMap, fieldTypes, defaultFields, }) {
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
export async function applyFieldsFromMap({ fields, fieldsMap, fieldTypes, defaultFields, skipFieldNames, }) {
|
|
18
|
+
let parsedCount = 0;
|
|
19
|
+
for (const name in fieldTypes) {
|
|
20
|
+
if (!Object.hasOwn(fieldTypes, name))
|
|
21
|
+
continue;
|
|
22
|
+
const type = fieldTypes[name];
|
|
23
|
+
const valkeyEntry = fieldsMap[name];
|
|
20
24
|
const value = valkeyEntry?.value != null
|
|
21
25
|
? parseField(type, stringifyValkeyField(valkeyEntry.value))
|
|
22
26
|
: defaultFields[name];
|
|
23
|
-
|
|
27
|
+
if (!skipFieldNames?.has(name)) {
|
|
28
|
+
fields.set(name, value);
|
|
29
|
+
}
|
|
30
|
+
// ⚡ Bolt: Yield to the event loop every 1000 fields to prevent blocking when applying huge configs.
|
|
31
|
+
if (++parsedCount % 1000 === 0) {
|
|
32
|
+
await new Promise((resolve) => setImmediate(resolve));
|
|
33
|
+
}
|
|
24
34
|
}
|
|
25
35
|
}
|
|
26
36
|
export async function writeDynamicConfigFields({ key, args, client = dynamicConfigValkeyClient, }) {
|
|
@@ -32,7 +42,7 @@ export function buildMissingDefaultWrites({ fieldsMap, fieldTypes, defaultFields
|
|
|
32
42
|
const toApply = [];
|
|
33
43
|
const writeArgs = [];
|
|
34
44
|
for (const [name, type] of Object.entries(fieldTypes)) {
|
|
35
|
-
const valkeyEntry = fieldsMap
|
|
45
|
+
const valkeyEntry = fieldsMap[name];
|
|
36
46
|
const value = valkeyEntry?.value != null
|
|
37
47
|
? parseField(type, stringifyValkeyField(valkeyEntry.value))
|
|
38
48
|
: defaultFields[name];
|
|
@@ -52,4 +62,7 @@ function stringifyValkeyField(value) {
|
|
|
52
62
|
}
|
|
53
63
|
return JSON.stringify(value) ?? "";
|
|
54
64
|
}
|
|
65
|
+
function isFieldEntry(entry) {
|
|
66
|
+
return !!entry && typeof entry === "object" && "field" in entry && "value" in entry;
|
|
67
|
+
}
|
|
55
68
|
//# sourceMappingURL=storage.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.mjs","sourceRoot":"","sources":["../../dynamic-config/storage.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAG5D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,cAAc,CACxD,UAAU,CAAC,+BAA+B,EAAE,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAC7E,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAW,EACX,SAAsB,yBAAyB;IAE/C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"storage.mjs","sourceRoot":"","sources":["../../dynamic-config/storage.mts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,8 @@ export declare class DynamicConfig {
|
|
|
11
11
|
private client;
|
|
12
12
|
private closed;
|
|
13
13
|
private lastRefresh;
|
|
14
|
+
private isRefreshing;
|
|
15
|
+
private refreshUpdatedFields;
|
|
14
16
|
private refreshTimer;
|
|
15
17
|
private readonly messageHandler;
|
|
16
18
|
constructor(options: DynamicConfigOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-config.d.mts","sourceRoot":"","sources":["../dynamic-config.mts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAQpG,OAAO,EACL,UAAU,EAEV,cAAc,EAEf,MAAM,6BAA6B,CAAC;AAIrC,eAAO,MAAM,cAAc,EAAE,aAAa,EAAO,CAAC;AAElD,qBAAa,aAAa;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAClD,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqD;gBAExE,OAAO,EAAE,oBAAoB;IAqBnC,UAAU;
|
|
1
|
+
{"version":3,"file":"dynamic-config.d.mts","sourceRoot":"","sources":["../dynamic-config.mts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAQpG,OAAO,EACL,UAAU,EAEV,cAAc,EAEf,MAAM,6BAA6B,CAAC;AAIrC,eAAO,MAAM,cAAc,EAAE,aAAa,EAAO,CAAC;AAElD,qBAAa,aAAa;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAClD,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,oBAAoB,CAA4B;IACxD,OAAO,CAAC,YAAY,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqD;gBAExE,OAAO,EAAE,oBAAoB;IAqBnC,UAAU;IAwBV,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C,OAAO,CAAC,kBAAkB;IAI1B,cAAc,wBAAkB;IAChC,UAAU,oBAAc;IAExB,OAAO,CAAC,YAAY;YAIN,kBAAkB;IAa1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,WAAW,IAAI,IAAI;IAInB,OAAO,CAAC,mBAAmB;IAgB3B,kBAAkB;IASlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAYhB,OAAO;IAyBb,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAUzC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B1E,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGjE"}
|
package/dist/dynamic-config.mjs
CHANGED
|
@@ -15,6 +15,8 @@ export class DynamicConfig {
|
|
|
15
15
|
client;
|
|
16
16
|
closed = false;
|
|
17
17
|
lastRefresh = 0;
|
|
18
|
+
isRefreshing = false;
|
|
19
|
+
refreshUpdatedFields = null;
|
|
18
20
|
refreshTimer = null;
|
|
19
21
|
messageHandler = (msg) => this.handlePubSubMessage(msg);
|
|
20
22
|
constructor(options) {
|
|
@@ -46,6 +48,8 @@ export class DynamicConfig {
|
|
|
46
48
|
defaultFields: this.defaultFields,
|
|
47
49
|
});
|
|
48
50
|
await writeDynamicConfigFields({ key: this.key, args: writeArgs, client: this.client });
|
|
51
|
+
// Keep identity stable for callers that captured `fields` by reference.
|
|
52
|
+
this.fields.clear();
|
|
49
53
|
for (const [name, value] of toApply) {
|
|
50
54
|
this.fields.set(name, value);
|
|
51
55
|
}
|
|
@@ -68,12 +72,13 @@ export class DynamicConfig {
|
|
|
68
72
|
getFieldsMap() {
|
|
69
73
|
return getDynamicConfigFieldsMap(this.key, this.client);
|
|
70
74
|
}
|
|
71
|
-
applyFieldsFromMap(fieldsMap) {
|
|
72
|
-
applyFieldsFromMap({
|
|
75
|
+
async applyFieldsFromMap(fieldsMap, skipFieldNames = new Set()) {
|
|
76
|
+
await applyFieldsFromMap({
|
|
73
77
|
fields: this.fields,
|
|
74
78
|
fieldsMap,
|
|
75
79
|
fieldTypes: this.fieldTypes,
|
|
76
80
|
defaultFields: this.defaultFields,
|
|
81
|
+
skipFieldNames,
|
|
77
82
|
});
|
|
78
83
|
}
|
|
79
84
|
async subscribe() {
|
|
@@ -99,6 +104,7 @@ export class DynamicConfig {
|
|
|
99
104
|
const type = this.fieldTypes[fieldName];
|
|
100
105
|
if (!type)
|
|
101
106
|
return;
|
|
107
|
+
this.refreshUpdatedFields?.add(fieldName);
|
|
102
108
|
const value = parseField(type, msg.message.toString());
|
|
103
109
|
this.fields.set(fieldName, value);
|
|
104
110
|
}
|
|
@@ -125,13 +131,18 @@ export class DynamicConfig {
|
|
|
125
131
|
async refresh() {
|
|
126
132
|
if (this.closed)
|
|
127
133
|
return;
|
|
134
|
+
if (this.isRefreshing)
|
|
135
|
+
return;
|
|
128
136
|
const now = Date.now();
|
|
129
137
|
if (now - this.lastRefresh < this.staleTtl * 1000)
|
|
130
138
|
return;
|
|
131
139
|
this.lastRefresh = now; // Optimistic claim: prevents concurrent duplicate refreshes
|
|
140
|
+
const refreshUpdatedFields = new Set();
|
|
141
|
+
this.refreshUpdatedFields = refreshUpdatedFields;
|
|
142
|
+
this.isRefreshing = true;
|
|
132
143
|
try {
|
|
133
144
|
const fieldsMap = await this.getFieldsMap();
|
|
134
|
-
this.applyFieldsFromMap(fieldsMap);
|
|
145
|
+
await this.applyFieldsFromMap(fieldsMap, refreshUpdatedFields);
|
|
135
146
|
}
|
|
136
147
|
catch (err) {
|
|
137
148
|
/* v8 ignore next -- transient Valkey failures are environment-dependent. */
|
|
@@ -139,6 +150,12 @@ export class DynamicConfig {
|
|
|
139
150
|
/* v8 ignore next -- rethrow preserves caller-visible refresh failure semantics. */
|
|
140
151
|
throw err;
|
|
141
152
|
}
|
|
153
|
+
finally {
|
|
154
|
+
if (this.refreshUpdatedFields === refreshUpdatedFields) {
|
|
155
|
+
this.refreshUpdatedFields = null;
|
|
156
|
+
}
|
|
157
|
+
this.isRefreshing = false;
|
|
158
|
+
}
|
|
142
159
|
}
|
|
143
160
|
getFields() {
|
|
144
161
|
const result = {};
|
|
@@ -150,20 +167,26 @@ export class DynamicConfig {
|
|
|
150
167
|
// set the fields in valkey and publish change events atomically via Lua script,
|
|
151
168
|
// then apply local state only after a successful write
|
|
152
169
|
async setFields(fields) {
|
|
153
|
-
const
|
|
170
|
+
const toApplyNames = [];
|
|
171
|
+
const toApplyValues = [];
|
|
154
172
|
const args = [];
|
|
155
|
-
for
|
|
156
|
-
|
|
173
|
+
// Use for-in to iterate over fields without allocating an array of entries
|
|
174
|
+
for (const name in fields) {
|
|
175
|
+
if (!Object.hasOwn(fields, name))
|
|
176
|
+
continue;
|
|
177
|
+
const type = this.fieldTypes[name];
|
|
178
|
+
if (!type) {
|
|
157
179
|
throw new Error(`Unknown field: ${name}`);
|
|
158
180
|
}
|
|
159
|
-
const
|
|
181
|
+
const value = fields[name];
|
|
160
182
|
const processedValue = processFieldValue(type, value);
|
|
161
|
-
|
|
183
|
+
toApplyNames.push(name);
|
|
184
|
+
toApplyValues.push(processedValue);
|
|
162
185
|
args.push(name, stringifyField(type, processedValue));
|
|
163
186
|
}
|
|
164
187
|
await writeDynamicConfigFields({ key: this.key, args, client: this.client });
|
|
165
|
-
for (
|
|
166
|
-
this.fields.set(
|
|
188
|
+
for (let i = 0; i < toApplyNames.length; i += 1) {
|
|
189
|
+
this.fields.set(toApplyNames[i], toApplyValues[i]);
|
|
167
190
|
}
|
|
168
191
|
}
|
|
169
192
|
setField(name, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-config.mjs","sourceRoot":"","sources":["../dynamic-config.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,2CAA2C,EAC3C,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC;AAE/C,MAAM,CAAC,MAAM,cAAc,GAAoB,EAAE,CAAC;AAElD,MAAM,OAAO,aAAa;IACxB,QAAQ,CAAS;IACjB,GAAG,CAAS;IACZ,MAAM,CAAkC;IACxC,UAAU,CAAyC;IACnD,aAAa,CAAqC;IAClD,cAAc,CAAgB;IACtB,MAAM,CAAc;IACpB,MAAM,GAAY,KAAK,CAAC;IACxB,WAAW,GAAW,CAAC,CAAC;IACxB,YAAY,GAA0C,IAAI,CAAC;IAClD,cAAc,GAAG,CAAC,GAAc,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAEpF,YAAY,OAA6B;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC,GAAG,GAAG,GAAG,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,yBAAyB,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,uFAAuF;QACvF,IAAI,CAAC,MAAM,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,8FAA8F;QAC9F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,yBAAyB,CAAC;YACvD,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QACH,MAAM,wBAAwB,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dynamic-config.mjs","sourceRoot":"","sources":["../dynamic-config.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.d.mts","sourceRoot":"","sources":["../rate-limiter.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limiter.d.mts","sourceRoot":"","sources":["../rate-limiter.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAexD,qBAAa,WAAW;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,MAAM,CAAc;gBAEhB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAgC,EAAE,EAAE,kBAAkB;IAQlF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE;IAkBvB;;;;;;;;;;;OAWG;IACG,WAAW,CACf,GAAG,EAAE,MAAM,EAAE,EACb,SAAS,EAAE,MAAM,EACjB,UAAU,SAAW,GACpB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAsClD;;;OAGG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,SAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAK9F;;;OAGG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,UAAU,SAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAiB5D,MAAM,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE;IAU7B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,UAAU;WAIG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,cAA0B;CAQzE"}
|
package/dist/rate-limiter.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { rateLimiterValkeyClient } from "./clients.mjs";
|
|
2
2
|
import { loadScript, registerScript } from "./scripts.mjs";
|
|
3
|
+
import { randomUUID } from "node:crypto";
|
|
3
4
|
import { deleteKeysWithPrefix } from "./delete.mjs";
|
|
4
5
|
import { emitValkeyEvent } from "./events.mjs";
|
|
5
6
|
import { normalizeCountResult } from "./utils.mjs";
|
|
@@ -27,7 +28,15 @@ export class RateLimiter {
|
|
|
27
28
|
return;
|
|
28
29
|
const keys = filteredIds.map((id) => this.getKey(id));
|
|
29
30
|
// Single script call for all keys (server time is used in script)
|
|
30
|
-
|
|
31
|
+
// Use CSPRNG to prevent predictability and collisions.
|
|
32
|
+
// Optimization: Generate one UUID and append index to avoid calling CSPRNG N times.
|
|
33
|
+
const base = randomUUID();
|
|
34
|
+
const args = [];
|
|
35
|
+
args.length = keys.length + 1;
|
|
36
|
+
args[0] = this.ttl.toString();
|
|
37
|
+
for (let i = 0; i < keys.length; i++) {
|
|
38
|
+
args[i + 1] = `${base}-${i}`;
|
|
39
|
+
}
|
|
31
40
|
await this.client.invokeScript(rateLimiterAddScript, { keys, args });
|
|
32
41
|
emitValkeyEvent("rate-limiter:add", { prefix: this.prefix, ids: filteredIds });
|
|
33
42
|
}
|
|
@@ -48,7 +57,15 @@ export class RateLimiter {
|
|
|
48
57
|
if (filteredIds.length === 0)
|
|
49
58
|
return { counts: [], limited: false };
|
|
50
59
|
const keys = filteredIds.map((id) => this.getKey(id));
|
|
51
|
-
|
|
60
|
+
// Use CSPRNG to prevent predictability and collisions.
|
|
61
|
+
// Optimization: Generate one UUID and append index to avoid calling CSPRNG N times.
|
|
62
|
+
const base = randomUUID();
|
|
63
|
+
const args = [];
|
|
64
|
+
args.length = keys.length + 1;
|
|
65
|
+
args[0] = ttlSeconds.toString();
|
|
66
|
+
for (let i = 0; i < keys.length; i++) {
|
|
67
|
+
args[i + 1] = `${base}-${i}`;
|
|
68
|
+
}
|
|
52
69
|
const results = await this.client.invokeScript(rateLimiterAddAndCheckScript, {
|
|
53
70
|
keys,
|
|
54
71
|
args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.mjs","sourceRoot":"","sources":["../rate-limiter.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,SAAS,GAAG,cAAc,CAAC;AAEjC,MAAM,oBAAoB,GAAG,cAAc,CAAC,UAAU,CAAC,sBAAsB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACjG,MAAM,oBAAoB,GAAG,cAAc,CAAC,UAAU,CAAC,sBAAsB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACjG,MAAM,4BAA4B,GAAG,cAAc,CACjD,UAAU,CAAC,gCAAgC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAC9D,CAAC;AAEF,MAAM,OAAO,WAAW;IACtB,MAAM,CAAS;IACf,GAAG,CAAS;IACJ,MAAM,CAAc;IAE5B,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,uBAAuB,EAAsB;QACtF,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC9D,IAAI,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACzF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAa;QACrB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACrC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,kEAAkE;QAClE,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"rate-limiter.mjs","sourceRoot":"","sources":["../rate-limiter.mts"],"names":[],"mappings":"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"}
|
package/dist/shutdown.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown.d.mts","sourceRoot":"","sources":["../shutdown.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shutdown.d.mts","sourceRoot":"","sources":["../shutdown.mts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,IAAI,CAgBvD,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAlBa,OAAO,CAAC,IAAI,CAkBJ,CAAC"}
|
package/dist/shutdown.mjs
CHANGED
|
@@ -2,17 +2,30 @@ import { urlsToClients, closeDynamicConfigValkeySubscriptionClient } from "./cli
|
|
|
2
2
|
import { dynamicConfigs } from "./dynamic-config.mjs";
|
|
3
3
|
import { handleValkeyError } from "./errors.mjs";
|
|
4
4
|
let shutdown = false;
|
|
5
|
+
/**
|
|
6
|
+
* Executes a close method safely, converting synchronous returns and throws into promises.
|
|
7
|
+
* This avoids the overhead of wrapping with Promise.resolve().then() for each item
|
|
8
|
+
* which creates unnecessary wrapper Promises and microtasks during shutdown.
|
|
9
|
+
*/
|
|
10
|
+
const safeClose = (obj) => {
|
|
11
|
+
try {
|
|
12
|
+
return obj.close();
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
return Promise.reject(error);
|
|
16
|
+
}
|
|
17
|
+
};
|
|
5
18
|
export const onGracefulShutdown = async () => {
|
|
6
19
|
if (shutdown)
|
|
7
20
|
return;
|
|
8
21
|
shutdown = true;
|
|
9
|
-
const configResults = await Promise.allSettled([...dynamicConfigs].map(
|
|
22
|
+
const configResults = await Promise.allSettled([...dynamicConfigs].map(safeClose));
|
|
10
23
|
for (const result of configResults) {
|
|
11
24
|
if (result.status === "rejected")
|
|
12
25
|
handleValkeyError(toError(result.reason));
|
|
13
26
|
}
|
|
14
27
|
const results = await Promise.allSettled([
|
|
15
|
-
...
|
|
28
|
+
...Array.from(urlsToClients.values(), safeClose),
|
|
16
29
|
closeDynamicConfigValkeySubscriptionClient(),
|
|
17
30
|
]);
|
|
18
31
|
for (const result of results) {
|
package/dist/shutdown.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown.mjs","sourceRoot":"","sources":["../shutdown.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,0CAA0C,EAAE,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,IAAI,QAAQ,GAAG,KAAK,CAAC;AAErB,MAAM,
|
|
1
|
+
{"version":3,"file":"shutdown.mjs","sourceRoot":"","sources":["../shutdown.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,0CAA0C,EAAE,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,IAAI,QAAQ,GAAG,KAAK,CAAC;AAErB;;;;GAIG;AACH,MAAM,SAAS,GAAG,CAAC,GAA6B,EAAE,EAAE;IAClD,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,IAAmB,EAAE;IAC1D,IAAI,QAAQ;QAAE,OAAO;IACrB,QAAQ,GAAG,IAAI,CAAC;IAEhB,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IACnF,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;YAAE,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC;QACvC,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC;QAChD,0CAA0C,EAAE;KAC7C,CAAC,CAAC;IACH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;YAAE,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAErD,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AACnE,CAAC"}
|
package/docs/testing-and-ci.md
CHANGED
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Tests use Vitest and require a Valkey instance with Bloom support.
|
|
4
4
|
|
|
5
|
+
Lua scripts in `scripts/` are linted with Selene 0.30.1. Install that version locally and make
|
|
6
|
+
sure `selene` is available on `PATH` before running `pnpm run lint`.
|
|
7
|
+
|
|
5
8
|
Local example:
|
|
6
9
|
|
|
7
10
|
```sh
|
|
@@ -17,5 +20,6 @@ Validation commands:
|
|
|
17
20
|
pnpm run typecheck
|
|
18
21
|
pnpm run build
|
|
19
22
|
pnpm run lint
|
|
23
|
+
pnpm run lint:lua
|
|
20
24
|
pnpm run test:coverage
|
|
21
25
|
```
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "valkyries",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"description": "Valkey utilities for caches, bloom filters, dynamic configuration, and rate limiting.",
|
|
5
5
|
"homepage": "https://github.com/jonathanong/valkyries#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -71,7 +71,8 @@
|
|
|
71
71
|
"typecheck": "tsc --noEmit --project tsconfig.json",
|
|
72
72
|
"test": "vitest run",
|
|
73
73
|
"test:coverage": "vitest run --coverage",
|
|
74
|
-
"lint": "pnpm run oxlint && pnpm run oxfmt:check",
|
|
74
|
+
"lint": "pnpm run oxlint && pnpm run oxfmt:check && pnpm run lint:lua",
|
|
75
|
+
"lint:lua": "selene scripts",
|
|
75
76
|
"oxlint": "oxlint --type-aware --deny-warnings",
|
|
76
77
|
"oxlint:fix": "oxlint --type-aware --fix --deny-warnings",
|
|
77
78
|
"oxfmt": "oxfmt",
|