@mhbdev/redis 0.2.1 → 0.2.2
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/CHANGELOG.md +6 -0
- package/dist/bullmq/adapter.d.ts +2 -0
- package/dist/bullmq/adapter.d.ts.map +1 -1
- package/dist/bullmq/adapter.js +13 -3
- package/dist/bullmq/adapter.js.map +1 -1
- package/dist/cache/cache.d.ts.map +1 -1
- package/dist/cache/cache.js +12 -2
- package/dist/cache/cache.js.map +1 -1
- package/dist/core/codec.d.ts.map +1 -1
- package/dist/core/codec.js +5 -1
- package/dist/core/codec.js.map +1 -1
- package/dist/core/executor.d.ts +1 -1
- package/dist/core/executor.d.ts.map +1 -1
- package/dist/core/executor.js +22 -3
- package/dist/core/executor.js.map +1 -1
- package/dist/ioredis/executor.d.ts +2 -2
- package/dist/ioredis/executor.d.ts.map +1 -1
- package/dist/ioredis/executor.js +6 -6
- package/dist/ioredis/executor.js.map +1 -1
- package/dist/ioredis/pubsub.d.ts +1 -0
- package/dist/ioredis/pubsub.d.ts.map +1 -1
- package/dist/ioredis/pubsub.js +39 -12
- package/dist/ioredis/pubsub.js.map +1 -1
- package/dist/locks/locks.d.ts.map +1 -1
- package/dist/locks/locks.js +14 -4
- package/dist/locks/locks.js.map +1 -1
- package/dist/node/client.d.ts.map +1 -1
- package/dist/node/client.js +18 -11
- package/dist/node/client.js.map +1 -1
- package/dist/node/pool.d.ts +8 -2
- package/dist/node/pool.d.ts.map +1 -1
- package/dist/node/pool.js +44 -19
- package/dist/node/pool.js.map +1 -1
- package/dist/node/pubsub.d.ts.map +1 -1
- package/dist/node/pubsub.js +36 -5
- package/dist/node/pubsub.js.map +1 -1
- package/dist/pubsub/pubsub.d.ts.map +1 -1
- package/dist/pubsub/pubsub.js +9 -1
- package/dist/pubsub/pubsub.js.map +1 -1
- package/dist/queue/queue.d.ts.map +1 -1
- package/dist/queue/queue.js +53 -53
- package/dist/queue/queue.js.map +1 -1
- package/dist/rate-limit/contracts.d.ts +1 -0
- package/dist/rate-limit/contracts.d.ts.map +1 -1
- package/dist/rate-limit/contracts.js +59 -26
- package/dist/rate-limit/contracts.js.map +1 -1
- package/docs/adapters.md +3 -1
- package/package.json +1 -1
package/dist/node/pool.d.ts
CHANGED
|
@@ -13,13 +13,19 @@ export declare class RedisPool implements RedisExecutor {
|
|
|
13
13
|
private readonly pool;
|
|
14
14
|
private readonly commandTimeoutMs;
|
|
15
15
|
private readonly acquireTimeoutMs;
|
|
16
|
+
private readonly connectTimeoutMs;
|
|
16
17
|
private closed;
|
|
17
18
|
private connected;
|
|
19
|
+
private connecting;
|
|
18
20
|
constructor(options: RedisPoolOptions);
|
|
19
21
|
get isReady(): boolean;
|
|
20
22
|
connect(): Promise<void>;
|
|
21
|
-
execute<T = unknown>(command: RedisCommand
|
|
22
|
-
|
|
23
|
+
execute<T = unknown>(command: RedisCommand, request?: {
|
|
24
|
+
signal?: AbortSignal;
|
|
25
|
+
}): Promise<T>;
|
|
26
|
+
eval<T = unknown>(script: string, options: RedisScriptOptions, request?: {
|
|
27
|
+
signal?: AbortSignal;
|
|
28
|
+
}): Promise<T>;
|
|
23
29
|
ping(): Promise<void>;
|
|
24
30
|
use<T>(operation: (client: unknown) => Promise<T>): Promise<T>;
|
|
25
31
|
close(): Promise<void>;
|
package/dist/node/pool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/node/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,kBAAkB,IAAI,gBAAgB,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/node/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,kBAAkB,IAAI,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAStF,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAEvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAChD,QAAQ,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,qBAAqB,CAAC,CAAC;CACtE,CAAC,CAAC;AAIJ,qBAAa,SAAU,YAAW,aAAa;IASlC,OAAO,CAAC,QAAQ,CAAC,OAAO;IARpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAA8B;IAEhD,YAA6B,OAAO,EAAE,gBAAgB,EA6CrD;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CA8B7B;IAEK,OAAO,CAAC,CAAC,GAAG,OAAO,EACxB,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACpC,OAAO,CAAC,CAAC,CAAC,CAsBZ;IAEK,IAAI,CAAC,CAAC,GAAG,OAAO,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kBAAkB,EAC3B,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACpC,OAAO,CAAC,CAAC,CAAC,CAWZ;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;IAEK,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAInE;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAM3B;IAED,OAAO,CAAC,WAAW;CAKnB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAEpE;AAED,iEAAiE;AACjE,wBAAsB,aAAa,CAAC,CAAC,EACpC,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,GACxC,OAAO,CAAC,CAAC,CAAC,CAQZ"}
|
package/dist/node/pool.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createClientPool } from "redis";
|
|
2
|
-
import { RedisClientStateError, RedisConfigurationError, RedisConnectionError, RedisTimeoutError, } from "../core/errors.js";
|
|
2
|
+
import { RedisClientStateError, RedisConfigurationError, RedisConnectionError, RedisRequestAbortedError, RedisTimeoutError, } from "../core/errors.js";
|
|
3
3
|
import { assertPositiveInteger, withTimeout, } from "../core/executor.js";
|
|
4
4
|
import { normalizeNodeRedisError } from "./errors.js";
|
|
5
5
|
export class RedisPool {
|
|
@@ -7,18 +7,32 @@ export class RedisPool {
|
|
|
7
7
|
pool;
|
|
8
8
|
commandTimeoutMs;
|
|
9
9
|
acquireTimeoutMs;
|
|
10
|
+
connectTimeoutMs;
|
|
10
11
|
closed = false;
|
|
11
12
|
connected = false;
|
|
13
|
+
connecting = null;
|
|
12
14
|
constructor(options) {
|
|
13
15
|
this.options = options;
|
|
14
16
|
const minimum = options.minimum ?? 1;
|
|
15
17
|
const maximum = options.maximum ?? 10;
|
|
16
18
|
this.commandTimeoutMs = options.commandTimeoutMs ?? 3_000;
|
|
17
19
|
this.acquireTimeoutMs = options.acquireTimeoutMs ?? 3_000;
|
|
20
|
+
this.connectTimeoutMs = options.connectTimeoutMs ?? 3_000;
|
|
21
|
+
const reconnectBaseDelayMs = options.reconnectBaseDelayMs ?? 100;
|
|
22
|
+
const reconnectMaxDelayMs = options.reconnectMaxDelayMs ?? 1_000;
|
|
23
|
+
const maxReconnectAttempts = options.maxReconnectAttempts ?? 3;
|
|
24
|
+
const cleanupDelayMs = options.cleanupDelayMs ?? 3_000;
|
|
18
25
|
assertPositiveInteger(minimum, "Redis pool minimum");
|
|
19
26
|
assertPositiveInteger(maximum, "Redis pool maximum");
|
|
20
27
|
assertPositiveInteger(this.commandTimeoutMs, "Redis command timeout");
|
|
21
28
|
assertPositiveInteger(this.acquireTimeoutMs, "Redis acquire timeout");
|
|
29
|
+
assertPositiveInteger(this.connectTimeoutMs, "Redis connect timeout");
|
|
30
|
+
assertPositiveInteger(reconnectBaseDelayMs, "Redis reconnect base delay");
|
|
31
|
+
assertPositiveInteger(reconnectMaxDelayMs, "Redis reconnect max delay");
|
|
32
|
+
if (!Number.isSafeInteger(maxReconnectAttempts) || maxReconnectAttempts < 0)
|
|
33
|
+
throw new RedisConfigurationError("Redis reconnect attempts must be non-negative");
|
|
34
|
+
if (!Number.isSafeInteger(cleanupDelayMs) || cleanupDelayMs < 0)
|
|
35
|
+
throw new RedisConfigurationError("Redis pool cleanup delay must be non-negative");
|
|
22
36
|
if (minimum > maximum)
|
|
23
37
|
throw new RedisConfigurationError("Redis pool minimum cannot exceed maximum");
|
|
24
38
|
this.pool = createClientPool({
|
|
@@ -27,52 +41,62 @@ export class RedisPool {
|
|
|
27
41
|
disableOfflineQueue: options.disableOfflineQueue ?? true,
|
|
28
42
|
socket: {
|
|
29
43
|
...options.clientOptions?.socket,
|
|
30
|
-
connectTimeout:
|
|
44
|
+
connectTimeout: this.connectTimeoutMs,
|
|
31
45
|
reconnectStrategy: (attempts) => {
|
|
32
|
-
if (attempts >=
|
|
46
|
+
if (attempts >= maxReconnectAttempts)
|
|
33
47
|
return false;
|
|
34
|
-
return Math.min(
|
|
48
|
+
return Math.min(reconnectBaseDelayMs * 2 ** attempts, reconnectMaxDelayMs);
|
|
35
49
|
},
|
|
36
50
|
},
|
|
37
51
|
}, {
|
|
38
52
|
minimum,
|
|
39
53
|
maximum,
|
|
40
54
|
acquireTimeout: this.acquireTimeoutMs,
|
|
41
|
-
cleanupDelay:
|
|
55
|
+
cleanupDelay: cleanupDelayMs,
|
|
42
56
|
});
|
|
43
57
|
this.pool.on("error", (error) => this.reportError(normalizeNodeRedisError(error)));
|
|
44
58
|
}
|
|
45
59
|
get isReady() {
|
|
46
|
-
return this.pool.
|
|
60
|
+
return this.connected && this.pool.isOpen && !this.closed;
|
|
47
61
|
}
|
|
48
62
|
async connect() {
|
|
49
63
|
if (this.closed)
|
|
50
64
|
throw new RedisClientStateError("The Redis pool has been closed");
|
|
51
65
|
if (this.connected)
|
|
52
66
|
return;
|
|
53
|
-
|
|
67
|
+
this.connecting ??= withTimeout(async () => {
|
|
54
68
|
this.options.hooks?.onStateChange?.("connecting");
|
|
55
|
-
await
|
|
69
|
+
await this.pool.connect();
|
|
70
|
+
}, this.connectTimeoutMs, "Redis pool connection timed out")
|
|
71
|
+
.then(() => {
|
|
56
72
|
this.connected = true;
|
|
57
73
|
this.options.hooks?.onStateChange?.("ready");
|
|
58
|
-
}
|
|
59
|
-
|
|
74
|
+
})
|
|
75
|
+
.catch((error) => {
|
|
60
76
|
const normalized = normalizeNodeRedisError(error);
|
|
61
77
|
this.reportError(normalized);
|
|
62
|
-
|
|
63
|
-
normalized instanceof RedisTimeoutError
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
78
|
+
if (normalized.code === "REDIS_CLIENT_STATE" ||
|
|
79
|
+
normalized instanceof RedisTimeoutError)
|
|
80
|
+
throw normalized;
|
|
81
|
+
throw new RedisConnectionError("Redis pool connection failed", normalized);
|
|
82
|
+
})
|
|
83
|
+
.finally(() => {
|
|
84
|
+
this.connecting = null;
|
|
85
|
+
});
|
|
86
|
+
await this.connecting;
|
|
87
|
+
if (this.closed)
|
|
88
|
+
throw new RedisClientStateError("The Redis pool has been closed");
|
|
67
89
|
}
|
|
68
|
-
async execute(command) {
|
|
90
|
+
async execute(command, request = {}) {
|
|
69
91
|
if (this.closed)
|
|
70
92
|
throw new RedisClientStateError("The Redis pool has been closed");
|
|
93
|
+
if (request.signal?.aborted)
|
|
94
|
+
throw new RedisRequestAbortedError(request.signal.reason);
|
|
71
95
|
await this.connect();
|
|
72
96
|
const started = Date.now();
|
|
73
97
|
this.options.hooks?.onCommandStart?.(command);
|
|
74
98
|
try {
|
|
75
|
-
return await withTimeout(() => this.pool.sendCommand([...command]), this.commandTimeoutMs);
|
|
99
|
+
return await withTimeout((signal) => this.pool.withAbortSignal(signal).sendCommand([...command]), this.commandTimeoutMs, "Redis command timed out", request.signal);
|
|
76
100
|
}
|
|
77
101
|
catch (error) {
|
|
78
102
|
const normalized = normalizeNodeRedisError(error);
|
|
@@ -83,14 +107,14 @@ export class RedisPool {
|
|
|
83
107
|
this.options.hooks?.onCommandEnd?.(command, Date.now() - started);
|
|
84
108
|
}
|
|
85
109
|
}
|
|
86
|
-
async eval(script, options) {
|
|
110
|
+
async eval(script, options, request = {}) {
|
|
87
111
|
return this.execute([
|
|
88
112
|
"EVAL",
|
|
89
113
|
script,
|
|
90
114
|
String(options.keys?.length ?? 0),
|
|
91
115
|
...(options.keys ?? []),
|
|
92
116
|
...(options.arguments ?? []),
|
|
93
|
-
]);
|
|
117
|
+
], request);
|
|
94
118
|
}
|
|
95
119
|
async ping() {
|
|
96
120
|
await this.execute(["PING"]);
|
|
@@ -105,6 +129,7 @@ export class RedisPool {
|
|
|
105
129
|
if (this.closed)
|
|
106
130
|
return;
|
|
107
131
|
this.closed = true;
|
|
132
|
+
await this.connecting?.catch(() => undefined);
|
|
108
133
|
await this.pool.close();
|
|
109
134
|
this.options.hooks?.onStateChange?.("closed");
|
|
110
135
|
}
|
package/dist/node/pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/node/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA+C,MAAM,OAAO,CAAC;AAEtF,OAAO,EACN,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,qBAAqB,EAIrB,WAAW,GACX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAatD,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/node/pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../src/node/pubsub.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../src/node/pubsub.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAMnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAKzE,wBAAgB,yBAAyB,CACxC,OAAO,EAAE,QAAQ,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;CAAE,CAAC,GAClE,0BAA0B,CA6C5B;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EACtC,OAAO,EAAE,QAAQ,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACjC,CAAC,GACA;IACF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,SAAS,CACR,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACzC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAChC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB,CAiBA"}
|
package/dist/node/pubsub.js
CHANGED
|
@@ -1,21 +1,41 @@
|
|
|
1
1
|
import { createClient } from "redis";
|
|
2
|
+
import { asError, RedisClientStateError, RedisConfigurationError, } from "../core/errors.js";
|
|
2
3
|
export function createNodePubSubTransport(options) {
|
|
3
4
|
let publisher = null;
|
|
4
5
|
let subscriber = null;
|
|
6
|
+
let closed = false;
|
|
7
|
+
const report = (error) => options.onError?.(asError(error));
|
|
5
8
|
return {
|
|
6
9
|
async publish(channel, message) {
|
|
10
|
+
if (closed)
|
|
11
|
+
throw new RedisClientStateError("The pub/sub transport has been closed");
|
|
12
|
+
if (!channel.trim())
|
|
13
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
7
14
|
publisher ??= createClient({ url: options.url });
|
|
8
|
-
|
|
15
|
+
if (!publisher.isOpen)
|
|
16
|
+
publisher.on("error", report);
|
|
9
17
|
if (!publisher.isReady)
|
|
10
18
|
await publisher.connect();
|
|
11
19
|
return publisher.publish(channel, message);
|
|
12
20
|
},
|
|
13
21
|
async subscribe(channel, handler) {
|
|
22
|
+
if (closed)
|
|
23
|
+
throw new RedisClientStateError("The pub/sub transport has been closed");
|
|
24
|
+
if (!channel.trim())
|
|
25
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
14
26
|
subscriber ??= createClient({ url: options.url });
|
|
15
|
-
|
|
27
|
+
if (!subscriber.isOpen)
|
|
28
|
+
subscriber.on("error", report);
|
|
16
29
|
if (!subscriber.isReady)
|
|
17
30
|
await subscriber.connect();
|
|
18
|
-
await subscriber.subscribe(channel,
|
|
31
|
+
await subscriber.subscribe(channel, (message) => {
|
|
32
|
+
try {
|
|
33
|
+
void Promise.resolve(handler(message)).catch(report);
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
report(error);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
19
39
|
return async () => {
|
|
20
40
|
if (!subscriber)
|
|
21
41
|
return;
|
|
@@ -23,6 +43,9 @@ export function createNodePubSubTransport(options) {
|
|
|
23
43
|
};
|
|
24
44
|
},
|
|
25
45
|
async close() {
|
|
46
|
+
if (closed)
|
|
47
|
+
return;
|
|
48
|
+
closed = true;
|
|
26
49
|
await Promise.all([
|
|
27
50
|
publisher?.isOpen ? publisher.close() : undefined,
|
|
28
51
|
subscriber?.isOpen ? subscriber.close() : undefined,
|
|
@@ -33,8 +56,16 @@ export function createNodePubSubTransport(options) {
|
|
|
33
56
|
export function createNodeTypedPubSub(options) {
|
|
34
57
|
const transport = createNodePubSubTransport(options);
|
|
35
58
|
return {
|
|
36
|
-
publish: async (channel, value) =>
|
|
37
|
-
|
|
59
|
+
publish: async (channel, value) => {
|
|
60
|
+
if (!channel.trim())
|
|
61
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
62
|
+
return transport.publish(channel, options.codec.encode(value));
|
|
63
|
+
},
|
|
64
|
+
subscribe: (channel, handler) => {
|
|
65
|
+
if (!channel.trim())
|
|
66
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
67
|
+
return transport.subscribe(channel, async (message) => handler(options.codec.decode(message)));
|
|
68
|
+
},
|
|
38
69
|
close: () => transport.close(),
|
|
39
70
|
};
|
|
40
71
|
}
|
package/dist/node/pubsub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/node/pubsub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/node/pubsub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../src/pubsub/pubsub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAEjE,qBAAa,WAAW,CAAC,CAAC;IAExB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFvB,YACkB,SAAS,EAAE,0BAA0B,EACrC,KAAK,GAAE,UAAU,CAAC,CAAC,CAAkB,EACnD;IAEE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAGxD;IAEK,SAAS,CACd,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACzC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAK9B;IAED,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../src/pubsub/pubsub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAEjE,qBAAa,WAAW,CAAC,CAAC;IAExB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFvB,YACkB,SAAS,EAAE,0BAA0B,EACrC,KAAK,GAAE,UAAU,CAAC,CAAC,CAAkB,EACnD;IAEE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAGxD;IAEK,SAAS,CACd,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACzC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAK9B;IAED,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAmC1C;IAED,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAErB;CACD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAC7B,SAAS,EAAE,0BAA0B,EACrC,KAAK,GAAE,UAAU,CAAC,CAAC,CAAkB,GACnC,WAAW,CAAC,CAAC,CAAC,CAEhB;AAED,sFAAsF;AACtF,eAAO,MAAM,iBAAiB,qBAAe,CAAC"}
|
package/dist/pubsub/pubsub.js
CHANGED
|
@@ -22,6 +22,11 @@ export class RedisPubSub {
|
|
|
22
22
|
const waiters = [];
|
|
23
23
|
let closed = false;
|
|
24
24
|
let unsubscribe;
|
|
25
|
+
const stopSubscription = async () => {
|
|
26
|
+
const stop = unsubscribe;
|
|
27
|
+
unsubscribe = undefined;
|
|
28
|
+
await stop?.();
|
|
29
|
+
};
|
|
25
30
|
const ready = this.subscribe(channel, (value) => {
|
|
26
31
|
const waiter = waiters.shift();
|
|
27
32
|
if (waiter)
|
|
@@ -30,6 +35,8 @@ export class RedisPubSub {
|
|
|
30
35
|
queue.push(value);
|
|
31
36
|
}).then((stop) => {
|
|
32
37
|
unsubscribe = stop;
|
|
38
|
+
if (closed)
|
|
39
|
+
return stopSubscription();
|
|
33
40
|
});
|
|
34
41
|
const iterator = {
|
|
35
42
|
next: async () => {
|
|
@@ -42,7 +49,8 @@ export class RedisPubSub {
|
|
|
42
49
|
},
|
|
43
50
|
return: async () => {
|
|
44
51
|
closed = true;
|
|
45
|
-
await
|
|
52
|
+
await ready;
|
|
53
|
+
await stopSubscription();
|
|
46
54
|
for (const waiter of waiters.splice(0))
|
|
47
55
|
waiter({ done: true, value: undefined });
|
|
48
56
|
return { done: true, value: undefined };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/pubsub/pubsub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAG5D,MAAM,OAAO,WAAW;IAEL,SAAS;IACT,KAAK;IAFvB,YACkB,SAAqC,EACrC,KAAK,GAAkB,SAAS,EAAK;yBADrC,SAAS;qBACT,KAAK;IACpB,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,KAAQ;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YAAE,MAAM,IAAI,uBAAuB,CAAC,6BAA6B,CAAC,CAAC;QACtF,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,SAAS,CACd,OAAe,EACf,OAA2C;QAE3C,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YAAE,MAAM,IAAI,uBAAuB,CAAC,6BAA6B,CAAC,CAAC;QACtF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAC1D,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CACnC,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,OAAe;QACvB,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,MAAM,OAAO,GAA+C,EAAE,CAAC;QAC/D,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,WAA8C,CAAC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,MAAM;gBAAE,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;;gBACtC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,WAAW,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/pubsub/pubsub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/queue/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,QAAQ,CAAC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAC5E,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,QAAQ,CAAC;IACtC,KAAK,EAAE,aAAa,CAAC;IACrB,oFAAoF;IACpF,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,WAAW,QAAQ,CAAC,CAAC;IAC1B,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,CACL,OAAO,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAC5C,OAAO,CAAC,EAAE,kBAAkB,GAC1B,WAAW,CAAC;IACf,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,qBAAa,UAAU,CAAC,CAAC,CAAE,YAAW,QAAQ,CAAC,CAAC,CAAC;IAMpC,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAE7C,YAA6B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/queue/queue.ts"],"names":[],"mappings":"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"}
|
package/dist/queue/queue.js
CHANGED
|
@@ -8,24 +8,35 @@ export class RedisQueue {
|
|
|
8
8
|
visibilityTimeoutMs;
|
|
9
9
|
constructor(options) {
|
|
10
10
|
this.options = options;
|
|
11
|
-
if (!options.name.trim())
|
|
12
|
-
throw new RedisQueueError("Queue name is
|
|
11
|
+
if (!options.name.trim() || options.name.includes("\n"))
|
|
12
|
+
throw new RedisQueueError("Queue name is invalid");
|
|
13
13
|
this.prefix = options.prefix ?? "mhbdev:queue";
|
|
14
14
|
this.valueCodec = options.codec ?? jsonCodec();
|
|
15
15
|
this.maxAttempts = options.maxAttempts ?? 3;
|
|
16
16
|
this.visibilityTimeoutMs = options.visibilityTimeoutMs ?? 30_000;
|
|
17
|
+
if (!this.prefix.trim() || this.prefix.includes("\n"))
|
|
18
|
+
throw new RedisQueueError("Queue prefix is invalid");
|
|
17
19
|
if (!Number.isSafeInteger(this.maxAttempts) || this.maxAttempts <= 0)
|
|
18
20
|
throw new RedisQueueError("Queue max attempts must be positive");
|
|
21
|
+
if (!Number.isSafeInteger(this.visibilityTimeoutMs) || this.visibilityTimeoutMs <= 0)
|
|
22
|
+
throw new RedisQueueError("Queue visibility timeout must be positive");
|
|
19
23
|
}
|
|
20
24
|
async enqueue(data, enqueueOptions = {}) {
|
|
25
|
+
const delayMs = enqueueOptions.delayMs ?? 0;
|
|
26
|
+
if (!Number.isSafeInteger(delayMs) || delayMs < 0)
|
|
27
|
+
throw new RedisQueueError("Queue delay must be a non-negative integer");
|
|
28
|
+
if (!Number.isSafeInteger(Date.now() + delayMs))
|
|
29
|
+
throw new RedisQueueError("Queue delivery time is outside the supported range");
|
|
30
|
+
if (enqueueOptions.jobId !== undefined && !enqueueOptions.jobId.trim())
|
|
31
|
+
throw new RedisQueueError("Queue job ID is required when provided");
|
|
21
32
|
const id = enqueueOptions.jobId ?? crypto.randomUUID();
|
|
22
33
|
const job = { id, data, attempts: 0, enqueuedAt: Date.now() };
|
|
23
34
|
const encoded = this.encode(job);
|
|
24
|
-
if (
|
|
35
|
+
if (delayMs > 0) {
|
|
25
36
|
await this.options.redis.execute([
|
|
26
37
|
"ZADD",
|
|
27
38
|
this.delayedKey,
|
|
28
|
-
String(Date.now() +
|
|
39
|
+
String(Date.now() + delayMs),
|
|
29
40
|
encoded,
|
|
30
41
|
]);
|
|
31
42
|
}
|
|
@@ -69,6 +80,14 @@ export class RedisQueue {
|
|
|
69
80
|
decode(value) {
|
|
70
81
|
try {
|
|
71
82
|
const parsed = JSON.parse(value);
|
|
83
|
+
if (typeof parsed.id !== "string" ||
|
|
84
|
+
!parsed.id.trim() ||
|
|
85
|
+
typeof parsed.data !== "string" ||
|
|
86
|
+
!Number.isSafeInteger(parsed.attempts) ||
|
|
87
|
+
parsed.attempts < 0 ||
|
|
88
|
+
!Number.isSafeInteger(parsed.enqueuedAt) ||
|
|
89
|
+
parsed.enqueuedAt < 0)
|
|
90
|
+
throw new TypeError("Queue job payload has an invalid shape");
|
|
72
91
|
return {
|
|
73
92
|
id: parsed.id,
|
|
74
93
|
data: this.valueCodec.decode(parsed.data),
|
|
@@ -97,6 +116,10 @@ export class RedisQueueWorker {
|
|
|
97
116
|
this.consumer = options.consumer ?? crypto.randomUUID();
|
|
98
117
|
this.blockMs = options.blockMs ?? 1_000;
|
|
99
118
|
this.concurrency = options.concurrency ?? 1;
|
|
119
|
+
if (!this.group.trim() || !this.consumer.trim())
|
|
120
|
+
throw new RedisQueueError("Queue consumer group and consumer are required");
|
|
121
|
+
if (!Number.isSafeInteger(this.blockMs) || this.blockMs <= 0)
|
|
122
|
+
throw new RedisQueueError("Queue block time must be a positive integer");
|
|
100
123
|
if (!Number.isSafeInteger(this.concurrency) || this.concurrency <= 0)
|
|
101
124
|
throw new RedisQueueError("Queue concurrency must be positive");
|
|
102
125
|
}
|
|
@@ -146,25 +169,10 @@ export class RedisQueueWorker {
|
|
|
146
169
|
});
|
|
147
170
|
}
|
|
148
171
|
async promoteDue() {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
String(Date.now()),
|
|
154
|
-
"LIMIT",
|
|
155
|
-
"0",
|
|
156
|
-
"100",
|
|
157
|
-
]);
|
|
158
|
-
for (const encoded of due ?? []) {
|
|
159
|
-
await this.queue.redis.execute(["ZREM", this.queue.delayedKey, encoded]);
|
|
160
|
-
await this.queue.redis.execute([
|
|
161
|
-
"XADD",
|
|
162
|
-
this.queue.streamKey,
|
|
163
|
-
"*",
|
|
164
|
-
"payload",
|
|
165
|
-
encoded,
|
|
166
|
-
]);
|
|
167
|
-
}
|
|
172
|
+
await this.queue.redis.eval(PROMOTE_DUE_SCRIPT, {
|
|
173
|
+
keys: [this.queue.delayedKey, this.queue.streamKey],
|
|
174
|
+
arguments: [String(Date.now()), "100"],
|
|
175
|
+
});
|
|
168
176
|
}
|
|
169
177
|
async recoverPending() {
|
|
170
178
|
const response = await this.queue.redis.execute([
|
|
@@ -180,42 +188,32 @@ export class RedisQueueWorker {
|
|
|
180
188
|
return parseAutoClaimResponse(response);
|
|
181
189
|
}
|
|
182
190
|
async process(entry) {
|
|
183
|
-
|
|
191
|
+
let job;
|
|
192
|
+
try {
|
|
193
|
+
job = this.queue.decode(entry.payload);
|
|
194
|
+
}
|
|
195
|
+
catch {
|
|
196
|
+
await this.queue.redis.eval(REQUEUE_FAILED_SCRIPT, {
|
|
197
|
+
keys: [this.queue.streamKey, this.queue.deadLetterKey],
|
|
198
|
+
arguments: [this.group, entry.id, entry.payload],
|
|
199
|
+
});
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
184
202
|
try {
|
|
185
203
|
await this.handler(job);
|
|
186
|
-
await this.queue.redis.execute([
|
|
187
|
-
"XACK",
|
|
188
|
-
this.queue.streamKey,
|
|
189
|
-
this.group,
|
|
190
|
-
entry.id,
|
|
191
|
-
]);
|
|
192
204
|
}
|
|
193
205
|
catch (_error) {
|
|
194
|
-
await this.queue.redis.execute([
|
|
195
|
-
"XACK",
|
|
196
|
-
this.queue.streamKey,
|
|
197
|
-
this.group,
|
|
198
|
-
entry.id,
|
|
199
|
-
]);
|
|
200
|
-
if (job.attempts + 1 >= this.queue.attempts) {
|
|
201
|
-
await this.queue.redis.execute([
|
|
202
|
-
"XADD",
|
|
203
|
-
this.queue.deadLetterKey,
|
|
204
|
-
"*",
|
|
205
|
-
"payload",
|
|
206
|
-
this.encodeRetry(job),
|
|
207
|
-
]);
|
|
208
|
-
return;
|
|
209
|
-
}
|
|
210
206
|
const retry = { ...job, attempts: job.attempts + 1 };
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
this.queue.streamKey
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
this.encodeRetry(retry),
|
|
217
|
-
|
|
207
|
+
const target = retry.attempts >= this.queue.attempts
|
|
208
|
+
? this.queue.deadLetterKey
|
|
209
|
+
: this.queue.streamKey;
|
|
210
|
+
await this.queue.redis.eval(REQUEUE_FAILED_SCRIPT, {
|
|
211
|
+
keys: [this.queue.streamKey, target],
|
|
212
|
+
arguments: [this.group, entry.id, this.encodeRetry(retry)],
|
|
213
|
+
});
|
|
214
|
+
return;
|
|
218
215
|
}
|
|
216
|
+
await this.queue.redis.execute(["XACK", this.queue.streamKey, this.group, entry.id]);
|
|
219
217
|
}
|
|
220
218
|
encodeRetry(job) {
|
|
221
219
|
return JSON.stringify({
|
|
@@ -227,6 +225,8 @@ export class RedisQueueWorker {
|
|
|
227
225
|
}
|
|
228
226
|
}
|
|
229
227
|
const ENSURE_GROUP_SCRIPT = `local groups = redis.pcall("XINFO", "GROUPS", KEYS[1]) if type(groups) == "table" then for _, group in ipairs(groups) do if group[2] == ARGV[1] then return 0 end end end local result = redis.pcall("XGROUP", "CREATE", KEYS[1], ARGV[1], "0-0", "MKSTREAM") if type(result) == "table" then return 1 end local groupsAfter = redis.pcall("XINFO", "GROUPS", KEYS[1]) if type(groupsAfter) == "table" then for _, group in ipairs(groupsAfter) do if group[2] == ARGV[1] then return 0 end end end return redis.error_reply("Redis consumer group creation failed")`;
|
|
228
|
+
const PROMOTE_DUE_SCRIPT = `local due = redis.call("ZRANGEBYSCORE", KEYS[1], "-inf", ARGV[1], "LIMIT", 0, ARGV[2]) for _, payload in ipairs(due) do redis.call("XADD", KEYS[2], "*", "payload", payload) redis.call("ZREM", KEYS[1], payload) end return #due`;
|
|
229
|
+
const REQUEUE_FAILED_SCRIPT = `redis.call("XADD", KEYS[2], "*", "payload", ARGV[3]) redis.call("XACK", KEYS[1], ARGV[1], ARGV[2]) return 1`;
|
|
230
230
|
function parseStreamResponse(value) {
|
|
231
231
|
if (!Array.isArray(value) || value.length === 0)
|
|
232
232
|
return [];
|
package/dist/queue/queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/queue/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AA0CpD,MAAM,OAAO,UAAU;IAMO,OAAO;IALnB,MAAM,CAAS;IACf,UAAU,CAAgB;IAC1B,WAAW,CAAS;IACpB,mBAAmB,CAAS;IAE7C,YAA6B,OAAwB;uBAAxB,OAAO;QACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/queue/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,7 @@ export declare class RedisRateLimiter implements RateLimiter {
|
|
|
86
86
|
blockUntilReady(identifier: string, timeoutMs: number, request?: RateLimitRequest): Promise<RateLimitResponse>;
|
|
87
87
|
setDynamicLimit(limit: number | false): Promise<void>;
|
|
88
88
|
getDynamicLimit(): Promise<number | null>;
|
|
89
|
+
private readDynamicLimit;
|
|
89
90
|
private runAlgorithm;
|
|
90
91
|
private keysFor;
|
|
91
92
|
private response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/rate-limit/contracts.ts"],"names":[],"mappings":"AAQA,OAAO,
|
|
1
|
+
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/rate-limit/contracts.ts"],"names":[],"mappings":"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"}
|