@workglow/postgres 0.2.37 → 0.3.1

package/dist/job-queue/node.js

@@ -299,6 +299,42 @@ function postgresQueueMigrations(tableName, prefixes) {
             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')
+        `);
+      }
     }
   ];
 }
@@ -347,7 +383,7 @@ class PostgresQueueStorage {
     const now = new Date().toISOString();
     job.queue = this.queueName;
     job.job_run_id = job.job_run_id ?? uuid4();
-    job.fingerprint = await makeFingerprint(job.input);
+    job.fingerprint = job.fingerprint ?? await makeFingerprint(job.input);
     job.status = JobStatus2.PENDING;
     job.progress = 0;
     job.progress_message = "";
@@ -389,7 +425,22 @@ class PostgresQueueStorage {
       job.progress_message,
       job.progress_details ? JSON.stringify(job.progress_details) : null
     ];
-    const result = await this.db.query(sql, params);
+    let result;
+    try {
+      result = await this.db.query(sql, params);
+    } catch (err) {
+      const e = err;
+      const isUniqueViolation = e?.code === "23505";
+      const involvesFingerprint = typeof e?.constraint === "string" ? e.constraint.includes("fingerprint") : typeof e?.message === "string" ? e.message.includes("fingerprint") : false;
+      if (isUniqueViolation && involvesFingerprint && job.fingerprint) {
+        const winner = await this.findActiveByFingerprint(job.fingerprint, this.queueName);
+        if (winner?.id != null) {
+          job.id = winner.id;
+          return winner.id;
+        }
+      }
+      throw err;
+    }
     if (!result)
       throw new Error("Failed to add to queue");
     job.id = result.rows[0].id;
@@ -580,6 +631,8 @@ class PostgresQueueStorage {
     if ("progress_details" in fields) {
       push("progress_details", fields.progress_details != null ? JSON.stringify(fields.progress_details) : null);
     }
+    if ("visible_at" in fields)
+      push("visible_at", fields.visible_at ?? null);
     if (sets.length === 0)
       return;
     const idParam = nextParam;
@@ -668,6 +721,66 @@ class PostgresQueueStorage {
     const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(3);
     await this.db.query(`DELETE FROM ${this.tableName} WHERE id = $1 AND queue = $2${prefixConditions}`, [jobId, this.queueName, ...prefixParams]);
   }
+  async findActiveByFingerprint(fingerprint, queueName) {
+    const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(3);
+    const result = await this.db.query(`SELECT * FROM ${this.tableName}
+        WHERE fingerprint = $1 AND queue = $2
+          AND status IN ('PENDING','PROCESSING')${prefixConditions}
+        ORDER BY created_at DESC
+        LIMIT 1`, [fingerprint, queueName, ...prefixParams]);
+    if (!result || result.rows.length === 0)
+      return;
+    return result.rows[0];
+  }
+  async getMany(ids) {
+    if (ids.length === 0)
+      return [];
+    const numericIds = ids.map((id) => Number(id)).filter((n) => Number.isInteger(n) && n > 0);
+    if (numericIds.length === 0)
+      return ids.map(() => {
+        return;
+      });
+    const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(3);
+    const result = await this.db.query(`SELECT * FROM ${this.tableName}
+        WHERE id = ANY($1::int[]) AND queue = $2${prefixConditions}`, [numericIds, this.queueName, ...prefixParams]);
+    if (!result)
+      return ids.map(() => {
+        return;
+      });
+    const map = new Map;
+    for (const row of result.rows) {
+      map.set(Number(row.id), row);
+    }
+    return ids.map((id) => map.get(Number(id)));
+  }
+  async completeWithResult(id, result) {
+    const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(3);
+    await this.db.query(`UPDATE ${this.tableName}
+          SET output = $1,
+              status = 'COMPLETED',
+              progress = 100,
+              progress_message = '',
+              progress_details = NULL,
+              completed_at = NOW() AT TIME ZONE 'UTC'
+        WHERE id = $2 AND queue = $3${prefixConditions}`, [result != null ? JSON.stringify(result) : null, id, this.queueName, ...prefixParams]);
+  }
+  async failWithError(id, opts) {
+    const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(5);
+    await this.db.query(`UPDATE ${this.tableName}
+          SET error = COALESCE($1, error),
+              error_code = COALESCE($2, error_code),
+              abort_requested_at = CASE WHEN $3 THEN NOW() AT TIME ZONE 'UTC' ELSE abort_requested_at END,
+              status = 'FAILED',
+              completed_at = COALESCE(completed_at, NOW() AT TIME ZONE 'UTC')
+        WHERE id = $4 AND queue = $5${prefixConditions}`, [
+      "error" in opts ? opts.error ?? null : null,
+      "errorCode" in opts ? opts.errorCode ?? null : null,
+      opts.abortRequested === true,
+      id,
+      this.queueName,
+      ...prefixParams
+    ]);
+  }
   async deleteJobsByStatusAndAge(status, olderThanMs) {
     const cutoffDate = new Date(Date.now() - olderThanMs).toISOString();
     const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(4);
@@ -1229,6 +1342,36 @@ class PostgresJobStore {
   async saveStatus(id, status) {
     await this.core.saveStatus(id, status);
   }
+  async create(body, opts) {
+    const enriched = {
+      ...body,
+      fingerprint: opts.fingerprint ?? body.fingerprint,
+      job_run_id: opts.jobRunId ?? body.job_run_id,
+      max_attempts: opts.maxAttempts ?? body.max_attempts,
+      deadline_at: opts.timeoutSeconds != null ? new Date(Date.now() + opts.timeoutSeconds * 1000).toISOString() : body.deadline_at
+    };
+    return this.core.add(enriched);
+  }
+  async findActiveByFingerprint(fingerprint, queueName) {
+    return this.core.findActiveByFingerprint(fingerprint, queueName);
+  }
+  async getMany(ids) {
+    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 markEnqueueDeferred(id, opts) {
+    await this.core.finalize(id, {
+      visible_at: opts.visible_at.toISOString(),
+      error_code: opts.errorCode
+    });
+  }
 }
 // src/job-queue/createPostgresQueue.ts
 function createPostgresQueue(queueName, pool, opts) {
@@ -1253,4 +1396,4 @@ export {
   POSTGRES_QUEUE_STORAGE
 };
 
-//# debugId=A893F6ECCE25069B64756E2164756E21
+//# debugId=D9E27F175B26F25364756E2164756E21