pg-boss 12.5.1 → 12.5.2

package/dist/boss.d.ts

@@ -10,7 +10,7 @@ declare class Boss extends EventEmitter implements types.EventsMixin {
     constructor(db: types.IDatabase, manager: Manager, config: types.ResolvedConstructorOptions);
     start(): Promise<void>;
     stop(): Promise<void>;
-    supervise(value?: string | types.QueueResult): Promise<void>;
+    supervise(value?: string | types.QueueResult[]): Promise<void>;
 }
 export default Boss;
 //# sourceMappingURL=boss.d.ts.map

package/dist/boss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"boss.d.ts","sourceRoot":"","sources":["../src/boss.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAYnC,cAAM,IAAK,SAAQ,YAAa,YAAW,KAAK,CAAC,WAAW;;IAQ1D,MAAM;;;MAAS;gBAGb,EAAE,EAAE,KAAK,CAAC,SAAS,EACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,CAAC,0BAA0B;IAkBpC,KAAK;IAUL,IAAI;IAiDJ,SAAS,CAAE,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW;CAwEpD;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"boss.d.ts","sourceRoot":"","sources":["../src/boss.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAYnC,cAAM,IAAK,SAAQ,YAAa,YAAW,KAAK,CAAC,WAAW;;IAQ1D,MAAM;;;MAAS;gBAGb,EAAE,EAAE,KAAK,CAAC,SAAS,EACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,CAAC,0BAA0B;IAkBpC,KAAK;IAUL,IAAI;IAiEJ,SAAS,CAAE,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW,EAAE;CAwEtD;AAED,eAAe,IAAI,CAAA"}

package/dist/boss.js

@@ -44,16 +44,28 @@ class Boss extends EventEmitter {
             this.#stopped = true;
         }
     }
-    async #executeSql(sql, values) {
+    async #executeSql(sql) {
         const started = Date.now();
-        const result = unwrapSQLResult(await this.#db.executeSql(sql, values));
-        const ended = Date.now();
-        const elapsed = (ended - started) / 1000;
+        const result = unwrapSQLResult(await this.#db.executeSql(sql));
+        const elapsed = (Date.now() - started) / 1000;
         if (elapsed > WARNINGS.SLOW_QUERY.seconds ||
             this.#config.__test__warn_slow_query) {
             this.emit(events.warning, {
                 message: WARNINGS.SLOW_QUERY.message,
-                data: { elapsed, sql, values },
+                data: { elapsed, sql },
+            });
+        }
+        return result;
+    }
+    async #executeQuery(query) {
+        const started = Date.now();
+        const result = unwrapSQLResult(await this.#db.executeSql(query.text, query.values));
+        const elapsed = (Date.now() - started) / 1000;
+        if (elapsed > WARNINGS.SLOW_QUERY.seconds ||
+            this.#config.__test__warn_slow_query) {
+            this.emit(events.warning, {
+                message: WARNINGS.SLOW_QUERY.message,
+                data: { elapsed, sql: query.text, values: query.values },
             });
         }
         return result;
@@ -69,9 +81,7 @@ class Boss extends EventEmitter {
             }
             this.#maintaining = true;
             const queues = await this.#manager.getQueues();
-            for (const queue of queues) {
-                !this.#stopped && (await this.supervise(queue));
-            }
+            !this.#stopped && (await this.supervise(queues));
         }
         catch (err) {
             this.emit(events.error, err);
@@ -82,8 +92,8 @@ class Boss extends EventEmitter {
     }
     async supervise(value) {
         let queues;
-        if (typeof value === 'object') {
-            queues = [value];
+        if (Array.isArray(value)) {
+            queues = value;
         }
         else {
             queues = await this.#manager.getQueues(value);
@@ -106,7 +116,7 @@ class Boss extends EventEmitter {
     }
     async #monitor(table, names) {
         const command = plans.trySetQueueMonitorTime(this.#config.schema, names, this.#config.monitorIntervalSeconds);
-        const { rows } = await this.#executeSql(command);
+        const { rows } = await this.#executeQuery(command);
         if (rows.length) {
             const queues = rows.map((q) => q.name);
             const cacheStatsSql = plans.cacheQueueStats(this.#config.schema, table, queues);
@@ -124,7 +134,7 @@ class Boss extends EventEmitter {
     }
     async #maintain(table, names) {
         const command = plans.trySetQueueDeletionTime(this.#config.schema, names, this.#config.maintenanceIntervalSeconds);
-        const { rows } = await this.#executeSql(command);
+        const { rows } = await this.#executeQuery(command);
         if (rows.length) {
             const queues = rows.map((q) => q.name);
             const sql = plans.deletion(this.#config.schema, table, queues);

package/dist/manager.js

@@ -340,10 +340,10 @@ class Manager extends EventEmitter {
             limit: options.batchSize || 1,
             ignoreSingletons: singletonsActive
         };
-        const sql = plans.fetchNextJob(fetchOptions);
+        const query = plans.fetchNextJob(fetchOptions);
         let result;
         try {
-            result = await db.executeSql(sql);
+            result = await db.executeSql(query.text, query.values);
         }
         catch (err) {
             // errors from fetchquery should only be unique constraint violations
@@ -448,8 +448,8 @@ class Manager extends EventEmitter {
                 Attorney.assertQueueName(name);
             }
         }
-        const sql = plans.getQueues(this.config.schema, names);
-        const { rows } = await this.db.executeSql(sql);
+        const query = plans.getQueues(this.config.schema, names);
+        const { rows } = await this.db.executeSql(query.text, query.values);
         return rows;
     }
     async updateQueue(name, options = {}) {
@@ -472,8 +472,8 @@ class Manager extends EventEmitter {
     }
     async getQueue(name) {
         Attorney.assertQueueName(name);
-        const sql = plans.getQueues(this.config.schema, [name]);
-        const { rows } = await this.db.executeSql(sql);
+        const query = plans.getQueues(this.config.schema, [name]);
+        const { rows } = await this.db.executeSql(query.text, query.values);
         return rows[0] || null;
     }
     async deleteQueue(name) {
@@ -517,8 +517,8 @@ class Manager extends EventEmitter {
     async getQueueStats(name) {
         Attorney.assertQueueName(name);
         const queue = await this.getQueueCache(name);
-        const sql = plans.getQueueStats(this.config.schema, queue.table, [name]);
-        const { rows } = await this.db.executeSql(sql);
+        const query = plans.getQueueStats(this.config.schema, queue.table, [name]);
+        const { rows } = await this.db.executeSql(query.text, query.values);
         return Object.assign(queue, rows.at(0) || {});
     }
     async getJobById(name, id, options = {}) {

package/dist/plans.d.ts

@@ -1,4 +1,8 @@
 import type { UpdateQueueOptions } from './types.ts';
+export interface SqlQuery {
+    text: string;
+    values: unknown[];
+}
 declare const DEFAULT_SCHEMA = "pgboss";
 declare const MIGRATE_RACE_MESSAGE = "division by zero";
 declare const CREATE_RACE_MESSAGE = "already exists";
@@ -22,11 +26,11 @@ declare function create(schema: string, version: number, options?: {
 }): string;
 declare function createQueue(schema: string, name: string, options: unknown): string;
 declare function deleteQueue(schema: string, name: string): string;
-declare function trySetQueueMonitorTime(schema: string, queues: string[], seconds: number): string;
-declare function trySetQueueDeletionTime(schema: string, queues: string[], seconds: number): string;
+declare function trySetQueueMonitorTime(schema: string, queues: string[], seconds: number): SqlQuery;
+declare function trySetQueueDeletionTime(schema: string, queues: string[], seconds: number): SqlQuery;
 declare function trySetCronTime(schema: string, seconds: number): string;
 declare function updateQueue(schema: string, { deadLetter }?: UpdateQueueOptions): string;
-declare function getQueues(schema: string, names?: string[]): string;
+declare function getQueues(schema: string, names?: string[]): SqlQuery;
 declare function deleteJobsById(schema: string, table: string): string;
 declare function deleteQueuedJobs(schema: string, table: string): string;
 declare function deleteStoredJobs(schema: string, table: string): string;
@@ -55,7 +59,7 @@ interface FetchJobOptions {
     ignoreStartAfter?: boolean;
     ignoreSingletons: string[] | null;
 }
-declare function fetchNextJob({ schema, table, name, policy, limit, includeMetadata, priority, ignoreStartAfter, ignoreSingletons }: FetchJobOptions): string;
+declare function fetchNextJob({ schema, table, name, policy, limit, includeMetadata, priority, ignoreStartAfter, ignoreSingletons }: FetchJobOptions): SqlQuery;
 declare function completeJobs(schema: string, table: string): string;
 declare function cancelJobs(schema: string, table: string): string;
 declare function resumeJobs(schema: string, table: string): string;
@@ -69,7 +73,7 @@ declare function failJobsById(schema: string, table: string): string;
 declare function failJobsByTimeout(schema: string, table: string, queues: string[]): string;
 declare function deletion(schema: string, table: string, queues: string[]): string;
 declare function retryJobs(schema: string, table: string): string;
-declare function getQueueStats(schema: string, table: string, queues: string[]): string;
+declare function getQueueStats(schema: string, table: string, queues: string[]): SqlQuery;
 declare function cacheQueueStats(schema: string, table: string, queues: string[]): string;
 declare function locked(schema: string, query: string | string[], key?: string): string;
 declare function assertMigration(schema: string, version: number): string;

package/dist/plans.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plans.d.ts","sourceRoot":"","sources":["../src/plans.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plans.d.ts","sourceRoot":"","sources":["../src/plans.ts"],"names":[],"mappings":"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"}

package/dist/plans.js

@@ -1,6 +1,7 @@
 const DEFAULT_SCHEMA = 'pgboss';
 const MIGRATE_RACE_MESSAGE = 'division by zero';
 const CREATE_RACE_MESSAGE = 'already exists';
+const SINGLE_QUOTE_REGEX = /'/g;
 const FIFTEEN_MINUTES = 60 * 15;
 const FORTEEN_DAYS = 60 * 60 * 24 * 14;
 const SEVEN_DAYS = 60 * 60 * 24 * 7;
@@ -357,13 +358,16 @@ function trySetTimestamp(schema, column, seconds) {
   `;
 }
 function trySetQueueTimestamp(schema, queues, column, seconds) {
-    return `
+    return {
+        text: `
     UPDATE ${schema}.queue
     SET ${column} = now()
-    WHERE name IN(${getQueueInClause(queues)})
+    WHERE name = ANY($1::text[])
       AND EXTRACT( EPOCH FROM (now() - COALESCE(${column}, now() - interval '1 week') ) ) > ${seconds}
-    RETURNING name    
-  `;
+    RETURNING name
+  `,
+        values: [queues]
+    };
 }
 function updateQueue(schema, { deadLetter } = {}) {
     return `
@@ -388,8 +392,10 @@ function updateQueue(schema, { deadLetter } = {}) {
   `;
 }
 function getQueues(schema, names) {
-    return `
-    SELECT 
+    const hasNames = names && names.length > 0;
+    return {
+        text: `
+    SELECT
       q.name,
       q.policy,
       q.retry_limit as "retryLimit",
@@ -411,8 +417,10 @@ function getQueues(schema, names) {
       q.created_on as "createdOn",
       q.updated_on as "updatedOn"
     FROM ${schema}.queue q
-    ${names ? `WHERE q.name IN (${names.map(i => `'${i}'`)})` : ''}
-   `;
+    ${hasNames ? 'WHERE q.name = ANY($1::text[])' : ''}
+   `,
+        values: hasNames ? [names] : []
+    };
 }
 function deleteJobsById(schema, table) {
     return `
@@ -502,14 +510,16 @@ function insertVersion(schema, version) {
 function fetchNextJob({ schema, table, name, policy, limit, includeMetadata, priority = true, ignoreStartAfter = false, ignoreSingletons = null }) {
     const singletonFetch = limit > 1 && (policy === QUEUE_POLICIES.singleton || policy === QUEUE_POLICIES.stately);
     const cte = singletonFetch ? 'grouped' : 'next';
-    return `
+    const hasIgnoreSingletons = ignoreSingletons != null && ignoreSingletons.length > 0;
+    return {
+        text: `
     WITH next as (
       SELECT id ${singletonFetch ? ', singleton_key' : ''}
       FROM ${schema}.${table}
       WHERE name = '${name}'
         AND state < '${JOB_STATES.active}'
         ${ignoreStartAfter ? '' : 'AND start_after < now()'}
-        ${ignoreSingletons != null && ignoreSingletons?.length > 0 ? `AND singleton_key NOT IN (${ignoreSingletons.map(i => `'${i}'`).join()})` : ''}
+        ${hasIgnoreSingletons ? 'AND singleton_key <> ALL($1::text[])' : ''}
       ORDER BY ${priority ? 'priority desc, ' : ''}created_on, id
       LIMIT ${limit}
       FOR UPDATE SKIP LOCKED
@@ -522,8 +532,10 @@ function fetchNextJob({ schema, table, name, policy, limit, includeMetadata, pri
     FROM ${cte}
     WHERE name = '${name}' AND j.id = ${cte}.id
       ${singletonFetch ? ` AND ${cte}.row_number = 1` : ''}
-    RETURNING j.${includeMetadata ? JOB_COLUMNS_ALL : JOB_COLUMNS_MIN}      
-  `;
+    RETURNING j.${includeMetadata ? JOB_COLUMNS_ALL : JOB_COLUMNS_MIN}
+  `,
+        values: hasIgnoreSingletons ? [ignoreSingletons] : []
+    };
 }
 function completeJobs(schema, table) {
     return `
@@ -645,7 +657,7 @@ function failJobsById(schema, table) {
 function failJobsByTimeout(schema, table, queues) {
     const where = `state = '${JOB_STATES.active}'
             AND (started_on + expire_seconds * interval '1s') < now()
-            AND name IN (${getQueueInClause(queues)})`;
+            AND name = ANY(${serializeArrayParam(queues)})`;
     const output = '\'{ "value": { "message": "job timed out" } }\'::jsonb';
     return locked(schema, failJobs(schema, table, where, output), table + 'failJobsByTimeout');
 }
@@ -798,13 +810,13 @@ function failJobs(schema, table, where, output) {
 function deletion(schema, table, queues) {
     const sql = `
     DELETE FROM ${schema}.${table}
-    WHERE name IN (${getQueueInClause(queues)})
+    WHERE name = ANY(${serializeArrayParam(queues)})
       AND
       (
         completed_on + deletion_seconds * interval '1s' < now()
         OR
         (state < '${JOB_STATES.active}' AND keep_until < now())
-      )        
+      )
   `;
     return locked(schema, sql, table + 'deletion');
 }
@@ -823,22 +835,28 @@ function retryJobs(schema, table) {
   `;
 }
 function getQueueStats(schema, table, queues) {
-    return `
+    return {
+        text: `
     SELECT
-        name, 
+        name,
         (count(*) FILTER (WHERE start_after > now()))::int as "deferredCount",
         (count(*) FILTER (WHERE state < '${JOB_STATES.active}'))::int as "queuedCount",
         (count(*) FILTER (WHERE state = '${JOB_STATES.active}'))::int as "activeCount",
         count(*)::int as "totalCount",
         array_agg(singleton_key) FILTER (WHERE policy IN ('${QUEUE_POLICIES.singleton}','${QUEUE_POLICIES.stately}') AND state = '${JOB_STATES.active}') as "singletonsActive"
       FROM ${schema}.${table}
-      WHERE name IN (${getQueueInClause(queues)})
+      WHERE name = ANY($1::text[])
       GROUP BY 1
-  `;
+  `,
+        values: [queues]
+    };
 }
 function cacheQueueStats(schema, table, queues) {
+    const statsQuery = getQueueStats(schema, table, queues);
+    // Serialize the $1 parameter for use in locked() multi-statement query
+    const statsText = statsQuery.text.replace('$1::text[]', serializeArrayParam(queues));
     const sql = `
-    WITH stats AS (${getQueueStats(schema, table, queues)})
+    WITH stats AS (${statsText})
     UPDATE ${schema}.queue SET
       deferred_count = "deferredCount",
       queued_count = "queuedCount",
@@ -854,16 +872,19 @@ function cacheQueueStats(schema, table, queues) {
   `;
     return locked(schema, sql, 'queue-stats');
 }
+// Serialize a string array for embedding directly in SQL as PostgreSQL array literal
+function serializeArrayParam(values) {
+    const escaped = values.map(v => `'${v.replace(SINGLE_QUOTE_REGEX, "''")}'`);
+    return `ARRAY[${escaped.join(',')}]::text[]`;
+}
 function locked(schema, query, key) {
-    if (Array.isArray(query)) {
-        query = query.join(';\n');
-    }
+    const sql = Array.isArray(query) ? query.join(';\n') : query;
     return `
     BEGIN;
     SET LOCAL lock_timeout = 30000;
     SET LOCAL idle_in_transaction_session_timeout = 30000;
     ${advisoryLock(schema, key)};
-    ${query};
+    ${sql};
     COMMIT;
   `;
 }
@@ -879,7 +900,4 @@ function assertMigration(schema, version) {
 function getJobById(schema, table) {
     return `SELECT ${JOB_COLUMNS_ALL} FROM ${schema}.${table} WHERE name = $1 AND id = $2`;
 }
-function getQueueInClause(queues) {
-    return queues.map(i => `'${i}'`).join(',');
-}
 export { create, insertVersion, getVersion, setVersion, versionTableExists, fetchNextJob, completeJobs, cancelJobs, resumeJobs, retryJobs, deleteJobsById, deleteAllJobs, deleteQueuedJobs, deleteStoredJobs, truncateTable, failJobsById, failJobsByTimeout, insertJobs, getTime, getSchedules, getSchedulesByQueue, schedule, unschedule, subscribe, unsubscribe, getQueuesForEvent, deletion, cacheQueueStats, updateQueue, createQueue, deleteQueue, getQueues, getQueueStats, trySetQueueMonitorTime, trySetQueueDeletionTime, trySetCronTime, locked, assertMigration, getJobById, QUEUE_POLICIES, JOB_STATES, MIGRATE_RACE_MESSAGE, CREATE_RACE_MESSAGE, DEFAULT_SCHEMA, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-boss",
-  "version": "12.5.1",
+  "version": "12.5.2",
   "description": "Queueing jobs in Postgres from Node.js like a boss",
   "type": "module",
   "main": "./dist/index.js",