@midwayjs/bull 3.0.0 → 3.0.1

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

@@ -5,6 +5,7 @@ export declare const bull: {
     contextLoggerApplyLogger: string;
     contextLoggerFormat: (info: any) => string;
     defaultConcurrency: number;
+    clearJobWhenStart: boolean;
 };
 export declare const midwayLogger: {
     clients: {

package/dist/config/config.default.js

@@ -11,6 +11,7 @@ exports.bull = {
         return `${info.timestamp} ${info.LEVEL} ${info.pid} [${jobId} ${triggerName}] ${info.message}`;
     },
     defaultConcurrency: 1,
+    clearJobWhenStart: true,
 };
 exports.midwayLogger = {
     clients: {

package/dist/constants.js

@@ -4,5 +4,4 @@ exports.BULL_PROCESSOR_KEY = exports.BULL_QUEUE_KEY = void 0;
 // task
 exports.BULL_QUEUE_KEY = 'bull:queue';
 exports.BULL_PROCESSOR_KEY = 'bull:processor';
-// export const BULL_REPEATABLE_PROCESSOR_KEY = 'bull:repeatableProcessor';
 //# sourceMappingURL=constants.js.map

package/dist/framework.d.ts

@@ -10,6 +10,7 @@ export declare class BullQueue extends Bull implements IQueue<Job> {
 export declare class BullFramework extends BaseFramework<Application, Context, any> implements IQueueManager<BullQueue, Job> {
     private bullDefaultQueueConfig;
     private bullDefaultConcurrency;
+    private bullClearJobWhenStart;
     private queueMap;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     configure(): any;

package/dist/framework.js

@@ -32,6 +32,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         this.app = {};
         this.bullDefaultQueueConfig = this.configService.getConfiguration('bull.defaultQueueOptions');
         this.bullDefaultConcurrency = this.configService.getConfiguration('bull.defaultConcurrency');
+        this.bullClearJobWhenStart = this.configService.getConfiguration('bull.bullClearJobWhenStart');
     }
     configure() {
         return this.configService.getConfiguration('bull');
@@ -45,6 +46,10 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         for (const mod of processorModules) {
             const options = (0, decorator_1.getClassMetadata)(constants_1.BULL_PROCESSOR_KEY, mod);
             this.ensureQueue(options.queueName);
+            // clear old job when start
+            if (this.bullClearJobWhenStart) {
+                await this.queueMap.get(options.queueName).obliterate({ force: true });
+            }
             await this.addProcessor(mod, options.queueName, options.concurrency);
             if ((_a = options.jobOptions) === null || _a === void 0 ? void 0 : _a.repeat) {
                 await this.runJob(options.queueName, {}, options.jobOptions);
@@ -77,15 +82,17 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
             const ctx = this.app.createAnonymousContext({
                 jobId: job.id,
                 job,
-                triggerName: (0, decorator_1.getProviderName)(processor),
-                triggerUUID: (0, decorator_1.getProviderUUId)(processor),
+                from: processor,
             });
+            ctx.logger.info(`[@midwayjs/bull] start process job ${job.id} from ${processor.name}`);
             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);
             });
             try {
-                return Promise.resolve(await fn(ctx));
+                const result = await Promise.resolve(await fn(ctx));
+                ctx.logger.info(`[@midwayjs/bull] complete process job ${job.id} from ${processor.name}`);
+                return result;
             }
             catch (err) {
                 ctx.logger.error(err);

package/dist/interface.d.ts

@@ -20,7 +20,6 @@ export declare type NextFunction = BaseNextFunction;
 export interface Context extends IMidwayContext {
     jobId: JobId;
     job: Job;
-    triggerName: string;
-    triggerUUID: string;
+    from: new (...args: any[]) => IProcessor;
 }
 //# sourceMappingURL=interface.d.ts.map

package/index.d.ts

@@ -8,6 +8,7 @@ declare module '@midwayjs/core/dist/interface' {
       defaultQueueOptions?: bull.QueueOptions;
       defaultJobOptions?: bull.JobOptions;
       defaultConcurrency?: number;
+      clearJobWhenStart?: boolean;
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",