@workglow/postgres 0.3.1 → 0.3.2

package/dist/job-queue/node.js

@@ -139,35 +139,18 @@ import {
   getPrefixIndexSuffix,
   PostgresDialect
 } from "@workglow/storage";
-var JOB_STATUS_V1 = [
-  "PENDING",
-  "PROCESSING",
-  "COMPLETED",
-  "ABORTING",
-  "FAILED",
-  "DISABLED"
-];
-function assertJobStatusMatchesV1() {
-  const current = new Set(Object.values(JobStatus));
-  for (const v of current) {
-    if (!JOB_STATUS_V1.includes(v)) {
-      throw new Error(`JobStatus contains "${v}" which is not in JOB_STATUS_V1. ` + `Add a new migration that runs "ALTER TYPE job_status ADD VALUE IF NOT EXISTS '${v}'" ` + `instead of mutating the v1 enum literal.`);
-    }
-  }
-}
 function postgresQueueMigrations(tableName, prefixes) {
-  assertJobStatusMatchesV1();
   const component = `queue:postgres:${tableName}`;
   const prefixColumnsSql = buildPrefixColumnsSql(PostgresDialect, prefixes);
   const prefixIndexPrefix = getPrefixIndexPrefix(prefixes);
   const indexSuffix = getPrefixIndexSuffix(prefixes);
+  const enumLiteral = Object.values(JobStatus).map((v) => `'${v}'`).join(",");
   return [
     {
       component,
       version: 1,
       description: "Create job_status enum + queue table + indexes + notify trigger",
       async up(db) {
-        const enumLiteral = JOB_STATUS_V1.map((v) => `'${v}'`).join(",");
         await db.query(`
           DO $$
           BEGIN
@@ -185,10 +168,10 @@ function postgresQueueMigrations(tableName, prefixes) {
             status job_status NOT NULL default 'PENDING',
             input jsonb NOT NULL,
             output jsonb,
-            run_attempts integer default 0,
-            max_retries integer default 20,
-            run_after timestamp with time zone DEFAULT now(),
-            last_ran_at timestamp with time zone,
+            attempts integer default 0,
+            max_attempts integer default 10,
+            visible_at timestamp with time zone DEFAULT now(),
+            last_attempted_at timestamp with time zone,
             created_at timestamp with time zone DEFAULT now(),
             deadline_at timestamp with time zone,
             completed_at timestamp with time zone,
@@ -197,21 +180,28 @@ function postgresQueueMigrations(tableName, prefixes) {
             progress real DEFAULT 0,
             progress_message text DEFAULT '',
             progress_details jsonb,
-            worker_id text
+            lease_owner text,
+            abort_requested_at timestamp with time zone,
+            lease_expires_at timestamp with time zone
           )
         `);
         await db.query(`
           CREATE INDEX IF NOT EXISTS job_fetcher${indexSuffix}_idx
-            ON ${tableName} (${prefixIndexPrefix}id, status, run_after)
+            ON ${tableName} (${prefixIndexPrefix}id, status, visible_at)
         `);
         await db.query(`
           CREATE INDEX IF NOT EXISTS job_queue_fetcher${indexSuffix}_idx
-            ON ${tableName} (${prefixIndexPrefix}queue, status, run_after)
+            ON ${tableName} (${prefixIndexPrefix}queue, status, visible_at)
         `);
         await db.query(`
           CREATE INDEX IF NOT EXISTS jobs_fingerprint${indexSuffix}_unique_idx
             ON ${tableName} (${prefixIndexPrefix}queue, fingerprint, status)
         `);
+        await db.query(`
+          CREATE UNIQUE INDEX IF NOT EXISTS idx_${tableName}_fingerprint_active
+            ON ${tableName}(${prefixIndexPrefix}queue, fingerprint)
+            WHERE status IN ('PENDING','PROCESSING')
+        `);
         const fnName = `${tableName}_notify`;
         const trgName = `${tableName}_notify_trg`;
         await db.query("SAVEPOINT install_notify_trigger");
@@ -249,92 +239,6 @@ function postgresQueueMigrations(tableName, prefixes) {
           });
         }
       }
-    },
-    {
-      component,
-      version: 2,
-      description: "Add abort_requested_at and lease_expires_at columns",
-      async up(db) {
-        await db.query(`
-          ALTER TABLE ${tableName}
-            ADD COLUMN IF NOT EXISTS abort_requested_at timestamp with time zone,
-            ADD COLUMN IF NOT EXISTS lease_expires_at timestamp with time zone
-        `);
-      }
-    },
-    {
-      component,
-      version: 3,
-      description: "Rename run_after→visible_at, last_ran_at→last_attempted_at, run_attempts→attempts, max_retries→max_attempts, worker_id→lease_owner; drop run_after-keyed indexes and recreate visible_at-keyed",
-      async up(db) {
-        await db.query(`
-          DO $$
-          BEGIN
-            IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='${tableName}' AND column_name='run_after' AND table_schema=current_schema()) THEN
-              EXECUTE 'ALTER TABLE ${tableName} RENAME COLUMN run_after TO visible_at';
-            END IF;
-            IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='${tableName}' AND column_name='last_ran_at' AND table_schema=current_schema()) THEN
-              EXECUTE 'ALTER TABLE ${tableName} RENAME COLUMN last_ran_at TO last_attempted_at';
-            END IF;
-            IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='${tableName}' AND column_name='run_attempts' AND table_schema=current_schema()) THEN
-              EXECUTE 'ALTER TABLE ${tableName} RENAME COLUMN run_attempts TO attempts';
-            END IF;
-            IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='${tableName}' AND column_name='max_retries' AND table_schema=current_schema()) THEN
-              EXECUTE 'ALTER TABLE ${tableName} RENAME COLUMN max_retries TO max_attempts';
-              EXECUTE 'ALTER TABLE ${tableName} ALTER COLUMN max_attempts SET DEFAULT 10';
-            END IF;
-            IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='${tableName}' AND column_name='worker_id' AND table_schema=current_schema()) THEN
-              EXECUTE 'ALTER TABLE ${tableName} RENAME COLUMN worker_id TO lease_owner';
-            END IF;
-          END $$
-        `);
-        await db.query(`DROP INDEX IF EXISTS job_fetcher${indexSuffix}_idx`);
-        await db.query(`DROP INDEX IF EXISTS job_queue_fetcher${indexSuffix}_idx`);
-        await db.query(`
-          CREATE INDEX IF NOT EXISTS job_fetcher${indexSuffix}_idx
-            ON ${tableName} (${prefixIndexPrefix}id, status, visible_at)
-        `);
-        await db.query(`
-          CREATE INDEX IF NOT EXISTS job_queue_fetcher${indexSuffix}_idx
-            ON ${tableName} (${prefixIndexPrefix}queue, status, visible_at)
-        `);
-      }
-    },
-    {
-      component,
-      version: 4,
-      description: "Add UNIQUE partial index for findActiveByFingerprint O(1) lookup + fingerprint dedup at the DB layer (H2)",
-      async up(db) {
-        await db.query(`
-          CREATE UNIQUE INDEX IF NOT EXISTS idx_${tableName}_fingerprint_active
-            ON ${tableName}(${prefixIndexPrefix}queue, fingerprint)
-            WHERE status IN ('PENDING','PROCESSING')
-        `);
-      }
-    },
-    {
-      component,
-      version: 5,
-      description: "Converge idx_<table>_fingerprint_active to UNIQUE for DBs that applied the pre-edit v4 (non-unique) variant",
-      async up(db) {
-        const indexName = `idx_${tableName}_fingerprint_active`;
-        const result = await db.query(`SELECT i.indisunique
-             FROM pg_class c
-             JOIN pg_index i ON i.indexrelid = c.oid
-             JOIN pg_namespace n ON n.oid = c.relnamespace
-            WHERE c.relname = $1
-              AND n.nspname = current_schema()`, [indexName]);
-        const existing = result.rows[0];
-        if (existing && existing.indisunique) {
-          return;
-        }
-        await db.query(`DROP INDEX IF EXISTS ${indexName}`);
-        await db.query(`
-          CREATE UNIQUE INDEX IF NOT EXISTS ${indexName}
-            ON ${tableName}(${prefixIndexPrefix}queue, fingerprint)
-            WHERE status IN ('PENDING','PROCESSING')
-        `);
-      }
     }
   ];
 }
@@ -781,6 +685,17 @@ class PostgresQueueStorage {
       ...prefixParams
     ]);
   }
+  async markDisabled(id) {
+    const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(2);
+    await this.db.query(`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 = $1 AND queue = $2${prefixConditions}`, [id, this.queueName, ...prefixParams]);
+  }
   async deleteJobsByStatusAndAge(status, olderThanMs) {
     const cutoffDate = new Date(Date.now() - olderThanMs).toISOString();
     const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(4);
@@ -1150,24 +1065,20 @@ class PostgresRateLimiterStorage {
 // src/job-queue/PostgresMessageQueue.ts
 class PostgresClaim {
   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,
@@ -1177,7 +1088,6 @@ class PostgresClaim {
     });
   }
   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({
@@ -1193,12 +1103,10 @@ class PostgresClaim {
   }
   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,
@@ -1211,7 +1119,6 @@ class PostgresClaim {
     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, {
@@ -1228,10 +1135,8 @@ class PostgresClaim {
 class PostgresMessageQueue {
   scope;
   core;
-  pending;
-  constructor(core, pending) {
+  constructor(core) {
     this.core = core;
-    this.pending = pending;
     this.scope = core.scope;
   }
   async send(body, opts) {
@@ -1251,12 +1156,11 @@ class PostgresMessageQueue {
       const job = await this.core.next(opts.workerId, { leaseMs: opts.leaseMs });
       if (!job)
         break;
-      claims.push(new PostgresClaim(this.core, this.pending, job.id, job, job.attempts ?? 0, opts.workerId));
+      claims.push(new PostgresClaim(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() {
@@ -1290,10 +1194,8 @@ function applySendOptions(body, opts) {
 // src/job-queue/PostgresJobStore.ts
 class PostgresJobStore {
   core;
-  pending;
-  constructor(core, pending) {
+  constructor(core) {
     this.core = core;
-    this.pending = pending;
   }
   get(id) {
     return this.core.get(id);
@@ -1313,27 +1215,13 @@ class PostgresJobStore {
   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) {
@@ -1359,13 +1247,14 @@ class PostgresJobStore {
     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(),
@@ -1376,11 +1265,9 @@ class PostgresJobStore {
 // src/job-queue/createPostgresQueue.ts
 function createPostgresQueue(queueName, pool, opts) {
   const core = new PostgresQueueStorage(pool, queueName, opts);
-  const pending = new Map;
   return {
-    messageQueue: new PostgresMessageQueue(core, pending),
-    jobStore: new PostgresJobStore(core, pending),
-    core
+    messageQueue: new PostgresMessageQueue(core),
+    jobStore: new PostgresJobStore(core)
   };
 }
 export {
@@ -1396,4 +1283,4 @@ export {
   POSTGRES_QUEUE_STORAGE
 };
 
-//# debugId=D9E27F175B26F25364756E2164756E21
+//# debugId=9FAE6AD52527D77864756E2164756E21