@midwayjs/bull 3.20.4 → 4.0.0-beta.1

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

@@ -8,13 +8,12 @@ export declare const bull: {
     };
     defaultConcurrency: number;
     clearRepeatJobWhenStart: boolean;
-    contextLoggerApplyLogger: string;
-    contextLoggerFormat: (info: any) => string;
 };
 export declare const midwayLogger: {
     clients: {
         bullLogger: {
             fileLogName: string;
+            contextFormat: (info: any) => string;
         };
     };
 };

package/dist/config/config.default.js

@@ -11,16 +11,15 @@ exports.bull = {
     },
     defaultConcurrency: 1,
     clearRepeatJobWhenStart: true,
-    contextLoggerApplyLogger: 'bullLogger',
-    contextLoggerFormat: info => {
-        const { jobId, from } = info.ctx;
-        return `${info.timestamp} ${info.LEVEL} ${info.pid} [${jobId} ${from.name}] ${info.message}`;
-    },
 };
 exports.midwayLogger = {
     clients: {
         bullLogger: {
             fileLogName: 'midway-bull.log',
+            contextFormat: info => {
+                const { jobId, from } = info.ctx;
+                return `${info.timestamp} ${info.LEVEL} ${info.pid} [${jobId} ${from.name}] ${info.message}`;
+            },
         },
     },
 };

package/dist/configuration.js

@@ -24,6 +24,7 @@ let BullConfiguration = class BullConfiguration {
         this.framework.loadConfig();
     }
 };
+exports.BullConfiguration = BullConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", framework_1.BullFramework)
@@ -38,7 +39,7 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], BullConfiguration.prototype, "init", null);
-BullConfiguration = __decorate([
+exports.BullConfiguration = BullConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'bull',
         importConfigs: [
@@ -48,5 +49,4 @@ BullConfiguration = __decorate([
         ],
     })
 ], BullConfiguration);
-exports.BullConfiguration = BullConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator.js

@@ -10,8 +10,8 @@ function Processor(queueName, concurrency, jobOptions, queueOptions) {
             jobOptions = { ...concurrency };
             concurrency = 1;
         }
-        (0, core_1.saveModule)(constants_1.BULL_PROCESSOR_KEY, target);
-        (0, core_1.saveClassMetadata)(constants_1.BULL_PROCESSOR_KEY, {
+        core_1.DecoratorManager.saveModule(constants_1.BULL_PROCESSOR_KEY, target);
+        core_1.MetadataManager.defineMetadata(constants_1.BULL_PROCESSOR_KEY, {
             queueName,
             concurrency,
             jobOptions,
@@ -23,7 +23,7 @@ function Processor(queueName, concurrency, jobOptions, queueOptions) {
 }
 exports.Processor = Processor;
 function InjectQueue(queueName) {
-    return (0, core_1.createCustomPropertyDecorator)(constants_1.BULL_QUEUE_KEY, {
+    return core_1.DecoratorManager.createCustomPropertyDecorator(constants_1.BULL_QUEUE_KEY, {
         queueName,
     });
 }

package/dist/framework.d.ts

@@ -1,4 +1,4 @@
-import { BaseFramework, IMidwayBootstrapOptions, ILogger } from '@midwayjs/core';
+import { BaseFramework, IMidwayBootstrapOptions } from '@midwayjs/core';
 import { Application, Context, IProcessor, IQueue, IQueueManager } from './interface';
 import { Job, JobOptions, QueueOptions } from 'bull';
 import Bull = require('bull');
@@ -16,7 +16,7 @@ export declare class BullFramework extends BaseFramework<Application, Context, a
     private bullDefaultConcurrency;
     private bullClearRepeatJobWhenStart;
     private queueMap;
-    protected bullLogger: ILogger;
+    protected frameworkLoggerName: string;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     loadConfig(): void;
     configure(): any;

package/dist/framework.js

@@ -5,9 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullFramework = exports.BullQueue = void 0;
 const core_1 = require("@midwayjs/core");
@@ -35,6 +32,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
     constructor() {
         super(...arguments);
         this.queueMap = new Map();
+        this.frameworkLoggerName = 'bullLogger';
     }
     async applicationInitialize(options) {
         this.app = {};
@@ -51,12 +49,11 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         return 'bull';
     }
     async run() {
-        var _a, _b, _c;
-        const processorModules = (0, core_1.listModule)(constants_1.BULL_PROCESSOR_KEY);
+        const processorModules = core_1.DecoratorManager.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 options = core_1.MetadataManager.getOwnMetadata(constants_1.BULL_PROCESSOR_KEY, mod);
+            const { repeat, delay, ...otherOptions } = options.jobOptions ?? {};
+            const queueOptions = options.queueOptions ?? {};
             const currentQueue = this.ensureQueue(options.queueName, {
                 ...queueOptions,
                 defaultJobOptions: otherOptions,
@@ -69,7 +66,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
                 }
             }
             await this.addProcessor(mod, options.queueName, options.concurrency);
-            if ((_c = options.jobOptions) === null || _c === void 0 ? void 0 : _c.repeat) {
+            if (options.jobOptions?.repeat) {
                 await this.addJobToQueue(options.queueName, {}, options.jobOptions);
             }
         }
@@ -84,7 +81,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         const queue = new BullQueue(name, (0, core_1.extend)(true, {}, this.bullDefaultQueueConfig, queueOptions));
         this.queueMap.set(name, queue);
         queue.on('error', err => {
-            this.bullLogger.error(err);
+            this.logger.error(err);
         });
         return queue;
     }
@@ -102,7 +99,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
     }
     async addProcessor(processor, queueName, concurrency) {
         const queue = typeof queueName === 'string' ? this.queueMap.get(queueName) : queueName;
-        queue.process(concurrency !== null && concurrency !== void 0 ? concurrency : this.bullDefaultConcurrency, async (job) => {
+        queue.process(concurrency ?? this.bullDefaultConcurrency, async (job) => {
             const ctx = this.app.createAnonymousContext({
                 jobId: job.id,
                 job,
@@ -149,12 +146,8 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         }
     }
 };
-__decorate([
-    (0, core_1.Logger)('bullLogger'),
-    __metadata("design:type", Object)
-], BullFramework.prototype, "bullLogger", void 0);
-BullFramework = __decorate([
+exports.BullFramework = BullFramework;
+exports.BullFramework = BullFramework = __decorate([
     (0, core_1.Framework)()
 ], BullFramework);
-exports.BullFramework = BullFramework;
 //# sourceMappingURL=framework.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/bull",
-  "version": "3.20.4",
+  "version": "4.0.0-beta.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit"
   },
   "keywords": [
     "midway",
@@ -24,8 +24,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/mock": "^3.20.4"
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1"
   },
   "dependencies": {
     "bull": "4.16.5"
@@ -33,5 +33,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "c3fb65a7ada8829635f3c6af5ef83c65c3a43d79"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }