deepspace 0.35.0 → 0.36.0

package/dist/server.d.ts

@@ -2669,7 +2669,7 @@ declare function armCronRoom(ctx: {
  * Persistent job queue with serial execution, progress, cancellation and retries.
  * Jobs run inside alarms unless listed in `backgroundJobTypes`.
  * Use `ctx.continue` to save a checkpoint for the next run.
- * After a restart, running jobs older than 16 minutes are retried or failed.
+ * After a restart, interrupted running jobs are retried or failed.
  */
 
 type JobStatus = 'queued' | 'running' | 'succeeded' | 'failed' | 'canceled';
@@ -2793,7 +2793,7 @@ declare abstract class JobRoom<E = Record<string, unknown>, P = unknown, R = unk
     private drainDueJobs;
     private executeJob;
     private makeContext;
-    private readStatus;
+    private readRunState;
     /** Reauthorize every live event so role revocation does not leave a stale reader. */
     protected broadcast(message: ServerMessage, exclude?: WebSocket): void;
     private resolveAccess;
@@ -3674,6 +3674,12 @@ interface DeepSpaceAuthConfig {
     emailAndPassword?: boolean;
     /** Trusted origins for CORS */
     trustedOrigins?: string[];
+    /**
+     * Where a failed OAuth callback lands when the flow can't be tied back to
+     * its own error URL (for example its state expired). Without it Better Auth
+     * shows its own developer-facing error page.
+     */
+    errorURL?: string;
     /**
      * Server-owned fields to add to Better Auth's user model. Use `input: false`
      * for values that may only be populated by a database hook, and
@@ -4714,8 +4720,11 @@ declare function createDeepSpaceAuth(config: DeepSpaceAuthConfig): better_auth.A
             };
         };
     } | undefined;
-    socialProviders: Parameters<typeof betterAuth>[0]["socialProviders"];
     trustedOrigins: string[];
+    onAPIError?: {
+        errorURL: string;
+    } | undefined;
+    socialProviders: Parameters<typeof betterAuth>[0]["socialProviders"];
     user?: {
         additionalFields: {
             [x: string]: better_auth.DBFieldAttribute;

package/dist/server.js

@@ -7384,7 +7384,7 @@ var JobRoom = class extends BaseRoom {
     `);
     this.sql.exec(`CREATE INDEX IF NOT EXISTS jobs_status_next_run ON jobs (status, next_run_at)`);
     this.sql.exec(`CREATE INDEX IF NOT EXISTS jobs_completed_at ON jobs (completed_at)`);
-    this.recoverStuckRunning();
+    this.recoverStuckRunning(true);
     this.scheduleNextAlarm();
   }
   // ==========================================================================
@@ -7630,8 +7630,7 @@ var JobRoom = class extends BaseRoom {
   }
   async executeJob(row) {
     const startedAt = row.started_at ?? (/* @__PURE__ */ new Date()).toISOString();
-    const attemptsBefore = row.attempts;
-    const attempt = attemptsBefore + 1;
+    const attempt = row.attempts + 1;
     this.sql.exec(
       `UPDATE jobs SET status = 'running', started_at = ?, attempts = ? WHERE id = ?`,
       startedAt,
@@ -7651,7 +7650,7 @@ var JobRoom = class extends BaseRoom {
     let result;
     let errorMessage;
     try {
-      const ctx = this.makeContext(row.id, controller.signal);
+      const ctx = this.makeContext(row.id, attempt, controller.signal);
       result = await this.onJob(job, ctx);
       if (this.continueState) outcome = "continued";
     } catch (e) {
@@ -7661,8 +7660,8 @@ var JobRoom = class extends BaseRoom {
     } finally {
       this.inFlight.delete(row.id);
     }
-    const currentStatus = this.readStatus(row.id);
-    if (currentStatus !== "running") {
+    const current = this.readRunState(row.id);
+    if (current?.status !== "running" || current.attempts !== attempt) {
       this.continueState = null;
       return;
     }
@@ -7741,9 +7740,11 @@ var JobRoom = class extends BaseRoom {
     const updated = this.getJobById(row.id);
     if (updated) this.broadcast(serverBuild.jobFailed(updated));
   }
-  makeContext(jobId, signal) {
+  makeContext(jobId, attempt, signal) {
     return {
       progress: (value, message) => {
+        const current = this.readRunState(jobId);
+        if (current?.status !== "running" || current.attempts !== attempt) return;
         const clamped = Math.max(0, Math.min(1, value));
         this.sql.exec(
           `UPDATE jobs SET progress = ?, progress_message = ? WHERE id = ?`,
@@ -7763,9 +7764,9 @@ var JobRoom = class extends BaseRoom {
       signal
     };
   }
-  readStatus(jobId) {
-    const row = this.sql.exec(`SELECT status FROM jobs WHERE id = ?`, jobId).toArray()[0];
-    return row?.status ?? null;
+  readRunState(jobId) {
+    const row = this.sql.exec(`SELECT status, attempts FROM jobs WHERE id = ?`, jobId).toArray()[0];
+    return row ?? null;
   }
   /** Reauthorize every live event so role revocation does not leave a stale reader. */
   broadcast(message, exclude) {
@@ -7823,11 +7824,12 @@ var JobRoom = class extends BaseRoom {
     if (targets.length === 0) return;
     this.state.storage.setAlarm(Math.max(Math.min(...targets), now + 50));
   }
-  recoverStuckRunning() {
+  recoverStuckRunning(onStartup = false) {
     const cutoff = new Date(Date.now() - RUNNING_STALE_MS).toISOString();
     const stuck = this.sql.exec(
       `SELECT id, attempts, max_attempts FROM jobs
-          WHERE status = 'running' AND (started_at IS NULL OR started_at <= ?)`,
+          WHERE status = 'running' AND (? = 1 OR started_at IS NULL OR started_at <= ?)`,
+      onStartup ? 1 : 0,
       cutoff
     ).toArray();
     for (const r of stuck) {
@@ -8832,6 +8834,7 @@ function createDeepSpaceAuth(config) {
     },
     ...config.userAdditionalFields ? { user: { additionalFields: config.userAdditionalFields } } : {},
     socialProviders,
+    ...config.errorURL ? { onAPIError: { errorURL: config.errorURL } } : {},
     trustedOrigins: config.trustedOrigins ?? [
       "https://deep.space",
       "https://*.deep.space",