bullmq 1.54.5 → 1.56.0
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/README.md +1 -1
- package/dist/classes/backoffs.js.map +1 -1
- package/dist/classes/child-pool.js +4 -7
- package/dist/classes/child-pool.js.map +1 -1
- package/dist/classes/child-processor.js +8 -8
- package/dist/classes/child-processor.js.map +1 -1
- package/dist/classes/flow-producer.js +2 -2
- package/dist/classes/flow-producer.js.map +1 -1
- package/dist/classes/index.js +14 -14
- package/dist/classes/index.js.map +1 -1
- package/dist/classes/job.d.ts +5 -1
- package/dist/classes/job.js +13 -9
- package/dist/classes/job.js.map +1 -1
- package/dist/classes/master.js +2 -2
- package/dist/classes/master.js.map +1 -1
- package/dist/classes/queue-events.js +6 -6
- package/dist/classes/queue-events.js.map +1 -1
- package/dist/classes/queue-getters.js.map +1 -1
- package/dist/classes/queue-scheduler.js +3 -3
- package/dist/classes/queue-scheduler.js.map +1 -1
- package/dist/classes/queue.js +7 -7
- package/dist/classes/queue.js.map +1 -1
- package/dist/classes/redis-connection.d.ts +0 -1
- package/dist/classes/redis-connection.js +3 -6
- package/dist/classes/redis-connection.js.map +1 -1
- package/dist/classes/repeat.js +2 -2
- package/dist/classes/repeat.js.map +1 -1
- package/dist/classes/sandbox.js +1 -1
- package/dist/classes/sandbox.js.map +1 -1
- package/dist/classes/scripts.js +12 -8
- package/dist/classes/scripts.js.map +1 -1
- package/dist/classes/timer-manager.js +1 -1
- package/dist/classes/timer-manager.js.map +1 -1
- package/dist/classes/worker.d.ts +1 -1
- package/dist/classes/worker.js +16 -14
- package/dist/classes/worker.js.map +1 -1
- package/dist/commands/addJob-9.lua +3 -3
- package/dist/commands/index.d.ts +4 -3
- package/dist/commands/index.js +8 -72
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/moveStalledJobsToWait-8.lua +2 -2
- package/dist/commands/moveToFinished-8.lua +17 -13
- package/dist/commands/removeJob-1.lua +3 -3
- package/dist/commands/script-loader.d.ts +120 -0
- package/dist/commands/script-loader.js +400 -0
- package/dist/commands/script-loader.js.map +1 -0
- package/dist/enums/index.js +1 -1
- package/dist/enums/index.js.map +1 -1
- package/dist/index.js +5 -5
- package/dist/index.js.map +1 -1
- package/dist/interfaces/index.js +19 -19
- package/dist/interfaces/index.js.map +1 -1
- package/dist/interfaces/jobs-options.d.ts +2 -0
- package/dist/utils.js +7 -5
- package/dist/utils.js.map +1 -1
- package/package.json +14 -12
@@ -0,0 +1,400 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.ScriptLoader = exports.ScriptLoaderError = void 0;
|
4
|
+
const crypto_1 = require("crypto");
|
5
|
+
const glob_1 = require("glob");
|
6
|
+
const path = require("path");
|
7
|
+
const fs = require("fs");
|
8
|
+
const util_1 = require("util");
|
9
|
+
const readFile = (0, util_1.promisify)(fs.readFile);
|
10
|
+
const readdir = (0, util_1.promisify)(fs.readdir);
|
11
|
+
const GlobOptions = { dot: true, silent: false };
|
12
|
+
const IncludeRegex = /^[-]{2,3}[ \t]*@include[ \t]+(["'])(.+?)\1[; \t\n]*$/m;
|
13
|
+
const EmptyLineRegex = /^\s*[\r\n]/gm;
|
14
|
+
class ScriptLoaderError extends Error {
|
15
|
+
constructor(message, path, stack = [], line, position = 0) {
|
16
|
+
super(message);
|
17
|
+
// Ensure the name of this error is the same as the class name
|
18
|
+
this.name = this.constructor.name;
|
19
|
+
Error.captureStackTrace(this, this.constructor);
|
20
|
+
this.includes = stack;
|
21
|
+
this.line = line !== null && line !== void 0 ? line : 0;
|
22
|
+
this.position = position;
|
23
|
+
}
|
24
|
+
}
|
25
|
+
exports.ScriptLoaderError = ScriptLoaderError;
|
26
|
+
const isPossiblyMappedPath = (path) => path && ['~', '<'].includes(path[0]);
|
27
|
+
const hasFilenamePattern = (path) => (0, glob_1.hasMagic)(path, GlobOptions);
|
28
|
+
/**
|
29
|
+
* Lua script loader with include support
|
30
|
+
*/
|
31
|
+
class ScriptLoader {
|
32
|
+
constructor() {
|
33
|
+
/**
|
34
|
+
* Map an alias to a path
|
35
|
+
*/
|
36
|
+
this.pathMapper = new Map();
|
37
|
+
this.clientScripts = new WeakMap();
|
38
|
+
/**
|
39
|
+
* Cache commands by dir
|
40
|
+
*/
|
41
|
+
this.commandCache = new Map();
|
42
|
+
this.rootPath = getPkgJsonDir();
|
43
|
+
this.pathMapper.set('~', this.rootPath);
|
44
|
+
this.pathMapper.set('rootDir', this.rootPath);
|
45
|
+
this.pathMapper.set('base', __dirname);
|
46
|
+
}
|
47
|
+
/**
|
48
|
+
* Add a script path mapping. Allows includes of the form "<includes>/utils.lua" where `includes` is a user
|
49
|
+
* defined path
|
50
|
+
* @param name - the name of the mapping. Note: do not include angle brackets
|
51
|
+
* @param mappedPath - if a relative path is passed, it's relative to the *caller* of this function.
|
52
|
+
* Mapped paths are also accepted, e.g. "~/server/scripts/lua" or "<base>/includes"
|
53
|
+
*/
|
54
|
+
addPathMapping(name, mappedPath) {
|
55
|
+
let resolved;
|
56
|
+
if (isPossiblyMappedPath(mappedPath)) {
|
57
|
+
resolved = this.resolvePath(mappedPath);
|
58
|
+
}
|
59
|
+
else {
|
60
|
+
const caller = getCallerFile();
|
61
|
+
const callerPath = path.dirname(caller);
|
62
|
+
resolved = path.normalize(path.resolve(callerPath, mappedPath));
|
63
|
+
}
|
64
|
+
const last = resolved.length - 1;
|
65
|
+
if (resolved[last] === path.sep) {
|
66
|
+
resolved = resolved.substr(0, last);
|
67
|
+
}
|
68
|
+
this.pathMapper.set(name, resolved);
|
69
|
+
}
|
70
|
+
/**
|
71
|
+
* Resolve the script path considering path mappings
|
72
|
+
* @param scriptName - the name of the script
|
73
|
+
* @param stack - the include stack, for nicer errors
|
74
|
+
*/
|
75
|
+
resolvePath(scriptName, stack = []) {
|
76
|
+
const first = scriptName[0];
|
77
|
+
if (first === '~') {
|
78
|
+
scriptName = path.join(this.rootPath, scriptName.substr(2));
|
79
|
+
}
|
80
|
+
else if (first === '<') {
|
81
|
+
const p = scriptName.indexOf('>');
|
82
|
+
if (p > 0) {
|
83
|
+
const name = scriptName.substring(1, p);
|
84
|
+
const mappedPath = this.pathMapper.get(name);
|
85
|
+
if (!mappedPath) {
|
86
|
+
throw new ScriptLoaderError(`No path mapping found for "${name}"`, scriptName, stack);
|
87
|
+
}
|
88
|
+
scriptName = path.join(mappedPath, scriptName.substring(p + 1));
|
89
|
+
}
|
90
|
+
}
|
91
|
+
return path.normalize(scriptName);
|
92
|
+
}
|
93
|
+
/**
|
94
|
+
* Recursively collect all scripts included in a file
|
95
|
+
* @param file - the parent file
|
96
|
+
* @param cache - a cache for file metadata to increase efficiency. Since a file can be included
|
97
|
+
* multiple times, we make sure to load it only once.
|
98
|
+
* @param stack - internal stack to prevent circular references
|
99
|
+
*/
|
100
|
+
async resolveDependencies(file, cache, stack = []) {
|
101
|
+
cache = cache !== null && cache !== void 0 ? cache : new Map();
|
102
|
+
if (stack.includes(file.path)) {
|
103
|
+
throw new ScriptLoaderError(`circular reference: "${file.path}"`, file.path, stack);
|
104
|
+
}
|
105
|
+
stack.push(file.path);
|
106
|
+
function findPos(content, match) {
|
107
|
+
const pos = content.indexOf(match);
|
108
|
+
const arr = content.slice(0, pos).split('\n');
|
109
|
+
return {
|
110
|
+
line: arr.length,
|
111
|
+
column: arr[arr.length - 1].length + match.indexOf('@include') + 1,
|
112
|
+
};
|
113
|
+
}
|
114
|
+
function raiseError(msg, match) {
|
115
|
+
const pos = findPos(file.content, match);
|
116
|
+
throw new ScriptLoaderError(msg, file.path, stack, pos.line, pos.column);
|
117
|
+
}
|
118
|
+
let res;
|
119
|
+
let content = file.content;
|
120
|
+
while ((res = IncludeRegex.exec(content)) !== null) {
|
121
|
+
const [match, , reference] = res;
|
122
|
+
const includeFilename = isPossiblyMappedPath(reference)
|
123
|
+
? // mapped paths imply absolute reference
|
124
|
+
this.resolvePath(ensureExt(reference), stack)
|
125
|
+
: // include path is relative to the file being processed
|
126
|
+
path.resolve(path.dirname(file.path), ensureExt(reference));
|
127
|
+
let includePaths;
|
128
|
+
if (hasFilenamePattern(includeFilename)) {
|
129
|
+
const filesMatched = await getFilenamesByPattern(includeFilename);
|
130
|
+
includePaths = filesMatched.map((x) => path.resolve(x));
|
131
|
+
}
|
132
|
+
else {
|
133
|
+
includePaths = [includeFilename];
|
134
|
+
}
|
135
|
+
includePaths = includePaths.filter((file) => path.extname(file) === '.lua');
|
136
|
+
if (includePaths.length === 0) {
|
137
|
+
raiseError(`include not found: "${reference}"`, match);
|
138
|
+
}
|
139
|
+
const tokens = [];
|
140
|
+
for (let i = 0; i < includePaths.length; i++) {
|
141
|
+
const includePath = includePaths[i];
|
142
|
+
const hasInclude = file.includes.find((x) => x.path === includePath);
|
143
|
+
if (hasInclude) {
|
144
|
+
/**
|
145
|
+
* We have something like
|
146
|
+
* --- \@include "a"
|
147
|
+
* ...
|
148
|
+
* --- \@include "a"
|
149
|
+
*/
|
150
|
+
raiseError(`file "${reference}" already included in "${file.path}"`, match);
|
151
|
+
}
|
152
|
+
let includeMetadata = cache.get(includePath);
|
153
|
+
let token;
|
154
|
+
if (!includeMetadata) {
|
155
|
+
const { name, numberOfKeys } = splitFilename(includePath);
|
156
|
+
let childContent;
|
157
|
+
try {
|
158
|
+
const buf = await readFile(includePath, { flag: 'r' });
|
159
|
+
childContent = buf.toString();
|
160
|
+
}
|
161
|
+
catch (err) {
|
162
|
+
if (err.code === 'ENOENT') {
|
163
|
+
raiseError(`include not found: "${reference}"`, match);
|
164
|
+
}
|
165
|
+
else {
|
166
|
+
throw err;
|
167
|
+
}
|
168
|
+
}
|
169
|
+
// this represents a normalized version of the path to make replacement easy
|
170
|
+
token = getPathHash(includePath);
|
171
|
+
includeMetadata = {
|
172
|
+
name,
|
173
|
+
numberOfKeys,
|
174
|
+
path: includePath,
|
175
|
+
content: childContent,
|
176
|
+
token,
|
177
|
+
includes: [],
|
178
|
+
};
|
179
|
+
cache.set(includePath, includeMetadata);
|
180
|
+
}
|
181
|
+
else {
|
182
|
+
token = includeMetadata.token;
|
183
|
+
}
|
184
|
+
tokens.push(token);
|
185
|
+
file.includes.push(includeMetadata);
|
186
|
+
await this.resolveDependencies(includeMetadata, cache, stack);
|
187
|
+
}
|
188
|
+
// Replace @includes with normalized path hashes
|
189
|
+
const substitution = tokens.join('\n');
|
190
|
+
content = content.replace(match, substitution);
|
191
|
+
}
|
192
|
+
file.content = content;
|
193
|
+
cache.set(file.path, file);
|
194
|
+
stack.pop();
|
195
|
+
}
|
196
|
+
/**
|
197
|
+
* Parse a (top-level) lua script
|
198
|
+
* @param filename - the full path to the script
|
199
|
+
* @param content - the content of the script
|
200
|
+
* @param cache - cache
|
201
|
+
*/
|
202
|
+
async parseScript(filename, content, cache) {
|
203
|
+
const meta = cache === null || cache === void 0 ? void 0 : cache.get(filename);
|
204
|
+
if ((meta === null || meta === void 0 ? void 0 : meta.content) === content) {
|
205
|
+
return meta;
|
206
|
+
}
|
207
|
+
const { name, numberOfKeys } = splitFilename(filename);
|
208
|
+
const fileInfo = {
|
209
|
+
path: filename,
|
210
|
+
token: getPathHash(filename),
|
211
|
+
content,
|
212
|
+
name,
|
213
|
+
numberOfKeys,
|
214
|
+
includes: [],
|
215
|
+
};
|
216
|
+
await this.resolveDependencies(fileInfo, cache);
|
217
|
+
return fileInfo;
|
218
|
+
}
|
219
|
+
/**
|
220
|
+
* Construct the final version of a file by interpolating its includes in dependency order.
|
221
|
+
* @param file - the file whose content we want to construct
|
222
|
+
* @param processed - a cache to keep track of which includes have already been processed
|
223
|
+
*/
|
224
|
+
interpolate(file, processed) {
|
225
|
+
processed = processed || new Set();
|
226
|
+
let content = file.content;
|
227
|
+
file.includes.forEach((child) => {
|
228
|
+
const emitted = processed.has(child.path);
|
229
|
+
const fragment = this.interpolate(child, processed);
|
230
|
+
const replacement = emitted ? '' : fragment;
|
231
|
+
if (!replacement) {
|
232
|
+
content = replaceAll(content, child.token, '');
|
233
|
+
}
|
234
|
+
else {
|
235
|
+
// replace the first instance with the dependency
|
236
|
+
content = content.replace(child.token, replacement);
|
237
|
+
// remove the rest
|
238
|
+
content = replaceAll(content, child.token, '');
|
239
|
+
}
|
240
|
+
processed.add(child.path);
|
241
|
+
});
|
242
|
+
return content;
|
243
|
+
}
|
244
|
+
async loadCommand(filename, cache) {
|
245
|
+
filename = path.resolve(filename);
|
246
|
+
let script = cache === null || cache === void 0 ? void 0 : cache.get(filename);
|
247
|
+
if (!script) {
|
248
|
+
const content = (await readFile(filename)).toString();
|
249
|
+
script = await this.parseScript(filename, content, cache);
|
250
|
+
}
|
251
|
+
const lua = removeEmptyLines(this.interpolate(script));
|
252
|
+
const { name, numberOfKeys } = script;
|
253
|
+
return {
|
254
|
+
name,
|
255
|
+
options: { numberOfKeys, lua },
|
256
|
+
};
|
257
|
+
}
|
258
|
+
/**
|
259
|
+
* Load redis lua scripts.
|
260
|
+
* The name of the script must have the following format:
|
261
|
+
*
|
262
|
+
* cmdName-numKeys.lua
|
263
|
+
*
|
264
|
+
* cmdName must be in camel case format.
|
265
|
+
*
|
266
|
+
* For example:
|
267
|
+
* moveToFinish-3.lua
|
268
|
+
*
|
269
|
+
*/
|
270
|
+
async loadScripts(dir, cache) {
|
271
|
+
dir = path.normalize(dir || __dirname);
|
272
|
+
let commands = this.commandCache.get(dir);
|
273
|
+
if (commands) {
|
274
|
+
return commands;
|
275
|
+
}
|
276
|
+
const files = await readdir(dir);
|
277
|
+
const luaFiles = files.filter((file) => path.extname(file) === '.lua');
|
278
|
+
if (luaFiles.length === 0) {
|
279
|
+
/**
|
280
|
+
* To prevent unclarified runtime error "updateDelayset is not a function
|
281
|
+
* @see https://github.com/OptimalBits/bull/issues/920
|
282
|
+
*/
|
283
|
+
throw new ScriptLoaderError('No .lua files found!', dir, []);
|
284
|
+
}
|
285
|
+
commands = [];
|
286
|
+
cache = cache !== null && cache !== void 0 ? cache : new Map();
|
287
|
+
for (let i = 0; i < luaFiles.length; i++) {
|
288
|
+
const file = path.join(dir, luaFiles[i]);
|
289
|
+
const command = await this.loadCommand(file, cache);
|
290
|
+
commands.push(command);
|
291
|
+
}
|
292
|
+
this.commandCache.set(dir, commands);
|
293
|
+
return commands;
|
294
|
+
}
|
295
|
+
/**
|
296
|
+
* Attach all lua scripts in a given directory to a client instance
|
297
|
+
* @param client - redis client to attach script to
|
298
|
+
* @param pathname - the path to the directory containing the scripts
|
299
|
+
*/
|
300
|
+
async load(client, pathname) {
|
301
|
+
let paths = this.clientScripts.get(client);
|
302
|
+
if (!paths) {
|
303
|
+
paths = new Set();
|
304
|
+
this.clientScripts.set(client, paths);
|
305
|
+
}
|
306
|
+
if (!paths.has(pathname)) {
|
307
|
+
paths.add(pathname);
|
308
|
+
const scripts = await this.loadScripts(pathname);
|
309
|
+
scripts.forEach((command) => {
|
310
|
+
// Only define the command if not already defined
|
311
|
+
if (!client[command.name]) {
|
312
|
+
client.defineCommand(command.name, command.options);
|
313
|
+
}
|
314
|
+
});
|
315
|
+
}
|
316
|
+
}
|
317
|
+
/**
|
318
|
+
* Clears the command cache
|
319
|
+
*/
|
320
|
+
clearCache() {
|
321
|
+
this.commandCache.clear();
|
322
|
+
}
|
323
|
+
}
|
324
|
+
exports.ScriptLoader = ScriptLoader;
|
325
|
+
function ensureExt(filename, ext = 'lua') {
|
326
|
+
const foundExt = path.extname(filename);
|
327
|
+
if (foundExt && foundExt !== '.') {
|
328
|
+
return filename;
|
329
|
+
}
|
330
|
+
if (ext && ext[0] !== '.') {
|
331
|
+
ext = `.${ext}`;
|
332
|
+
}
|
333
|
+
return `${filename}${ext}`;
|
334
|
+
}
|
335
|
+
function splitFilename(filePath) {
|
336
|
+
const longName = path.basename(filePath, '.lua');
|
337
|
+
const [name, num] = longName.split('-');
|
338
|
+
const numberOfKeys = num && parseInt(num, 10);
|
339
|
+
return { name, numberOfKeys };
|
340
|
+
}
|
341
|
+
async function getFilenamesByPattern(pattern) {
|
342
|
+
return new Promise((resolve, reject) => {
|
343
|
+
(0, glob_1.glob)(pattern, GlobOptions, (err, files) => {
|
344
|
+
return err ? reject(err) : resolve(files);
|
345
|
+
});
|
346
|
+
});
|
347
|
+
}
|
348
|
+
// Determine the project root
|
349
|
+
// https://stackoverflow.com/a/18721515
|
350
|
+
function getPkgJsonDir() {
|
351
|
+
for (const modPath of module.paths) {
|
352
|
+
try {
|
353
|
+
const prospectivePkgJsonDir = path.dirname(modPath);
|
354
|
+
fs.accessSync(modPath, fs.constants.F_OK);
|
355
|
+
return prospectivePkgJsonDir;
|
356
|
+
// eslint-disable-next-line no-empty
|
357
|
+
}
|
358
|
+
catch (e) { }
|
359
|
+
}
|
360
|
+
}
|
361
|
+
// https://stackoverflow.com/a/66842927
|
362
|
+
// some dark magic here :-)
|
363
|
+
// this version is preferred to the simpler version because of
|
364
|
+
// https://github.com/facebook/jest/issues/5303 -
|
365
|
+
// tldr: dont assume you're the only one with the doing something like this
|
366
|
+
function getCallerFile() {
|
367
|
+
const originalFunc = Error.prepareStackTrace;
|
368
|
+
let callerFile;
|
369
|
+
try {
|
370
|
+
Error.prepareStackTrace = (_, stack) => stack;
|
371
|
+
const sites = new Error().stack;
|
372
|
+
const currentFile = sites.shift().getFileName();
|
373
|
+
while (sites.length) {
|
374
|
+
callerFile = sites.shift().getFileName();
|
375
|
+
if (currentFile !== callerFile) {
|
376
|
+
break;
|
377
|
+
}
|
378
|
+
}
|
379
|
+
// eslint-disable-next-line no-empty
|
380
|
+
}
|
381
|
+
catch (e) {
|
382
|
+
}
|
383
|
+
finally {
|
384
|
+
Error.prepareStackTrace = originalFunc;
|
385
|
+
}
|
386
|
+
return callerFile;
|
387
|
+
}
|
388
|
+
function sha1(data) {
|
389
|
+
return (0, crypto_1.createHash)('sha1').update(data).digest('hex');
|
390
|
+
}
|
391
|
+
function getPathHash(normalizedPath) {
|
392
|
+
return `@@${sha1(normalizedPath)}`;
|
393
|
+
}
|
394
|
+
function replaceAll(str, find, replace) {
|
395
|
+
return str.replace(new RegExp(find, 'g'), replace);
|
396
|
+
}
|
397
|
+
function removeEmptyLines(str) {
|
398
|
+
return str.replace(EmptyLineRegex, '');
|
399
|
+
}
|
400
|
+
//# sourceMappingURL=script-loader.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"script-loader.js","sourceRoot":"","sources":["../../src/commands/script-loader.ts"],"names":[],"mappings":"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"}
|
package/dist/enums/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
|
-
tslib_1.__exportStar(require("./error-codes.enum"), exports);
|
4
|
+
(0, tslib_1.__exportStar)(require("./error-codes.enum"), exports);
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/dist/enums/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/enums/index.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/enums/index.ts"],"names":[],"mappings":";;;AAAA,kEAAmC"}
|
package/dist/index.js
CHANGED
@@ -1,9 +1,9 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
|
-
tslib_1.__exportStar(require("./classes"), exports);
|
5
|
-
tslib_1.__exportStar(require("./commands"), exports);
|
6
|
-
tslib_1.__exportStar(require("./enums"), exports);
|
7
|
-
tslib_1.__exportStar(require("./interfaces"), exports);
|
8
|
-
tslib_1.__exportStar(require("./utils"), exports);
|
4
|
+
(0, tslib_1.__exportStar)(require("./classes"), exports);
|
5
|
+
(0, tslib_1.__exportStar)(require("./commands"), exports);
|
6
|
+
(0, tslib_1.__exportStar)(require("./enums"), exports);
|
7
|
+
(0, tslib_1.__exportStar)(require("./interfaces"), exports);
|
8
|
+
(0, tslib_1.__exportStar)(require("./utils"), exports);
|
9
9
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,yDAA0B;AAC1B,0DAA2B;AAC3B,uDAAwB;AACxB,4DAA6B;AAC7B,uDAAwB"}
|
package/dist/interfaces/index.js
CHANGED
@@ -1,23 +1,23 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
|
-
tslib_1.__exportStar(require("./advanced-options"), exports);
|
5
|
-
tslib_1.__exportStar(require("./backoff-options"), exports);
|
6
|
-
tslib_1.__exportStar(require("./child-command"), exports);
|
7
|
-
tslib_1.__exportStar(require("./child-message"), exports);
|
8
|
-
tslib_1.__exportStar(require("./connection"), exports);
|
9
|
-
tslib_1.__exportStar(require("./flow-job"), exports);
|
10
|
-
tslib_1.__exportStar(require("./jobs-options"), exports);
|
11
|
-
tslib_1.__exportStar(require("./parent-command"), exports);
|
12
|
-
tslib_1.__exportStar(require("./parent-message"), exports);
|
13
|
-
tslib_1.__exportStar(require("./parent"), exports);
|
14
|
-
tslib_1.__exportStar(require("./queue-options"), exports);
|
15
|
-
tslib_1.__exportStar(require("./queue-scheduler-options"), exports);
|
16
|
-
tslib_1.__exportStar(require("./rate-limiter-options"), exports);
|
17
|
-
tslib_1.__exportStar(require("./redis-options"), exports);
|
18
|
-
tslib_1.__exportStar(require("./redis-streams"), exports);
|
19
|
-
tslib_1.__exportStar(require("./repeat-options"), exports);
|
20
|
-
tslib_1.__exportStar(require("./sandboxed-job-processor"), exports);
|
21
|
-
tslib_1.__exportStar(require("./sandboxed-job"), exports);
|
22
|
-
tslib_1.__exportStar(require("./worker-options"), exports);
|
4
|
+
(0, tslib_1.__exportStar)(require("./advanced-options"), exports);
|
5
|
+
(0, tslib_1.__exportStar)(require("./backoff-options"), exports);
|
6
|
+
(0, tslib_1.__exportStar)(require("./child-command"), exports);
|
7
|
+
(0, tslib_1.__exportStar)(require("./child-message"), exports);
|
8
|
+
(0, tslib_1.__exportStar)(require("./connection"), exports);
|
9
|
+
(0, tslib_1.__exportStar)(require("./flow-job"), exports);
|
10
|
+
(0, tslib_1.__exportStar)(require("./jobs-options"), exports);
|
11
|
+
(0, tslib_1.__exportStar)(require("./parent-command"), exports);
|
12
|
+
(0, tslib_1.__exportStar)(require("./parent-message"), exports);
|
13
|
+
(0, tslib_1.__exportStar)(require("./parent"), exports);
|
14
|
+
(0, tslib_1.__exportStar)(require("./queue-options"), exports);
|
15
|
+
(0, tslib_1.__exportStar)(require("./queue-scheduler-options"), exports);
|
16
|
+
(0, tslib_1.__exportStar)(require("./rate-limiter-options"), exports);
|
17
|
+
(0, tslib_1.__exportStar)(require("./redis-options"), exports);
|
18
|
+
(0, tslib_1.__exportStar)(require("./redis-streams"), exports);
|
19
|
+
(0, tslib_1.__exportStar)(require("./repeat-options"), exports);
|
20
|
+
(0, tslib_1.__exportStar)(require("./sandboxed-job-processor"), exports);
|
21
|
+
(0, tslib_1.__exportStar)(require("./sandboxed-job"), exports);
|
22
|
+
(0, tslib_1.__exportStar)(require("./worker-options"), exports);
|
23
23
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,kEAAmC;AACnC,iEAAkC;AAClC,+DAAgC;AAChC,+DAAgC;AAChC,4DAA6B;AAC7B,0DAA2B;AAC3B,8DAA+B;AAC/B,gEAAiC;AACjC,gEAAiC;AACjC,wDAAyB;AACzB,+DAAgC;AAChC,yEAA0C;AAC1C,sEAAuC;AACvC,+DAAgC;AAChC,+DAAgC;AAChC,gEAAiC;AACjC,yEAA0C;AAC1C,+DAAgC;AAChC,gEAAiC"}
|
@@ -15,10 +15,12 @@ export interface JobsOptions {
|
|
15
15
|
* An amount of milliseconds to wait until this job can be processed.
|
16
16
|
* Note that for accurate delays, worker and producers
|
17
17
|
* should have their clocks synchronized.
|
18
|
+
* @defaultValue 0
|
18
19
|
*/
|
19
20
|
delay?: number;
|
20
21
|
/**
|
21
22
|
* The total number of attempts to try the job until it completes.
|
23
|
+
* @defaultValue 0
|
22
24
|
*/
|
23
25
|
attempts?: number;
|
24
26
|
/**
|
package/dist/utils.js
CHANGED
@@ -93,10 +93,10 @@ function getParentKey(opts) {
|
|
93
93
|
exports.getParentKey = getParentKey;
|
94
94
|
function jobIdForGroup(jobOpts, data, queueOpts) {
|
95
95
|
const jobId = jobOpts === null || jobOpts === void 0 ? void 0 : jobOpts.jobId;
|
96
|
-
const groupKeyPath = lodash_1.get(queueOpts, 'limiter.groupKey');
|
97
|
-
const groupKey = lodash_1.get(data, groupKeyPath);
|
96
|
+
const groupKeyPath = (0, lodash_1.get)(queueOpts, 'limiter.groupKey');
|
97
|
+
const groupKey = (0, lodash_1.get)(data, groupKeyPath);
|
98
98
|
if (groupKeyPath && !(typeof groupKey === 'undefined')) {
|
99
|
-
return `${jobId || uuid_1.v4()}:${groupKey}`;
|
99
|
+
return `${jobId || (0, uuid_1.v4)()}:${groupKey}`;
|
100
100
|
}
|
101
101
|
return jobId;
|
102
102
|
}
|
@@ -110,7 +110,7 @@ function isNotConnectionError(error) {
|
|
110
110
|
!errorMessage.includes('ECONNREFUSED'));
|
111
111
|
}
|
112
112
|
exports.isNotConnectionError = isNotConnectionError;
|
113
|
-
|
113
|
+
const childSend = (proc, msg) => {
|
114
114
|
return new Promise((resolve, reject) => {
|
115
115
|
proc.send(msg, (err) => {
|
116
116
|
if (err) {
|
@@ -122,7 +122,8 @@ exports.childSend = (proc, msg) => {
|
|
122
122
|
});
|
123
123
|
});
|
124
124
|
};
|
125
|
-
exports.
|
125
|
+
exports.childSend = childSend;
|
126
|
+
const parentSend = (child, msg) => {
|
126
127
|
return new Promise((resolve, reject) => {
|
127
128
|
child.send(msg, (err) => {
|
128
129
|
if (err) {
|
@@ -134,4 +135,5 @@ exports.parentSend = (child, msg) => {
|
|
134
135
|
});
|
135
136
|
});
|
136
137
|
};
|
138
|
+
exports.parentSend = parentSend;
|
137
139
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAClC,6DAA6D;AAC7D,aAAa;AACb,+CAAkE;AAClE,+BAA0B;AAC1B,mCAA6B;AAUhB,QAAA,WAAW,GAA6B,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAErE,SAAgB,QAAQ,CACtB,EAAyB,EACzB,GAAQ,EACR,IAAW;IAEX,IAAI;QACF,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QACV,mBAAW,CAAC,KAAK,GAAG,CAAC,CAAC;QACtB,OAAO,mBAAW,CAAC;KACpB;AACH,CAAC;AAXD,4BAWC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC;AAFD,8CAEC;AAED,SAAgB,OAAO,CAAC,GAAW;IACjC,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;QACrB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAClD,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,0BAOC;AAED,SAAgB,SAAS,CAAC,GAAa;IACrC,MAAM,GAAG,GAAgC,EAAE,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QACtC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;KAC1B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAND,8BAMC;AAED,SAAgB,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACtC,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,KAAK,CAAC;KACd;IACD,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IACxD,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC;AACjE,CAAC;AAND,0CAMC;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAmB,EACnB,SAAiB,EACjB,MAAM,GAAG,MAAM;IAEf,IAAI,MAAM,YAAY,iBAAO,EAAE;QAC7B,6BAA6B;QAC7B,kDAAkD;QAClD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC/B;IACD,MAAM,OAAO,GAAG,GAAG,MAAM,IAAI,SAAS,IAAI,CAAC;IAC3C,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC;YAC/B,KAAK,EAAE,OAAO;SACf,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACjB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBAC5B,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAClC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC;AA7BD,gDA6BC;AAED,SAAgB,YAAY,CAAC,IAAmC;IAC9D,IAAI,IAAI,EAAE;QACR,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;KACnC;AACH,CAAC;AAJD,oCAIC;AAED,SAAgB,aAAa,CAC3B,OAAoB,EACpB,IAAS,EACT,SAAuB;IAEvB,MAAM,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;IAC7B,MAAM,YAAY,GAAG,YAAG,
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "bullmq",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.56.0",
|
4
4
|
"description": "Queue for messages and jobs based on Redis",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"types": "dist/index.d.ts",
|
@@ -38,12 +38,13 @@
|
|
38
38
|
"semantic-release": "semantic-release",
|
39
39
|
"semantic-release-prepare": "ts-node tools/semantic-release-prepare",
|
40
40
|
"test": "tsc && ts-mocha --config ./.mocharc.js",
|
41
|
-
"test:watch": "ts-mocha --paths '
|
41
|
+
"test:watch": "ts-mocha --paths 'tests/test_*.ts' -w --watch-extensions ts",
|
42
42
|
"tsc": "tsc"
|
43
43
|
},
|
44
44
|
"dependencies": {
|
45
45
|
"cron-parser": "^2.18.0",
|
46
46
|
"get-port": "^5.1.1",
|
47
|
+
"glob": "^7.2.0",
|
47
48
|
"ioredis": "^4.27.9",
|
48
49
|
"lodash": "^4.17.21",
|
49
50
|
"msgpackr": "^1.4.6",
|
@@ -55,17 +56,18 @@
|
|
55
56
|
"@commitlint/cli": "^8.3.5",
|
56
57
|
"@commitlint/config-conventional": "^8.3.4",
|
57
58
|
"@istanbuljs/nyc-config-typescript": "^0.1.3",
|
58
|
-
"@microsoft/api-documenter": "^7.13.
|
59
|
-
"@microsoft/api-extractor": "^7.18.
|
59
|
+
"@microsoft/api-documenter": "^7.13.68",
|
60
|
+
"@microsoft/api-extractor": "^7.18.19",
|
60
61
|
"@semantic-release/changelog": "^6.0.0",
|
61
|
-
"@semantic-release/commit-analyzer": "^
|
62
|
-
"@semantic-release/exec": "^
|
63
|
-
"@semantic-release/git": "^
|
62
|
+
"@semantic-release/commit-analyzer": "^9.0.2",
|
63
|
+
"@semantic-release/exec": "^6.0.2",
|
64
|
+
"@semantic-release/git": "^10.0.1",
|
64
65
|
"@semantic-release/github": "^8.0.2",
|
65
|
-
"@semantic-release/npm": "^
|
66
|
-
"@semantic-release/release-notes-generator": "^
|
66
|
+
"@semantic-release/npm": "^8.0.3",
|
67
|
+
"@semantic-release/release-notes-generator": "^10.0.3",
|
67
68
|
"@types/chai": "^4.2.22",
|
68
69
|
"@types/chai-as-promised": "^7.1.4",
|
70
|
+
"@types/glob": "^7.2.0",
|
69
71
|
"@types/ioredis": "^4.27.4",
|
70
72
|
"@types/lodash": "^4.14.173",
|
71
73
|
"@types/mocha": "^5.2.7",
|
@@ -81,7 +83,7 @@
|
|
81
83
|
"commitizen": "^4.2.4",
|
82
84
|
"copyfiles": "^2.4.1",
|
83
85
|
"coveralls": "^3.1.1",
|
84
|
-
"eslint": "
|
86
|
+
"eslint": "7.0.0",
|
85
87
|
"eslint-config-prettier": "6.7.0",
|
86
88
|
"eslint-plugin-mocha": "^8.2.0",
|
87
89
|
"eslint-plugin-prettier": "3.1.2",
|
@@ -97,12 +99,12 @@
|
|
97
99
|
"prettier": "^2.4.1",
|
98
100
|
"pretty-quick": "^3.1.1",
|
99
101
|
"rimraf": "^3.0.2",
|
100
|
-
"semantic-release": "^
|
102
|
+
"semantic-release": "^18.0.1",
|
101
103
|
"sinon": "^7.5.0",
|
102
104
|
"test-console": "^2.0.0",
|
103
105
|
"ts-mocha": "^8.0.0",
|
104
106
|
"ts-node": "^8.10.2",
|
105
|
-
"typescript": "^
|
107
|
+
"typescript": "^4.5.2"
|
106
108
|
},
|
107
109
|
"nyc": {
|
108
110
|
"extends": "@istanbuljs/nyc-config-typescript",
|