@openora/core 0.4.1-canary.37 → 0.4.1-canary.39

package/dist/server/db/outbox/__tests__/relay.test.js

@@ -1,124 +1,117 @@
-import { describe, it, expect, vi } from 'vitest';
-import { mock } from '../../../../testing/mock.js';
+import { describe, it, expect, vi, beforeAll, afterAll, beforeEach } from 'vitest';
+import { randomUUID } from 'node:crypto';
+import { eq, sql } from 'drizzle-orm';
+import { createTestDb } from '@openora/core/testing';
+import { migrate } from '@openora/core/server/migrate';
 import { OutboxRelay } from '../relay.js';
-function row(id, topic) {
-    return {
-        eventId: id,
-        topic,
-        payload: { id },
-        schemaVersion: 1,
-        traceId: null,
-        orderingKey: null,
-        occurredAt: new Date('2026-01-01T00:00:00.000Z'),
-        publishedAt: null,
-    };
+import { eventOutbox } from '../schema.js';
+let db;
+async function seedRow(overrides = {}) {
+    const [row] = await db.drizzle.db
+        .insert(eventOutbox)
+        .values({
+        eventId: randomUUID(),
+        topic: 'wallet.deposit.completed',
+        payload: { id: randomUUID() },
+        occurredAt: new Date(),
+        ...overrides,
+    })
+        .returning();
+    return row;
 }
-// Fake drizzle: transaction() answers the SKIP LOCKED claim select; each row is then
-// marked via a top-level update(). trackPublish links that update() to the row the
-// broker just published, so a mid-batch throw leaves already-marked rows published.
-function harness(rows) {
-    let lastPublishedId = null;
-    const db = mock({
-        transaction: async (callback) => callback({
-            select: () => ({
-                from: () => ({
-                    where: () => ({
-                        orderBy: () => ({
-                            limit: () => ({
-                                for: async () => rows.filter((r) => r.publishedAt === null).map((r) => ({ ...r })),
-                            }),
-                        }),
-                    }),
-                }),
-            }),
-        }),
-        update: () => ({
-            set: (values) => ({
-                where: async () => {
-                    const r = rows.find((x) => x.eventId === lastPublishedId);
-                    if (r) {
-                        r.publishedAt = values.publishedAt;
-                    }
-                },
-            }),
-        }),
-    });
-    return { db, trackPublish: (eventId) => (lastPublishedId = eventId) };
-}
-function brokerThat(trackPublish, onPublish) {
+function brokerThat(onPublish) {
     return {
-        publish: vi.fn(async (env) => {
-            trackPublish(env.eventId);
-            onPublish?.(env.eventId);
+        publish: vi.fn(async (envelope) => {
+            onPublish?.(envelope);
         }),
         subscribe: () => () => { },
         close: async () => { },
     };
 }
-describe('OutboxRelay.drainOnce', () => {
+async function rowsById() {
+    const rows = await db.drizzle.db.select().from(eventOutbox);
+    return new Map(rows.map((r) => [r.eventId, r]));
+}
+beforeAll(async () => {
+    db = await createTestDb([migrate]);
+});
+afterAll(async () => {
+    await db.drop();
+});
+beforeEach(async () => {
+    await db.drizzle.db.execute(sql `TRUNCATE ${eventOutbox} RESTART IDENTITY CASCADE`);
+});
+describe('OutboxRelay.drainOnce (real PG)', () => {
     it('publishes pending rows in order and marks them published', async () => {
-        const rows = [row('a', 'wallet.deposit.completed'), row('b', 'wallet.withdrawal.completed')];
-        const { db, trackPublish } = harness(rows);
-        const broker = brokerThat(trackPublish);
-        const relay = new OutboxRelay(db, broker);
+        const a = await seedRow({
+            topic: 'wallet.deposit.completed',
+            occurredAt: new Date('2026-01-01T00:00:00.000Z'),
+        });
+        await seedRow({
+            topic: 'wallet.withdrawal.completed',
+            occurredAt: new Date('2026-01-01T00:00:01.000Z'),
+        });
+        const broker = brokerThat();
+        const relay = new OutboxRelay(db.drizzle.db, broker);
         const n = await relay.drainOnce();
         expect(n).toBe(2);
         expect(broker.publish).toHaveBeenCalledTimes(2);
         expect(broker.publish.mock.calls[0][0]).toMatchObject({
-            eventId: 'a',
-            topic: 'wallet.deposit.completed',
+            eventId: a.eventId,
+            topic: a.topic,
         });
+        const rows = await db.drizzle.db.select().from(eventOutbox);
         expect(rows.every((r) => r.publishedAt !== null)).toBe(true);
     });
     it('is a no-op when nothing is pending', async () => {
-        const rows = [{ ...row('a', 'x'), publishedAt: new Date() }];
-        const { db, trackPublish } = harness(rows);
-        const broker = brokerThat(trackPublish);
-        const relay = new OutboxRelay(db, broker);
+        await seedRow({ publishedAt: new Date() });
+        const broker = brokerThat();
+        const relay = new OutboxRelay(db.drizzle.db, broker);
         const n = await relay.drainOnce();
         expect(n).toBe(0);
         expect(broker.publish).not.toHaveBeenCalled();
     });
     it('leaves the row pending when broker.publish throws', async () => {
-        const rows = [row('a', 'wallet.deposit.completed')];
-        const { db, trackPublish } = harness(rows);
+        const row = await seedRow();
         const broker = {
-            publish: vi.fn(async (env) => {
-                trackPublish(env.eventId);
+            publish: vi.fn(async () => {
                 throw new Error('broker unreachable');
             }),
             subscribe: () => () => { },
             close: async () => { },
         };
-        const relay = new OutboxRelay(db, broker);
+        const relay = new OutboxRelay(db.drizzle.db, broker);
         await expect(relay.drainOnce()).rejects.toThrow('broker unreachable');
-        expect(rows[0]?.publishedAt).toBeNull();
+        const [after] = await db.drizzle.db
+            .select()
+            .from(eventOutbox)
+            .where(eq(eventOutbox.eventId, row.eventId));
+        expect(after?.publishedAt).toBeNull();
     });
     it('keeps rows published before a mid-batch publish failure, retrying only the failing row', async () => {
-        const rows = [
-            row('a', 'wallet.deposit.completed'),
-            row('b', 'wallet.withdrawal.completed'),
-            row('c', 'wallet.deposit.completed'),
-        ];
-        const { db, trackPublish } = harness(rows);
-        const broker = brokerThat(trackPublish, (eventId) => {
-            if (eventId === 'b') {
+        const a = await seedRow({ occurredAt: new Date('2026-01-01T00:00:00.000Z') });
+        const b = await seedRow({ occurredAt: new Date('2026-01-01T00:00:01.000Z') });
+        const c = await seedRow({ occurredAt: new Date('2026-01-01T00:00:02.000Z') });
+        const broker = brokerThat((envelope) => {
+            if (envelope.eventId === b.eventId) {
                 throw new Error('broker unreachable');
             }
         });
-        const relay = new OutboxRelay(db, broker);
+        const relay = new OutboxRelay(db.drizzle.db, broker);
         await expect(relay.drainOnce()).rejects.toThrow('broker unreachable');
-        expect(rows[0]?.publishedAt).not.toBeNull(); // a - published before the failure
-        expect(rows[1]?.publishedAt).toBeNull(); // b - failed
-        expect(rows[2]?.publishedAt).toBeNull(); // c - never reached
+        const afterFailure = await rowsById();
+        expect(afterFailure.get(a.eventId)?.publishedAt).not.toBeNull();
+        expect(afterFailure.get(b.eventId)?.publishedAt).toBeNull();
+        expect(afterFailure.get(c.eventId)?.publishedAt).toBeNull();
         const publishSpy = broker.publish;
         publishSpy.mockClear();
-        publishSpy.mockImplementation(async (env) => trackPublish(env.eventId));
+        publishSpy.mockImplementation(async () => undefined);
         const n = await relay.drainOnce();
         expect(n).toBe(2);
         expect(publishSpy).toHaveBeenCalledTimes(2);
-        expect(publishSpy.mock.calls.map((c) => c[0].eventId)).toEqual(['b', 'c']);
-        expect(rows.every((r) => r.publishedAt !== null)).toBe(true);
+        expect(publishSpy.mock.calls.map((call) => call[0].eventId)).toEqual([b.eventId, c.eventId]);
+        const afterRetry = await rowsById();
+        expect([...afterRetry.values()].every((r) => r.publishedAt !== null)).toBe(true);
     });
 });
 //# sourceMappingURL=relay.test.js.map

package/dist/server/db/outbox/__tests__/relay.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"relay.test.js","sourceRoot":"","sources":["../../../../../src/server/db/outbox/__tests__/relay.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"relay.test.js","sourceRoot":"","sources":["../../../../../src/server/db/outbox/__tests__/relay.test.ts"],"names":[],"mappings":"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"}

package/dist/server/kernel/__tests__/bullmq-job-queue.test.js

@@ -1,190 +1,240 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeAll, afterEach, afterAll } from 'vitest';
+import { Queue } from 'bullmq';
 import { z } from 'zod';
 import { queue } from '@openora/core/contracts';
-const { queues, workers, closeOrder, FakeQueue, FakeWorker } = vi.hoisted(() => {
-    const closeOrder = [];
-    class FakeQueue {
-        name;
-        opts;
-        add = vi.fn(async () => ({ id: 'job-1' }));
-        upsertJobScheduler = vi.fn(async () => ({}));
-        removeJobScheduler = vi.fn(async () => true);
-        close = vi.fn(async () => {
-            closeOrder.push('queue');
-        });
-        constructor(name, opts) {
-            this.name = name;
-            this.opts = opts;
-            queues.push(this);
-        }
-    }
-    class FakeWorker {
-        name;
-        processor;
-        opts;
-        handlers = new Map();
-        close = vi.fn(async () => {
-            closeOrder.push('worker');
-        });
-        constructor(name, processor, opts) {
-            this.name = name;
-            this.processor = processor;
-            this.opts = opts;
-            workers.push(this);
-        }
-        on(event, cb) {
-            this.handlers.set(event, cb);
-            return this;
-        }
-    }
-    const queues = [];
-    const workers = [];
-    return { queues, workers, closeOrder, FakeQueue, FakeWorker };
-});
-vi.mock('bullmq', () => ({ Queue: FakeQueue, Worker: FakeWorker }));
-const { BullMqJobQueue } = await import('../bullmq-job-queue.js');
+import { createTestRedis, redisUrlForWorker } from '@openora/core/testing';
+import { BullMqJobQueue } from '../bullmq-job-queue.js';
 const Payload = z.object({ value: z.string() });
-const flush = () => new Promise((r) => setTimeout(r, 0));
-const REDIS_URL = 'redis://localhost:6379';
-beforeEach(() => {
-    queues.length = 0;
-    workers.length = 0;
-    closeOrder.length = 0;
+const POLL = { timeout: 5000, interval: 20 };
+let redis;
+const instances = [];
+const rawQueues = [];
+function makeQueue() {
+    const q = new BullMqJobQueue(redisUrlForWorker());
+    instances.push(q);
+    return q;
+}
+function rawQueue(name) {
+    const q = new Queue(name, {
+        connection: { url: redisUrlForWorker(), maxRetriesPerRequest: null },
+    });
+    rawQueues.push(q);
+    return q;
+}
+beforeAll(async () => {
+    redis = await createTestRedis();
+});
+afterEach(async () => {
+    await Promise.allSettled(instances.map((q) => q.close()));
+    await Promise.allSettled(rawQueues.map((q) => q.close()));
+    instances.length = 0;
+    rawQueues.length = 0;
+    await redis.flush();
+});
+afterAll(async () => {
+    await redis.quit();
 });
 describe('BullMqJobQueue', () => {
-    it('maps enqueue options to BullMQ job options and wraps the payload in an envelope', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
-        const result = await q.enqueue(queue('demo'), { value: 'hi' }, {
-            idempotencyKey: 'k1',
-            delayMs: 5000,
-            attempts: 3,
-            backoff: { type: 'exponential', delayMs: 500 },
-            priority: 2,
-            meta: { correlationId: 'c1' },
+    it('enqueues, validates the payload, and hands the worker a JobContext', async () => {
+        const q = makeQueue();
+        const seen = [];
+        q.registerWorker({
+            queue: queue('demo'),
+            schema: Payload,
+            handler: (ctx) => {
+                seen.push({ ...ctx });
+            },
         });
-        expect(result).toEqual({ id: 'job-1' });
-        expect(queues[0]?.add).toHaveBeenCalledTimes(1);
-        expect(queues[0]?.add).toHaveBeenCalledWith('demo', { payload: { value: 'hi' }, meta: { correlationId: 'c1', idempotencyKey: 'k1' } }, {
-            jobId: 'k1',
-            delay: 5000,
-            attempts: 3,
-            backoff: { type: 'exponential', delay: 500 },
-            priority: 2,
+        const result = await q.enqueue(queue('demo'), { value: 'hi' }, { idempotencyKey: 'k1', meta: { correlationId: 'c1' } });
+        expect(result.id).toBe('k1');
+        await vi.waitFor(() => expect(seen).toHaveLength(1), POLL);
+        const ctx = seen[0];
+        expect(ctx['id']).toBe('k1');
+        expect(ctx['name']).toBe('demo');
+        expect(ctx['payload']).toEqual({ value: 'hi' });
+        expect(ctx['attempt']).toBe(1);
+        expect(ctx['meta']).toEqual({ correlationId: 'c1', idempotencyKey: 'k1' });
+        expect(ctx['enqueuedAt']).toBeInstanceOf(Date);
+    });
+    it('dedupes concurrent enqueues that share an idempotencyKey', async () => {
+        const q = makeQueue();
+        let count = 0;
+        q.registerWorker({
+            queue: queue('dedupe'),
+            schema: Payload,
+            handler: () => {
+                count += 1;
+            },
         });
+        await q.enqueue(queue('dedupe'), { value: 'a' }, { idempotencyKey: 'k1' });
+        await q.enqueue(queue('dedupe'), { value: 'b' }, { idempotencyKey: 'k1' });
+        await vi.waitFor(() => expect(count).toBe(1), POLL);
+        await new Promise((r) => setTimeout(r, 150));
+        expect(count).toBe(1);
     });
-    it('returns the BullMQ-assigned id when no idempotencyKey is given', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
-        const result = await q.enqueue(queue('demo'), { value: 'hi' });
-        expect(result).toEqual({ id: 'job-1' });
-        expect(queues[0]?.add).toHaveBeenCalledWith('demo', { payload: { value: 'hi' }, meta: { idempotencyKey: undefined } }, {
-            jobId: undefined,
-            delay: undefined,
-            attempts: undefined,
-            backoff: undefined,
-            priority: undefined,
+    it('runs a job whose idempotencyKey contains the reserved colon separator', async () => {
+        const q = makeQueue();
+        const seen = [];
+        q.registerWorker({
+            queue: queue('colon-key'),
+            schema: Payload,
+            handler: ({ payload }) => {
+                seen.push(payload.value);
+            },
         });
+        await q.enqueue(queue('colon-key'), { value: 'a' }, { idempotencyKey: 'rg-eval:user-1' });
+        await vi.waitFor(() => expect(seen).toEqual(['a']), POLL);
     });
-    it('validates the payload and builds a JobContext with attempt = attemptsMade + 1 and carried meta', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
+    it('keeps the original idempotencyKey in meta after encoding it into a job id', async () => {
+        const q = makeQueue();
         const seen = [];
         q.registerWorker({
-            queue: queue('demo'),
+            queue: queue('colon-meta'),
             schema: Payload,
-            handler: (ctx) => {
-                seen.push({ ...ctx });
+            handler: ({ meta }) => {
+                seen.push(meta);
             },
         });
-        await workers[0]?.processor({
-            id: 'j1',
-            name: 'demo',
-            data: { payload: { value: 'hi' }, meta: { idempotencyKey: 'k1' } },
-            attemptsMade: 1,
-            timestamp: 1000,
-            opts: { attempts: 3 },
+        await q.enqueue(queue('colon-meta'), { value: 'a' }, { idempotencyKey: 'rg-eval:user-1' });
+        await vi.waitFor(() => expect(seen).toHaveLength(1), POLL);
+        expect(seen[0]?.['idempotencyKey']).toBe('rg-eval:user-1');
+    });
+    it('does not collapse two colon keys that differ only where the separator sits', async () => {
+        const q = makeQueue();
+        let count = 0;
+        q.registerWorker({
+            queue: queue('colon-distinct'),
+            schema: Payload,
+            handler: () => {
+                count += 1;
+            },
         });
-        expect(seen[0]).toEqual({
-            id: 'j1',
-            name: 'demo',
-            payload: { value: 'hi' },
-            attempt: 2,
-            enqueuedAt: new Date(1000),
-            meta: { idempotencyKey: 'k1' },
+        await q.enqueue(queue('colon-distinct'), { value: 'a' }, { idempotencyKey: 'a:b' });
+        await q.enqueue(queue('colon-distinct'), { value: 'b' }, { idempotencyKey: 'a%3Ab' });
+        await vi.waitFor(() => expect(count).toBe(2), POLL);
+    });
+    it('runs a job whose idempotencyKey is all digits, which BullMQ rejects as a raw id', async () => {
+        const q = makeQueue();
+        const seen = [];
+        q.registerWorker({
+            queue: queue('digit-key'),
+            schema: Payload,
+            handler: ({ payload }) => {
+                seen.push(payload.value);
+            },
         });
+        await q.enqueue(queue('digit-key'), { value: 'a' }, { idempotencyKey: '12345' });
+        await vi.waitFor(() => expect(seen).toEqual(['a']), POLL);
     });
-    it('fails the job when the payload does not match the schema', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
-        q.registerWorker({ queue: queue('demo'), schema: Payload, handler: () => undefined });
-        await expect(workers[0]?.processor({
-            id: 'j1',
-            name: 'demo',
-            data: { payload: { value: 42 }, meta: {} },
-            attemptsMade: 0,
-            timestamp: 1000,
-            opts: { attempts: 1 },
-        })).rejects.toThrow();
+    it('delays processing by delayMs', async () => {
+        const q = makeQueue();
+        const enqueuedAt = Date.now();
+        let processedAt = 0;
+        q.registerWorker({
+            queue: queue('delayed'),
+            schema: Payload,
+            handler: () => {
+                processedAt = Date.now();
+            },
+        });
+        await q.enqueue(queue('delayed'), { value: 'hi' }, { delayMs: 300 });
+        await vi.waitFor(() => expect(processedAt).toBeGreaterThan(0), POLL);
+        expect(processedAt - enqueuedAt).toBeGreaterThanOrEqual(250);
     });
-    it('passes worker concurrency through to BullMQ', () => {
-        const q = new BullMqJobQueue(REDIS_URL);
+    it('retries a failing handler up to attempts with backoff, then dead-letters', async () => {
+        const q = makeQueue();
+        const attempts = [];
+        const deadLettered = [];
         q.registerWorker({
-            queue: queue('demo'),
+            queue: queue('retry'),
             schema: Payload,
-            handler: () => undefined,
-            options: { concurrency: 5 },
+            handler: (ctx) => {
+                attempts.push(ctx.attempt);
+                throw new Error('always fails');
+            },
+            onDeadLetter: (ctx, error) => {
+                deadLettered.push({ attempt: ctx.attempt, error: error.message });
+            },
         });
-        expect(workers[0]?.opts.concurrency).toBe(5);
+        await q.enqueue(queue('retry'), { value: 'hi' }, { attempts: 2, backoff: { type: 'fixed', delayMs: 30 } });
+        await vi.waitFor(() => expect(attempts).toEqual([1, 2]), POLL);
+        await vi.waitFor(() => expect(deadLettered).toHaveLength(1), POLL);
+        expect(deadLettered[0]).toEqual({ attempt: 2, error: 'always fails' });
     });
-    it('dead-letters only on terminal failure and swallows a throwing hook', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
-        const onDeadLetter = vi.fn(async () => {
-            throw new Error('hook boom');
+    it('dead-letters only once retries are exhausted and swallows a throwing hook', async () => {
+        const q = makeQueue();
+        let deadLetterCalls = 0;
+        q.registerWorker({
+            queue: queue('poison'),
+            schema: Payload,
+            handler: () => {
+                throw new Error('boom');
+            },
+            onDeadLetter: async () => {
+                deadLetterCalls += 1;
+                throw new Error('hook boom');
+            },
         });
+        await q.enqueue(queue('poison'), { value: 'hi' }, { attempts: 2, backoff: { type: 'fixed', delayMs: 30 } });
+        await vi.waitFor(() => expect(deadLetterCalls).toBe(1), POLL);
+        // The hook threw, but the queue kept running (no unhandled rejection) - still one call.
+        await new Promise((r) => setTimeout(r, 120));
+        expect(deadLetterCalls).toBe(1);
+    });
+    it('fails the job when the payload does not match the schema', async () => {
+        const q = makeQueue();
+        let handlerCalls = 0;
+        const deadLettered = [];
         q.registerWorker({
-            queue: queue('demo'),
+            queue: queue('validate'),
             schema: Payload,
-            handler: () => undefined,
-            onDeadLetter,
+            handler: () => {
+                handlerCalls += 1;
+            },
+            onDeadLetter: (ctx) => {
+                deadLettered.push(ctx.payload);
+            },
         });
-        const failed = workers[0]?.handlers.get('failed');
-        const err = new Error('boom');
-        const job = {
-            id: 'j1',
-            name: 'demo',
-            data: { payload: { value: 'hi' }, meta: { idempotencyKey: 'k1' } },
-            attemptsMade: 1,
-            timestamp: 1000,
-            opts: { attempts: 3 },
-        };
-        failed?.(job, err);
-        await flush();
-        expect(onDeadLetter).not.toHaveBeenCalled();
-        failed?.({ ...job, attemptsMade: 3 }, err);
-        await flush();
-        expect(onDeadLetter).toHaveBeenCalledWith(expect.objectContaining({
-            id: 'j1',
-            name: 'demo',
-            attempt: 3,
-            payload: { value: 'hi' },
-            meta: { idempotencyKey: 'k1' },
-        }), err);
+        await q.enqueue(queue('validate'), { value: 42 });
+        await vi.waitFor(() => expect(deadLettered).toHaveLength(1), POLL);
+        expect(handlerCalls).toBe(0);
+        expect(deadLettered[0]).toEqual({ value: 42 });
     });
-    it('maps a cron schedule to a job scheduler and unschedules by id', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
+    it('registers a cron job scheduler and removes it on unschedule', async () => {
+        const q = makeQueue();
         await q.schedule(queue('sched'), 'daily', { value: 'x' }, { cron: '0 0 * * *', timezone: 'UTC' });
-        expect(queues[0]?.upsertJobScheduler).toHaveBeenCalledWith('daily', { pattern: '0 0 * * *', every: undefined, tz: 'UTC' }, { name: 'sched', data: { payload: { value: 'x' }, meta: {} } });
+        const raw = rawQueue('sched');
+        const scheduled = await raw.getJobSchedulers();
+        const daily = scheduled.find((s) => s.key === 'daily');
+        expect(daily?.pattern).toBe('0 0 * * *');
+        expect(daily?.tz).toBe('UTC');
         await q.unschedule(queue('sched'), 'daily');
-        expect(queues[0]?.removeJobScheduler).toHaveBeenCalledWith('daily');
+        expect(await raw.getJobSchedulers()).toHaveLength(0);
     });
-    it('maps an everyMs schedule to the every option', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
-        await q.schedule(queue('sched'), 'tick', { value: 'x' }, { everyMs: 60000 });
-        expect(queues[0]?.upsertJobScheduler).toHaveBeenCalledWith('tick', { pattern: undefined, every: 60000, tz: undefined }, { name: 'sched', data: { payload: { value: 'x' }, meta: {} } });
+    it('registers an everyMs job scheduler', async () => {
+        const q = makeQueue();
+        await q.schedule(queue('tick'), 'interval', { value: 'x' }, { everyMs: 60000 });
+        const raw = rawQueue('tick');
+        const interval = (await raw.getJobSchedulers()).find((s) => s.key === 'interval');
+        expect(interval?.every).toBe(60000);
     });
-    it('closes workers before queues', async () => {
-        const q = new BullMqJobQueue(REDIS_URL);
-        q.registerWorker({ queue: queue('demo'), schema: Payload, handler: () => undefined });
-        await q.enqueue(queue('demo'), { value: 'hi' });
+    it('close drains an in-flight job before resolving', async () => {
+        const q = makeQueue();
+        let started = false;
+        let finished = false;
+        q.registerWorker({
+            queue: queue('drain'),
+            schema: Payload,
+            handler: async () => {
+                started = true;
+                await new Promise((r) => setTimeout(r, 100));
+                finished = true;
+            },
+        });
+        await q.enqueue(queue('drain'), { value: 'hi' });
+        await vi.waitFor(() => expect(started).toBe(true), POLL);
         await q.close();
-        expect(closeOrder).toEqual(['worker', 'queue']);
+        expect(finished).toBe(true);
     });
 });
 //# sourceMappingURL=bullmq-job-queue.test.js.map