@workglow/supabase 0.3.1 → 0.3.2

package/dist/job-queue/node.js

@@ -122,21 +122,6 @@ class SupabaseQueueStorage {
         throw tableError;
       }
     }
-    const alterSqls = [
-      `ALTER TABLE ${this.tableName} ADD COLUMN IF NOT EXISTS abort_requested_at timestamp with time zone`,
-      `ALTER TABLE ${this.tableName} ADD COLUMN IF NOT EXISTS lease_expires_at timestamp with time zone`,
-      `ALTER TABLE ${this.tableName} RENAME COLUMN run_after TO visible_at`,
-      `ALTER TABLE ${this.tableName} RENAME COLUMN last_ran_at TO last_attempted_at`,
-      `ALTER TABLE ${this.tableName} RENAME COLUMN run_attempts TO attempts`,
-      `ALTER TABLE ${this.tableName} RENAME COLUMN max_retries TO max_attempts`,
-      `ALTER TABLE ${this.tableName} RENAME COLUMN worker_id TO lease_owner`
-    ];
-    for (const sql of alterSqls) {
-      const { error } = await this.client.rpc("exec_sql", { query: sql });
-      if (error && error.code !== "42703") {
-        throw new Error(`Failed to rename column: ${error.message}`);
-      }
-    }
     const indexes = [
       `CREATE INDEX IF NOT EXISTS job_fetcher${indexSuffix}_idx ON ${this.tableName} (${prefixIndexPrefix}id, status, visible_at)`,
       `CREATE INDEX IF NOT EXISTS job_queue_fetcher${indexSuffix}_idx ON ${this.tableName} (${prefixIndexPrefix}queue, status, visible_at)`,
@@ -582,6 +567,27 @@ class SupabaseQueueStorage {
     if (error)
       throw error;
   }
+  async markDisabled(id) {
+    const numericId = Number(id);
+    if (!Number.isFinite(numericId)) {
+      throw new Error(`Invalid job id: ${id}`);
+    }
+    const prefixConditions = this.buildPrefixWhereSql();
+    const validatedQueueName = this.validateSqlValue(this.queueName, "queueName");
+    const escapedQueueName = this.escapeSqlString(validatedQueueName);
+    const sql = `
+      UPDATE ${this.tableName}
+          SET status = 'DISABLED',
+              completed_at = COALESCE(completed_at, NOW() AT TIME ZONE 'UTC'),
+              lease_owner = NULL,
+              progress = 0,
+              progress_message = '',
+              progress_details = NULL
+        WHERE id = ${numericId} AND queue = '${escapedQueueName}'${prefixConditions}`;
+    const { error } = await this.client.rpc("exec_sql", { query: sql });
+    if (error)
+      throw error;
+  }
   async deleteJobsByStatusAndAge(status, olderThanMs) {
     const cutoffDate = new Date(Date.now() - olderThanMs).toISOString();
     let query = this.client.from(this.tableName).delete().eq("queue", this.queueName).eq("status", status).not("completed_at", "is", null).lte("completed_at", cutoffDate);
@@ -959,24 +965,20 @@ class SupabaseRateLimiterStorage {
 // src/job-queue/SupabaseMessageQueue.ts
 class SupabaseClaim {
   core;
-  pending;
   id;
   body;
   attempts;
   workerId;
-  constructor(core, pending, id, body, attempts, workerId) {
+  constructor(core, id, body, attempts, workerId) {
     this.core = core;
-    this.pending = pending;
     this.id = id;
     this.body = body;
     this.attempts = attempts;
     this.workerId = workerId;
   }
   async ack(result) {
-    const buf = this.pending.get(this.id);
-    this.pending.delete(this.id);
     const current = await this.core.get(this.id) ?? this.body;
-    const output = result !== undefined ? result : buf?.output !== undefined ? buf.output : current.output ?? null;
+    const output = result !== undefined ? result : current.output ?? null;
     await this.core.finalize(this.id, {
       output,
       error: null,
@@ -986,7 +988,6 @@ class SupabaseClaim {
     });
   }
   async retry(opts) {
-    this.pending.delete(this.id);
     const delay = opts?.delaySeconds ?? 0;
     const current = await this.core.get(this.id) ?? this.body;
     await this.core.complete({
@@ -1002,12 +1003,10 @@ class SupabaseClaim {
   }
   async fail(opts) {
     opts?.permanent;
-    const buf = this.pending.get(this.id);
-    this.pending.delete(this.id);
     const current = await this.core.get(this.id) ?? this.body;
-    const error = opts?.error !== undefined ? opts.error : buf?.error !== undefined ? buf.error : current.error ?? null;
-    const errorCode = opts?.errorCode !== undefined ? opts.errorCode : buf?.errorCode !== undefined ? buf.errorCode : current.error_code ?? null;
-    const abortRequested = opts?.abortRequested !== undefined ? opts.abortRequested : buf?.abortRequested ?? false;
+    const error = opts?.error !== undefined ? opts.error : current.error ?? null;
+    const errorCode = opts?.errorCode !== undefined ? opts.errorCode : current.error_code ?? null;
+    const abortRequested = opts?.abortRequested === true;
     await this.core.finalize(this.id, {
       error,
       error_code: errorCode,
@@ -1020,7 +1019,6 @@ class SupabaseClaim {
     await this.core.extendLease(this.id, this.workerId, ms);
   }
   async disable() {
-    this.pending.delete(this.id);
     const current = await this.core.get(this.id);
     const completedAt = current?.completed_at ?? new Date().toISOString();
     await this.core.finalize(this.id, {
@@ -1037,10 +1035,8 @@ class SupabaseClaim {
 class SupabaseMessageQueue {
   scope;
   core;
-  pending;
-  constructor(core, pending) {
+  constructor(core) {
     this.core = core;
-    this.pending = pending;
     this.scope = core.scope;
   }
   async send(body, opts) {
@@ -1060,12 +1056,11 @@ class SupabaseMessageQueue {
       const job = await this.core.next(opts.workerId, { leaseMs: opts.leaseMs });
       if (!job)
         break;
-      claims.push(new SupabaseClaim(this.core, this.pending, job.id, job, job.attempts ?? 0, opts.workerId));
+      claims.push(new SupabaseClaim(this.core, job.id, job, job.attempts ?? 0, opts.workerId));
     }
     return claims;
   }
   async releaseClaim(id) {
-    this.pending.delete(id);
     await this.core.releaseClaim(id);
   }
   async migrate() {
@@ -1099,10 +1094,8 @@ function applySendOptions(body, opts) {
 // src/job-queue/SupabaseJobStore.ts
 class SupabaseJobStore {
   core;
-  pending;
-  constructor(core, pending) {
+  constructor(core) {
     this.core = core;
-    this.pending = pending;
   }
   get(id) {
     return this.core.get(id);
@@ -1122,27 +1115,13 @@ class SupabaseJobStore {
   async saveProgress(id, progress, message, details) {
     await this.core.saveProgress(id, progress, message, details);
   }
-  async saveResult(id, output) {
-    const buf = this.pending.get(id) ?? {};
-    buf.output = output ?? null;
-    this.pending.set(id, buf);
-  }
-  async saveError(id, error, errorCode, abortRequested) {
-    const buf = this.pending.get(id) ?? {};
-    buf.error = error;
-    buf.errorCode = errorCode;
-    buf.abortRequested = abortRequested;
-    this.pending.set(id, buf);
-  }
   async deleteByStatusAndAge(status, olderThanMs) {
     await this.core.deleteJobsByStatusAndAge(status, olderThanMs);
   }
   async delete(id) {
-    this.pending.delete(id);
     await this.core.delete(id);
   }
   async deleteAll() {
-    this.pending.clear();
     await this.core.deleteAll();
   }
   async abort(id) {
@@ -1168,13 +1147,14 @@ class SupabaseJobStore {
     return this.core.getMany(ids);
   }
   async completeWithResult(id, result) {
-    this.pending.delete(id);
     await this.core.completeWithResult(id, result);
   }
   async failWithError(id, opts) {
-    this.pending.delete(id);
     await this.core.failWithError(id, opts);
   }
+  async markDisabled(id) {
+    await this.core.markDisabled(id);
+  }
   async markEnqueueDeferred(id, opts) {
     await this.core.finalize(id, {
       visible_at: opts.visible_at.toISOString(),
@@ -1185,11 +1165,9 @@ class SupabaseJobStore {
 // src/job-queue/createSupabaseQueue.ts
 function createSupabaseQueue(queueName, client, opts) {
   const core = new SupabaseQueueStorage(client, queueName, opts);
-  const pending = new Map;
   return {
-    messageQueue: new SupabaseMessageQueue(core, pending),
-    jobStore: new SupabaseJobStore(core, pending),
-    core
+    messageQueue: new SupabaseMessageQueue(core),
+    jobStore: new SupabaseJobStore(core)
   };
 }
 export {
@@ -1202,4 +1180,4 @@ export {
   SUPABASE_QUEUE_STORAGE
 };
 
-//# debugId=837D2F28138161DA64756E2164756E21
+//# debugId=245CD3EE76DB8E7764756E2164756E21