@c9up/rover 0.1.15 → 0.1.17

package/dist/webhooks/sendgrid.js

@@ -1,5 +1,6 @@
 import { Buffer } from "node:buffer";
 import { createPublicKey, verify } from "node:crypto";
+import { emitSafely } from "../emitSafely.js";
 const EVENT_MAP = {
     delivered: "mail.delivered",
     bounce: "mail.bounced",
@@ -69,7 +70,7 @@ export function createSendGridWebhookHandler(options) {
             if (!mapped)
                 continue;
             try {
-                emitter.emit(mapped, {
+                emitSafely(emitter, mapped, {
                     messageId: ev.sg_message_id ?? "",
                     to: ev.email ?? "",
                     reason: ev.reason,

package/dist/webhooks/sendgrid.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendgrid.js","sourceRoot":"","sources":["../../src/webhooks/sendgrid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sendgrid.js","sourceRoot":"","sources":["../../src/webhooks/sendgrid.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c9up/rover",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Mail transport for Ream — SMTP, log, and pluggable transports",
   "type": "module",
   "main": "./dist/index.js",
@@ -68,9 +68,12 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.10",
+    "@c9up/bay": "^0.2.0",
     "@c9up/helix": "^0.2.0",
+    "@c9up/ream": "^0.2.0",
     "@types/node": "*",
     "@types/nodemailer": "^7.0.0",
+    "@vitest/coverage-v8": "^4.1.2",
     "typescript": "^6.0.2",
     "vitest": "^4.1.2"
   },
@@ -106,8 +109,9 @@
     "build:napi": "cargo build --release -p rover-template-engine-napi && pnpm build:napi-types && node scripts/copy-napi.mjs",
     "build:napi-types": "node scripts/build-napi-types.mjs",
     "test": "vitest run",
-    "lint": "biome check src/",
+    "lint": "biome check src/ tests/",
     "test:coverage": "vitest run --coverage",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "typecheck:tests": "tsc --noEmit -p tsconfig.tests.json"
   }
 }

package/scripts/build-napi-types.mjs

@@ -7,7 +7,8 @@
  * cargo a `/tmp/...` path the native proc-macro cannot write to, so the
  * type-def file comes back empty and the build fails for no visible reason.
  *
- * One crate at a time on purpose: napi-derive APPENDS to `TYPE_DEF_TMP_PATH`
+ * One crate at a time on purpose: with napi-derive 2 the writes all went to a
+ * single `TYPE_DEF_TMP_PATH` and a parallel build interleaved them
  * while cargo compiles, and a parallel build interleaves the writes —
  * definitions go missing, silently, and the generated file comes out short.
  */
@@ -28,11 +29,11 @@ const scratch = mkdtempSync(join(tmpdir(), 'napi-types-'))
 try {
   const lines = []
   for (const crate of CRATES) {
-    const perCrate = join(scratch, `${crate}.jsonl`)
+    const perCrate = join(scratch, crate)
     writeFileSync(perCrate, '')
     execFileSync('cargo', ['build', '-p', crate], {
       cwd: packageRoot,
-      env: { ...process.env, TYPE_DEF_TMP_PATH: perCrate },
+      env: { ...process.env, NAPI_TYPE_DEF_TMP_FOLDER: scratch },
       stdio: ['ignore', 'ignore', 'inherit'],
     })
     const emitted = readFileSync(perCrate, 'utf8').split('\n').filter(Boolean)

package/scripts/generate-napi-types.mjs

@@ -130,12 +130,15 @@ for (const fn of fns) {
   // napi-derive emits the whole declaration for a function, unlike a struct
   // where `def` holds only the members.
   const declaration = fn.def.trim()
-  out.push(
-    declaration.startsWith('export declare function')
-      ? `${declaration};`
-      : `export declare function ${fn.name}${declaration};`,
-    '',
-  )
+  // napi-derive 3 emits a bare `function name(...)` where 2 emitted the
+  // signature after the name; concatenating onto the former produced
+  // `function xfunction x(...)`.
+  const rendered = declaration.startsWith('export declare function')
+    ? declaration
+    : declaration.startsWith('function ')
+      ? `export declare ${declaration}`
+      : `export declare function ${fn.name}${declaration}`
+  out.push(`${rendered};`, '')
 }
 
 const stale = Object.keys(CALLBACK_REFINEMENTS).filter((k) => !used.has(k))

package/src/Mail.ts

@@ -72,7 +72,11 @@ export interface MailTransport {
  * Rover never hard-imports the event bus.
  */
 export interface EmitterLike {
-	emit(event: string, data: unknown): void;
+	/**
+	 * `unknown`, not `void`: a `void` return ACCEPTS a promise-returning
+	 * function, which is how an Adonis emitter's rejection went unnoticed.
+	 */
+	emit(event: string, data: unknown): unknown;
 }
 
 /**
@@ -147,7 +151,7 @@ export interface MailConfig {
 	 */
 	mailers?: Record<
 		string,
-		{ transport: string; retry?: RetryConfig; [key: string]: unknown }
+		{ transport: string; retry?: Partial<RetryConfig>; [key: string]: unknown }
 	>;
 	/**
 	 * Rover's older spelling of `mailers`. Still accepted and identical in
@@ -155,14 +159,14 @@ export interface MailConfig {
 	 */
 	transports?: Record<
 		string,
-		{ transport: string; retry?: RetryConfig; [key: string]: unknown }
+		{ transport: string; retry?: Partial<RetryConfig>; [key: string]: unknown }
 	>;
 	/** Root directory for `htmlView(path, data)` template lookups. Default: `"resources/views/emails"`. */
 	viewsRoot?: string;
 	/** Optional Bay queue tuning for `sendLater()`. */
 	queue?: { name?: string; maxAttempts?: number };
 	/** Process-wide retry defaults. Overridden per-mailer via `mailers[name].retry`. */
-	retry?: RetryConfig;
+	retry?: Partial<RetryConfig>;
 }
 
 /**
@@ -393,8 +397,8 @@ export class Mail {
 	#memoryMessenger: MemoryMailMessenger;
 	#queueName: string;
 	#queueMaxAttempts: number;
-	#globalRetry: RetryConfig | undefined;
-	#transportRetry: Map<string, RetryConfig> = new Map();
+	#globalRetry: Partial<RetryConfig> | undefined;
+	#transportRetry: Map<string, Partial<RetryConfig>> = new Map();
 	#hooks: MailHooks;
 	#emitter: EmitterLike | null;
 	/** Per-instance template root, threaded into each render so concurrent Mails with different roots don't clobber the shared global. */

package/src/MessageBuilder.ts

@@ -228,7 +228,7 @@ function listUrls(value: ListHeader | ListHeader[] | ListHeader[][]): string[] {
 function titleCaseKey(key: string): string {
 	return key
 		.split("-")
-		.map((part) => (part ? part[0].toUpperCase() + part.slice(1) : part))
+		.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
 		.join("-");
 }
 

package/src/RoverProvider.ts

@@ -1,7 +1,8 @@
+import "./augmentations.js";
 import type { EmitterLike, MailConfig } from "./Mail.js";
 import { Mail } from "./Mail.js";
 import type { BayQueueLike } from "./queue/MailJob.js";
-import { setMail } from "./services/main.js";
+import { clearMail, getMail, setMail } from "./services/main.js";
 
 /**
  * Duck-typed slice of the host's IoC container — rover does NOT import
@@ -10,6 +11,12 @@ import { setMail } from "./services/main.js";
 interface RoverContainer {
 	singleton(token: unknown, factory: () => unknown): void;
 	resolve<T = unknown>(token: unknown): Promise<T>;
+	/**
+	 * Optional reader — present on ream's real container. Asked before resolving
+	 * an OPTIONAL peer, so "not installed" is answered by a lookup rather than
+	 * inferred from whatever resolving it threw.
+	 */
+	has?(token: unknown): boolean;
 }
 interface RoverConfigStore {
 	get<T = unknown>(key: string): T | undefined;
@@ -20,6 +27,9 @@ export interface RoverAppContext {
 }
 
 export default class RoverProvider {
+	/** The Mail this provider bound, so shutdown only clears its own. */
+	#mail: Mail | undefined;
+
 	constructor(protected app: RoverAppContext) {}
 
 	register() {
@@ -43,19 +53,33 @@ export default class RoverProvider {
 				},
 			);
 		});
-		this.app.container.singleton("mail", () => {
-			return this.app.container.resolve<Mail>(Mail);
-		});
+		// Namespaced by the package that owns it, the way upstream namespaces
+		// `lucid.db`, `auth.manager` and `drive.manager` by theirs. The bare
+		// token stays bound beside it: it is what every existing
+		// `container.make(...)` asks for, and a token is not worth breaking an
+		// application over.
+		const mail = (): Promise<Mail> => this.app.container.resolve<Mail>(Mail);
+		this.app.container.singleton("rover.mail", mail);
+		this.app.container.singleton("mail", mail);
 	}
 
 	async boot() {
 		// Populate the `@c9up/rover/services/main` singleton with the
 		// container-resolved Mail instance so apps can
 		// `import mail from '@c9up/rover/services/main'` from anywhere.
-		setMail(await this.app.container.resolve<Mail>(Mail));
+		const mail = await this.app.container.resolve<Mail>(Mail);
+		this.#mail = mail;
+		setMail(mail);
 	}
 
-	async shutdown() {}
+	async shutdown() {
+		// Release the module-level singleton, but only while it is still ours: a
+		// stopped application left a dead Mail reachable through
+		// `services/main`, and with two applications in one process the one
+		// shutting down must not clear a binding the other has since installed.
+		if (this.#mail !== undefined && getMail() === this.#mail) clearMail();
+		this.#mail = undefined;
+	}
 }
 
 /**
@@ -67,9 +91,14 @@ async function tryResolve<T>(
 	app: RoverAppContext,
 	token: string,
 ): Promise<T | undefined> {
-	try {
-		return await app.container.resolve<T>(token);
-	} catch {
+	// ASK whether the token is bound, rather than catching whatever resolving it
+	// throws. Catching everything meant a registered binding whose factory
+	// failed — a bad queue config, a driver that cannot connect — read exactly
+	// like "bay is not installed": rover disabled the feature and said nothing,
+	// and mail queued nowhere. Absence is a `has()` answer; a factory that
+	// throws is a fault, and faults propagate.
+	if (typeof app.container.has === "function" && !app.container.has(token)) {
 		return undefined;
 	}
+	return await app.container.resolve<T>(token);
 }

package/src/augmentations.ts

@@ -0,0 +1,33 @@
+/**
+ * Teach ream's `ContainerBindings` what `container.make(...)` returns for the
+ * tokens rover binds.
+ *
+ * ream declares that interface open on purpose: it registers its own entries
+ * and expects each package to contribute the ones it owns. Nothing filled
+ * these in, so resolving by the string token answered `unknown` and every call
+ * site had to assert a type it could not prove.
+ *
+ * Loaded from the package barrel, so importing Rover anywhere in the
+ * application is enough — nobody writes a `declare module` of their own.
+ *
+ * Type-only, and ream stays an OPTIONAL peer: nothing here reaches a runtime
+ * import, and a `declare module` for a specifier that does not resolve is
+ * simply inert.
+ */
+
+// Referenced so the augmentation below resolves the module it augments.
+import type {} from "@c9up/ream/types";
+
+import type { Mail } from "./Mail.js";
+
+declare module "@c9up/ream/types" {
+	interface ContainerBindings {
+		/** The mailer, bound by `RoverProvider`. */
+		"rover.mail": Mail;
+		/**
+		 * The same binding under the name it had before the token carried its
+		 * package. Kept bound so an existing `container.make(...)` resolves.
+		 */
+		mail: Mail;
+	}
+}

package/src/emitSafely.ts

@@ -0,0 +1,31 @@
+/**
+ * Emit an event without letting the listener come back.
+ *
+ * `@adonisjs/events` declares `emit(): Promise<void>` and rethrows when a
+ * listener fails and the application registered no error handler. Nothing here
+ * awaits an event — a webhook has already been acknowledged, a queued mail has
+ * already been sent or already failed — so that rejection had nowhere to go
+ * and ended the process over a notification.
+ *
+ * The emitter is invoked INSIDE the async function rather than before it:
+ * `Promise.resolve(emit(...))` runs `emit` first, so a synchronous throw would
+ * still escape. The call itself stays synchronous, because an async body runs
+ * to its first `await` — only the failure handling is deferred.
+ */
+export function emitSafely(
+	emitter:
+		| { emit: (event: string, data: unknown) => unknown }
+		| null
+		| undefined,
+	event: string,
+	data: unknown,
+): void {
+	if (emitter == null) return;
+	void (async () => emitter.emit(event, data))().catch((error: unknown) => {
+		process.stderr.write(
+			`[rover] '${event}' listener failed: ${
+				error instanceof Error ? error.message : String(error)
+			}\n`,
+		);
+	});
+}

package/src/index.ts

@@ -7,6 +7,8 @@
  * for each of them, so each has to be there when the config is read.
  */
 
+import "./augmentations.js";
+
 export type { MailAddress } from "./BaseMail.js";
 export { BaseMail } from "./BaseMail.js";
 export type { TransportDescriptor } from "./config.js";

package/src/queue/MemoryMailMessenger.ts

@@ -1,4 +1,5 @@
 import { randomBytes } from "node:crypto";
+import { emitSafely } from "../emitSafely.js";
 import type { EmitterLike, MailMessage } from "../Mail.js";
 import type { MailDispatcher } from "./MailJob.js";
 
@@ -24,20 +25,20 @@ export class MemoryMailMessenger {
 			this.#dispatcher
 				.dispatchMessage(message, transport)
 				.catch((error: unknown) => {
-					if (!this.#emitter) return;
-					try {
-						this.#emitter.emit("queued:mail:error", {
-							jobId,
-							transportName: transport,
-							error:
-								error instanceof Error
-									? { message: error.message }
-									: { message: String(error) },
-						});
-					} catch {
-						// Event bus failure ≠ mail failure — swallow so the microtask
-						// never rejects.
-					}
+					// The try/catch here only ever caught a listener that threw
+					// SYNCHRONOUSLY. An Adonis emitter's `emit` is async and
+					// rethrows when a listener fails and no error handler is
+					// registered, so an async one rejected inside a microtask
+					// nobody awaits — the failure notification taking the process
+					// down after the mail had already failed.
+					emitSafely(this.#emitter, "queued:mail:error", {
+						jobId,
+						transportName: transport,
+						error:
+							error instanceof Error
+								? { message: error.message }
+								: { message: String(error) },
+					});
 				});
 		});
 		return jobId;

package/src/retry.ts

@@ -83,9 +83,18 @@ export function computeBackoffMs(
 	return Math.min(config.maxDelayMs, Math.max(50, raw));
 }
 
+/**
+ * Global and per-transport overrides, merged over the defaults.
+ *
+ * `Partial`, because that is what the function does: it spreads whatever it is
+ * given over {@link DEFAULT_RETRY_CONFIG}, so `{ maxAttempts: 1 }` is a
+ * complete answer. Declared as the full `RetryConfig`, a config file writing
+ * exactly that was a type error for doing the supported thing — and every
+ * caller had to spell `baseDelayMs` and `factor` it did not want to change.
+ */
 export function resolveRetryConfig(
-	globalConfig: RetryConfig | undefined,
-	transportConfig: RetryConfig | undefined,
+	globalConfig: Partial<RetryConfig> | undefined,
+	transportConfig: Partial<RetryConfig> | undefined,
 ): Required<RetryConfig> {
 	// Skip entries whose value is `undefined` so a partial override doesn't
 	// clobber a default or global value. Pre-spread filter is required because

package/src/services/main.ts

@@ -25,6 +25,18 @@ export function getMail(): Mail | undefined {
 	return instance;
 }
 
+/**
+ * @internal Release the singleton, so a shut-down application does not leave a
+ * dead Mail reachable through `services/main`.
+ *
+ * The caller checks ownership first (`getMail() === mine`): with two
+ * applications in one process, the one shutting down must not clear a binding
+ * the other has since installed.
+ */
+export function clearMail(): void {
+	instance = undefined;
+}
+
 const mail: Mail = new Proxy({} as Mail, {
 	get(_target, prop) {
 		if (!instance) {

package/src/templating/loadNapi.ts

@@ -8,25 +8,21 @@
 // — every boundary is narrowed with a `Reflect.get` type guard.
 
 import { createRequire } from "node:module";
-import { arch, platform } from "node:process";
 import { fileURLToPath } from "node:url";
 import { RoverError } from "../RoverError.js";
-
-const SUFFIX_MAP: Readonly<Record<string, string>> = {
-	"linux-x64": "linux-x64-gnu",
-	"linux-arm64": "linux-arm64-gnu",
-	"darwin-x64": "darwin-x64",
-	"darwin-arm64": "darwin-arm64",
-	"win32-x64": "win32-x64-msvc",
-};
+import {
+	muslHint,
+	nativeBinarySuffix,
+	supportedTargets,
+} from "../vendor/nativeBinary.js";
 
 function platformSuffix(): string {
-	const key = `${platform}-${arch}`;
-	const suffix = SUFFIX_MAP[key];
-	if (typeof suffix !== "string") {
+	// The table is shared; the refusal is rover's, with rover's code on it.
+	const suffix = nativeBinarySuffix();
+	if (suffix === undefined) {
 		throw new RoverError(
 			"E_MAIL_TEMPLATE_NAPI_REQUIRED",
-			`Unsupported platform/arch '${key}' for @c9up/rover native binary. Supported: ${Object.keys(SUFFIX_MAP).join(", ")}.`,
+			`No @c9up/rover native binary for this platform. Supported: ${supportedTargets().join(", ")}.`,
 			{
 				hint: "Build the native binary on a supported platform with 'pnpm --filter @c9up/rover build:napi'.",
 			},
@@ -83,12 +79,10 @@ export function getNative(): NativeExports {
 		// The prebuilt linux binaries target glibc (`-gnu`). On musl hosts (Alpine
 		// containers) the `-gnu` binary fails to dlopen with a libc symbol error —
 		// surface that explicitly rather than only pointing at the build step.
-		const muslHint = suffix.endsWith("-gnu")
-			? " If you are on Alpine/musl, note the prebuilt binaries target glibc (musl is not a supported target)."
-			: "";
+		const musl = muslHint();
 		throw new RoverError(
 			"E_MAIL_TEMPLATE_NAPI_REQUIRED",
-			`@c9up/rover native binary 'index.${suffix}.node' not found or failed to load near ${here} — run 'pnpm --filter @c9up/rover build:napi' to build it.${muslHint} Cause: ${causeMessage}`,
+			`@c9up/rover native binary 'index.${suffix}.node' not found or failed to load near ${here} — run 'pnpm --filter @c9up/rover build:napi' to build it.${musl} Cause: ${causeMessage}`,
 			{
 				hint: "Run 'pnpm --filter @c9up/rover build:napi' to compile the native template engine.",
 			},

package/src/testing/FakeMail.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from "@c9up/helix";
+import type { PluginApi } from "@c9up/helix";
 import { BaseMail } from "../BaseMail.js";
 import type { MailMessage, MailSendOutcome, MailTransport } from "../Mail.js";
 
@@ -340,8 +340,17 @@ export interface FakeableMailer {
  * frame) and torn down when that test ends — so capture never leaks between
  * tests. Uses the manager's own `fake()`/`restore()` (the Adonis pattern).
  */
-export function mailFake(mailer: FakeableMailer): Plugin {
-	return (api) => {
+/** The slice of helix's `PluginApi` this plugin uses. */
+export type MailPluginHost = Pick<PluginApi, "context">;
+
+export function mailFake(
+	mailer: FakeableMailer,
+): (api: MailPluginHost) => void {
+	// Typed by what it touches, not by the whole `PluginApi`: a test wiring the
+	// plugin had to build every field of it — `config`, `cliArgs`, `runner`,
+	// `emitter`, `cleanup` — to exercise a function that reads one. Same shape
+	// `@c9up/helix-plugin-ream` uses for its own host.
+	return (api: MailPluginHost) => {
 		api.context.getter("mail", (ctx) => {
 			const fake = mailer.fake();
 			ctx.cleanup(() => mailer.restore());

package/src/transports/BrevoTransport.ts

@@ -165,9 +165,12 @@ export class BrevoTransport implements MailTransport {
 function parseContact(input: string): BrevoContact {
 	const s = stripCrlf(input).trim();
 	const match = s.match(/^(.*)<([^>]+)>\s*$/);
-	if (match) {
-		const email = match[2].trim();
-		const name = match[1].trim().replace(/^"|"$/g, "").trim();
+	// Both groups are required by the pattern, so a match carries both —
+	// named rather than indexed, which is what says so.
+	const [, rawName, rawEmail] = match ?? [];
+	if (rawEmail !== undefined) {
+		const email = rawEmail.trim();
+		const name = (rawName ?? "").trim().replace(/^"|"$/g, "").trim();
 		return name ? { email, name } : { email };
 	}
 	return { email: s };

package/src/transports/SparkPostTransport.ts

@@ -177,9 +177,12 @@ export class SparkPostTransport implements MailTransport {
 function parseAddress(input: string): { email: string; name?: string } {
 	const s = stripCrlf(input).trim();
 	const match = s.match(/^(.*)<([^>]+)>\s*$/);
-	if (match) {
-		const email = match[2].trim();
-		const name = match[1].trim().replace(/^"|"$/g, "").trim();
+	// Both groups are required by the pattern, so a match carries both —
+	// named rather than indexed, which is what says so.
+	const [, rawName, rawEmail] = match ?? [];
+	if (rawEmail !== undefined) {
+		const email = rawEmail.trim();
+		const name = (rawName ?? "").trim().replace(/^"|"$/g, "").trim();
 		return name ? { email, name } : { email };
 	}
 	return { email: s };