pg-boss 10.3.3 → 10.4.1

package/dist/worker.d.ts

@@ -0,0 +1,43 @@
+import type * as types from './types.ts';
+interface WorkerOptions<T> {
+    id: string;
+    name: string;
+    options: types.WorkOptions;
+    interval: number;
+    fetch: () => Promise<types.Job<T>[]>;
+    onFetch: (jobs: types.Job<T>[]) => Promise<void>;
+    onError: (err: any) => void;
+}
+declare class Worker<T = unknown> {
+    readonly id: string;
+    readonly name: string;
+    readonly options: types.WorkOptions;
+    readonly fetch: () => Promise<types.Job<T>[]>;
+    readonly onFetch: (jobs: types.Job<T>[]) => Promise<void>;
+    readonly onError: (err: any) => void;
+    readonly interval: number;
+    jobs: types.Job<T>[];
+    createdOn: number;
+    state: types.WorkerState;
+    lastFetchedOn: number | null;
+    lastJobStartedOn: number | null;
+    lastJobEndedOn: number | null;
+    lastJobDuration: number | null;
+    lastError: any;
+    lastErrorOn: number | null;
+    stopping: boolean;
+    stopped: boolean;
+    abortController: AbortController | null;
+    private loopDelayPromise;
+    private beenNotified;
+    private runPromise;
+    constructor({ id, name, options, interval, fetch, onFetch, onError }: WorkerOptions<T>);
+    start(): void;
+    private run;
+    notify(): void;
+    stop(): Promise<void>;
+    abort(): void;
+    toWipData(): types.WipData;
+}
+export default Worker;
+//# sourceMappingURL=worker.d.ts.map

package/dist/worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AASxC,UAAU,aAAa,CAAC,CAAC;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,KAAK,CAAC,WAAW,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACpC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChD,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;CAC5B;AAED,cAAM,MAAM,CAAC,CAAC,GAAG,OAAO;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC7C,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzD,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IAEzB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAK;IACzB,SAAS,SAAa;IACtB,KAAK,EAAE,KAAK,CAAC,WAAW,CAAwB;IAChD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAO;IACnC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAO;IACtC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAO;IACpC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAO;IACrC,SAAS,EAAE,GAAG,CAAO;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAO;IACjC,QAAQ,UAAQ;IAChB,OAAO,UAAQ;IACf,eAAe,EAAE,eAAe,GAAG,IAAI,CAAO;IAC9C,OAAO,CAAC,gBAAgB,CAAsC;IAC9D,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,UAAU,CAA6B;gBAElC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;IAUvF,KAAK;YAIS,GAAG;IAgDjB,MAAM;IAQA,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAW5B,KAAK,IAAK,IAAI;IAMd,SAAS,IAAK,KAAK,CAAC,OAAO;CAgB5B;AAED,eAAe,MAAM,CAAA"}

package/dist/worker.js

@@ -0,0 +1,113 @@
+import { delay } from "./tools.js";
+const WORKER_STATES = {
+    created: 'created',
+    active: 'active',
+    stopping: 'stopping',
+    stopped: 'stopped'
+};
+class Worker {
+    id;
+    name;
+    options;
+    fetch;
+    onFetch;
+    onError;
+    interval;
+    jobs = [];
+    createdOn = Date.now();
+    state = WORKER_STATES.created;
+    lastFetchedOn = null;
+    lastJobStartedOn = null;
+    lastJobEndedOn = null;
+    lastJobDuration = null;
+    lastError = null;
+    lastErrorOn = null;
+    stopping = false;
+    stopped = false;
+    abortController = null;
+    loopDelayPromise = null;
+    beenNotified = false;
+    runPromise = null;
+    constructor({ id, name, options, interval, fetch, onFetch, onError }) {
+        this.id = id;
+        this.name = name;
+        this.options = options;
+        this.fetch = fetch;
+        this.onFetch = onFetch;
+        this.onError = onError;
+        this.interval = interval;
+    }
+    start() {
+        this.runPromise = this.run();
+    }
+    async run() {
+        this.state = WORKER_STATES.active;
+        while (!this.stopping) {
+            const started = Date.now();
+            try {
+                this.beenNotified = false;
+                const jobs = await this.fetch();
+                this.lastFetchedOn = Date.now();
+                if (jobs) {
+                    this.jobs = jobs;
+                    this.lastJobStartedOn = this.lastFetchedOn;
+                    await this.onFetch(jobs);
+                    this.lastJobEndedOn = Date.now();
+                    this.jobs = [];
+                }
+            }
+            catch (err) {
+                this.lastErrorOn = Date.now();
+                this.lastError = err;
+                err.message = `${err.message} (Queue: ${this.name}, Worker: ${this.id})`;
+                this.onError(err);
+            }
+            const duration = Date.now() - started;
+            this.lastJobDuration = duration;
+            if (!this.stopping && !this.beenNotified && (this.interval - duration) > 100) {
+                this.loopDelayPromise = delay(this.interval - duration);
+                await this.loopDelayPromise;
+                this.loopDelayPromise = null;
+            }
+        }
+        this.stopping = false;
+        this.stopped = true;
+        this.state = WORKER_STATES.stopped;
+    }
+    notify() {
+        this.beenNotified = true;
+        if (this.loopDelayPromise) {
+            this.loopDelayPromise.abort();
+        }
+    }
+    async stop() {
+        this.stopping = true;
+        this.state = WORKER_STATES.stopping;
+        if (this.loopDelayPromise) {
+            this.loopDelayPromise.abort();
+        }
+        await this.runPromise;
+    }
+    abort() {
+        if (this.abortController && !this.abortController.signal.aborted) {
+            this.abortController.abort();
+        }
+    }
+    toWipData() {
+        return {
+            id: this.id,
+            name: this.name,
+            options: this.options,
+            state: this.state,
+            count: this.jobs.length,
+            createdOn: this.createdOn,
+            lastFetchedOn: this.lastFetchedOn,
+            lastJobStartedOn: this.lastJobStartedOn,
+            lastJobEndedOn: this.lastJobEndedOn,
+            lastError: this.lastError,
+            lastErrorOn: this.lastErrorOn,
+            lastJobDuration: this.lastJobDuration
+        };
+    }
+}
+export default Worker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-boss",
-  "version": "10.3.3",
+  "version": "10.4.1",
   "description": "Queueing jobs in Postgres from Node.js like a boss",
   "main": "./src/index.js",
   "engines": {

package/src/plans.js

@@ -506,7 +506,7 @@ function insertVersion (schema, version) {
 function fetchNextJob (schema) {
   return ({ includeMetadata, priority = true, ignoreStartAfter = false } = {}) => `
     WITH next as (
-      SELECT id
+      SELECT id, singleton_key, policy
       FROM ${schema}.job
       WHERE name = $1
         AND state < '${JOB_STATES.active}'
@@ -514,13 +514,28 @@ function fetchNextJob (schema) {
       ORDER BY ${priority ? 'priority desc, ' : ''}created_on, id
       LIMIT $2
       FOR UPDATE SKIP LOCKED
+    ), grouped as (
+      SELECT
+        n.id,
+        n.policy as grouped_policy,
+        row_number() OVER (
+          PARTITION BY CASE
+            WHEN $2 > 1 AND n.policy in ('${QUEUE_POLICIES.singleton}', '${QUEUE_POLICIES.stately}') THEN n.singleton_key -- gate singleton/stately by key per batch
+            ELSE n.id::text
+          END
+        ) as row_number
+      FROM next n
     )
     UPDATE ${schema}.job j SET
       state = '${JOB_STATES.active}',
       started_on = now(),
       retry_count = CASE WHEN started_on IS NOT NULL THEN retry_count + 1 ELSE retry_count END
-    FROM next
-    WHERE name = $1 AND j.id = next.id
+    FROM grouped
+    WHERE name = $1 AND j.id = grouped.id
+      AND (
+        (grouped.grouped_policy IN ('${QUEUE_POLICIES.singleton}', '${QUEUE_POLICIES.stately}') AND grouped.row_number = 1) -- only one per singleton key
+        OR COALESCE(grouped.grouped_policy, '') NOT IN ('${QUEUE_POLICIES.singleton}', '${QUEUE_POLICIES.stately}') -- other policies unaffected
+      )
     RETURNING j.${includeMetadata ? allJobColumns : baseJobColumns}
   `
 }
@@ -777,9 +792,9 @@ function insertJob (schema) {
       singleton_on,
       COALESCE(j.dead_letter, q.dead_letter) as dead_letter,
       CASE
-        WHEN expire_in IS NOT NULL THEN CAST(expire_in as interval)
+        WHEN expire_in IS NOT NULL THEN expire_in::numeric * interval '1s'
         WHEN q.expire_seconds IS NOT NULL THEN q.expire_seconds * interval '1s'
-        WHEN expire_in_default IS NOT NULL THEN CAST(expire_in_default as interval)
+        WHEN expire_in_default IS NOT NULL THEN expire_in_default::numeric * interval '1s'
         ELSE interval '15 minutes'
         END as expire_in,
       CASE
@@ -865,9 +880,9 @@ function insertJobs (schema) {
         END as singleton_on,
       COALESCE("deadLetter", q.dead_letter) as dead_letter,
       CASE
-        WHEN "expireInSeconds" IS NOT NULL THEN "expireInSeconds" *  interval '1s'
+        WHEN "expireInSeconds" IS NOT NULL THEN "expireInSeconds"::numeric * interval '1s'
         WHEN q.expire_seconds IS NOT NULL THEN q.expire_seconds * interval '1s'
-        WHEN defaults.expire_in IS NOT NULL THEN CAST(defaults.expire_in as interval)
+        WHEN defaults.expire_in IS NOT NULL THEN defaults.expire_in::numeric * interval '1s'
         ELSE interval '15 minutes'
         END as expire_in,
       CASE