@shaferllc/keel 0.59.0 → 0.68.0

package/dist/core/queue.d.ts

@@ -7,8 +7,10 @@
  * so it stays edge-safe.
  *
  *   class SendWelcome extends Job {
+ *     static maxRetries = 3;
  *     constructor(private userId: number) { super(); }
  *     async handle() { await mail().to(...).send(); }
+ *     async failed(error: unknown) { logger().error("welcome failed", { error }); }
  *   }
  *
  *   await dispatch(new SendWelcome(user.id));   // runs now with the sync driver
@@ -17,18 +19,91 @@
  *   setQueue(new MemoryDriver());
  *   await dispatch(new SendWelcome(user.id));   // queued
  *   await work();                               // runs everything pending
+ *
+ * A job that throws is **retried** with backoff up to `maxRetries`, and only then
+ * declared failed — at which point `failed()` runs and it lands in the driver's
+ * dead-letter list rather than vanishing.
+ */
+/** What a job knows about its own execution while `handle()` runs. */
+export interface JobContext {
+    /** This dispatch's id — stable across retries. */
+    jobId: string;
+    /** 1 on the first run, 2 on the first retry, and so on. */
+    attempt: number;
+    /** The lane it was placed on. */
+    queue: string;
+}
+/**
+ * A unit of background work. Subclass and implement `handle`.
+ *
+ * Retry policy is per-class, via statics:
+ *
+ *   class ChargeCard extends Job {
+ *     static maxRetries = 5;
+ *     static backoff = exponentialBackoff(1_000);
+ *     async handle() { … }
+ *   }
  */
-/** A unit of background work. Subclass and implement `handle`. */
 export declare abstract class Job {
+    /** How many times to retry after the first failure. Default: 0 (no retries). */
+    static maxRetries: number;
+    /** How long to wait before each retry. Default: exponential from 1s. */
+    static backoff: Backoff;
+    /** Default lane for this job class. */
+    static queue?: string;
+    /** Default priority for this job class (lower runs first). */
+    static priority?: number;
+    /** Set by the driver before `handle()` runs. */
+    context?: JobContext;
     abstract handle(): void | Promise<void>;
+    /**
+     * Called once the job has exhausted its retries — the last chance to record
+     * the failure, alert, or compensate. A throw in here is logged and swallowed:
+     * failing to handle a failure must not itself crash the worker.
+     */
+    failed(_error: unknown): void | Promise<void>;
 }
 /** Anything dispatchable: a `Job` instance or a plain function. */
 export type Dispatchable = Job | (() => void | Promise<void>);
+/** Milliseconds to wait before attempt `attempt` (1 = the first retry). */
+export type Backoff = (attempt: number) => number;
+/** Doubles each time: 1s, 2s, 4s, 8s… Capped at `maxMs`. */
+export declare function exponentialBackoff(baseMs?: number, maxMs?: number): Backoff;
+/** Adds a fixed step each time: 5s, 10s, 15s… Capped at `maxMs`. */
+export declare function linearBackoff(stepMs?: number, maxMs?: number): Backoff;
+/** The same delay every time. */
+export declare function fixedBackoff(delayMs?: number): Backoff;
+/** No delay at all — retry straight away. */
+export declare const noBackoff: Backoff;
 export interface JobOptions {
     /** Seconds to wait before the job becomes available (drivers may honor it). */
     delay?: number;
-    /** Named queue/lane to place the job on. */
+    /** Named queue/lane to place the job on. Default: `"default"`. */
     queue?: string;
+    /** Lower runs first. Default: 0. */
+    priority?: number;
+    /** Override the job class's `maxRetries`. */
+    maxRetries?: number;
+    /** Override the job class's `backoff`. */
+    backoff?: Backoff;
+}
+/** A job sitting on a queue, with everything needed to run and retry it. */
+export interface QueuedJob {
+    id: string;
+    job: Dispatchable;
+    options: JobOptions;
+    /** How many times it has been attempted so far. */
+    attempts: number;
+    /** Epoch ms before which it must not run (delay / backoff). */
+    availableAt: number;
+}
+/** A job that exhausted its retries. */
+export interface FailedJob {
+    id: string;
+    job: Dispatchable;
+    options: JobOptions;
+    attempts: number;
+    error: unknown;
 }
 /** The bridge to your queue backend. */
 export interface QueueDriver {
@@ -39,20 +114,36 @@ export interface Drainable {
     readonly size: number;
     work(): Promise<number>;
 }
-/** Runs jobs the moment they're dispatched — the default; ideal for dev/tests. */
+/**
+ * Runs jobs the moment they're dispatched — the default; ideal for dev/tests.
+ *
+ * Retries still apply, but the backoff delay is **not** slept through: an
+ * inline driver blocking the request for a 30-second backoff would be worse than
+ * useless. Use `MemoryDriver` or a real broker to exercise real delays.
+ */
 export declare class SyncDriver implements QueueDriver {
-    push(job: Dispatchable, _options: JobOptions): Promise<void>;
-}
-export interface QueuedJob {
-    job: Dispatchable;
-    options: JobOptions;
+    /** Jobs that exhausted their retries. */
+    readonly failed: FailedJob[];
+    push(job: Dispatchable, options: JobOptions): Promise<void>;
 }
 /** Holds jobs in memory; `work()` drains them. Assert on `.jobs` in tests. */
 export declare class MemoryDriver implements QueueDriver, Drainable {
     readonly jobs: QueuedJob[];
+    /** Jobs that exhausted their retries. */
+    readonly failed: FailedJob[];
     push(job: Dispatchable, options: JobOptions): Promise<void>;
     get size(): number;
-    /** Run every pending job in FIFO order; returns how many ran. */
+    /** The next job that's due, by priority then insertion order. */
+    private takeNext;
+    /**
+     * Run every job that's currently due, highest priority first; returns how many
+     * ran. A job that throws is re-queued with its backoff delay until it runs out
+     * of retries, then moves to `failed`.
+     *
+     * Jobs whose delay or backoff hasn't elapsed are left in place — `work()`
+     * drains what's *due*, it doesn't sleep. Call it again later, or advance your
+     * test's clock.
+     */
     work(): Promise<number>;
 }
 export declare class Queue {
@@ -62,7 +153,29 @@ export declare class Queue {
     dispatch(job: Dispatchable, options?: JobOptions): Promise<void>;
     /** Drain the driver if it holds jobs locally; returns how many ran. */
     work(): Promise<number>;
+    /** Jobs that exhausted their retries, if the driver tracks them. */
+    get failed(): FailedJob[];
+}
+/**
+ * A driver that records dispatches without running anything, plus assertions —
+ * what `fakeQueue()` installs so a test can check a job was *queued* without
+ * paying for it to run.
+ */
+export declare class FakeQueue extends Queue {
+    readonly pushed: QueuedJob[];
+    constructor();
+    /** Dispatches of a job class (or all of them, with no argument). */
+    private matching;
+    assertPushed<T extends Job>(type: JobClass<T>, where?: (job: T) => boolean): void;
+    assertNotPushed<T extends Job>(type: JobClass<T>, where?: (job: T) => boolean): void;
+    assertPushedCount(expected: number, type?: JobClass): void;
+    assertNothingPushed(): void;
+    /** The queued entry for a job class — to assert on its delay, lane, or priority. */
+    pushedJobs<T extends Job>(type: JobClass<T>): QueuedJob[];
+    private summary;
 }
+/** A `Job` subclass, as passed to the fake's assertions. */
+export type JobClass<T extends Job = Job> = abstract new (...args: never[]) => T;
 /** Register the default queue driver used by `dispatch()`. */
 export declare function setQueue(driver: QueueDriver): Queue;
 /** The default queue instance. */
@@ -71,3 +184,15 @@ export declare function getQueue(): Queue;
 export declare function dispatch(job: Dispatchable, options?: JobOptions): Promise<void>;
 /** Drain the default queue's pending jobs (no-op for immediate drivers). */
 export declare function work(): Promise<number>;
+/**
+ * Swap the queue for one that records dispatches without running them, so a test
+ * can assert a job was queued without paying for it to run. Undo with
+ * `restoreQueue()`.
+ *
+ *   const q = fakeQueue();
+ *   await register(user);
+ *   q.assertPushed(SendWelcome, (job) => job.userId === user.id);
+ */
+export declare function fakeQueue(): FakeQueue;
+/** Restore the real queue after `fakeQueue()`. */
+export declare function restoreQueue(): void;

package/dist/core/queue.js

@@ -7,8 +7,10 @@
  * so it stays edge-safe.
  *
  *   class SendWelcome extends Job {
+ *     static maxRetries = 3;
  *     constructor(private userId: number) { super(); }
  *     async handle() { await mail().to(...).send(); }
+ *     async failed(error: unknown) { logger().error("welcome failed", { error }); }
  *   }
  *
  *   await dispatch(new SendWelcome(user.id));   // runs now with the sync driver
@@ -17,38 +19,227 @@
  *   setQueue(new MemoryDriver());
  *   await dispatch(new SendWelcome(user.id));   // queued
  *   await work();                               // runs everything pending
+ *
+ * A job that throws is **retried** with backoff up to `maxRetries`, and only then
+ * declared failed — at which point `failed()` runs and it lands in the driver's
+ * dead-letter list rather than vanishing.
+ */
+import { logger, hasApplication } from "./helpers.js";
+/**
+ * A unit of background work. Subclass and implement `handle`.
+ *
+ * Retry policy is per-class, via statics:
+ *
+ *   class ChargeCard extends Job {
+ *     static maxRetries = 5;
+ *     static backoff = exponentialBackoff(1_000);
+ *     async handle() { … }
+ *   }
  */
-/** A unit of background work. Subclass and implement `handle`. */
 export class Job {
+    /** How many times to retry after the first failure. Default: 0 (no retries). */
+    static maxRetries = 0;
+    /** How long to wait before each retry. Default: exponential from 1s. */
+    static backoff = exponentialBackoff(1_000);
+    /** Default lane for this job class. */
+    static queue;
+    /** Default priority for this job class (lower runs first). */
+    static priority;
+    /** Set by the driver before `handle()` runs. */
+    context;
+    /**
+     * Called once the job has exhausted its retries — the last chance to record
+     * the failure, alert, or compensate. A throw in here is logged and swallowed:
+     * failing to handle a failure must not itself crash the worker.
+     */
+    failed(_error) { }
 }
-function run(job) {
-    return Promise.resolve(job instanceof Job ? job.handle() : job());
+/** Doubles each time: 1s, 2s, 4s, 8s… Capped at `maxMs`. */
+export function exponentialBackoff(baseMs = 1_000, maxMs = 60_000) {
+    return (attempt) => Math.min(baseMs * 2 ** (attempt - 1), maxMs);
+}
+/** Adds a fixed step each time: 5s, 10s, 15s… Capped at `maxMs`. */
+export function linearBackoff(stepMs = 1_000, maxMs = 60_000) {
+    return (attempt) => Math.min(stepMs * attempt, maxMs);
+}
+/** The same delay every time. */
+export function fixedBackoff(delayMs = 1_000) {
+    return () => delayMs;
+}
+/** No delay at all — retry straight away. */
+export const noBackoff = () => 0;
+/* ------------------------------- execution -------------------------------- */
+/** The retry policy for a dispatchable, from its class statics and any overrides. */
+function policy(job, options) {
+    const cls = job instanceof Job ? job.constructor : undefined;
+    return {
+        maxRetries: options.maxRetries ?? cls?.maxRetries ?? 0,
+        backoff: options.backoff ?? cls?.backoff ?? exponentialBackoff(1_000),
+    };
+}
+function invoke(job, context) {
+    if (typeof job === "function")
+        return Promise.resolve(job());
+    job.context = context;
+    return Promise.resolve(job.handle());
+}
+/**
+ * Log through the application logger, falling back to the console. The queue is
+ * a primitive — it has to work in a worker that never bootstrapped an
+ * Application — and reporting a failure must never itself be the thing that
+ * throws.
+ */
+function log(message, context) {
+    if (hasApplication())
+        logger().error(message, context);
+    else
+        console.error(message, context);
+}
+/**
+ * A job has exhausted its retries. Log it — loudly, because a worker that keeps
+ * running past a failure must not do so silently — then run the `failed()` hook.
+ * A throw in the hook is logged too, never rethrown: failing to handle a failure
+ * must not itself crash the worker.
+ */
+async function reportFailure(job, error, context) {
+    log("queue: job failed", {
+        job: job instanceof Job ? job.constructor.name : "fn",
+        jobId: context.jobId,
+        attempts: context.attempt,
+        queue: context.queue,
+        error,
+    });
+    if (!(job instanceof Job))
+        return;
+    try {
+        await job.failed(error);
+    }
+    catch (hookError) {
+        log("queue: a job's failed() hook threw", { error: hookError });
+    }
 }
 /* -------------------------------- drivers --------------------------------- */
-/** Runs jobs the moment they're dispatched — the default; ideal for dev/tests. */
+let counter = 0;
+function nextId() {
+    return `job_${++counter}`;
+}
+/**
+ * Runs jobs the moment they're dispatched — the default; ideal for dev/tests.
+ *
+ * Retries still apply, but the backoff delay is **not** slept through: an
+ * inline driver blocking the request for a 30-second backoff would be worse than
+ * useless. Use `MemoryDriver` or a real broker to exercise real delays.
+ */
 export class SyncDriver {
-    async push(job, _options) {
-        await run(job);
+    /** Jobs that exhausted their retries. */
+    failed = [];
+    async push(job, options) {
+        const { maxRetries } = policy(job, options);
+        const id = nextId();
+        const queue = options.queue ?? "default";
+        for (let attempt = 1;; attempt++) {
+            const context = { jobId: id, attempt, queue };
+            try {
+                await invoke(job, context);
+                return;
+            }
+            catch (error) {
+                if (attempt > maxRetries) {
+                    await reportFailure(job, error, context);
+                    this.failed.push({ id, job, options, attempts: attempt, error });
+                    // The sync driver *is* the work — it ran inline, so the caller gets the
+                    // error. A background driver can't do that; it records instead.
+                    throw error;
+                }
+            }
+        }
     }
 }
 /** Holds jobs in memory; `work()` drains them. Assert on `.jobs` in tests. */
 export class MemoryDriver {
     jobs = [];
+    /** Jobs that exhausted their retries. */
+    failed = [];
     async push(job, options) {
-        this.jobs.push({ job, options });
+        this.jobs.push({
+            id: nextId(),
+            job,
+            options,
+            attempts: 0,
+            availableAt: Date.now() + (options.delay ?? 0) * 1000,
+        });
     }
     get size() {
         return this.jobs.length;
     }
-    /** Run every pending job in FIFO order; returns how many ran. */
+    /** The next job that's due, by priority then insertion order. */
+    takeNext(now) {
+        let best = -1;
+        for (let i = 0; i < this.jobs.length; i++) {
+            const candidate = this.jobs[i];
+            if (candidate.availableAt > now)
+                continue; // not due yet
+            if (best === -1) {
+                best = i;
+                continue;
+            }
+            const incumbent = this.jobs[best];
+            if ((candidate.options.priority ?? 0) < (incumbent.options.priority ?? 0))
+                best = i;
+        }
+        return best === -1 ? undefined : this.jobs.splice(best, 1)[0];
+    }
+    /**
+     * Run every job that's currently due, highest priority first; returns how many
+     * ran. A job that throws is re-queued with its backoff delay until it runs out
+     * of retries, then moves to `failed`.
+     *
+     * Jobs whose delay or backoff hasn't elapsed are left in place — `work()`
+     * drains what's *due*, it doesn't sleep. Call it again later, or advance your
+     * test's clock.
+     */
     async work() {
         let count = 0;
-        while (this.jobs.length) {
-            const next = this.jobs.shift();
-            await run(next.job);
-            count++;
+        for (;;) {
+            const now = Date.now();
+            const next = this.takeNext(now);
+            if (!next)
+                return count;
+            const { maxRetries, backoff } = policy(next.job, next.options);
+            const attempt = next.attempts + 1;
+            const context = {
+                jobId: next.id,
+                attempt,
+                queue: next.options.queue ?? "default",
+            };
+            try {
+                await invoke(next.job, context);
+                count++;
+            }
+            catch (error) {
+                if (attempt > maxRetries) {
+                    // A failed job must not take down the worker — record it, log it, and
+                    // carry on with the rest of the queue.
+                    await reportFailure(next.job, error, context);
+                    this.failed.push({
+                        id: next.id,
+                        job: next.job,
+                        options: next.options,
+                        attempts: attempt,
+                        error,
+                    });
+                }
+                else {
+                    // Back on the queue, not runnable until the backoff has elapsed.
+                    this.jobs.push({
+                        ...next,
+                        attempts: attempt,
+                        availableAt: Date.now() + backoff(attempt),
+                    });
+                }
+                count++;
+            }
         }
-        return count;
     }
 }
 /* --------------------------------- queue ---------------------------------- */
@@ -59,16 +250,93 @@ export class Queue {
     }
     /** Place a job on the queue (the driver decides when it runs). */
     async dispatch(job, options = {}) {
-        await this.driver.push(job, options);
+        const cls = job instanceof Job ? job.constructor : undefined;
+        await this.driver.push(job, {
+            ...options,
+            queue: options.queue ?? cls?.queue ?? "default",
+            priority: options.priority ?? cls?.priority ?? 0,
+        });
     }
     /** Drain the driver if it holds jobs locally; returns how many ran. */
     async work() {
         const drainable = this.driver;
         return typeof drainable.work === "function" ? drainable.work() : 0;
     }
+    /** Jobs that exhausted their retries, if the driver tracks them. */
+    get failed() {
+        return this.driver.failed ?? [];
+    }
+}
+/* --------------------------------- faking --------------------------------- */
+/**
+ * A driver that records dispatches without running anything, plus assertions —
+ * what `fakeQueue()` installs so a test can check a job was *queued* without
+ * paying for it to run.
+ */
+export class FakeQueue extends Queue {
+    pushed = [];
+    constructor() {
+        const pushed = [];
+        super({
+            async push(job, options) {
+                pushed.push({
+                    id: nextId(),
+                    job,
+                    options,
+                    attempts: 0,
+                    availableAt: Date.now() + (options.delay ?? 0) * 1000,
+                });
+            },
+        });
+        this.pushed = pushed;
+    }
+    /** Dispatches of a job class (or all of them, with no argument). */
+    matching(type, where) {
+        return this.pushed.filter((entry) => {
+            if (type && !(entry.job instanceof type))
+                return false;
+            return where ? where(entry.job) : true;
+        });
+    }
+    assertPushed(type, where) {
+        if (this.matching(type, where).length)
+            return;
+        const total = this.pushed.filter((e) => e.job instanceof type).length;
+        throw new Error(where && total
+            ? `Expected a ${type.name} matching the predicate. ${total} were pushed, but none matched.`
+            : `Expected ${type.name} to be pushed, but it was not. ${this.summary()}`);
+    }
+    assertNotPushed(type, where) {
+        const found = this.matching(type, where).length;
+        if (found)
+            throw new Error(`Expected no ${type.name}, but ${found} were pushed.`);
+    }
+    assertPushedCount(expected, type) {
+        const found = this.matching(type).length;
+        if (found !== expected) {
+            const what = type ? `${type.name} job(s)` : "job(s)";
+            throw new Error(`Expected ${expected} ${what} to be pushed, but ${found} were.`);
+        }
+    }
+    assertNothingPushed() {
+        if (this.pushed.length) {
+            throw new Error(`Expected nothing to be pushed, but ${this.pushed.length} were. ${this.summary()}`);
+        }
+    }
+    /** The queued entry for a job class — to assert on its delay, lane, or priority. */
+    pushedJobs(type) {
+        return this.matching(type);
+    }
+    summary() {
+        if (!this.pushed.length)
+            return "Nothing was pushed.";
+        const names = [...new Set(this.pushed.map((e) => (e.job instanceof Job ? e.job.constructor.name : "fn")))];
+        return `Pushed: ${names.join(", ")}.`;
+    }
 }
 /* --------------------------------- global --------------------------------- */
 let queue = new Queue(new SyncDriver());
+let real;
 /** Register the default queue driver used by `dispatch()`. */
 export function setQueue(driver) {
     queue = new Queue(driver);
@@ -86,3 +354,25 @@ export function dispatch(job, options) {
 export function work() {
     return queue.work();
 }
+/**
+ * Swap the queue for one that records dispatches without running them, so a test
+ * can assert a job was queued without paying for it to run. Undo with
+ * `restoreQueue()`.
+ *
+ *   const q = fakeQueue();
+ *   await register(user);
+ *   q.assertPushed(SendWelcome, (job) => job.userId === user.id);
+ */
+export function fakeQueue() {
+    if (!real)
+        real = queue; // only remember the *real* queue — faking twice must not stash a fake
+    const fake = new FakeQueue();
+    queue = fake;
+    return fake;
+}
+/** Restore the real queue after `fakeQueue()`. */
+export function restoreQueue() {
+    if (real)
+        queue = real;
+    real = undefined;
+}

package/dist/core/rate-limit.js

@@ -35,10 +35,12 @@ export function rateLimiter(options = {}) {
         }
         bucket.count++;
         const remaining = Math.max(0, max - bucket.count);
+        const resetSeconds = Math.ceil(bucket.reset / 1000);
         if (bucket.count > max) {
             return c.json({ error: options.message ?? "Too Many Requests", status: 429 }, 429, {
                 "X-RateLimit-Limit": String(max),
                 "X-RateLimit-Remaining": "0",
+                "X-RateLimit-Reset": String(resetSeconds),
                 "Retry-After": String(Math.ceil((bucket.reset - now) / 1000)),
             });
         }
@@ -46,5 +48,6 @@ export function rateLimiter(options = {}) {
         // Set headers on the final response (survives any handler type).
         c.header("X-RateLimit-Limit", String(max));
         c.header("X-RateLimit-Remaining", String(remaining));
+        c.header("X-RateLimit-Reset", String(resetSeconds));
     };
 }

package/dist/core/relations.js

@@ -56,7 +56,7 @@ export class HasMany extends Relation {
         return this.parent[this.localKey];
     }
     query() {
-        return db(this.related.table).where(this.foreignKey, this.localValue());
+        return db(this.related.table, this.related.connection).where(this.foreignKey, this.localValue());
     }
     async get() {
         return this.hydrate(await this.query().get());
@@ -64,7 +64,7 @@ export class HasMany extends Relation {
     async eager(models, name) {
         const keys = unique(models.map((m) => m[this.localKey]).filter((v) => v != null));
         const rows = keys.length
-            ? await db(this.related.table).whereIn(this.foreignKey, keys).get()
+            ? await db(this.related.table, this.related.connection).whereIn(this.foreignKey, keys).get()
             : [];
         const grouped = new Map();
         for (const row of rows) {
@@ -90,7 +90,7 @@ export class HasOne extends Relation {
         return this.parent[this.localKey];
     }
     query() {
-        return db(this.related.table).where(this.foreignKey, this.localValue());
+        return db(this.related.table, this.related.connection).where(this.foreignKey, this.localValue());
     }
     async get() {
         const row = await this.query().first();
@@ -99,7 +99,7 @@ export class HasOne extends Relation {
     async eager(models, name) {
         const keys = unique(models.map((m) => m[this.localKey]).filter((v) => v != null));
         const rows = keys.length
-            ? await db(this.related.table).whereIn(this.foreignKey, keys).get()
+            ? await db(this.related.table, this.related.connection).whereIn(this.foreignKey, keys).get()
             : [];
         const byKey = new Map();
         for (const row of rows) {
@@ -124,7 +124,7 @@ export class BelongsTo extends Relation {
         return this.parent[this.foreignKey];
     }
     query() {
-        return db(this.related.table).where(this.ownerKey, this.foreignValue());
+        return db(this.related.table, this.related.connection).where(this.ownerKey, this.foreignValue());
     }
     async get() {
         if (this.foreignValue() == null)
@@ -135,7 +135,7 @@ export class BelongsTo extends Relation {
     async eager(models, name) {
         const keys = unique(models.map((m) => m[this.foreignKey]).filter((v) => v != null));
         const rows = keys.length
-            ? await db(this.related.table).whereIn(this.ownerKey, keys).get()
+            ? await db(this.related.table, this.related.connection).whereIn(this.ownerKey, keys).get()
             : [];
         const byKey = new Map();
         for (const row of rows)
@@ -165,18 +165,18 @@ export class BelongsToMany extends Relation {
     }
     /** The query against the related table, once pivot rows are known. */
     query() {
-        return db(this.related.table);
+        return db(this.related.table, this.related.connection);
     }
     async get() {
         if (this.parentValue() == null)
             return [];
-        const pivots = await db(this.pivotTable)
+        const pivots = await db(this.pivotTable, this.related.connection)
             .where(this.foreignPivotKey, this.parentValue())
             .get();
         const relatedIds = unique(pivots.map((p) => p[this.relatedPivotKey]));
         if (!relatedIds.length)
             return [];
-        const rows = await db(this.related.table).whereIn(this.relatedKey, relatedIds).get();
+        const rows = await db(this.related.table, this.related.connection).whereIn(this.relatedKey, relatedIds).get();
         return this.hydrate(rows);
     }
     async eager(models, name) {
@@ -186,10 +186,10 @@ export class BelongsToMany extends Relation {
                 m.setRelation(name, []);
             return;
         }
-        const pivots = await db(this.pivotTable).whereIn(this.foreignPivotKey, parentIds).get();
+        const pivots = await db(this.pivotTable, this.related.connection).whereIn(this.foreignPivotKey, parentIds).get();
         const relatedIds = unique(pivots.map((p) => p[this.relatedPivotKey]));
         const rows = relatedIds.length
-            ? await db(this.related.table).whereIn(this.relatedKey, relatedIds).get()
+            ? await db(this.related.table, this.related.connection).whereIn(this.relatedKey, relatedIds).get()
             : [];
         const relatedById = new Map(rows.map((row) => [row[this.relatedKey], row]));
         const grouped = new Map();
@@ -207,7 +207,7 @@ export class BelongsToMany extends Relation {
     }
     /** Attach a related row by linking it through the pivot table. */
     async attach(id, extra = {}) {
-        await db(this.pivotTable).insert({
+        await db(this.pivotTable, this.related.connection).insert({
             [this.foreignPivotKey]: this.parentValue(),
             [this.relatedPivotKey]: id,
             ...extra,
@@ -215,7 +215,7 @@ export class BelongsToMany extends Relation {
     }
     /** Detach one related row (or all, when no id is given). */
     async detach(id) {
-        let q = db(this.pivotTable).where(this.foreignPivotKey, this.parentValue());
+        let q = db(this.pivotTable, this.related.connection).where(this.foreignPivotKey, this.parentValue());
         if (id !== undefined)
             q = q.where(this.relatedPivotKey, id);
         await q.delete();