@mhbdev/redis 0.2.1 → 0.2.3
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 +12 -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/core/hooks.d.ts +5 -0
- package/dist/core/hooks.d.ts.map +1 -0
- package/dist/core/hooks.js +23 -0
- package/dist/core/hooks.js.map +1 -0
- 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 +40 -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 +28 -20
- 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 +53 -27
- package/dist/node/pool.js.map +1 -1
- package/dist/node/pubsub.d.ts.map +1 -1
- package/dist/node/pubsub.js +37 -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/index.d.ts +1 -1
- package/dist/queue/index.d.ts.map +1 -1
- package/dist/queue/index.js.map +1 -1
- package/dist/queue/queue.d.ts +20 -0
- package/dist/queue/queue.d.ts.map +1 -1
- package/dist/queue/queue.js +216 -73
- 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/docs/queues.md +16 -0
- package/package.json +1 -1
package/dist/node/client.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createClient, } from "redis";
|
|
2
|
-
import { asError, RedisClientStateError, RedisConnectionError } from "../core/errors.js";
|
|
2
|
+
import { asError, RedisClientStateError, RedisConfigurationError, RedisConnectionError, RedisRequestAbortedError, RedisTimeoutError, } from "../core/errors.js";
|
|
3
3
|
import { assertPositiveInteger, withTimeout, } from "../core/executor.js";
|
|
4
|
+
import { notifyError, notifyHook } from "../core/hooks.js";
|
|
4
5
|
import { normalizeNodeRedisError } from "./errors.js";
|
|
5
6
|
export class RedisClient {
|
|
6
7
|
client;
|
|
@@ -22,6 +23,11 @@ export class RedisClient {
|
|
|
22
23
|
};
|
|
23
24
|
assertPositiveInteger(this.options.connectTimeoutMs, "Redis connect timeout");
|
|
24
25
|
assertPositiveInteger(this.options.commandTimeoutMs, "Redis command timeout");
|
|
26
|
+
if (!Number.isSafeInteger(this.options.maxReconnectAttempts) ||
|
|
27
|
+
this.options.maxReconnectAttempts < 0)
|
|
28
|
+
throw new RedisConfigurationError("Redis reconnect attempts must be non-negative");
|
|
29
|
+
assertPositiveInteger(this.options.reconnectBaseDelayMs, "Redis reconnect base delay");
|
|
30
|
+
assertPositiveInteger(this.options.reconnectMaxDelayMs, "Redis reconnect max delay");
|
|
25
31
|
this.client = this.createClient();
|
|
26
32
|
}
|
|
27
33
|
get isReady() {
|
|
@@ -47,12 +53,12 @@ export class RedisClient {
|
|
|
47
53
|
});
|
|
48
54
|
client.on("error", (error) => {
|
|
49
55
|
const normalized = asError(error);
|
|
50
|
-
this.options.onError
|
|
51
|
-
this.options.hooks?.onError
|
|
52
|
-
this.options.hooks?.onStateChange?.
|
|
56
|
+
notifyError(this.options.onError, normalized);
|
|
57
|
+
notifyError(this.options.hooks?.onError, normalized);
|
|
58
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "error");
|
|
53
59
|
});
|
|
54
|
-
client.on("ready", () => this.options.hooks?.onStateChange?.
|
|
55
|
-
client.on("reconnecting", () => this.options.hooks?.onStateChange?.
|
|
60
|
+
client.on("ready", () => notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "ready"));
|
|
61
|
+
client.on("reconnecting", () => notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "connecting"));
|
|
56
62
|
return client;
|
|
57
63
|
}
|
|
58
64
|
replaceClient() {
|
|
@@ -67,19 +73,19 @@ export class RedisClient {
|
|
|
67
73
|
throw new RedisClientStateError("The Redis client has been closed");
|
|
68
74
|
if (this.client.isReady)
|
|
69
75
|
return;
|
|
76
|
+
const client = this.client;
|
|
70
77
|
this.connecting ??= withTimeout(async () => {
|
|
71
|
-
this.options.hooks?.onStateChange?.
|
|
72
|
-
|
|
73
|
-
await this.client.connect();
|
|
74
|
-
}
|
|
75
|
-
catch (error) {
|
|
76
|
-
this.replaceClient();
|
|
77
|
-
throw new RedisConnectionError("Redis connection failed", error);
|
|
78
|
-
}
|
|
78
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "connecting");
|
|
79
|
+
await client.connect();
|
|
79
80
|
}, this.options.connectTimeoutMs, "Redis connection timed out")
|
|
80
81
|
.catch((error) => {
|
|
81
|
-
this.
|
|
82
|
-
|
|
82
|
+
if (this.client === client)
|
|
83
|
+
this.replaceClient();
|
|
84
|
+
if (error instanceof RedisConnectionError ||
|
|
85
|
+
error instanceof RedisTimeoutError ||
|
|
86
|
+
error instanceof RedisClientStateError)
|
|
87
|
+
throw error;
|
|
88
|
+
throw new RedisConnectionError("Redis connection failed", error);
|
|
83
89
|
})
|
|
84
90
|
.finally(() => {
|
|
85
91
|
this.connecting = null;
|
|
@@ -89,14 +95,16 @@ export class RedisClient {
|
|
|
89
95
|
throw new RedisClientStateError("The Redis client was closed while connecting");
|
|
90
96
|
}
|
|
91
97
|
async execute(command, options = {}) {
|
|
98
|
+
if (options.signal?.aborted)
|
|
99
|
+
throw new RedisRequestAbortedError(options.signal.reason);
|
|
92
100
|
await this.connect();
|
|
93
101
|
const started = Date.now();
|
|
94
|
-
this.options.hooks?.onCommandStart?.
|
|
102
|
+
notifyHook(this.options.hooks?.onCommandStart, this.options.hooks?.onError, command);
|
|
95
103
|
try {
|
|
96
|
-
return await withTimeout((signal) => this.sendCommand(command,
|
|
104
|
+
return await withTimeout((signal) => this.sendCommand(command, signal), this.options.commandTimeoutMs, "Redis command timed out", options.signal);
|
|
97
105
|
}
|
|
98
106
|
finally {
|
|
99
|
-
this.options.hooks?.onCommandEnd?.
|
|
107
|
+
notifyHook(this.options.hooks?.onCommandEnd, this.options.hooks?.onError, command, Date.now() - started);
|
|
100
108
|
}
|
|
101
109
|
}
|
|
102
110
|
async sendCommand(command, signal) {
|
|
@@ -130,7 +138,7 @@ export class RedisClient {
|
|
|
130
138
|
await this.connecting?.catch(() => undefined);
|
|
131
139
|
if (this.client.isOpen)
|
|
132
140
|
await this.client.close();
|
|
133
|
-
this.options.hooks?.onStateChange?.
|
|
141
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "closed");
|
|
134
142
|
})();
|
|
135
143
|
await this.closing;
|
|
136
144
|
}
|
package/dist/node/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/node/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,GAGZ,MAAM,OAAO,CAAC;AAEf,OAAO,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/node/client.ts"],"names":[],"mappings":"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"}
|
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;AAE7B,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,CAsC7B;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,CA2BZ;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,24 +1,39 @@
|
|
|
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
|
+
import { notifyError, notifyHook } from "../core/hooks.js";
|
|
4
5
|
import { normalizeNodeRedisError } from "./errors.js";
|
|
5
6
|
export class RedisPool {
|
|
6
7
|
options;
|
|
7
8
|
pool;
|
|
8
9
|
commandTimeoutMs;
|
|
9
10
|
acquireTimeoutMs;
|
|
11
|
+
connectTimeoutMs;
|
|
10
12
|
closed = false;
|
|
11
13
|
connected = false;
|
|
14
|
+
connecting = null;
|
|
12
15
|
constructor(options) {
|
|
13
16
|
this.options = options;
|
|
14
17
|
const minimum = options.minimum ?? 1;
|
|
15
18
|
const maximum = options.maximum ?? 10;
|
|
16
19
|
this.commandTimeoutMs = options.commandTimeoutMs ?? 3_000;
|
|
17
20
|
this.acquireTimeoutMs = options.acquireTimeoutMs ?? 3_000;
|
|
21
|
+
this.connectTimeoutMs = options.connectTimeoutMs ?? 3_000;
|
|
22
|
+
const reconnectBaseDelayMs = options.reconnectBaseDelayMs ?? 100;
|
|
23
|
+
const reconnectMaxDelayMs = options.reconnectMaxDelayMs ?? 1_000;
|
|
24
|
+
const maxReconnectAttempts = options.maxReconnectAttempts ?? 3;
|
|
25
|
+
const cleanupDelayMs = options.cleanupDelayMs ?? 3_000;
|
|
18
26
|
assertPositiveInteger(minimum, "Redis pool minimum");
|
|
19
27
|
assertPositiveInteger(maximum, "Redis pool maximum");
|
|
20
28
|
assertPositiveInteger(this.commandTimeoutMs, "Redis command timeout");
|
|
21
29
|
assertPositiveInteger(this.acquireTimeoutMs, "Redis acquire timeout");
|
|
30
|
+
assertPositiveInteger(this.connectTimeoutMs, "Redis connect timeout");
|
|
31
|
+
assertPositiveInteger(reconnectBaseDelayMs, "Redis reconnect base delay");
|
|
32
|
+
assertPositiveInteger(reconnectMaxDelayMs, "Redis reconnect max delay");
|
|
33
|
+
if (!Number.isSafeInteger(maxReconnectAttempts) || maxReconnectAttempts < 0)
|
|
34
|
+
throw new RedisConfigurationError("Redis reconnect attempts must be non-negative");
|
|
35
|
+
if (!Number.isSafeInteger(cleanupDelayMs) || cleanupDelayMs < 0)
|
|
36
|
+
throw new RedisConfigurationError("Redis pool cleanup delay must be non-negative");
|
|
22
37
|
if (minimum > maximum)
|
|
23
38
|
throw new RedisConfigurationError("Redis pool minimum cannot exceed maximum");
|
|
24
39
|
this.pool = createClientPool({
|
|
@@ -27,52 +42,62 @@ export class RedisPool {
|
|
|
27
42
|
disableOfflineQueue: options.disableOfflineQueue ?? true,
|
|
28
43
|
socket: {
|
|
29
44
|
...options.clientOptions?.socket,
|
|
30
|
-
connectTimeout:
|
|
45
|
+
connectTimeout: this.connectTimeoutMs,
|
|
31
46
|
reconnectStrategy: (attempts) => {
|
|
32
|
-
if (attempts >=
|
|
47
|
+
if (attempts >= maxReconnectAttempts)
|
|
33
48
|
return false;
|
|
34
|
-
return Math.min(
|
|
49
|
+
return Math.min(reconnectBaseDelayMs * 2 ** attempts, reconnectMaxDelayMs);
|
|
35
50
|
},
|
|
36
51
|
},
|
|
37
52
|
}, {
|
|
38
53
|
minimum,
|
|
39
54
|
maximum,
|
|
40
55
|
acquireTimeout: this.acquireTimeoutMs,
|
|
41
|
-
cleanupDelay:
|
|
56
|
+
cleanupDelay: cleanupDelayMs,
|
|
42
57
|
});
|
|
43
58
|
this.pool.on("error", (error) => this.reportError(normalizeNodeRedisError(error)));
|
|
44
59
|
}
|
|
45
60
|
get isReady() {
|
|
46
|
-
return this.pool.
|
|
61
|
+
return this.connected && this.pool.isOpen && !this.closed;
|
|
47
62
|
}
|
|
48
63
|
async connect() {
|
|
49
64
|
if (this.closed)
|
|
50
65
|
throw new RedisClientStateError("The Redis pool has been closed");
|
|
51
66
|
if (this.connected)
|
|
52
67
|
return;
|
|
53
|
-
|
|
54
|
-
this.options.hooks?.onStateChange?.
|
|
55
|
-
await
|
|
68
|
+
this.connecting ??= withTimeout(async () => {
|
|
69
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "connecting");
|
|
70
|
+
await this.pool.connect();
|
|
71
|
+
}, this.connectTimeoutMs, "Redis pool connection timed out")
|
|
72
|
+
.then(() => {
|
|
56
73
|
this.connected = true;
|
|
57
|
-
this.options.hooks?.onStateChange?.
|
|
58
|
-
}
|
|
59
|
-
|
|
74
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "ready");
|
|
75
|
+
})
|
|
76
|
+
.catch((error) => {
|
|
60
77
|
const normalized = normalizeNodeRedisError(error);
|
|
61
78
|
this.reportError(normalized);
|
|
62
|
-
|
|
63
|
-
normalized instanceof RedisTimeoutError
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
79
|
+
if (normalized.code === "REDIS_CLIENT_STATE" ||
|
|
80
|
+
normalized instanceof RedisTimeoutError)
|
|
81
|
+
throw normalized;
|
|
82
|
+
throw new RedisConnectionError("Redis pool connection failed", normalized);
|
|
83
|
+
})
|
|
84
|
+
.finally(() => {
|
|
85
|
+
this.connecting = null;
|
|
86
|
+
});
|
|
87
|
+
await this.connecting;
|
|
88
|
+
if (this.closed)
|
|
89
|
+
throw new RedisClientStateError("The Redis pool has been closed");
|
|
67
90
|
}
|
|
68
|
-
async execute(command) {
|
|
91
|
+
async execute(command, request = {}) {
|
|
69
92
|
if (this.closed)
|
|
70
93
|
throw new RedisClientStateError("The Redis pool has been closed");
|
|
94
|
+
if (request.signal?.aborted)
|
|
95
|
+
throw new RedisRequestAbortedError(request.signal.reason);
|
|
71
96
|
await this.connect();
|
|
72
97
|
const started = Date.now();
|
|
73
|
-
this.options.hooks?.onCommandStart?.
|
|
98
|
+
notifyHook(this.options.hooks?.onCommandStart, this.options.hooks?.onError, command);
|
|
74
99
|
try {
|
|
75
|
-
return await withTimeout(() => this.pool.sendCommand([...command]), this.commandTimeoutMs);
|
|
100
|
+
return await withTimeout((signal) => this.pool.withAbortSignal(signal).sendCommand([...command]), this.commandTimeoutMs, "Redis command timed out", request.signal);
|
|
76
101
|
}
|
|
77
102
|
catch (error) {
|
|
78
103
|
const normalized = normalizeNodeRedisError(error);
|
|
@@ -80,17 +105,17 @@ export class RedisPool {
|
|
|
80
105
|
throw normalized;
|
|
81
106
|
}
|
|
82
107
|
finally {
|
|
83
|
-
this.options.hooks?.onCommandEnd?.
|
|
108
|
+
notifyHook(this.options.hooks?.onCommandEnd, this.options.hooks?.onError, command, Date.now() - started);
|
|
84
109
|
}
|
|
85
110
|
}
|
|
86
|
-
async eval(script, options) {
|
|
111
|
+
async eval(script, options, request = {}) {
|
|
87
112
|
return this.execute([
|
|
88
113
|
"EVAL",
|
|
89
114
|
script,
|
|
90
115
|
String(options.keys?.length ?? 0),
|
|
91
116
|
...(options.keys ?? []),
|
|
92
117
|
...(options.arguments ?? []),
|
|
93
|
-
]);
|
|
118
|
+
], request);
|
|
94
119
|
}
|
|
95
120
|
async ping() {
|
|
96
121
|
await this.execute(["PING"]);
|
|
@@ -105,13 +130,14 @@ export class RedisPool {
|
|
|
105
130
|
if (this.closed)
|
|
106
131
|
return;
|
|
107
132
|
this.closed = true;
|
|
133
|
+
await this.connecting?.catch(() => undefined);
|
|
108
134
|
await this.pool.close();
|
|
109
|
-
this.options.hooks?.onStateChange?.
|
|
135
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "closed");
|
|
110
136
|
}
|
|
111
137
|
reportError(error) {
|
|
112
|
-
this.options.onError
|
|
113
|
-
this.options.hooks?.onError
|
|
114
|
-
this.options.hooks?.onStateChange?.
|
|
138
|
+
notifyError(this.options.onError, error);
|
|
139
|
+
notifyError(this.options.hooks?.onError, error);
|
|
140
|
+
notifyHook(this.options.hooks?.onStateChange, this.options.hooks?.onError, "error");
|
|
115
141
|
}
|
|
116
142
|
}
|
|
117
143
|
export function createRedisPool(options) {
|
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;
|
|
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;AAGnD,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,42 @@
|
|
|
1
1
|
import { createClient } from "redis";
|
|
2
|
+
import { RedisClientStateError, RedisConfigurationError } from "../core/errors.js";
|
|
3
|
+
import { notifyError } from "../core/hooks.js";
|
|
2
4
|
export function createNodePubSubTransport(options) {
|
|
3
5
|
let publisher = null;
|
|
4
6
|
let subscriber = null;
|
|
7
|
+
let closed = false;
|
|
8
|
+
const report = (error) => notifyError(options.onError, error);
|
|
5
9
|
return {
|
|
6
10
|
async publish(channel, message) {
|
|
11
|
+
if (closed)
|
|
12
|
+
throw new RedisClientStateError("The pub/sub transport has been closed");
|
|
13
|
+
if (!channel.trim())
|
|
14
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
7
15
|
publisher ??= createClient({ url: options.url });
|
|
8
|
-
|
|
16
|
+
if (!publisher.isOpen)
|
|
17
|
+
publisher.on("error", report);
|
|
9
18
|
if (!publisher.isReady)
|
|
10
19
|
await publisher.connect();
|
|
11
20
|
return publisher.publish(channel, message);
|
|
12
21
|
},
|
|
13
22
|
async subscribe(channel, handler) {
|
|
23
|
+
if (closed)
|
|
24
|
+
throw new RedisClientStateError("The pub/sub transport has been closed");
|
|
25
|
+
if (!channel.trim())
|
|
26
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
14
27
|
subscriber ??= createClient({ url: options.url });
|
|
15
|
-
|
|
28
|
+
if (!subscriber.isOpen)
|
|
29
|
+
subscriber.on("error", report);
|
|
16
30
|
if (!subscriber.isReady)
|
|
17
31
|
await subscriber.connect();
|
|
18
|
-
await subscriber.subscribe(channel,
|
|
32
|
+
await subscriber.subscribe(channel, (message) => {
|
|
33
|
+
try {
|
|
34
|
+
void Promise.resolve(handler(message)).catch(report);
|
|
35
|
+
}
|
|
36
|
+
catch (error) {
|
|
37
|
+
report(error);
|
|
38
|
+
}
|
|
39
|
+
});
|
|
19
40
|
return async () => {
|
|
20
41
|
if (!subscriber)
|
|
21
42
|
return;
|
|
@@ -23,6 +44,9 @@ export function createNodePubSubTransport(options) {
|
|
|
23
44
|
};
|
|
24
45
|
},
|
|
25
46
|
async close() {
|
|
47
|
+
if (closed)
|
|
48
|
+
return;
|
|
49
|
+
closed = true;
|
|
26
50
|
await Promise.all([
|
|
27
51
|
publisher?.isOpen ? publisher.close() : undefined,
|
|
28
52
|
subscriber?.isOpen ? subscriber.close() : undefined,
|
|
@@ -33,8 +57,16 @@ export function createNodePubSubTransport(options) {
|
|
|
33
57
|
export function createNodeTypedPubSub(options) {
|
|
34
58
|
const transport = createNodePubSubTransport(options);
|
|
35
59
|
return {
|
|
36
|
-
publish: async (channel, value) =>
|
|
37
|
-
|
|
60
|
+
publish: async (channel, value) => {
|
|
61
|
+
if (!channel.trim())
|
|
62
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
63
|
+
return transport.publish(channel, options.codec.encode(value));
|
|
64
|
+
},
|
|
65
|
+
subscribe: (channel, handler) => {
|
|
66
|
+
if (!channel.trim())
|
|
67
|
+
throw new RedisConfigurationError("Pub/sub channel is required");
|
|
68
|
+
return transport.subscribe(channel, async (message) => handler(options.codec.decode(message)));
|
|
69
|
+
},
|
|
38
70
|
close: () => transport.close(),
|
|
39
71
|
};
|
|
40
72
|
}
|
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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"}
|
package/dist/queue/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export type { EnqueueOptions, JobQueue, QueueJob, QueueOptions, QueueWorker, QueueWorkerOptions, } from "./queue.js";
|
|
1
|
+
export type { EnqueueOptions, JobQueue, QueueJob, QueueJobContext, QueueOptions, QueueWorker, QueueWorkerHooks, QueueWorkerOptions, } from "./queue.js";
|
|
2
2
|
export { createQueue, createRedisQueue, RedisQueue, RedisQueueWorker } from "./queue.js";
|
|
3
3
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queue/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,kBAAkB,GAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queue/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/queue/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/queue/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/queue/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/queue/queue.d.ts
CHANGED
|
@@ -24,6 +24,20 @@ export type QueueWorkerOptions = Readonly<{
|
|
|
24
24
|
consumer?: string;
|
|
25
25
|
blockMs?: number;
|
|
26
26
|
concurrency?: number;
|
|
27
|
+
hooks?: QueueWorkerHooks;
|
|
28
|
+
}>;
|
|
29
|
+
export type QueueJobContext = Readonly<{
|
|
30
|
+
id: string;
|
|
31
|
+
attempts: number;
|
|
32
|
+
enqueuedAt: number;
|
|
33
|
+
}>;
|
|
34
|
+
/** Lifecycle hooks receive job metadata without the potentially sensitive payload. */
|
|
35
|
+
export type QueueWorkerHooks = Readonly<{
|
|
36
|
+
onJobStart?: (job: QueueJobContext) => void;
|
|
37
|
+
onJobComplete?: (job: QueueJobContext) => void;
|
|
38
|
+
onJobFailure?: (job: QueueJobContext, error: Error) => void;
|
|
39
|
+
onDeadLetter?: (job: QueueJobContext, error?: Error) => void;
|
|
40
|
+
onError?: (error: Error) => void;
|
|
27
41
|
}>;
|
|
28
42
|
export interface JobQueue<T> {
|
|
29
43
|
enqueue(data: T, options?: EnqueueOptions): Promise<string>;
|
|
@@ -60,6 +74,7 @@ export declare class RedisQueueWorker<T> implements QueueWorker {
|
|
|
60
74
|
private readonly consumer;
|
|
61
75
|
private readonly blockMs;
|
|
62
76
|
private readonly concurrency;
|
|
77
|
+
private readonly hooks?;
|
|
63
78
|
private stopping;
|
|
64
79
|
private running;
|
|
65
80
|
constructor(queue: RedisQueue<T>, handler: (job: QueueJob<T>) => Promise<void>, options: QueueWorkerOptions);
|
|
@@ -70,6 +85,11 @@ export declare class RedisQueueWorker<T> implements QueueWorker {
|
|
|
70
85
|
private promoteDue;
|
|
71
86
|
private recoverPending;
|
|
72
87
|
private process;
|
|
88
|
+
private notifyJobStart;
|
|
89
|
+
private notifyJobComplete;
|
|
90
|
+
private notifyJobFailure;
|
|
91
|
+
private notifyDeadLetter;
|
|
92
|
+
private reportError;
|
|
73
93
|
private encodeRetry;
|
|
74
94
|
}
|
|
75
95
|
export declare function createQueue<T>(options: QueueOptions<T>): RedisQueue<T>;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/queue/queue.ts"],"names":[],"mappings":"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"}
|