@midwayjs/bull 3.11.0 → 3.11.1

package/dist/decorator.d.ts

@@ -1,5 +1,5 @@
-import { JobOptions } from 'bull';
-export declare function Processor(queueName: string, jobOptions?: JobOptions): ClassDecorator;
-export declare function Processor(queueName: string, concurrency?: number, jobOptions?: JobOptions): ClassDecorator;
+import { JobOptions, QueueOptions } from 'bull';
+export declare function Processor(queueName: string, jobOptions?: JobOptions, queueOptions?: QueueOptions): ClassDecorator;
+export declare function Processor(queueName: string, concurrency?: number, jobOptions?: JobOptions, queueOptions?: QueueOptions): ClassDecorator;
 export declare function InjectQueue(queueName: string): PropertyDecorator;
 //# sourceMappingURL=decorator.d.ts.map

package/dist/decorator.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectQueue = exports.Processor = void 0;
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
-function Processor(queueName, concurrency, jobOptions) {
+function Processor(queueName, concurrency, jobOptions, queueOptions) {
     return function (target) {
         if (typeof concurrency !== 'number') {
-            jobOptions = concurrency;
+            queueOptions = { ...jobOptions };
+            jobOptions = { ...concurrency };
             concurrency = 1;
         }
         (0, core_1.saveModule)(constants_1.BULL_PROCESSOR_KEY, target);
@@ -14,6 +15,7 @@ function Processor(queueName, concurrency, jobOptions) {
             queueName,
             concurrency,
             jobOptions,
+            queueOptions,
         }, target);
         (0, core_1.Provide)()(target);
         (0, core_1.Scope)(core_1.ScopeEnum.Request)(target);

package/dist/framework.js

@@ -42,12 +42,14 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         return 'bull';
     }
     async run() {
-        var _a, _b;
+        var _a, _b, _c;
         const processorModules = (0, core_1.listModule)(constants_1.BULL_PROCESSOR_KEY);
         for (const mod of processorModules) {
             const options = (0, core_1.getClassMetadata)(constants_1.BULL_PROCESSOR_KEY, mod);
             const { repeat, delay, ...otherOptions } = (_a = options.jobOptions) !== null && _a !== void 0 ? _a : {};
+            const queueOptions = (_b = options.queueOptions) !== null && _b !== void 0 ? _b : {};
             const currentQueue = this.ensureQueue(options.queueName, {
+                ...queueOptions,
                 defaultJobOptions: otherOptions,
             });
             // clear old repeat job when start
@@ -58,7 +60,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
                 }
             }
             await this.addProcessor(mod, options.queueName, options.concurrency);
-            if ((_b = options.jobOptions) === null || _b === void 0 ? void 0 : _b.repeat) {
+            if ((_c = options.jobOptions) === null || _c === void 0 ? void 0 : _c.repeat) {
                 await this.runJob(options.queueName, {}, options.jobOptions);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull",
-  "version": "3.11.0",
+  "version": "3.11.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,8 +24,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.11.0",
-    "@midwayjs/mock": "^3.11.0"
+    "@midwayjs/core": "^3.11.1",
+    "@midwayjs/mock": "^3.11.1"
   },
   "dependencies": {
     "bull": "4.10.4"
@@ -33,5 +33,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "eadb977e7fddcd4287c099fc32b601cd51702514"
+  "gitHead": "bd9375874eb8cfaa49fbcfaa0497021cea06a394"
 }