From 4413fb75c4b802e6020fe49599b851dec7abf7cb Mon Sep 17 00:00:00 2001 From: Borys Kupar Date: Mon, 22 Jul 2019 20:06:14 +0200 Subject: [PATCH] [bull] Fixed queue process function definition (#36958) * [bull] Fixed queue process function definition * Revert version bump --- types/bull/bull-tests.tsx | 3 +++ types/bull/index.d.ts | 25 +++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx index 58468fe900..22cd0dc638 100644 --- a/types/bull/bull-tests.tsx +++ b/types/bull/bull-tests.tsx @@ -51,6 +51,9 @@ videoQueue.process((job, done) => { // If the job throws an unhandled exception it is also handled correctly throw new Error('some unexpected error'); +}).catch(error => { + // Catch the general error, like redis connection + console.log(error); }); audioQueue.process((job, done) => { diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts index 95dd4790e3..0221a62adc 100644 --- a/types/bull/index.d.ts +++ b/types/bull/index.d.ts @@ -15,6 +15,7 @@ // Christian D. // Silas Rech // DoYoung Ha +// Borys Kupar // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.8 @@ -475,9 +476,9 @@ declare namespace Bull { * If the promise is rejected, the error will be passed as a second argument to the "failed" event. * If it is resolved, its value will be the "completed" event's second argument. */ - process(callback: ProcessCallbackFunction): void; - process(callback: ProcessPromiseFunction): void; - process(callback: string): void; + process(callback: ProcessCallbackFunction): Promise; + process(callback: ProcessPromiseFunction): Promise; + process(callback: string): Promise; /** * Defines a processing function for the jobs placed into a given Queue. @@ -498,9 +499,9 @@ declare namespace Bull { * * @param concurrency Bull will then call your handler in parallel respecting this maximum value. */ - process(concurrency: number, callback: ProcessCallbackFunction): void; - process(concurrency: number, callback: ProcessPromiseFunction): void; - process(concurrency: number, callback: string): void; + process(concurrency: number, callback: ProcessCallbackFunction): Promise; + process(concurrency: number, callback: ProcessPromiseFunction): Promise; + process(concurrency: number, callback: string): Promise; /** * Defines a processing function for the jobs placed into a given Queue. @@ -521,9 +522,9 @@ declare namespace Bull { * * @param name Bull will only call the handler if the job name matches */ - process(name: string, callback: ProcessCallbackFunction): void; - process(name: string, callback: ProcessPromiseFunction): void; - process(name: string, callback: string): void; + process(name: string, callback: ProcessCallbackFunction): Promise; + process(name: string, callback: ProcessPromiseFunction): Promise; + process(name: string, callback: string): Promise; /** * Defines a processing function for the jobs placed into a given Queue. @@ -545,9 +546,9 @@ declare namespace Bull { * @param name Bull will only call the handler if the job name matches * @param concurrency Bull will then call your handler in parallel respecting this maximum value. */ - process(name: string, concurrency: number, callback: ProcessCallbackFunction): void; - process(name: string, concurrency: number, callback: ProcessPromiseFunction): void; - process(name: string, concurrency: number, callback: string): void; + process(name: string, concurrency: number, callback: ProcessCallbackFunction): Promise; + process(name: string, concurrency: number, callback: ProcessPromiseFunction): Promise; + process(name: string, concurrency: number, callback: string): Promise; /* tslint:enable:unified-signatures */