@tachybase/plugin-adapter-bullmq 1.3.17 → 1.3.18

package/dist/node_modules/bullmq/dist/cjs/classes/queue.js

@@ -14,9 +14,9 @@ const version_1 = require("../version");
  * This class provides methods to add jobs to a queue and some other high-level
  * administration such as pausing or deleting queues.
  *
- * @template DataType - The type of the data that the job will process.
- * @template ResultType - The type of the result of the job.
- * @template NameType - The type of the name of the job.
+ * @typeParam DataType - The type of the data that the job will process.
+ * @typeParam ResultType - The type of the result of the job.
+ * @typeParam NameType - The type of the name of the job.
  *
  * @example
  *
@@ -130,6 +130,13 @@ class Queue extends queue_getters_1.QueueGetters {
         const client = await this.client;
         return client.hset(this.keys.meta, 'concurrency', concurrency);
     }
+    /**
+     * Remove global concurrency value.
+     */
+    async removeGlobalConcurrency() {
+        const client = await this.client;
+        return client.hdel(this.keys.meta, 'concurrency');
+    }
     /**
      * Adds a new job to the queue.
      *
@@ -158,9 +165,9 @@ class Queue extends queue_getters_1.QueueGetters {
      * addJob is a telemetry free version of the add method, useful in order to wrap it
      * with custom telemetry on subclasses.
      *
-     * @param name
-     * @param data
-     * @param opts
+     * @param name - Name of the job to be added to the queue.
+     * @param data - Arbitrary data to append to the job.
+     * @param opts - Job options that affects how the job is going to be processed.
      *
      * @returns Job
      */
@@ -316,7 +323,6 @@ class Queue extends queue_getters_1.QueueGetters {
     /**
      * Get all repeatable meta jobs.
      *
-     *
      * @deprecated This method is deprecated and will be removed in v6. Use getJobSchedulers instead.
      *
      * @param start - Offset of first job to return.
@@ -366,8 +372,8 @@ class Queue extends queue_getters_1.QueueGetters {
      * @see removeRepeatableByKey
      *
      * @param name - Job name
-     * @param repeatOpts -
-     * @param jobId -
+     * @param repeatOpts - Repeat options
+     * @param jobId - Job id to remove. If not provided, all jobs with the same repeatOpts
      * @returns
      */
     async removeRepeatable(name, repeatOpts, jobId) {
@@ -385,7 +391,7 @@ class Queue extends queue_getters_1.QueueGetters {
      *
      * Removes a job scheduler.
      *
-     * @param jobSchedulerId
+     * @param jobSchedulerId - identifier of the job scheduler.
      *
      * @returns
      */
@@ -398,7 +404,7 @@ class Queue extends queue_getters_1.QueueGetters {
      * Removes a debounce key.
      * @deprecated use removeDeduplicationKey
      *
-     * @param id - identifier
+     * @param id - debounce identifier
      */
     async removeDebounceKey(id) {
         return this.trace(enums_1.SpanKind.INTERNAL, 'removeDebounceKey', `${this.name}`, async (span) => {
@@ -572,7 +578,7 @@ class Queue extends queue_getters_1.QueueGetters {
     /**
      * Retry all the failed or completed jobs.
      *
-     * @param opts: { count: number; state: FinishedStatus; timestamp: number}
+     * @param opts - An object with the following properties:
      *   - count  number to limit how many jobs will be moved to wait status per iteration,
      *   - state  failed by default or completed.
      *   - timestamp from which timestamp to start moving jobs to wait status, default Date.now().
@@ -593,7 +599,7 @@ class Queue extends queue_getters_1.QueueGetters {
     /**
      * Promote all the delayed jobs.
      *
-     * @param opts: { count: number }
+     * @param opts - An object with the following properties:
      *   - count  number to limit how many jobs will be moved to wait status per iteration
      *
      * @returns

package/dist/node_modules/bullmq/dist/cjs/classes/redis-connection.js

@@ -16,22 +16,23 @@ const overrideMessage = [
 ].join(' ');
 const deprecationMessage = 'BullMQ: Your redis options maxRetriesPerRequest must be null.';
 class RedisConnection extends events_1.EventEmitter {
-    constructor(opts, shared = false, blocking = true, skipVersionCheck = false) {
+    constructor(opts, extraOptions) {
         super();
-        this.shared = shared;
-        this.blocking = blocking;
+        this.extraOptions = extraOptions;
         this.capabilities = {
             canDoubleTimeout: false,
             canBlockFor1Ms: true,
         };
         this.status = 'initializing';
         this.packageVersion = version_1.version;
+        // Set extra options defaults
+        this.extraOptions = Object.assign({ shared: false, blocking: true, skipVersionCheck: false, skipWaitingForReady: false }, extraOptions);
         if (!(0, utils_2.isRedisInstance)(opts)) {
             this.checkBlockingOptions(overrideMessage, opts);
             this.opts = Object.assign({ port: 6379, host: '127.0.0.1', retryStrategy: function (times) {
                     return Math.max(Math.min(Math.exp(times), 20000), 1000);
                 } }, opts);
-            if (this.blocking) {
+            if (this.extraOptions.blocking) {
                 this.opts.maxRetriesPerRequest = null;
             }
         }
@@ -51,7 +52,8 @@ class RedisConnection extends events_1.EventEmitter {
             this.checkBlockingOptions(deprecationMessage, this.opts, true);
         }
         this.skipVersionCheck =
-            skipVersionCheck || !!(this.opts && this.opts.skipVersionCheck);
+            (extraOptions === null || extraOptions === void 0 ? void 0 : extraOptions.skipVersionCheck) ||
+                !!(this.opts && this.opts.skipVersionCheck);
         this.handleClientError = (err) => {
             this.emit('error', err);
         };
@@ -65,7 +67,7 @@ class RedisConnection extends events_1.EventEmitter {
         this.initializing.catch(err => this.emit('error', err));
     }
     checkBlockingOptions(msg, options, throwError = false) {
-        if (this.blocking && options && options.maxRetriesPerRequest) {
+        if (this.extraOptions.blocking && options && options.maxRetriesPerRequest) {
             if (throwError) {
                 throw new Error(msg);
             }
@@ -153,7 +155,9 @@ class RedisConnection extends events_1.EventEmitter {
         // ioredis treats connection errors as a different event ('close')
         this._client.on('close', this.handleClientClose);
         this._client.on('ready', this.handleClientReady);
-        await RedisConnection.waitUntilReady(this._client);
+        if (!this.extraOptions.skipWaitingForReady) {
+            await RedisConnection.waitUntilReady(this._client);
+        }
         this.loadCommands(this.packageVersion);
         if (this._client['status'] !== 'end') {
             this.version = await this.getRedisVersion();
@@ -214,7 +218,7 @@ class RedisConnection extends events_1.EventEmitter {
                     // Not sure if we need to wait for this
                     await this.initializing;
                 }
-                if (!this.shared) {
+                if (!this.extraOptions.shared) {
                     if (status == 'initializing' || force) {
                         // If we have not still connected to Redis, we need to disconnect.
                         this._client.disconnect();
@@ -242,10 +246,13 @@ class RedisConnection extends events_1.EventEmitter {
         }
     }
     async getRedisVersion() {
+        if (this.skipVersionCheck) {
+            return RedisConnection.minimumVersion;
+        }
         const doc = await this._client.info();
         const redisPrefix = 'redis_version:';
         const maxMemoryPolicyPrefix = 'maxmemory_policy:';
-        const lines = doc.split('\r\n');
+        const lines = doc.split(/\r?\n/);
         let redisVersion;
         for (let i = 0; i < lines.length; i++) {
             if (lines[i].indexOf(maxMemoryPolicyPrefix) === 0) {

package/dist/node_modules/bullmq/dist/cjs/classes/repeat.js

@@ -28,7 +28,7 @@ class Repeat extends queue_base_1.QueueBase {
         // Check if we reached the end date of the repeatable job
         let now = Date.now();
         const { endDate } = repeatOpts;
-        if (!(typeof endDate === undefined) && now > new Date(endDate).getTime()) {
+        if (endDate && now > new Date(endDate).getTime()) {
             return;
         }
         const prevMillis = opts.prevMillis || 0;

package/dist/node_modules/bullmq/dist/cjs/classes/sandbox.js

@@ -13,32 +13,61 @@ const sandbox = (processFile, childPool) => {
                         exitHandler = (exitCode, signal) => {
                             reject(new Error('Unexpected exit code: ' + exitCode + ' signal: ' + signal));
                         };
-                        child = await childPool.retain(processFile, exitHandler);
+                        child = await childPool.retain(processFile);
+                        child.on('exit', exitHandler);
                         msgHandler = async (msg) => {
-                            var _a, _b;
-                            switch (msg.cmd) {
-                                case enums_1.ParentCommand.Completed:
-                                    resolve(msg.value);
-                                    break;
-                                case enums_1.ParentCommand.Failed:
-                                case enums_1.ParentCommand.Error: {
-                                    const err = new Error();
-                                    Object.assign(err, msg.value);
-                                    reject(err);
-                                    break;
+                            var _a, _b, _c;
+                            try {
+                                switch (msg.cmd) {
+                                    case enums_1.ParentCommand.Completed:
+                                        resolve(msg.value);
+                                        break;
+                                    case enums_1.ParentCommand.Failed:
+                                    case enums_1.ParentCommand.Error: {
+                                        const err = new Error();
+                                        Object.assign(err, msg.value);
+                                        reject(err);
+                                        break;
+                                    }
+                                    case enums_1.ParentCommand.Progress:
+                                        await job.updateProgress(msg.value);
+                                        break;
+                                    case enums_1.ParentCommand.Log:
+                                        await job.log(msg.value);
+                                        break;
+                                    case enums_1.ParentCommand.MoveToDelayed:
+                                        await job.moveToDelayed((_a = msg.value) === null || _a === void 0 ? void 0 : _a.timestamp, (_b = msg.value) === null || _b === void 0 ? void 0 : _b.token);
+                                        break;
+                                    case enums_1.ParentCommand.MoveToWait:
+                                        await job.moveToWait((_c = msg.value) === null || _c === void 0 ? void 0 : _c.token);
+                                        break;
+                                    case enums_1.ParentCommand.Update:
+                                        await job.updateData(msg.value);
+                                        break;
+                                    case enums_1.ParentCommand.GetChildrenValues:
+                                        {
+                                            const value = await job.getChildrenValues();
+                                            child.send({
+                                                requestId: msg.requestId,
+                                                cmd: enums_1.ChildCommand.GetChildrenValuesResponse,
+                                                value,
+                                            });
+                                        }
+                                        break;
+                                    case enums_1.ParentCommand.GetIgnoredChildrenFailures:
+                                        {
+                                            const value = await job.getIgnoredChildrenFailures();
+                                            child.send({
+                                                requestId: msg.requestId,
+                                                cmd: enums_1.ChildCommand.GetIgnoredChildrenFailuresResponse,
+                                                value,
+                                            });
+                                        }
+                                        break;
                                 }
-                                case enums_1.ParentCommand.Progress:
-                                    await job.updateProgress(msg.value);
-                                    break;
-                                case enums_1.ParentCommand.Log:
-                                    await job.log(msg.value);
-                                    break;
-                                case enums_1.ParentCommand.MoveToDelayed:
-                                    await job.moveToDelayed((_a = msg.value) === null || _a === void 0 ? void 0 : _a.timestamp, (_b = msg.value) === null || _b === void 0 ? void 0 : _b.token);
-                                    break;
-                                case enums_1.ParentCommand.Update:
-                                    await job.updateData(msg.value);
-                                    break;
+                            }
+                            catch (err) {
+                                reject(err);
                             }
                         };
                         child.on('message', msgHandler);
@@ -61,10 +90,7 @@ const sandbox = (processFile, childPool) => {
             if (child) {
                 child.off('message', msgHandler);
                 child.off('exit', exitHandler);
-                if (child.exitCode !== null || /SIG.*/.test(`${child.signalCode}`)) {
-                    childPool.remove(child);
-                }
-                else {
+                if (child.exitCode === null && child.signalCode === null) {
                     childPool.release(child);
                 }
             }