diff --git a/package-lock.json b/package-lock.json index 852fa4b..206e211 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@athenna/queue", - "version": "5.21.0", + "version": "5.22.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@athenna/queue", - "version": "5.21.0", + "version": "5.22.0", "license": "MIT", "dependencies": { "@aws-sdk/client-sqs": "^3.1009.0" diff --git a/package.json b/package.json index db2c11d..3e4b677 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@athenna/queue", - "version": "5.21.0", + "version": "5.22.0", "description": "The Athenna queue handler.", "license": "MIT", "author": "João Lenon ", diff --git a/src/drivers/MemoryDriver.ts b/src/drivers/MemoryDriver.ts index b4b7921..d6a3453 100644 --- a/src/drivers/MemoryDriver.ts +++ b/src/drivers/MemoryDriver.ts @@ -281,6 +281,7 @@ export class MemoryDriver extends Driver { job.availableAt = Date.now() + this.noAckDelayMs + requeueJitterMs } } catch (error) { + console.log('error', error) await new MemoryDriverExceptionHandler().handle({ job, error, diff --git a/tests/unit/drivers/AwsSqsDriverTest.ts b/tests/unit/drivers/AwsSqsDriverTest.ts index 3c7fcdf..e54ce9d 100644 --- a/tests/unit/drivers/AwsSqsDriverTest.ts +++ b/tests/unit/drivers/AwsSqsDriverTest.ts @@ -158,19 +158,20 @@ export class AwsSqsDriverTest extends BaseTest { @Test() public async shouldBeAbleToProcessTheNextJobFromTheQueueWithAProcessor({ assert }: Context) { - assert.plan(1) - const queue = Queue.connection('aws_sqs') await queue.add({ name: 'lenon' }) + let data: any = {} + let attempts: number + await queue.process(async job => { - assert.containSubset(job, { - attempts: 1, - queue: 'default', - data: { name: 'lenon' } - }) + data = job.data + attempts = job.attempts }) + + assert.equal(attempts, 0) + assert.equal(data.name, 'lenon') } @Test() diff --git a/tests/unit/drivers/DatabaseDriverTest.ts b/tests/unit/drivers/DatabaseDriverTest.ts index a1b09ce..10f45c6 100644 --- a/tests/unit/drivers/DatabaseDriverTest.ts +++ b/tests/unit/drivers/DatabaseDriverTest.ts @@ -162,19 +162,20 @@ export class DatabaseDriverTest { @Test() public async shouldBeAbleToProcessTheNextJobFromTheQueueWithAProcessor({ assert }: Context) { - assert.plan(1) - const queue = Queue.connection('database') await queue.add({ name: 'lenon' }) + let data: any = {} + let attempts: number + await queue.process(async job => { - assert.containSubset(job, { - attempts: 1, - queue: 'default', - data: { name: 'lenon' } - }) + data = job.data + attempts = job.attempts }) + + assert.equal(attempts, 0) + assert.equal(data.name, 'lenon') } @Test() diff --git a/tests/unit/drivers/MemoryDriverTest.ts b/tests/unit/drivers/MemoryDriverTest.ts index 6458359..cd4cfbe 100644 --- a/tests/unit/drivers/MemoryDriverTest.ts +++ b/tests/unit/drivers/MemoryDriverTest.ts @@ -150,18 +150,20 @@ export class MemoryDriverTest { @Test() public async shouldBeAbleToProcessTheNextJobFromTheQueueWithAProcessor({ assert }: Context) { - assert.plan(1) - const queue = Queue.connection('memory') await queue.add({ name: 'lenon' }) + let data: any = {} + let attempts: number + await queue.process(async job => { - assert.containSubset(job, { - attempts: 1, - data: { name: 'lenon' } - }) + data = job.data + attempts = job.attempts }) + + assert.equal(attempts, 0) + assert.equal(data.name, 'lenon') } @Test()