exp-node-server 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exp-node-server",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "CLI to scaffold Express + TypeScript APIs with Mongoose or Prisma, Zod validation and Swagger docs",
   "type": "module",
   "bin": {

package/templates/mongoose/.prettierignore

@@ -1,3 +1,4 @@
 node_modules
 dist
 coverage
+.exp-node-server

package/templates/mongoose/_gitignore

@@ -29,4 +29,7 @@ coverage/
 .idea/
 
 # Docker 
-*.pid
+*.pid
+
+# backups made by `exp-node-server -g <name> --force`
+.exp-node-server/

package/templates/mongoose/eslint.config.js

@@ -4,7 +4,7 @@ import tseslint from 'typescript-eslint';
 
 export default [
   {
-    ignores: ['node_modules', 'dist', 'coverage'],
+    ignores: ['node_modules', 'dist', 'coverage', '.exp-node-server'],
   },
 
   js.configs.recommended,

package/templates/mongoose/package-lock.json

@@ -23,7 +23,7 @@
         "mongodb": "^7.7.0",
         "mongoose": "^9.11.2",
         "multer": "^2.0.2",
-        "nodemailer": "^8.0.5",
+        "nodemailer": "^10.1.0",
         "passport": "^0.7.0",
         "passport-facebook": "^3.0.0",
         "passport-github": "^1.1.0",
@@ -44,7 +44,6 @@
         "@types/jsonwebtoken": "^9.0.10",
         "@types/multer": "^2.0.0",
         "@types/node": "^24.12.2",
-        "@types/nodemailer": "^7.0.2",
         "@types/passport": "^1.0.17",
         "@types/passport-facebook": "^3.0.4",
         "@types/passport-github": "^1.1.13",
@@ -1416,16 +1415,6 @@
         "undici-types": ">=7.24.0 <7.24.7"
       }
     },
-    "node_modules/@types/nodemailer": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-7.0.12.tgz",
-      "integrity": "sha512-80vKwiIsVSyFA1rRovH59jNPLBOuc6dRZIHEu40gXTkBkZnQv8vog1xSGEb9j5q/tdMAs5ivvDR2pLTU0hGHXA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/oauth": {
       "version": "0.9.6",
       "resolved": "https://registry.npmjs.org/@types/oauth/-/oauth-0.9.6.tgz",
@@ -4652,12 +4641,12 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.11.tgz",
-      "integrity": "sha512-nrO/pDAUKl+wXX+lx16tDLbnm0fW6sK/x8mgohaCpg+CdCEl482bD4tCuAZk2DyliruiNTIZxRCoWkDqJEnAiA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-10.1.0.tgz",
+      "integrity": "sha512-fXW8AulB25aOTuwfRYV6lqHyfz2VM4rr4SGXH03mE7x5znEUpzL5mu6anARUpZN7744Ziwkmr4AxSLPJsBQspg==",
       "license": "MIT-0",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/numbered": {

package/templates/mongoose/package.json

@@ -32,7 +32,7 @@
     "mongodb": "^7.7.0",
     "mongoose": "^9.11.2",
     "multer": "^2.0.2",
-    "nodemailer": "^8.0.5",
+    "nodemailer": "^10.1.0",
     "passport": "^0.7.0",
     "passport-facebook": "^3.0.0",
     "passport-github": "^1.1.0",
@@ -53,7 +53,6 @@
     "@types/jsonwebtoken": "^9.0.10",
     "@types/multer": "^2.0.0",
     "@types/node": "^24.12.2",
-    "@types/nodemailer": "^7.0.2",
     "@types/passport": "^1.0.17",
     "@types/passport-facebook": "^3.0.4",
     "@types/passport-github": "^1.1.13",

package/templates/mongoose/readme.md

@@ -177,6 +177,9 @@ through the route, controller and service against a real in-memory MongoDB
 ([mongodb-memory-server](https://github.com/typegoose/mongodb-memory-server), downloaded
 on the first run). Only the email queue and Cloudinary are mocked.
 
+The email queue tests run the real Agenda worker on the same in-memory MongoDB
+(retries, giving up, several workers, graceful shutdown).
+
 ## 🧠 Tech Stack
 
 - Express.js — Backend framework

package/templates/mongoose/src/app/queues/agenda.ts

@@ -3,18 +3,30 @@ import { Agenda } from 'agenda';
 import mongoose from 'mongoose';
 import { logger } from '../lib/logger.js';
 
+export type AgendaOptions = {
+  /** How often a worker looks for due jobs (ms or a human interval). */
+  processEvery?: string | number;
+};
+
 /**
  * Agenda stores jobs in the app's MongoDB (`agendaJobs` collection), so no Redis
  * is needed. Created on start, once mongoose is connected, to reuse its connection.
  */
 let agenda: Agenda | undefined;
 
-export const createAgenda = () => {
-  agenda = new Agenda({
+/** A new Agenda instance (a worker) on the app's MongoDB connection. */
+export const newAgenda = ({ processEvery = '5 seconds' }: AgendaOptions = {}) => {
+  const instance = new Agenda({
     backend: new MongoBackend({ mongo: mongoose.connection.db! }),
-    processEvery: '5 seconds',
+    processEvery,
   });
-  agenda.on('error', (err) => logger.error(err, 'Agenda error'));
+  instance.on('error', (err) => logger.error(err, 'Agenda error'));
+  return instance;
+};
+
+/** Creates the app's Agenda instance, used by `enqueueEmail()` & co. */
+export const createAgenda = (options?: AgendaOptions) => {
+  agenda = newAgenda(options);
   return agenda;
 };
 

package/templates/mongoose/src/app/queues/email.queue.ts

@@ -1,4 +1,5 @@
-import { exponential, type Job } from 'agenda';
+import { type Agenda, exponential, type Job } from 'agenda';
+import mongoose from 'mongoose';
 import { configs } from '../configs/index.js';
 import { logger } from '../lib/logger.js';
 import { otpEmailTemplate } from '../templates/otpEmailTemplate.js';
@@ -7,6 +8,8 @@ import sendMail from '../utils/mail_sender.js';
 import { getAgenda } from './agenda.js';
 
 export const EMAIL_QUEUE = 'email';
+// Agenda's default collection (see agenda.ts)
+export const JOBS_COLLECTION = 'agendaJobs';
 
 /** Every email the app sends goes through this one queue. */
 export type EmailJob =
@@ -30,8 +33,18 @@ const render = (job: EmailJob) => {
   }
 };
 
-export const defineEmailJob = () =>
-  getAgenda().define(
+export type EmailJobOptions = {
+  /** Delay before the first retry; it doubles on every further retry. */
+  retryDelayMs?: number;
+  maxRetries?: number;
+};
+
+/** Registers the email job on a worker. */
+export const defineEmailJob = (
+  agenda: Agenda,
+  { retryDelayMs = 10_000, maxRetries = 3 }: EmailJobOptions = {},
+) =>
+  agenda.define(
     EMAIL_QUEUE,
     async ({ attrs }: Job<EmailJob>) => {
       const data = attrs.data;
@@ -44,9 +57,24 @@ export const defineEmailJob = () =>
       }
     },
     {
-      backoff: exponential({ delay: 10_000, factor: 2, maxRetries: 3 }),
-      // jobs carry OTPs and reset links, so don't keep them around
-      removeOnComplete: true,
+      backoff: exponential({ delay: retryDelayMs, factor: 2, maxRetries }),
+      // Not `removeOnComplete`: Agenda emits "complete" before it forgets the job,
+      // and the extra await of the removal makes drain() miss it and hang until its
+      // timeout on every shutdown. A TTL index cleans up instead (below).
+    },
+  );
+
+/**
+ * Jobs carry OTPs and reset links, so finished email jobs (sent or given up on)
+ * are deleted by MongoDB an hour later. Only the email job: other jobs are kept.
+ */
+export const ensureEmailJobCleanup = () =>
+  mongoose.connection.db!.collection(JOBS_COLLECTION).createIndex(
+    { lastFinishedAt: 1 },
+    {
+      name: 'email_jobs_ttl',
+      expireAfterSeconds: 60 * 60,
+      partialFilterExpression: { name: EMAIL_QUEUE },
     },
   );
 

package/templates/mongoose/src/app/queues/index.ts

@@ -1,11 +1,15 @@
 import { logger } from '../lib/logger.js';
-import { createAgenda, getAgenda } from './agenda.js';
-import { defineEmailJob } from './email.queue.js';
+import { type AgendaOptions, createAgenda, getAgenda } from './agenda.js';
+import { defineEmailJob, type EmailJobOptions, ensureEmailJobCleanup } from './email.queue.js';
 
-export const startQueues = async () => {
-  createAgenda();
-  defineEmailJob();
-  await getAgenda().start();
+/** The defaults are meant for production; tests pass shorter delays. */
+export type QueueOptions = AgendaOptions & EmailJobOptions;
+
+export const startQueues = async (options: QueueOptions = {}) => {
+  const agenda = createAgenda(options);
+  defineEmailJob(agenda, options);
+  await ensureEmailJobCleanup();
+  await agenda.start();
   logger.info('Queues are running...');
 };
 

package/templates/mongoose/tests/queues/email.queue.test.ts

@@ -0,0 +1,137 @@
+import type { Agenda } from 'agenda';
+import mongoose from 'mongoose';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { newAgenda } from '../../src/app/queues/agenda.js';
+import { defineEmailJob, enqueueEmail, type EmailJob } from '../../src/app/queues/email.queue.js';
+import { startQueues, stopQueues } from '../../src/app/queues/index.js';
+import sendMail from '../../src/app/utils/mail_sender.js';
+
+// the real queue (tests/setup.ts mocks it for the route tests); only SMTP is faked
+vi.unmock('../../src/app/queues/email.queue.js');
+vi.mock('../../src/app/utils/mail_sender.js', () => ({ default: vi.fn() }));
+
+const send = vi.mocked(sendMail);
+const FAST = { processEvery: 50, retryDelayMs: 50, maxRetries: 2 };
+
+const email = (to: string): EmailJob => ({
+  type: 'reset-password',
+  email: to,
+  resetLink: `https://app.test/reset?token=${to}`,
+});
+
+const jobs = () => mongoose.connection.db!.collection('agendaJobs');
+
+/** Polls until `check` passes or `timeoutMs` is over. */
+const waitFor = async (check: () => unknown | Promise<unknown>, timeoutMs = 5000) => {
+  const start = Date.now();
+  for (;;) {
+    try {
+      await check();
+      return;
+    } catch (err) {
+      if (Date.now() - start > timeoutMs) throw err;
+      await new Promise((r) => setTimeout(r, 25));
+    }
+  }
+};
+
+/** Lets workers run for a while, to show that nothing else happens. */
+const settle = (ms = 400) => new Promise((r) => setTimeout(r, ms));
+
+const extraWorkers: Agenda[] = [];
+afterEach(async () => {
+  await Promise.all(extraWorkers.splice(0).map((w) => w.stop()));
+  await stopQueues().catch(() => {});
+});
+
+describe('email queue (Agenda)', () => {
+  it('sends a queued email once, and finished jobs expire', async () => {
+    send.mockResolvedValue({} as never);
+    await startQueues(FAST);
+
+    await enqueueEmail(email('a@test.com'));
+
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(1));
+    expect(send).toHaveBeenCalledWith(
+      expect.objectContaining({ to: 'a@test.com', subject: 'Reset Your Password' }),
+    );
+    // jobs carry reset links and OTPs: MongoDB deletes finished email jobs after an hour
+    await waitFor(async () =>
+      expect(await jobs().findOne({ name: 'email' })).toHaveProperty('lastFinishedAt'),
+    );
+    const ttl = (await jobs().indexes()).find((i) => i.name === 'email_jobs_ttl');
+    expect(ttl).toMatchObject({
+      expireAfterSeconds: 3600,
+      partialFilterExpression: { name: 'email' },
+    });
+  });
+
+  it('retries a failed send', async () => {
+    send.mockRejectedValueOnce(new Error('SMTP down')).mockResolvedValue({} as never);
+    await startQueues(FAST);
+
+    await enqueueEmail(email('retry@test.com'));
+
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(2));
+  });
+
+  it('gives up after the retry limit', async () => {
+    send.mockRejectedValue(new Error('SMTP down'));
+    await startQueues(FAST);
+
+    await enqueueEmail(email('broken@test.com'));
+
+    // the first attempt + 2 retries, and then nothing more
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(3));
+    await settle();
+    expect(send).toHaveBeenCalledTimes(3);
+    const [job] = await jobs().find().toArray();
+    expect(job).toMatchObject({ failReason: 'SMTP down' });
+  });
+
+  it('never sends the same email twice, even with several workers', async () => {
+    send.mockResolvedValue({} as never);
+    await startQueues(FAST);
+    const second = newAgenda(FAST);
+    defineEmailJob(second, FAST);
+    extraWorkers.push(second);
+    await second.start();
+
+    const recipients = ['1', '2', '3', '4', '5', '6'].map((n) => `${n}@test.com`);
+    await Promise.all(recipients.map((to) => enqueueEmail(email(to))));
+
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(recipients.length));
+    await settle();
+    const sentTo = send.mock.calls.map(([mail]) => mail.to).sort();
+    expect(sentTo).toEqual(recipients.sort());
+  });
+
+  it('sends the emails that were queued while no worker was running', async () => {
+    send.mockResolvedValue({} as never);
+    await startQueues(FAST);
+    await stopQueues();
+    await enqueueEmail(email('queued@test.com'));
+    await settle();
+    expect(send).not.toHaveBeenCalled();
+
+    await startQueues(FAST); // e.g. after a deploy
+
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(1));
+  });
+
+  it('waits for a running send to finish before shutting down', async () => {
+    let finished = false;
+    send.mockImplementation(async () => {
+      await new Promise((r) => setTimeout(r, 300));
+      finished = true;
+      return {} as never;
+    });
+    await startQueues(FAST);
+    await enqueueEmail(email('slow@test.com'));
+    await waitFor(() => expect(send).toHaveBeenCalled());
+
+    await stopQueues();
+
+    expect(finished).toBe(true);
+  });
+});

package/templates/prisma/.prettierignore

@@ -1,3 +1,4 @@
 node_modules
 dist
-prisma/generated
+prisma/generated
+.exp-node-server

package/templates/prisma/_gitignore

@@ -32,4 +32,7 @@ coverage/
 .idea/
 
 # Docker 
-*.pid
+*.pid
+
+# backups made by `exp-node-server -g <name> --force`
+.exp-node-server/

package/templates/prisma/eslint.config.js

@@ -4,7 +4,7 @@ import tseslint from 'typescript-eslint';
 
 export default [
   {
-    ignores: ['node_modules', 'dist', 'prisma/generated'],
+    ignores: ['node_modules', 'dist', 'prisma/generated', '.exp-node-server'],
   },
 
   js.configs.recommended,

package/templates/prisma/package-lock.json

@@ -21,7 +21,7 @@
         "helmet": "^8.3.0",
         "jsonwebtoken": "^9.0.2",
         "multer": "^2.0.2",
-        "nodemailer": "^8.0.5",
+        "nodemailer": "^10.1.0",
         "passport": "^0.7.0",
         "passport-facebook": "^3.0.0",
         "passport-github": "^1.1.0",
@@ -44,7 +44,6 @@
         "@types/jsonwebtoken": "^9.0.10",
         "@types/multer": "^2.0.0",
         "@types/node": "^24.12.2",
-        "@types/nodemailer": "^7.0.2",
         "@types/passport": "^1.0.17",
         "@types/passport-facebook": "^3.0.4",
         "@types/passport-github": "^1.1.13",
@@ -1835,16 +1834,6 @@
         "undici-types": "~7.16.0"
       }
     },
-    "node_modules/@types/nodemailer": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-7.0.11.tgz",
-      "integrity": "sha512-E+U4RzR2dKrx+u3N4DlsmLaDC6mMZOM/TPROxA0UAPiTgI0y4CEFBmZE+coGWTjakDriRsXG368lNk1u9Q0a2g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/oauth": {
       "version": "0.9.6",
       "resolved": "https://registry.npmjs.org/@types/oauth/-/oauth-0.9.6.tgz",
@@ -5244,12 +5233,12 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.11.tgz",
-      "integrity": "sha512-nrO/pDAUKl+wXX+lx16tDLbnm0fW6sK/x8mgohaCpg+CdCEl482bD4tCuAZk2DyliruiNTIZxRCoWkDqJEnAiA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-10.1.0.tgz",
+      "integrity": "sha512-fXW8AulB25aOTuwfRYV6lqHyfz2VM4rr4SGXH03mE7x5znEUpzL5mu6anARUpZN7744Ziwkmr4AxSLPJsBQspg==",
       "license": "MIT-0",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/non-error": {

package/templates/prisma/package.json

@@ -32,7 +32,7 @@
     "helmet": "^8.3.0",
     "jsonwebtoken": "^9.0.2",
     "multer": "^2.0.2",
-    "nodemailer": "^8.0.5",
+    "nodemailer": "^10.1.0",
     "passport": "^0.7.0",
     "passport-facebook": "^3.0.0",
     "passport-github": "^1.1.0",
@@ -55,7 +55,6 @@
     "@types/jsonwebtoken": "^9.0.10",
     "@types/multer": "^2.0.0",
     "@types/node": "^24.12.2",
-    "@types/nodemailer": "^7.0.2",
     "@types/passport": "^1.0.17",
     "@types/passport-facebook": "^3.0.4",
     "@types/passport-github": "^1.1.13",

package/templates/prisma/readme.md

@@ -173,6 +173,15 @@ Route tests with [supertest](https://github.com/ladjs/supertest) run each reques
 through the route, controller and service. Prisma, the email queue and Cloudinary
 are mocked, so no database is needed.
 
+The email queue tests need a real PostgreSQL and are skipped otherwise:
+
+```bash
+docker compose up -d
+TEST_DATABASE_URL="postgresql://postgres:change-me@localhost:5432/server_db" npm test
+```
+
+They use their own schema, which is dropped afterwards.
+
 ## 🧠 Tech Stack
 
 - Express.js — Backend framework

package/templates/prisma/src/app/queues/boss.ts

@@ -2,7 +2,32 @@ import { PgBoss } from 'pg-boss';
 import { configs } from '../configs/index.js';
 import { logger } from '../lib/logger.js';
 
-// pg-boss stores jobs in its own `pgboss` schema in the app's Postgres database
-export const boss = new PgBoss({ connectionString: configs.db_url });
+export type BossOptions = {
+  connectionString?: string;
+  /** Postgres schema for the job tables (default `pgboss`). */
+  schema?: string;
+};
 
-boss.on('error', (error) => logger.error(error, 'pg-boss error'));
+/**
+ * pg-boss stores jobs in its own schema in the app's Postgres database, so no
+ * Redis is needed. Created on start, see startQueues().
+ */
+let boss: PgBoss | undefined;
+
+/** A new pg-boss instance (a producer and/or worker). */
+export const newBoss = ({ connectionString = configs.db_url, schema }: BossOptions = {}) => {
+  const instance = new PgBoss({ connectionString, ...(schema && { schema }) });
+  instance.on('error', (error) => logger.error(error, 'pg-boss error'));
+  return instance;
+};
+
+/** Creates the app's pg-boss instance, used by `enqueueEmail()` & co. */
+export const createBoss = (options?: BossOptions) => {
+  boss = newBoss(options);
+  return boss;
+};
+
+export const getBoss = (): PgBoss => {
+  if (!boss) throw new Error('Queues are not started, call startQueues() first');
+  return boss;
+};

package/templates/prisma/src/app/queues/email.queue.ts

@@ -1,10 +1,10 @@
-import type { Job } from 'pg-boss';
+import type { Job, PgBoss } from 'pg-boss';
 import { configs } from '../configs/index.js';
 import { logger } from '../lib/logger.js';
 import { otpEmailTemplate } from '../templates/otpEmailTemplate.js';
 import { resetPasswordEmailTemplate } from '../templates/resetPasswordEmailTemplate.js';
 import sendMail from '../utils/mail_sender.js';
-import { boss } from './boss.js';
+import { getBoss } from './boss.js';
 
 export const EMAIL_QUEUE = 'email';
 
@@ -30,20 +30,35 @@ const render = (job: EmailJob) => {
   }
 };
 
-export const createEmailQueue = () =>
+export type EmailJobOptions = {
+  /** Delay before the first retry; it doubles on every further retry. */
+  retryDelaySeconds?: number;
+  retryLimit?: number;
+  /** How often an idle worker checks for new jobs. */
+  pollingIntervalSeconds?: number;
+};
+
+export const createEmailQueue = (
+  boss: PgBoss,
+  { retryDelaySeconds = 10, retryLimit = 3 }: EmailJobOptions = {},
+) =>
   boss.createQueue(EMAIL_QUEUE, {
-    retryLimit: 3,
-    retryDelay: 10,
+    retryLimit,
+    retryDelay: retryDelaySeconds,
     retryBackoff: true,
     expireInSeconds: 60,
     // jobs carry OTPs and reset links, so don't keep them around
     deleteAfterSeconds: 60 * 60,
   });
 
-export const enqueueEmail = (job: EmailJob) => boss.send(EMAIL_QUEUE, job);
+export const enqueueEmail = (job: EmailJob) => getBoss().send(EMAIL_QUEUE, job);
 
-export const startEmailWorker = () =>
-  boss.work<EmailJob>(EMAIL_QUEUE, async (jobs: Job<EmailJob>[]) => {
+/** Starts processing emails on `boss`. */
+export const startEmailWorker = (
+  boss: PgBoss,
+  { pollingIntervalSeconds = 2 }: EmailJobOptions = {},
+) =>
+  boss.work<EmailJob>(EMAIL_QUEUE, { pollingIntervalSeconds }, async (jobs: Job<EmailJob>[]) => {
     for (const { id, data } of jobs) {
       try {
         await sendMail({ to: data.email, ...render(data) });

package/templates/prisma/src/app/queues/index.ts

@@ -1,14 +1,23 @@
 import { logger } from '../lib/logger.js';
-import { boss } from './boss.js';
-import { createEmailQueue, startEmailWorker } from './email.queue.js';
+import { type BossOptions, createBoss, getBoss } from './boss.js';
+import { createEmailQueue, type EmailJobOptions, startEmailWorker } from './email.queue.js';
 import { startMaintenance } from './maintenance.queue.js';
 
-export const startQueues = async () => {
+/** The defaults are meant for production; tests pass shorter delays. */
+export type QueueOptions = BossOptions &
+  EmailJobOptions & {
+    /** Schedule the cleanup of expired rows (default true). */
+    maintenance?: boolean;
+  };
+
+export const startQueues = async (options: QueueOptions = {}) => {
+  const boss = createBoss(options);
   await boss.start();
-  await createEmailQueue();
-  await startEmailWorker();
-  await startMaintenance();
+  await createEmailQueue(boss, options);
+  await startEmailWorker(boss, options);
+  if (options.maintenance !== false) await startMaintenance(boss);
   logger.info('Queues are running...');
 };
 
-export const stopQueues = () => boss.stop({ graceful: true });
+// waits for running jobs to finish (up to 30s) instead of abandoning them
+export const stopQueues = () => getBoss().stop({ graceful: true, timeout: 30_000 });

package/templates/prisma/src/app/queues/maintenance.queue.ts

@@ -1,6 +1,6 @@
 import { prisma } from '../lib/prisma.js';
 import { logger } from '../lib/logger.js';
-import { boss } from './boss.js';
+import type { PgBoss } from 'pg-boss';
 
 export const MAINTENANCE_QUEUE = 'maintenance';
 
@@ -22,7 +22,7 @@ const cleanup = async () => {
   );
 };
 
-export const startMaintenance = async () => {
+export const startMaintenance = async (boss: PgBoss) => {
   await boss.createQueue(MAINTENANCE_QUEUE, { retryLimit: 1, deleteAfterSeconds: 60 * 60 });
   // pg-boss runs a schedule once across all instances, every 15 minutes
   await boss.schedule(MAINTENANCE_QUEUE, '*/15 * * * *');