diff --git a/package.json b/package.json index d36090b245..ae7b09fa1b 100644 --- a/package.json +++ b/package.json @@ -56,10 +56,8 @@ "cron-parser": "^4.9.0", "ioredis": "^5.4.1", "msgpackr": "^1.11.2", - "node-abort-controller": "^3.1.1", "semver": "^7.5.4", - "tslib": "^2.0.0", - "uuid": "^9.0.0" + "tslib": "^2.0.0" }, "devDependencies": { "@commitlint/cli": "^17.0.3", @@ -78,10 +76,9 @@ "@types/lodash.isarguments": "^3.1.7", "@types/mocha": "^5.2.7", "@types/msgpack": "^0.0.31", - "@types/node": "^12.20.25", + "@types/node": "^16.7.0", "@types/semver": "^7.3.9", "@types/sinon": "^10.0.13", - "@types/uuid": "^3.4.10", "@typescript-eslint/eslint-plugin": "^4.32.0", "@typescript-eslint/parser": "^5.33.0", "chai": "^4.3.4", diff --git a/src/classes/flow-producer.ts b/src/classes/flow-producer.ts index ddfb7bfed7..00281df642 100644 --- a/src/classes/flow-producer.ts +++ b/src/classes/flow-producer.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'events'; import { Redis, ChainableCommander } from 'ioredis'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { FlowJob, FlowQueuesOpts, @@ -324,7 +324,7 @@ export class FlowProducer extends EventEmitter { const queueOpts = queuesOpts && queuesOpts[node.queueName]; const jobsOpts = queueOpts?.defaultJobOptions ?? {}; - const jobId = node.opts?.jobId || v4(); + const jobId = node.opts?.jobId || randomUUID(); return trace>( this.telemetry, diff --git a/src/classes/queue.ts b/src/classes/queue.ts index 290d142780..668b42bd2a 100644 --- a/src/classes/queue.ts +++ b/src/classes/queue.ts @@ -1,4 +1,4 @@ -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { BaseJobOptions, BulkJobOptions, @@ -152,7 +152,7 @@ export class Queue< ResultType = ExtractResultType, NameType extends string = ExtractNameType, > extends QueueGetters> { - token = v4(); + token = randomUUID(); jobsOpts: BaseJobOptions; opts: QueueOptions; diff --git a/src/classes/worker.ts b/src/classes/worker.ts index 344c2b097c..53452e4cfd 100644 --- a/src/classes/worker.ts +++ b/src/classes/worker.ts @@ -2,10 +2,7 @@ import * as fs from 'fs'; import { URL } from 'url'; import { Redis } from 'ioredis'; import * as path from 'path'; -import { v4 } from 'uuid'; - -// Note: this Polyfill is only needed for Node versions < 15.4.0 -import { AbortController } from 'node-abort-controller'; +import { randomUUID } from 'crypto'; import { GetNextJobOptions, @@ -244,7 +241,7 @@ export class Worker< this.opts.lockRenewTime = this.opts.lockRenewTime || this.opts.lockDuration / 2; - this.id = v4(); + this.id = randomUUID(); if (processor) { if (typeof processor === 'function') { diff --git a/src/utils.ts b/src/utils.ts index 38999e56b5..acfd3e0ba2 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,8 +1,5 @@ import { Cluster, Redis } from 'ioredis'; -// Note: this Polyfill is only needed for Node versions < 15.4.0 -import { AbortController } from 'node-abort-controller'; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import { CONNECTION_CLOSED_ERROR_MSG } from 'ioredis/built/utils'; diff --git a/tests/test_bulk.ts b/tests/test_bulk.ts index ddc78072bf..9e1fec8883 100644 --- a/tests/test_bulk.ts +++ b/tests/test_bulk.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { after, beforeEach, describe, it, before } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, QueueEvents, Worker, Job } from '../src/classes'; import { removeAllQueueData, delay } from '../src/utils'; @@ -18,7 +18,7 @@ describe('bulk jobs', () => { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); }); @@ -66,7 +66,7 @@ describe('bulk jobs', () => { it('should allow to pass parent option', async () => { const name = 'test'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const parentWorker = new Worker(parentQueueName, null, { diff --git a/tests/test_clean.ts b/tests/test_clean.ts index 2e844f4d4a..ab3f9efb84 100644 --- a/tests/test_clean.ts +++ b/tests/test_clean.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { after } from 'lodash'; import { beforeEach, describe, it, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { FlowProducer, Queue, @@ -25,7 +25,7 @@ describe('Cleaner', () => { }); beforeEach(async () => { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -462,7 +462,7 @@ describe('Cleaner', () => { describe('when parent has pending children in different queue', async () => { it('keeps parent in waiting-children', async () => { - const childrenQueueName = `test-${v4()}`; + const childrenQueueName = `test-${randomUUID()}`; const childrenQueue = new Queue(childrenQueueName, { connection, prefix, @@ -605,7 +605,7 @@ describe('Cleaner', () => { describe('when parent belongs to different queue', async () => { describe('when parent has more than 1 pending children', async () => { it('deletes each children until trying to move parent to wait', async () => { - const parentQueueName = `test-${v4()}`; + const parentQueueName = `test-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, @@ -661,7 +661,7 @@ describe('Cleaner', () => { describe('when parent has only 1 pending children', async () => { it('moves parent to wait to try to process it', async () => { - const parentQueueName = `test-${v4()}`; + const parentQueueName = `test-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, diff --git a/tests/test_concurrency.ts b/tests/test_concurrency.ts index 400ae7bbcc..3ac84c19c7 100644 --- a/tests/test_concurrency.ts +++ b/tests/test_concurrency.ts @@ -8,7 +8,7 @@ import { } from '../src/classes'; import { delay, removeAllQueueData } from '../src/utils'; import { beforeEach, describe, it, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { expect } from 'chai'; import * as ProgressBar from 'progress'; import { after } from 'lodash'; @@ -24,7 +24,7 @@ describe('Concurrency', () => { }); beforeEach(async () => { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; await new IORedis().flushall(); }); diff --git a/tests/test_connection.ts b/tests/test_connection.ts index dfd38aeb2d..037f92c023 100644 --- a/tests/test_connection.ts +++ b/tests/test_connection.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { default as IORedis, RedisOptions } from 'ioredis'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, Job, @@ -174,7 +174,7 @@ describe('connection', () => { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); }); diff --git a/tests/test_delay.ts b/tests/test_delay.ts index fe670e7690..5d2151d339 100644 --- a/tests/test_delay.ts +++ b/tests/test_delay.ts @@ -2,7 +2,7 @@ import { after } from 'lodash'; import { describe, beforeEach, it, before, after as afterAll } from 'mocha'; import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, Job, Worker, QueueEvents } from '../src/classes'; import { removeAllQueueData, delay } from '../src/utils'; @@ -20,7 +20,7 @@ describe('Delayed jobs', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); await queue.waitUntilReady(); }); diff --git a/tests/test_events.ts b/tests/test_events.ts index 3ec45cc9ce..8dc812d9d2 100644 --- a/tests/test_events.ts +++ b/tests/test_events.ts @@ -1,5 +1,5 @@ import { default as IORedis } from 'ioredis'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { expect } from 'chai'; import { after } from 'lodash'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; @@ -28,7 +28,7 @@ describe('events', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queue.waitUntilReady(); @@ -47,7 +47,7 @@ describe('events', function () { describe('when autorun option is provided as false', function () { it('emits waiting when a job has been added', async () => { - const queueName2 = `test-${v4()}`; + const queueName2 = `test-${randomUUID()}`; const queue2 = new Queue(queueName2, { connection, prefix }); const queueEvents2 = new QueueEvents(queueName2, { autorun: false, @@ -74,7 +74,7 @@ describe('events', function () { describe('when run method is called when queueEvent is running', function () { it('throws error', async () => { - const queueName2 = `test-${v4()}`; + const queueName2 = `test-${randomUUID()}`; const queue2 = new Queue(queueName2, { connection, prefix }); const queueEvents2 = new QueueEvents(queueName2, { autorun: false, @@ -857,7 +857,7 @@ describe('events', function () { prefix, }); const name = 'parent-job'; - const childrenQueueName = `children-queue-${v4()}`; + const childrenQueueName = `children-queue-${randomUUID()}`; const childrenWorker = new Worker( childrenQueueName, @@ -1244,7 +1244,7 @@ describe('events', function () { }); it('should trim events manually', async () => { - const queueName = 'test-manual-' + v4(); + const queueName = 'test-manual-' + randomUUID(); const trimmedQueue = new Queue(queueName, { connection, prefix }); await trimmedQueue.add('test', {}); @@ -1270,7 +1270,7 @@ describe('events', function () { describe('when publishing custom events', function () { it('emits waiting when a job has been added', async () => { - const queueName2 = `test-${v4()}`; + const queueName2 = `test-${randomUUID()}`; const queueEventsProducer = new QueueEventsProducer(queueName2, { connection, prefix, diff --git a/tests/test_flow.ts b/tests/test_flow.ts index 75554abe01..7308741dae 100644 --- a/tests/test_flow.ts +++ b/tests/test_flow.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Job, Queue, @@ -26,7 +26,7 @@ describe('flows', () => { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); }); @@ -255,7 +255,7 @@ describe('flows', () => { describe('when child is debounced when added again with same debounce id', function () { describe('when ttl is not provided', function () { it('waits until job is finished before removing debounce key', async function () { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const flow = new FlowProducer({ connection, prefix }); const queueEvents = new QueueEvents(queueName, { connection, prefix }); @@ -357,7 +357,7 @@ describe('flows', () => { { qux: 'something' }, ]; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor, parentProcessor, @@ -455,8 +455,8 @@ describe('flows', () => { const name = 'child-job'; const values = [{ bar: 'something' }, { baz: 'something' }]; - const parentQueueName = `parent-queue-${v4()}`; - const grandparentQueueName = `grandparent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandparentQueueName = `grandparent-queue-${randomUUID()}`; const grandparentQueue = new Queue(grandparentQueueName, { connection, prefix, @@ -759,7 +759,7 @@ describe('flows', () => { describe('when ignoreDependencyOnFailure is provided', async () => { it('moves parent to wait after children fail', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const name = 'child-job'; @@ -864,7 +864,7 @@ describe('flows', () => { describe('when removeDependencyOnFailure is provided', async () => { it('moves parent to wait after children fail', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const name = 'child-job'; @@ -961,8 +961,8 @@ describe('flows', () => { describe('when chaining flows at runtime using step jobs', () => { it('should wait children as one step of the parent job', async function () { this.timeout(8000); - const childrenQueueName = `children-queue-${v4()}`; - const grandchildrenQueueName = `grandchildren-queue-${v4()}`; + const childrenQueueName = `children-queue-${randomUUID()}`; + const grandchildrenQueueName = `grandchildren-queue-${randomUUID()}`; enum Step { Initial, @@ -1164,7 +1164,7 @@ describe('flows', () => { describe('when defaultJobOptions is provided', async () => { it('processes children before the parent', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const name = 'child-job'; const values = [ @@ -1282,8 +1282,8 @@ describe('flows', () => { describe('when priority is provided', async () => { it('processes children before the parent respecting priority option', async () => { - const parentQueueName = `parent-queue-${v4()}`; - const grandchildrenQueueName = `grandchildren-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandchildrenQueueName = `grandchildren-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const parentName = 'parent-job'; const grandchildrenName = 'grandchildren-job'; @@ -1475,7 +1475,7 @@ describe('flows', () => { const name = 'child-job'; const values = [{ bar: 'something' }]; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor, parentProcessor, @@ -1853,7 +1853,7 @@ describe('flows', () => { const name = 'child-job'; const values = [{ bar: 'something' }]; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor, parentProcessor, @@ -1952,8 +1952,8 @@ describe('flows', () => { { qux: 'something' }, ]; - const parentQueueName = `parent-queue-${v4()}`; - const grandChildrenQueueName = `grand-children-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandChildrenQueueName = `grand-children-queue-${randomUUID()}`; let grandChildrenProcessor, childrenProcessor, @@ -2109,8 +2109,8 @@ describe('flows', () => { it('should move parent to failed when child is moved to failed', async () => { const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; - const grandChildrenQueueName = `grand-children-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandChildrenQueueName = `grand-children-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -2245,8 +2245,8 @@ describe('flows', () => { it('should remove parent when child is moved to failed', async () => { const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; - const grandChildrenQueueName = `grand-children-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandChildrenQueueName = `grand-children-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -2380,8 +2380,8 @@ describe('flows', () => { it('moves parent to wait after children fail', async () => { const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; - const grandChildrenQueueName = `grand-children-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandChildrenQueueName = `grand-children-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -2522,8 +2522,8 @@ describe('flows', () => { it('moves parent to wait after children fail', async () => { const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; - const grandChildrenQueueName = `grand-children-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandChildrenQueueName = `grand-children-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -2675,7 +2675,7 @@ describe('flows', () => { bar: 'something', })); - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor, parentProcessor, @@ -2763,7 +2763,7 @@ describe('flows', () => { it('should get a flow tree', async () => { const name = 'child-job'; - const topQueueName = `parent-queue-${v4()}`; + const topQueueName = `parent-queue-${randomUUID()}`; const flow = new FlowProducer({ connection, prefix }); const originalTree = await flow.add({ @@ -2824,7 +2824,7 @@ describe('flows', () => { it('should get part of flow tree', async () => { const name = 'child-job'; - const topQueueName = `parent-queue-${v4()}`; + const topQueueName = `parent-queue-${randomUUID()}`; const flow = new FlowProducer({ connection, prefix }); const originalTree = await flow.add({ @@ -2897,7 +2897,7 @@ describe('flows', () => { { qux: 'something' }, ]; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); @@ -3005,7 +3005,7 @@ describe('flows', () => { }); it('should process parent when children is an empty array', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let parentProcessor; @@ -3048,7 +3048,7 @@ describe('flows', () => { { qux: 'something' }, ]; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor, parentProcessor, @@ -3149,7 +3149,7 @@ describe('flows', () => { { idx: 2, qux: 'something' }, ]; - const topQueueName = `top-queue-${v4()}`; + const topQueueName = `top-queue-${randomUUID()}`; let childrenProcessor, parentProcessor, @@ -3276,7 +3276,7 @@ describe('flows', () => { it('should add meta key to both parents and children', async () => { const name = 'child-job'; - const topQueueName = `top-queue-${v4()}`; + const topQueueName = `top-queue-${randomUUID()}`; const flow = new FlowProducer({ connection, prefix }); await flow.add({ @@ -3319,7 +3319,7 @@ describe('flows', () => { const name = 'child-job'; const values = [{ idx: 0, bar: 'something' }]; - const topQueueName = `top-queue-${v4()}`; + const topQueueName = `top-queue-${randomUUID()}`; let parentProcessor; const childrenWorker = new Worker( @@ -3426,7 +3426,7 @@ describe('flows', () => { const name = 'child-job'; const values = [{ idx: 0, bar: 'something' }]; - const topQueueName = `top-queue-${v4()}`; + const topQueueName = `top-queue-${randomUUID()}`; let parentProcessor; const childrenWorker = new Worker( @@ -3520,7 +3520,7 @@ describe('flows', () => { it('should not process parent if child fails', async () => { const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor; const processingChildren = new Promise( @@ -3568,7 +3568,7 @@ describe('flows', () => { it('should not process parent until queue is unpaused', async () => { const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; let childrenProcessor, parentProcessor; const processingChildren = new Promise( @@ -3642,8 +3642,8 @@ describe('flows', () => { const name = 'child-job'; const values = [{ bar: 'something' }, { baz: 'something' }]; - const parentQueueName = `parent-queue-${v4()}`; - const grandparentQueueName = `grandparent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandparentQueueName = `grandparent-queue-${randomUUID()}`; const grandparentQueue = new Queue(grandparentQueueName, { connection, prefix, @@ -3871,7 +3871,7 @@ describe('flows', () => { describe('.remove', () => { it('should remove all children when removing a parent', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const name = 'child-job'; const flow = new FlowProducer({ connection, prefix }); @@ -3936,7 +3936,7 @@ describe('flows', () => { describe('when removeChildren option is provided as false', () => { it('does not remove any children when removing a parent', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const name = 'child-job'; const flow = new FlowProducer({ connection, prefix }); @@ -4004,7 +4004,7 @@ describe('flows', () => { describe('when there are processed children', () => { it('removes all children when removing a parent', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const name = 'child-job'; const flow = new FlowProducer({ connection, prefix }); @@ -4093,8 +4093,8 @@ describe('flows', () => { describe('when there is a grand parent', () => { it('removes all children when removing a parent, but not grandparent', async () => { - const parentQueueName = `parent-queue-${v4()}`; - const grandparentQueueName = `grandparent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; + const grandparentQueueName = `grandparent-queue-${randomUUID()}`; const name = 'child-job'; const flow = new FlowProducer({ connection, prefix }); @@ -4210,7 +4210,7 @@ describe('flows', () => { }); it('should not remove anything if there is a locked job in the tree', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const name = 'child-job'; const worker = new Worker(queueName, null, { connection, prefix }); @@ -4246,7 +4246,7 @@ describe('flows', () => { }); it('should remove from parent dependencies and move parent to wait', async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const name = 'child-job'; const flow = new FlowProducer({ connection, prefix }); @@ -4293,7 +4293,7 @@ describe('flows', () => { }); it(`should only move parent to wait when all children have been removed`, async () => { - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const name = 'child-job'; const flow = new FlowProducer({ connection, prefix }); diff --git a/tests/test_getters.ts b/tests/test_getters.ts index a6779d00cc..e8e715cf00 100644 --- a/tests/test_getters.ts +++ b/tests/test_getters.ts @@ -7,7 +7,7 @@ import { describe, beforeEach, it, before, after as afterAll } from 'mocha'; import * as sinon from 'sinon'; import { default as IORedis } from 'ioredis'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { FlowProducer, Queue, QueueEvents, Worker } from '../src/classes'; import { delay, removeAllQueueData } from '../src/utils'; @@ -23,7 +23,7 @@ describe('Jobs getters', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); }); diff --git a/tests/test_job.ts b/tests/test_job.ts index 741772b105..1e24680bd8 100644 --- a/tests/test_job.ts +++ b/tests/test_job.ts @@ -12,7 +12,7 @@ import { before, after as afterAll, } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Job, Queue, QueueEvents, Worker } from '../src/classes'; import { JobsOptions } from '../src/types'; import { delay, getParentKey, removeAllQueueData } from '../src/utils'; @@ -29,7 +29,7 @@ describe('Job', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); }); @@ -119,7 +119,7 @@ describe('Job', function () { describe('when parent key is missing', () => { it('throws an error', async () => { const data = { foo: 'bar' }; - const parentId = v4(); + const parentId = randomUUID(); const opts: JobsOptions = { parent: { id: parentId, queue: `${prefix}:${queueName}` }, }; @@ -292,7 +292,7 @@ describe('Job', function () { const values = [{ idx: 0, bar: 'something' }]; const token = 'my-token'; const token2 = 'my-token2'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const parentWorker = new Worker(parentQueueName, null, { @@ -621,7 +621,7 @@ describe('Job', function () { ]; const token = 'my-token'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); diff --git a/tests/test_job_scheduler.ts b/tests/test_job_scheduler.ts index dfa7cf0c26..4086322e13 100644 --- a/tests/test_job_scheduler.ts +++ b/tests/test_job_scheduler.ts @@ -3,7 +3,7 @@ import { default as IORedis } from 'ioredis'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; import * as sinon from 'sinon'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { rrulestr } from 'rrule'; import { Job, @@ -41,7 +41,7 @@ describe('Job Scheduler', function () { beforeEach(async function () { this.clock = sinon.useFakeTimers({ shouldClearNativeTimers: true }); - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); repeat = new Repeat(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); @@ -611,7 +611,7 @@ describe('Job Scheduler', function () { describe('when using removeOnComplete', function () { it('should remove repeated job', async function () { this.timeout(10000); - const queueName2 = `test-${v4()}`; + const queueName2 = `test-${randomUUID()}`; const queue2 = new Queue(queueName2, { connection, prefix, diff --git a/tests/test_job_scheduler_stress.ts b/tests/test_job_scheduler_stress.ts index 1c3967e73b..4d67875fc7 100644 --- a/tests/test_job_scheduler_stress.ts +++ b/tests/test_job_scheduler_stress.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, QueueEvents, Repeat, Worker } from '../src/classes'; import { removeAllQueueData } from '../src/utils'; @@ -25,7 +25,7 @@ describe('Job Scheduler Stress', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); repeat = new Repeat(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); diff --git a/tests/test_metrics.ts b/tests/test_metrics.ts index f59d4e44d7..8ea0940a5f 100644 --- a/tests/test_metrics.ts +++ b/tests/test_metrics.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; import * as sinon from 'sinon'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, QueueEvents, Repeat, Worker } from '../src/classes'; import { removeAllQueueData } from '../src/utils'; @@ -32,7 +32,7 @@ describe('metrics', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); repeat = new Repeat(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); diff --git a/tests/test_obliterate.ts b/tests/test_obliterate.ts index 2358bcf790..59d5b8b2d2 100644 --- a/tests/test_obliterate.ts +++ b/tests/test_obliterate.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { after } from 'lodash'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, QueueEvents, FlowProducer, Worker, Job } from '../src/classes'; import { delay, removeAllQueueData } from '../src/utils'; @@ -20,7 +20,7 @@ describe('Obliterate', function () { }); beforeEach(async () => { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -187,7 +187,7 @@ describe('Obliterate', function () { describe('when parent has pending children in different queue', async () => { it('keeps parent in waiting-children', async () => { await queue.waitUntilReady(); - const childrenQueueName = `test-${v4()}`; + const childrenQueueName = `test-${randomUUID()}`; const childrenQueue = new Queue(childrenQueueName, { connection, prefix, @@ -231,7 +231,7 @@ describe('Obliterate', function () { describe('when parent has more than 1 pending children', async () => { it('deletes each children until trying to move parent to wait', async () => { await queue.waitUntilReady(); - const parentQueueName = `test-${v4()}`; + const parentQueueName = `test-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, @@ -284,7 +284,7 @@ describe('Obliterate', function () { describe('when parent has only 1 pending children', async () => { it('moves parent to wait to try to process it', async () => { await queue.waitUntilReady(); - const parentQueueName = `test-${v4()}`; + const parentQueueName = `test-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, diff --git a/tests/test_pause.ts b/tests/test_pause.ts index 9ad1f6e5c5..3989de2d66 100644 --- a/tests/test_pause.ts +++ b/tests/test_pause.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Job, Queue, QueueEvents, Worker } from '../src/classes'; import { delay, removeAllQueueData } from '../src/utils'; @@ -19,7 +19,7 @@ describe('Pause', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); diff --git a/tests/test_queue.ts b/tests/test_queue.ts index 446e6121a1..8e1f7a0573 100644 --- a/tests/test_queue.ts +++ b/tests/test_queue.ts @@ -3,7 +3,7 @@ import { default as IORedis } from 'ioredis'; import { describe, beforeEach, it, before, after as afterAll } from 'mocha'; import { after } from 'lodash'; import * as sinon from 'sinon'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { FlowProducer, Job, Queue, Worker } from '../src/classes'; import { delay, removeAllQueueData } from '../src/utils'; import { version as currentPackageVersion } from '../src/version'; @@ -22,7 +22,7 @@ describe('queues', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); await queue.waitUntilReady(); }); @@ -61,7 +61,7 @@ describe('queues', function () { }); it('should return default library version when using skipMetasUpdate', async () => { - const exQueueName = `test-${v4()}`; + const exQueueName = `test-${randomUUID()}`; const queue = new Queue(exQueueName, { connection, skipMetasUpdate: true }); const version = await queue.getVersion(); expect(version).to.be.equal(null); @@ -209,7 +209,7 @@ describe('queues', function () { describe('when parent has pending children in different queue', async () => { it('keeps parent in waiting-children', async () => { await queue.waitUntilReady(); - const childrenQueueName = `test-${v4()}`; + const childrenQueueName = `test-${randomUUID()}`; const childrenQueue = new Queue(childrenQueueName, { connection, prefix, @@ -253,7 +253,7 @@ describe('queues', function () { describe('when parent has more than 1 pending children', async () => { it('deletes each children until trying to move parent to wait', async () => { await queue.waitUntilReady(); - const parentQueueName = `test-${v4()}`; + const parentQueueName = `test-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, @@ -308,7 +308,7 @@ describe('queues', function () { describe('when parent has only 1 pending children', async () => { it('moves parent to wait to try to process it', async () => { await queue.waitUntilReady(); - const parentQueueName = `test-${v4()}`; + const parentQueueName = `test-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, diff --git a/tests/test_rate_limiter.ts b/tests/test_rate_limiter.ts index c583d35333..a3acabf54d 100644 --- a/tests/test_rate_limiter.ts +++ b/tests/test_rate_limiter.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { after, every } from 'lodash'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { FlowProducer, Queue, @@ -26,7 +26,7 @@ describe('Rate Limiter', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -201,7 +201,7 @@ describe('Rate Limiter', function () { it('should obey the rate limit per queue', async function () { this.timeout(20000); const name = 'child-job'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueueEvents = new QueueEvents(parentQueueName, { connection, prefix, diff --git a/tests/test_repeat.ts b/tests/test_repeat.ts index 4685c08803..4f81fb665e 100644 --- a/tests/test_repeat.ts +++ b/tests/test_repeat.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; import * as sinon from 'sinon'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { rrulestr } from 'rrule'; import { Job, @@ -46,7 +46,7 @@ describe('repeat', function () { beforeEach(async function () { this.clock = sinon.useFakeTimers({ shouldClearNativeTimers: true }); - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); repeat = new Repeat(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); @@ -461,7 +461,7 @@ describe('repeat', function () { describe('when using removeOnComplete', function () { it('should remove repeated job', async function () { this.timeout(10000); - const queueName2 = `test-${v4()}`; + const queueName2 = `test-${randomUUID()}`; const queue2 = new Queue(queueName2, { connection, prefix, diff --git a/tests/test_sandboxed_process.ts b/tests/test_sandboxed_process.ts index 063d6b94e5..7895f84f65 100644 --- a/tests/test_sandboxed_process.ts +++ b/tests/test_sandboxed_process.ts @@ -12,7 +12,7 @@ import { Worker, } from '../src/classes'; import { beforeEach, before, after as afterAll, it } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { delay, removeAllQueueData } from '../src/utils'; const { stdout, stderr } = require('test-console'); @@ -32,7 +32,7 @@ describe('Sandboxed process using child processes', () => { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -148,7 +148,7 @@ describe('Sandboxed process using worker threads', () => { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -221,7 +221,7 @@ function sandboxProcessTests( }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -774,7 +774,7 @@ function sandboxProcessTests( __dirname + '/fixtures/fixture_processor_get_children_values_child.js'; const parentProcessFile = __dirname + '/fixtures/fixture_processor_get_children_values.js'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentWorker = new Worker(parentQueueName, parentProcessFile, { connection, @@ -839,7 +839,7 @@ function sandboxProcessTests( __dirname + '/fixtures/fixture_processor_get_children_values_child.js'; const parentProcessFile = __dirname + '/fixtures/fixture_processor_get_children_values.js'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentWorker = new Worker(parentQueueName, parentProcessFile, { connection, @@ -1007,7 +1007,7 @@ function sandboxProcessTests( it('includes parent', async () => { const processFile = __dirname + '/fixtures/fixture_processor_parent.js'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const worker = new Worker(queueName, processFile, { connection, diff --git a/tests/test_scripts.ts b/tests/test_scripts.ts index 50c4fdb69c..ae39a3df39 100644 --- a/tests/test_scripts.ts +++ b/tests/test_scripts.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { default as IORedis } from 'ioredis'; import { describe, beforeEach, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue } from '../src/classes'; import { removeAllQueueData } from '../src/utils'; @@ -18,7 +18,7 @@ describe('scripts', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); await queue.waitUntilReady(); }); diff --git a/tests/test_stalled_jobs.ts b/tests/test_stalled_jobs.ts index 2ccdf5c8a4..1e3f661165 100644 --- a/tests/test_stalled_jobs.ts +++ b/tests/test_stalled_jobs.ts @@ -3,7 +3,7 @@ import { delay, removeAllQueueData } from '../src/utils'; import { default as IORedis } from 'ioredis'; import { after } from 'lodash'; import { beforeEach, describe, it, before, after as afterAll } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { expect } from 'chai'; describe('stalled jobs', function () { @@ -18,7 +18,7 @@ describe('stalled jobs', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); }); @@ -382,7 +382,7 @@ describe('stalled jobs', function () { it('should move parent to failed when child is moved to failed', async function () { this.timeout(6000); const concurrency = 4; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -471,7 +471,7 @@ describe('stalled jobs', function () { it('should move parent to waiting when child is moved to failed and save child failedReason', async function () { this.timeout(6000); const concurrency = 4; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -565,7 +565,7 @@ describe('stalled jobs', function () { it('should move parent to waiting when child is moved to failed', async function () { this.timeout(6000); const concurrency = 4; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, diff --git a/tests/test_telemetry_interface.ts b/tests/test_telemetry_interface.ts index fa6ff4290a..d1c9ac8439 100644 --- a/tests/test_telemetry_interface.ts +++ b/tests/test_telemetry_interface.ts @@ -1,7 +1,7 @@ import { expect, assert } from 'chai'; import { default as IORedis } from 'ioredis'; import { after, beforeEach, describe, it, before } from 'mocha'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { FlowProducer, Job, JobScheduler, Queue, Worker } from '../src/classes'; import { removeAllQueueData } from '../src/utils'; import { @@ -126,7 +126,7 @@ describe('Telemetry', () => { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; telemetryClient = new MockTelemetry('mockTracer'); queue = new Queue(queueName, { diff --git a/tests/test_worker.ts b/tests/test_worker.ts index 151fd8fb08..1c54d9eb5b 100644 --- a/tests/test_worker.ts +++ b/tests/test_worker.ts @@ -3,7 +3,7 @@ import { default as IORedis } from 'ioredis'; import { after, times } from 'lodash'; import { describe, beforeEach, it, before, after as afterAll } from 'mocha'; import * as sinon from 'sinon'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Queue, QueueEvents, @@ -37,7 +37,7 @@ describe('workers', function () { }); beforeEach(async function () { - queueName = `test-${v4()}`; + queueName = `test-${randomUUID()}`; queue = new Queue(queueName, { connection, prefix }); queueEvents = new QueueEvents(queueName, { connection, prefix }); await queueEvents.waitUntilReady(); @@ -1005,7 +1005,7 @@ describe('workers', function () { describe('when sharing connection', () => { it('should not fail', async () => { - const queueName2 = `test-${v4()}`; + const queueName2 = `test-${randomUUID()}`; const connection = new IORedis({ host: redisHost, @@ -1697,7 +1697,7 @@ describe('workers', function () { const connection = new IORedis(redisHost, { maxRetriesPerRequest: null, }); - const queueName2 = `test-shared-${v4()}`; + const queueName2 = `test-shared-${randomUUID()}`; const queue2 = new Queue(queueName2, { defaultJobOptions: { removeOnComplete: true }, @@ -3224,7 +3224,7 @@ describe('workers', function () { describe('when creating children at runtime', () => { it('should wait children as one step of the parent job', async function () { this.timeout(8000); - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, @@ -3342,7 +3342,7 @@ describe('workers', function () { describe('when skip attempt option is provided as true', () => { it('should wait children as one step of the parent job whithout incrementing attemptMade', async function () { this.timeout(8000); - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix, @@ -4092,7 +4092,7 @@ describe('workers', function () { const parentToken2 = 'parent-token2'; const childToken = 'child-token'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const parentWorker = new Worker(parentQueueName, null, { @@ -4220,7 +4220,7 @@ describe('workers', function () { const parentToken = 'parent-token'; const childToken = 'child-token'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, @@ -4305,7 +4305,7 @@ describe('workers', function () { const value = { bar: 'something' }; const parentToken = 'parent-token'; - const parentQueueName = `parent-queue-${v4()}`; + const parentQueueName = `parent-queue-${randomUUID()}`; const parentQueue = new Queue(parentQueueName, { connection, prefix }); const parentWorker = new Worker(parentQueueName, null, { diff --git a/yarn.lock b/yarn.lock index 6141eb518f..007ea6bcc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1123,10 +1123,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.1.tgz#178d58ee7e4834152b0e8b4d30cbfab578b9bb30" integrity sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg== -"@types/node@^12.20.25": - version "12.20.55" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" - integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== +"@types/node@^16.7.0": + version "16.18.126" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.126.tgz#27875faa2926c0f475b39a8bb1e546c0176f8d4b" + integrity sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw== "@types/normalize-package-data@^2.4.0": version "2.4.4" @@ -1155,11 +1155,6 @@ resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz#5fd3592ff10c1e9695d377020c033116cc2889f2" integrity sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ== -"@types/uuid@^3.4.10": - version "3.4.13" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.13.tgz#fe890e517fb840620be284ee213e81d702b1f76b" - integrity sha512-pAeZeUbLE4Z9Vi9wsWV2bYPTweEHeJJy0G4pEjOA/FSvy1Ad5U5Km8iDV6TKre1mjBiVNfAdVHKruP8bAh4Q5A== - "@typescript-eslint/eslint-plugin@^4.32.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" @@ -5314,11 +5309,6 @@ nise@^6.0.0: just-extend "^6.2.0" path-to-regexp "^8.1.0" -node-abort-controller@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" - integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== - node-emoji@^1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" @@ -7656,11 +7646,6 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" - integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== - v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"