bullmq 2.0.2 → 2.1.1

package/dist/esm/commands/moveToFinished-12.lua

@@ -24,13 +24,13 @@
 
       ARGV[1]  jobId
       ARGV[2]  timestamp
-      ARGV[3]  msg property
+      ARGV[3]  msg property returnvalue / failedReason
       ARGV[4]  return value / failed reason
       ARGV[5]  target (completed/failed)
       ARGV[6]  event data (? maybe just send jobid).
       ARGV[7]  fetch next?
       ARGV[8]  keys prefix
-      ARGV[9] opts
+      ARGV[9]  opts
 
       opts - token - lock token
       opts - keepJobs
@@ -40,6 +40,7 @@
       opts - attempts max attempts
       opts - attemptsMade
       opts - maxMetricsSize
+      opts - fpof - fail parent on fail
 
     Output:
       0 OK
@@ -54,15 +55,15 @@
 local rcall = redis.call
 
 --- Includes
---- @include "includes/destructureJobKey"
+--- @include "includes/collectMetrics"
+--- @include "includes/getNextDelayedTimestamp"
 --- @include "includes/moveJobFromWaitToActive"
+--- @include "includes/moveParentFromWaitingChildrenToFailed"
+--- @include "includes/promoteDelayedJobs"
 --- @include "includes/removeJobsByMaxAge"
 --- @include "includes/removeJobsByMaxCount"
 --- @include "includes/trimEvents"
 --- @include "includes/updateParentDepsIfNeeded"
---- @include "includes/collectMetrics"
---- @include "includes/getNextDelayedTimestamp"
---- @include "includes/promoteDelayedJobs"
 
 local jobIdKey = KEYS[10]
 if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
@@ -112,13 +113,15 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
         parentId = getJobIdFromKey(parentKey)
         parentQueueKey = getJobKeyPrefix(parentKey, ":" .. parentId)
     end
-    if parentId ~= "" and ARGV[5] == "completed" then
-        local parentKey = parentQueueKey .. ":" .. parentId
-        local dependenciesSet = parentKey .. ":dependencies"
-        local result = rcall("SREM", dependenciesSet, jobIdKey)
-        if result == 1 then
-            updateParentDepsIfNeeded(parentKey, parentQueueKey, dependenciesSet,
-                                     parentId, jobIdKey, ARGV[4])
+    if parentId ~= "" then
+        if ARGV[5] == "completed" then
+            local dependenciesSet = parentKey .. ":dependencies"
+            if rcall("SREM", dependenciesSet, jobIdKey) == 1 then
+                updateParentDepsIfNeeded(parentKey, parentQueueKey, dependenciesSet,
+                                        parentId, jobIdKey, ARGV[4])
+            end
+        elseif opts['fpof'] then
+            moveParentFromWaitingChildrenToFailed(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
         end
     end
 

package/dist/esm/interfaces/{jobs-options.d.ts → base-job-options.d.ts}

@@ -1,5 +1,5 @@
 import { RepeatOptions, KeepJobs, BackoffOptions } from './';
-export interface BaseJobOptions {
+export interface DefaultJobOptions {
     /**
      * Timestamp when the job was created.
      * @defaultValue Date.now()
@@ -63,7 +63,7 @@ export interface BaseJobOptions {
      */
     sizeLimit?: number;
 }
-export interface JobsOptions extends BaseJobOptions {
+export interface BaseJobOptions extends DefaultJobOptions {
     /**
      * Repeat this job, for example based on a `cron` schedule.
      */

package/dist/esm/interfaces/base-job-options.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=base-job-options.js.map

package/dist/esm/interfaces/base-job-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-job-options.js","sourceRoot":"","sources":["../../../src/interfaces/base-job-options.ts"],"names":[],"mappings":""}

package/dist/esm/interfaces/flow-job.d.ts

@@ -1,4 +1,4 @@
-import { JobsOptions } from './jobs-options';
+import { JobsOptions } from '../types';
 import { QueueOptions } from './queue-options';
 export interface FlowJob {
     name: string;

package/dist/esm/interfaces/index.d.ts

@@ -1,12 +1,12 @@
 export * from './advanced-options';
 export * from './backoff-options';
+export * from './base-job-options';
 export * from './child-command';
 export * from './child-message';
 export * from './connection';
 export * from './flow-job';
 export * from './ioredis-events';
 export * from './job-json';
-export * from './jobs-options';
 export * from './keep-jobs';
 export * from './metrics-options';
 export * from './metrics';

package/dist/esm/interfaces/index.js

@@ -1,12 +1,12 @@
 export * from './advanced-options';
 export * from './backoff-options';
+export * from './base-job-options';
 export * from './child-command';
 export * from './child-message';
 export * from './connection';
 export * from './flow-job';
 export * from './ioredis-events';
 export * from './job-json';
-export * from './jobs-options';
 export * from './keep-jobs';
 export * from './metrics-options';
 export * from './metrics';

package/dist/esm/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}

package/dist/esm/interfaces/job-json.d.ts

@@ -1,10 +1,10 @@
-import { JobsOptions } from './jobs-options';
+import { RedisJobOptions } from '../types';
 import { ParentKeys } from './parent';
 export interface JobJson {
     id: string;
     name: string;
     data: string;
-    opts: JobsOptions;
+    opts: RedisJobOptions;
     progress: number | object;
     attemptsMade: number;
     finishedOn?: number;

package/dist/esm/interfaces/parent.d.ts

@@ -1,4 +1,4 @@
-import { JobsOptions } from './jobs-options';
+import { JobsOptions } from '../types';
 /**
  * Describes the parent for a Job.
  */

package/dist/esm/interfaces/queue-options.d.ts

@@ -1,5 +1,5 @@
 import { AdvancedRepeatOptions } from './advanced-options';
-import { BaseJobOptions } from './jobs-options';
+import { DefaultJobOptions } from './base-job-options';
 import { ConnectionOptions } from './redis-options';
 export declare enum ClientType {
     blocking = "blocking",
@@ -30,7 +30,7 @@ export interface QueueBaseOptions {
  * Options for the Queue class.
  */
 export interface QueueOptions extends QueueBaseOptions {
-    defaultJobOptions?: BaseJobOptions;
+    defaultJobOptions?: DefaultJobOptions;
     /**
      * Options for the rate limiter.
      */

package/dist/esm/interfaces/sandboxed-job.d.ts

@@ -1,5 +1,5 @@
+import { JobsOptions } from '../types';
 import { JobJson } from './job-json';
-import { JobsOptions } from './jobs-options';
 /**
  * @see {@link https://docs.bullmq.io/guide/workers/sandboxed-processors}
  */

package/dist/esm/types/index.d.ts

@@ -1,4 +1,5 @@
 export * from './repeat-strategy';
 export * from './finished-status';
 export * from './job-json-sandbox';
+export * from './job-options';
 export * from './job-type';

package/dist/esm/types/index.js

@@ -1,5 +1,6 @@
 export * from './repeat-strategy';
 export * from './finished-status';
 export * from './job-json-sandbox';
+export * from './job-options';
 export * from './job-type';
 //# sourceMappingURL=index.js.map

package/dist/esm/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}

package/dist/esm/types/job-options.d.ts

@@ -0,0 +1,16 @@
+import { BaseJobOptions } from '../interfaces';
+export declare type JobsOptions = BaseJobOptions & {
+    /**
+     * If true, moves parent to failed.
+     */
+    failParentOnFailure?: boolean;
+};
+/**
+ * These fields are the ones stored in Redis with smaller keys for compactness.
+ */
+export declare type RedisJobOptions = BaseJobOptions & {
+    /**
+     * If true, moves parent to failed.
+     */
+    fpof?: boolean;
+};

package/dist/esm/types/job-options.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=job-options.js.map

package/dist/esm/types/job-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-options.js","sourceRoot":"","sources":["../../../src/types/job-options.ts"],"names":[],"mappings":""}

package/dist/esm/utils.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Cluster, Redis } from 'ioredis';
-import { ChildMessage, JobsOptions, ParentMessage, QueueOptions, RedisClient } from './interfaces';
+import { ChildMessage, ParentMessage, QueueOptions, RedisClient } from './interfaces';
+import { JobsOptions } from './types';
 import { ChildProcess } from 'child_process';
 export declare const errorObject: {
     [index: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bullmq",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "Queue for messages and jobs based on Redis",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -46,7 +46,6 @@
   },
   "dependencies": {
     "cron-parser": "^4.6.0",
-    "get-port": "6.1.2",
     "glob": "^8.0.3",
     "ioredis": "^5.2.2",
     "lodash": "^4.17.21",

package/dist/cjs/interfaces/jobs-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jobs-options.js","sourceRoot":"","sources":["../../../src/interfaces/jobs-options.ts"],"names":[],"mappings":""}

package/dist/esm/interfaces/jobs-options.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=jobs-options.js.map

package/dist/esm/interfaces/jobs-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jobs-options.js","sourceRoot":"","sources":["../../../src/interfaces/jobs-options.ts"],"names":[],"mappings":""}