@midwayjs/bull 3.0.5 → 3.6.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/config/config.default.d.ts

@@ -3,7 +3,7 @@ export declare const bull: {
         prefix: string;
     };
     defaultJobOptions: {
-        removeOnSuccess: boolean;
+        removeOnSuccess: number;
         removeOnFail: number;
     };
     defaultConcurrency: number;

package/dist/config/config.default.js

@@ -6,7 +6,7 @@ exports.bull = {
         prefix: '{midway-bull}',
     },
     defaultJobOptions: {
-        removeOnSuccess: true,
+        removeOnSuccess: 3,
         removeOnFail: 10,
     },
     defaultConcurrency: 1,

package/dist/configuration.d.ts

@@ -1,5 +1,5 @@
-import { BullFramework } from './framework';
 import { MidwayDecoratorService } from '@midwayjs/core';
+import { BullFramework } from './framework';
 export declare class BullConfiguration {
     framework: BullFramework;
     decoratorService: MidwayDecoratorService;

package/dist/configuration.js

@@ -10,10 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const DefaultConfig = require("./config/config.default");
 const framework_1 = require("./framework");
-const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 let BullConfiguration = class BullConfiguration {
     async init() {
@@ -23,21 +22,21 @@ let BullConfiguration = class BullConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", framework_1.BullFramework)
 ], BullConfiguration.prototype, "framework", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], BullConfiguration.prototype, "decoratorService", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], BullConfiguration.prototype, "init", null);
 BullConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'bull',
         importConfigs: [
             {

package/dist/decorator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectQueue = exports.Processor = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 function Processor(queueName, concurrency, jobOptions) {
     return function (target) {
@@ -9,19 +9,19 @@ function Processor(queueName, concurrency, jobOptions) {
             jobOptions = concurrency;
             concurrency = 1;
         }
-        (0, decorator_1.saveModule)(constants_1.BULL_PROCESSOR_KEY, target);
-        (0, decorator_1.saveClassMetadata)(constants_1.BULL_PROCESSOR_KEY, {
+        (0, core_1.saveModule)(constants_1.BULL_PROCESSOR_KEY, target);
+        (0, core_1.saveClassMetadata)(constants_1.BULL_PROCESSOR_KEY, {
             queueName,
             concurrency,
             jobOptions,
         }, target);
-        (0, decorator_1.Provide)()(target);
-        (0, decorator_1.Scope)(decorator_1.ScopeEnum.Request)(target);
+        (0, core_1.Provide)()(target);
+        (0, core_1.Scope)(core_1.ScopeEnum.Request)(target);
     };
 }
 exports.Processor = Processor;
 function InjectQueue(queueName) {
-    return (0, decorator_1.createCustomPropertyDecorator)(constants_1.BULL_QUEUE_KEY, {
+    return (0, core_1.createCustomPropertyDecorator)(constants_1.BULL_QUEUE_KEY, {
         queueName,
     });
 }

package/dist/framework.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullFramework = exports.BullQueue = void 0;
 const core_1 = require("@midwayjs/core");
-const decorator_1 = require("@midwayjs/decorator");
 const Bull = require("bull");
 const constants_1 = require("./constants");
 class BullQueue extends Bull {
@@ -42,9 +41,9 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
     }
     async run() {
         var _a;
-        const processorModules = (0, decorator_1.listModule)(constants_1.BULL_PROCESSOR_KEY);
+        const processorModules = (0, core_1.listModule)(constants_1.BULL_PROCESSOR_KEY);
         for (const mod of processorModules) {
-            const options = (0, decorator_1.getClassMetadata)(constants_1.BULL_PROCESSOR_KEY, mod);
+            const options = (0, core_1.getClassMetadata)(constants_1.BULL_PROCESSOR_KEY, mod);
             const currentQueue = this.ensureQueue(options.queueName);
             // clear old repeat job when start
             if (this.bullClearRepeatJobWhenStart) {
@@ -91,9 +90,15 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
                 from: processor,
             });
             ctx.logger.info(`start process job ${job.id} from ${processor.name}`);
+            const isPassed = await this.app
+                .getFramework()
+                .runGuard(ctx, processor, 'execute');
+            if (!isPassed) {
+                throw new core_1.MidwayInvokeForbiddenError('execute', processor);
+            }
             const service = await ctx.requestContext.getAsync(processor);
             const fn = await this.applyMiddleware(async (ctx) => {
-                return await decorator_1.Utils.toAsyncFunction(service.execute.bind(service))(job.data, job);
+                return await core_1.Utils.toAsyncFunction(service.execute.bind(service))(job.data, job);
             });
             try {
                 const result = await Promise.resolve(await fn(ctx));
@@ -120,7 +125,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
     }
 };
 BullFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], BullFramework);
 exports.BullFramework = BullFramework;
 //# sourceMappingURL=framework.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull",
-  "version": "3.0.5",
+  "version": "3.6.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,15 +24,15 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.4.13",
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/mock": "^3.4.13"
+    "@midwayjs/core": "^3.6.0",
+    "@midwayjs/mock": "^3.6.0"
   },
   "dependencies": {
-    "bull": "4.8.5",
-    "@types/bull": "3.15.9"
+    "@types/bull": "3.15.9",
+    "bull": "4.10.1"
   },
   "engines": {
     "node": ">=12"
-  }
+  },
+  "gitHead": "7aa8d1d712ff5ae7e3b27eb2e154d3f7ee40889a"
 }