redis-smq 9.0.6-next.0 → 9.0.6-next.1
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/cjs/src/common/redis/redis-client/scripts/lua/clear-queue-rate-limit.lua +36 -0
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.d.ts +2 -1
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.d.ts.map +1 -1
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.js +2 -0
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.js.map +1 -1
- package/dist/cjs/src/config/configuration.d.ts +18 -9
- package/dist/cjs/src/config/configuration.d.ts.map +1 -1
- package/dist/cjs/src/config/configuration.js +190 -88
- package/dist/cjs/src/config/configuration.js.map +1 -1
- package/dist/cjs/src/queue-rate-limit/queue-rate-limit.d.ts.map +1 -1
- package/dist/cjs/src/queue-rate-limit/queue-rate-limit.js +9 -4
- package/dist/cjs/src/queue-rate-limit/queue-rate-limit.js.map +1 -1
- package/dist/cjs/src/redis-smq.d.ts +10 -6
- package/dist/cjs/src/redis-smq.d.ts.map +1 -1
- package/dist/cjs/src/redis-smq.js +149 -80
- package/dist/cjs/src/redis-smq.js.map +1 -1
- package/dist/esm/src/common/redis/redis-client/scripts/lua/clear-queue-rate-limit.lua +36 -0
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.d.ts +2 -1
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.d.ts.map +1 -1
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.js +2 -0
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.js.map +1 -1
- package/dist/esm/src/config/configuration.d.ts +18 -9
- package/dist/esm/src/config/configuration.d.ts.map +1 -1
- package/dist/esm/src/config/configuration.js +193 -87
- package/dist/esm/src/config/configuration.js.map +1 -1
- package/dist/esm/src/queue-rate-limit/queue-rate-limit.d.ts.map +1 -1
- package/dist/esm/src/queue-rate-limit/queue-rate-limit.js +10 -5
- package/dist/esm/src/queue-rate-limit/queue-rate-limit.js.map +1 -1
- package/dist/esm/src/redis-smq.d.ts +10 -6
- package/dist/esm/src/redis-smq.d.ts.map +1 -1
- package/dist/esm/src/redis-smq.js +150 -81
- package/dist/esm/src/redis-smq.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { PowerSwitch } from 'redis-smq-common';
|
|
1
2
|
import { ConfigurationNotFoundError } from '../errors/configuration-not-found.error.js';
|
|
2
3
|
import { redisKeys } from '../common/redis/redis-keys/redis-keys.js';
|
|
3
4
|
import { parseConfig } from './parse-config.js';
|
|
@@ -6,11 +7,62 @@ import { defaultConfig } from './default-config.js';
|
|
|
6
7
|
import { withSharedPoolConnection } from '../common/redis/redis-connection-pool/with-shared-pool-connection.js';
|
|
7
8
|
export class Configuration {
|
|
8
9
|
static instance = null;
|
|
10
|
+
static state = new PowerSwitch();
|
|
11
|
+
static initializationQueue = [];
|
|
12
|
+
operationInProgress = false;
|
|
13
|
+
operationQueue = [];
|
|
14
|
+
completionWaiters = [];
|
|
9
15
|
config = defaultConfig;
|
|
10
16
|
constructor() { }
|
|
17
|
+
static validateInitializationState(cb) {
|
|
18
|
+
if (Configuration.state.isUp()) {
|
|
19
|
+
cb(new ConfigurationError('Configuration already initialized'));
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
if (Configuration.state.isGoingUp()) {
|
|
23
|
+
Configuration.initializationQueue.push(cb);
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
if (Configuration.state.isGoingDown()) {
|
|
27
|
+
cb(new ConfigurationError('Configuration is shutting down. Cannot initialize.'));
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
static completeInitialization(error, cb) {
|
|
33
|
+
if (error) {
|
|
34
|
+
Configuration.state.rollback();
|
|
35
|
+
Configuration.instance = null;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
Configuration.state.commit();
|
|
39
|
+
}
|
|
40
|
+
const queuedCallbacks = Configuration.initializationQueue.splice(0);
|
|
41
|
+
cb(error);
|
|
42
|
+
queuedCallbacks.forEach((queuedCb) => queuedCb(error));
|
|
43
|
+
}
|
|
44
|
+
static performInitialization(initializationFn, cb) {
|
|
45
|
+
if (!Configuration.validateInitializationState(cb)) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
Configuration.state.goingUp();
|
|
49
|
+
const instance = (Configuration.instance = new Configuration());
|
|
50
|
+
initializationFn(instance, (err) => {
|
|
51
|
+
Configuration.completeInitialization(err, cb);
|
|
52
|
+
});
|
|
53
|
+
}
|
|
11
54
|
static getInstance() {
|
|
55
|
+
if (Configuration.state.isDown()) {
|
|
56
|
+
throw new ConfigurationError('Configuration not initialized. Call initialize() first.');
|
|
57
|
+
}
|
|
58
|
+
if (Configuration.state.isGoingUp()) {
|
|
59
|
+
throw new ConfigurationError('Configuration is currently initializing. Please wait for initialization to complete.');
|
|
60
|
+
}
|
|
61
|
+
if (Configuration.state.isGoingDown()) {
|
|
62
|
+
throw new ConfigurationError('Configuration is shutting down. Cannot access instance.');
|
|
63
|
+
}
|
|
12
64
|
if (!Configuration.instance) {
|
|
13
|
-
throw new ConfigurationError('Configuration
|
|
65
|
+
throw new ConfigurationError('Configuration instance is null despite being initialized');
|
|
14
66
|
}
|
|
15
67
|
return Configuration.instance;
|
|
16
68
|
}
|
|
@@ -18,112 +70,166 @@ export class Configuration {
|
|
|
18
70
|
return Configuration.getInstance().getConfig();
|
|
19
71
|
}
|
|
20
72
|
static initialize(cb) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
if (err) {
|
|
73
|
+
Configuration.performInitialization((instance, cb) => {
|
|
74
|
+
instance.load((err) => {
|
|
75
|
+
if (err && !(err instanceof ConfigurationNotFoundError)) {
|
|
76
|
+
return cb(err);
|
|
77
|
+
}
|
|
27
78
|
if (err instanceof ConfigurationNotFoundError) {
|
|
28
|
-
|
|
29
|
-
if (err)
|
|
30
|
-
return cb(err);
|
|
31
|
-
Configuration.instance = instance;
|
|
32
|
-
cb(null, instance);
|
|
33
|
-
});
|
|
79
|
+
instance.saveCurrentConfig(cb);
|
|
34
80
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
81
|
+
else {
|
|
82
|
+
cb();
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}, cb);
|
|
40
86
|
}
|
|
41
87
|
static initializeWithConfig(config, cb) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
88
|
+
Configuration.performInitialization((instance, cb) => {
|
|
89
|
+
try {
|
|
90
|
+
instance.config = parseConfig(config);
|
|
91
|
+
instance.saveCurrentConfig(cb);
|
|
92
|
+
}
|
|
93
|
+
catch (parseErr) {
|
|
94
|
+
const error = parseErr instanceof Error
|
|
95
|
+
? parseErr
|
|
96
|
+
: new ConfigurationError(String(parseErr));
|
|
97
|
+
cb(error);
|
|
98
|
+
}
|
|
99
|
+
}, cb);
|
|
53
100
|
}
|
|
54
101
|
static shutdown(cb) {
|
|
55
|
-
Configuration.
|
|
56
|
-
|
|
102
|
+
if (Configuration.state.isDown()) {
|
|
103
|
+
return cb();
|
|
104
|
+
}
|
|
105
|
+
if (Configuration.state.isGoingDown()) {
|
|
106
|
+
return cb(new ConfigurationError('Configuration is already shutting down'));
|
|
107
|
+
}
|
|
108
|
+
if (Configuration.state.isGoingUp()) {
|
|
109
|
+
return cb(new ConfigurationError('Cannot shutdown while initializing'));
|
|
110
|
+
}
|
|
111
|
+
Configuration.state.goingDown();
|
|
112
|
+
if (Configuration.instance) {
|
|
113
|
+
Configuration.instance.waitForOperationCompletion(() => {
|
|
114
|
+
Configuration.instance = null;
|
|
115
|
+
Configuration.state.commit();
|
|
116
|
+
cb();
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
Configuration.state.commit();
|
|
121
|
+
cb();
|
|
122
|
+
}
|
|
57
123
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (err)
|
|
63
|
-
return cb(err);
|
|
64
|
-
if (!configData) {
|
|
65
|
-
return cb(new ConfigurationNotFoundError());
|
|
66
|
-
}
|
|
124
|
+
runExclusive(fn, done) {
|
|
125
|
+
const run = () => {
|
|
126
|
+
this.operationInProgress = true;
|
|
127
|
+
const releaseAndNext = (err) => {
|
|
67
128
|
try {
|
|
68
|
-
|
|
69
|
-
cb(null, this.config);
|
|
129
|
+
done(err);
|
|
70
130
|
}
|
|
71
|
-
|
|
72
|
-
|
|
131
|
+
finally {
|
|
132
|
+
this.operationInProgress = false;
|
|
133
|
+
this.notifyCompletionWaiters();
|
|
134
|
+
this.flushOperationQueue();
|
|
73
135
|
}
|
|
74
|
-
}
|
|
75
|
-
|
|
136
|
+
};
|
|
137
|
+
try {
|
|
138
|
+
fn(releaseAndNext);
|
|
139
|
+
}
|
|
140
|
+
catch (e) {
|
|
141
|
+
const err = e instanceof Error ? e : new ConfigurationError(String(e));
|
|
142
|
+
releaseAndNext(err);
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
if (this.operationInProgress) {
|
|
146
|
+
this.operationQueue.push(run);
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
run();
|
|
150
|
+
}
|
|
76
151
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
152
|
+
flushOperationQueue() {
|
|
153
|
+
if (this.operationInProgress || this.operationQueue.length === 0)
|
|
154
|
+
return;
|
|
155
|
+
setImmediate(() => {
|
|
156
|
+
if (this.operationInProgress)
|
|
157
|
+
return;
|
|
158
|
+
const next = this.operationQueue.shift();
|
|
159
|
+
if (next)
|
|
160
|
+
next();
|
|
161
|
+
});
|
|
80
162
|
}
|
|
81
|
-
|
|
82
|
-
this.
|
|
163
|
+
notifyCompletionWaiters() {
|
|
164
|
+
if (!this.operationInProgress && this.operationQueue.length === 0) {
|
|
165
|
+
const waiters = this.completionWaiters.splice(0);
|
|
166
|
+
waiters.forEach((waiter) => waiter());
|
|
167
|
+
}
|
|
83
168
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
169
|
+
waitForOperationCompletion(cb) {
|
|
170
|
+
if (!this.operationInProgress && this.operationQueue.length === 0) {
|
|
171
|
+
return cb();
|
|
172
|
+
}
|
|
173
|
+
this.completionWaiters.push(cb);
|
|
174
|
+
}
|
|
175
|
+
mergeConfig(current, updates) {
|
|
176
|
+
return {
|
|
177
|
+
...current,
|
|
178
|
+
...updates,
|
|
179
|
+
};
|
|
87
180
|
}
|
|
88
181
|
getConfig() {
|
|
89
182
|
return this.config;
|
|
90
183
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}
|
|
184
|
+
load(cb) {
|
|
185
|
+
this.runExclusive((done) => {
|
|
186
|
+
withSharedPoolConnection((client, cb) => {
|
|
187
|
+
const key = redisKeys.getMainKeys().keyConfiguration;
|
|
188
|
+
client.get(key, (err, configData) => {
|
|
189
|
+
if (err)
|
|
190
|
+
return cb(err);
|
|
191
|
+
if (!configData)
|
|
192
|
+
return cb(new ConfigurationNotFoundError());
|
|
193
|
+
this.config = JSON.parse(configData);
|
|
194
|
+
return cb();
|
|
195
|
+
});
|
|
196
|
+
}, done);
|
|
197
|
+
}, cb);
|
|
106
198
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
199
|
+
saveCurrentConfig(cb) {
|
|
200
|
+
this.runExclusive((done) => {
|
|
201
|
+
withSharedPoolConnection((client, cb) => {
|
|
202
|
+
const key = redisKeys.getMainKeys().keyConfiguration;
|
|
203
|
+
const configData = JSON.stringify(this.config);
|
|
204
|
+
client.set(key, configData, {}, (err) => {
|
|
205
|
+
if (err)
|
|
206
|
+
return cb(err);
|
|
207
|
+
cb();
|
|
208
|
+
});
|
|
209
|
+
}, done);
|
|
115
210
|
}, cb);
|
|
116
211
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
212
|
+
updateConfig(updates, cb) {
|
|
213
|
+
this.runExclusive((done) => {
|
|
214
|
+
try {
|
|
215
|
+
const updatedConfig = this.mergeConfig(this.config, updates);
|
|
216
|
+
this.config = parseConfig(updatedConfig);
|
|
217
|
+
}
|
|
218
|
+
catch (e) {
|
|
219
|
+
const err = e instanceof Error
|
|
220
|
+
? e
|
|
221
|
+
: new ConfigurationError(`Invalid configuration: ${String(e)}`);
|
|
222
|
+
return done(err);
|
|
223
|
+
}
|
|
224
|
+
withSharedPoolConnection((client, cb) => {
|
|
225
|
+
const key = redisKeys.getMainKeys().keyConfiguration;
|
|
226
|
+
const configData = JSON.stringify(this.config);
|
|
227
|
+
client.set(key, configData, {}, (err) => {
|
|
228
|
+
if (err)
|
|
229
|
+
return cb(err);
|
|
230
|
+
cb();
|
|
231
|
+
});
|
|
232
|
+
}, done);
|
|
127
233
|
}, cb);
|
|
128
234
|
}
|
|
129
235
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/config/configuration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/config/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/queue-rate-limit/queue-rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,SAAS,
|
|
1
|
+
{"version":3,"file":"queue-rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/queue-rate-limit/queue-rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAEL,YAAY,EACZ,eAAe,EACf,YAAY,EACb,MAAM,2BAA2B,CAAC;AAgBnC,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,qCAAC;IACjB,SAAS,CAAC,KAAK,eAAC;;IAkBhB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;IA2D9D,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,SAAS,EAAE,eAAe,EAC1B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IAqFP,WAAW,CACT,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,SAAS,EAAE,eAAe,EAC1B,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,GACrB,IAAI;IAqDP,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,EAAE,EAAE,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC,GACpC,IAAI;CA+CR"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { async, CallbackEmptyReplyError, createLogger, } from 'redis-smq-common';
|
|
1
|
+
import { async, CallbackEmptyReplyError, createLogger, PanicError, } from 'redis-smq-common';
|
|
2
2
|
import { ELuaScriptName } from '../common/redis/redis-client/scripts/scripts.js';
|
|
3
3
|
import { redisKeys } from '../common/redis/redis-keys/redis-keys.js';
|
|
4
4
|
import { Configuration } from '../config/index.js';
|
|
@@ -24,14 +24,19 @@ export class QueueRateLimit {
|
|
|
24
24
|
async.withCallback((cb) => _parseQueueParamsAndValidate(client, queue, cb), (queueParams, cb) => {
|
|
25
25
|
const { keyQueueProperties, keyQueueRateLimitCounter } = redisKeys.getQueueKeys(queueParams.ns, queueParams.name, null);
|
|
26
26
|
this.logger.debug(`Clearing rate limit for queue ${queueParams.name}@${queueParams.ns} using keys: ${keyQueueProperties}, ${keyQueueRateLimitCounter}`);
|
|
27
|
-
|
|
28
|
-
multi.hdel(keyQueueProperties, String(EQueueProperty.RATE_LIMIT));
|
|
29
|
-
multi.del(keyQueueRateLimitCounter);
|
|
30
|
-
multi.exec((err) => {
|
|
27
|
+
client.runScript(ELuaScriptName.CLEAR_QUEUE_RATE_LIMIT, [keyQueueProperties, keyQueueRateLimitCounter], [String(EQueueProperty.RATE_LIMIT)], (err, reply) => {
|
|
31
28
|
if (err) {
|
|
32
29
|
this.logger.error(`Failed to clear rate limit: ${err.message}`);
|
|
33
30
|
return cb(err);
|
|
34
31
|
}
|
|
32
|
+
if (!['OK', 'QUEUE_NOT_FOUND'].includes(String(reply))) {
|
|
33
|
+
this.logger.error(`Failed to clear rate limit. Got unknown reply: ${reply}`);
|
|
34
|
+
return cb(new PanicError('UNKNOWN_REPLY'));
|
|
35
|
+
}
|
|
36
|
+
if (reply === 'QUEUE_NOT_FOUND') {
|
|
37
|
+
this.logger.error(`Failed to clear rate limit: ${reply}`);
|
|
38
|
+
return cb(new QueueNotFoundError());
|
|
39
|
+
}
|
|
35
40
|
this.logger.info(`Successfully cleared rate limit for queue: ${queueParams.name}@${queueParams.ns}`);
|
|
36
41
|
cb();
|
|
37
42
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-rate-limit.js","sourceRoot":"","sources":["../../../../src/queue-rate-limit/queue-rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,EACL,uBAAuB,EACvB,YAAY,
|
|
1
|
+
{"version":3,"file":"queue-rate-limit.js","sourceRoot":"","sources":["../../../../src/queue-rate-limit/queue-rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,EACL,uBAAuB,EACvB,YAAY,EAEZ,UAAU,GACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wDAAwD,CAAC;AACtG,OAAO,EACL,cAAc,EAGd,YAAY,GACb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EACL,qBAAqB,EACrB,6BAA6B,EAC7B,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,sEAAsE,CAAC;AAShH,MAAM,OAAO,cAAc;IACf,MAAM,CAAC;IACP,KAAK,CAAC;IAEhB;QACE,IAAI,CAAC,MAAM,GAAG,YAAY,CACxB,aAAa,CAAC,SAAS,EAAE,CAAC,MAAM,EAChC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CACpC,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC;IAQD,KAAK,CAAC,KAA4B,EAAE,EAAmB;QACrD,MAAM,SAAS,GACb,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;QAEjE,wBAAwB,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;YACnE,KAAK,CAAC,YAAY,CAChB,CAAC,EAA2B,EAAE,EAAE,CAC9B,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,EACjD,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE;gBAClB,MAAM,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,GACpD,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACjE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iCAAiC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,gBAAgB,kBAAkB,KAAK,wBAAwB,EAAE,CACrI,CAAC;gBAEF,MAAM,CAAC,SAAS,CACd,cAAc,CAAC,sBAAsB,EACrC,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,EAC9C,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,EACnC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACb,IAAI,GAAG,EAAE,CAAC;wBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;wBAChE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;oBACjB,CAAC;oBACD,IAAI,CAAC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;wBACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kDAAkD,KAAK,EAAE,CAC1D,CAAC;wBACF,OAAO,EAAE,CAAC,IAAI,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;oBAC7C,CAAC;oBACD,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;wBAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC;wBAC1D,OAAO,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;oBACtC,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,8CAA8C,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,EAAE,CACnF,CAAC;oBACF,EAAE,EAAE,CAAC;gBACP,CAAC,CACF,CAAC;YACJ,CAAC,EACD,EAAE,CACH,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAaD,GAAG,CACD,KAA4B,EAC5B,SAA0B,EAC1B,EAAmB;QAEnB,MAAM,SAAS,GACb,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iCAAiC,SAAS,YAAY,SAAS,CAAC,KAAK,eAAe,SAAS,CAAC,QAAQ,IAAI,CAC3G,CAAC;QAEF,wBAAwB,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;YACnE,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;gBAC/D,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wCAAwC,GAAG,CAAC,OAAO,EAAE,CACtD,CAAC;oBACF,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;gBACD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mDAAmD,CACpD,CAAC;oBACF,OAAO,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;gBAC3C,CAAC;gBAGD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;oBAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;oBAClE,OAAO,EAAE,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;gBACzC,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,IAAI,EAAE,CAAC;oBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,gCAAgC,SAAS,CAAC,QAAQ,EAAE,CACrD,CAAC;oBACF,OAAO,EAAE,CAAC,IAAI,6BAA6B,EAAE,CAAC,CAAC;gBACjD,CAAC;gBAED,MAAM,kBAAkB,GAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;gBAChE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yBAAyB,KAAK,iBAAiB,QAAQ,iBAAiB,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,EAAE,CAC7G,CAAC;gBAEF,MAAM,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAAC,YAAY,CACnD,WAAW,CAAC,EAAE,EACd,WAAW,CAAC,IAAI,EAChB,IAAI,CACL,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iCAAiC,kBAAkB,EAAE,CACtD,CAAC;gBAEF,MAAM,CAAC,SAAS,CACd,cAAc,CAAC,oBAAoB,EACnC,CAAC,kBAAkB,CAAC,EACpB,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,EAC/D,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACb,IAAI,GAAG,EAAE,CAAC;wBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC9D,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;oBACjB,CAAC;oBACD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;wBACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4CAA4C,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,EAAE,CACjF,CAAC;wBACF,OAAO,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;oBACtC,CAAC;oBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0CAA0C,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,YAAY,KAAK,eAAe,QAAQ,IAAI,CACzH,CAAC;oBACF,EAAE,EAAE,CAAC;gBACP,CAAC,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IASD,WAAW,CACT,KAA4B,EAC5B,SAA0B,EAC1B,EAAsB;QAEtB,MAAM,SAAS,GACb,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,8CAA8C,SAAS,YAAY,SAAS,CAAC,KAAK,eAAe,SAAS,CAAC,QAAQ,IAAI,CACxH,CAAC;QAEF,wBAAwB,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;YACnE,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;gBAC/D,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wCAAwC,GAAG,CAAC,OAAO,EAAE,CACtD,CAAC;oBACF,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;gBACD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mDAAmD,CACpD,CAAC;oBACF,OAAO,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;gBAC3C,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kCAAkC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,EAAE,CACvE,CAAC;gBACF,qBAAqB,CACnB,MAAM,EACN,WAAW,EACX,SAAS,EACT,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;oBACnB,IAAI,GAAG,EAAE,CAAC;wBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;wBAChE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;oBACjB,CAAC;oBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qCAAqC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,EAAE,CACxH,CAAC;oBACF,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBACxB,CAAC,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IASD,GAAG,CACD,KAA4B,EAC5B,EAAqC;QAErC,MAAM,SAAS,GACb,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;QAChE,wBAAwB,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;YACnE,KAAK,CAAC,YAAY,CAChB,CAAC,EAA2B,EAAE,EAAE,CAC9B,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,EACjD,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE;gBAClB,MAAM,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAAC,YAAY,CACnD,WAAW,CAAC,EAAE,EACd,WAAW,CAAC,IAAI,EAChB,IAAI,CACL,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iCAAiC,kBAAkB,EAAE,CACtD,CAAC;gBAEF,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,EACjC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACb,IAAI,GAAG,EAAE,CAAC;wBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC9D,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;oBACjB,CAAC;oBAED,IAAI,CAAC,KAAK,EAAE,CAAC;wBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kCAAkC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,EAAE,CACvE,CAAC;wBACF,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAED,MAAM,SAAS,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kCAAkC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,YAAY,SAAS,CAAC,KAAK,eAAe,SAAS,CAAC,QAAQ,IAAI,CACrI,CAAC;oBACF,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBACtB,CAAC,CACF,CAAC;YACJ,CAAC,EACD,EAAE,CACH,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;CACF"}
|
|
@@ -14,8 +14,16 @@ import { QueuePendingMessages } from './queue-pending-messages/index.js';
|
|
|
14
14
|
import { QueueRateLimit } from './queue-rate-limit/index.js';
|
|
15
15
|
import { MessageManager } from './message-manager/index.js';
|
|
16
16
|
export declare class RedisSMQ {
|
|
17
|
-
private static
|
|
17
|
+
private static state;
|
|
18
|
+
private static initWaiters;
|
|
19
|
+
private static shutdownWaiters;
|
|
18
20
|
private static readonly components;
|
|
21
|
+
private static initInternal;
|
|
22
|
+
private static finishInitialization;
|
|
23
|
+
private static trackComponent;
|
|
24
|
+
private static shutdownComponents;
|
|
25
|
+
private static bootstrap;
|
|
26
|
+
private static ensureInitialized;
|
|
19
27
|
static initialize(redisConfig: IRedisConfig, cb: ICallback): void;
|
|
20
28
|
static initializeWithConfig(redisSMQConfig: IRedisSMQConfig, cb: ICallback): void;
|
|
21
29
|
static createProducer(): Producer;
|
|
@@ -35,14 +43,10 @@ export declare class RedisSMQ {
|
|
|
35
43
|
static createDirectExchange(): ExchangeDirect;
|
|
36
44
|
static getConfigurationInstance(): Configuration;
|
|
37
45
|
static isInitialized(): boolean;
|
|
38
|
-
static reset(): void;
|
|
46
|
+
static reset(cb?: ICallback): void;
|
|
39
47
|
static shutdown(cb: ICallback): void;
|
|
40
48
|
static startProducer(cb: ICallback<boolean>): Producer;
|
|
41
49
|
static startConsumer(enableMultiplexing: boolean, cb: ICallback<boolean>): Consumer;
|
|
42
50
|
static startConsumer(cb: ICallback<boolean>): Consumer;
|
|
43
|
-
private static trackComponent;
|
|
44
|
-
private static shutdownComponents;
|
|
45
|
-
private static bootstrap;
|
|
46
|
-
private static ensureInitialized;
|
|
47
51
|
}
|
|
48
52
|
//# sourceMappingURL=redis-smq.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-smq.d.ts","sourceRoot":"","sources":["../../../src/redis-smq.ts"],"names":[],"mappings":"AASA,OAAO,
|
|
1
|
+
{"version":3,"file":"redis-smq.d.ts","sourceRoot":"","sources":["../../../src/redis-smq.ts"],"names":[],"mappings":"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"}
|