pg-boss 11.1.0 → 11.1.2

package/README.md

@@ -82,9 +82,9 @@ To run the test suite, linter and code coverage:
 npm run cover
 ```
 
-The test suite will try and create a new database named pgboss. The [config.json](https://github.com/timgit/pg-boss/test/config.json) file has the default credentials to connect to postgres.
+The test suite will try and create a new database named pgboss. The [config.json](https://github.com/timgit/pg-boss/blob/master/test/config.json) file has the default credentials to connect to postgres.
 
-The [Docker Compose](https://github.com/timgit/pg-boss/docker-compose.yaml) file can be used to start a local postgres instance for testing:
+The [Docker Compose](https://github.com/timgit/pg-boss/blob/master/docker-compose.yaml) file can be used to start a local postgres instance for testing:
 
 ```bash
 docker compose up

package/package.json

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

package/src/boss.js

@@ -1,5 +1,6 @@
 const EventEmitter = require('node:events')
 const plans = require('./plans')
+const { unwrapSQLResult } = require('./tools')
 
 const events = {
   error: 'error',
@@ -58,7 +59,7 @@ class Boss extends EventEmitter {
   async #executeSql (sql, values) {
     const started = Date.now()
 
-    const result = await this.#db.executeSql(sql, values)
+    const result = unwrapSQLResult(await this.#db.executeSql(sql, values))
 
     const ended = Date.now()
 
@@ -130,10 +131,8 @@ class Boss extends EventEmitter {
       const queues = rows.map(q => q.name)
 
       const cacheStatsSql = plans.cacheQueueStats(this.#config.schema, table, queues)
-      const results = await this.#executeSql(cacheStatsSql)
-
-      const inter = results.flatMap(i => i.rows)
-      const warnings = inter.filter(i => i.queuedCount > (i.warningQueueSize || WARNINGS.LARGE_QUEUE.size))
+      const { rows: rowsCacheStats } = await this.#executeSql(cacheStatsSql)
+      const warnings = rowsCacheStats.filter(i => i.queuedCount > (i.warningQueueSize || WARNINGS.LARGE_QUEUE.size))
 
       for (const warning of warnings) {
         this.emit(events.warning, { message: WARNINGS.LARGE_QUEUE.mesasge, data: warning })

package/src/timekeeper.js

@@ -136,7 +136,7 @@ class Timekeeper extends EventEmitter {
 
     const scheduled = schedules
       .filter(i => this.shouldSendIt(i.cron, i.timezone))
-      .map(({ name, data, options }) => ({ data: { name, data, options }, singletonKey: name, singletonSeconds: 60 }))
+      .map(({ name, key, data, options }) => ({ data: { name, data, options }, singletonKey: `${name}__${key}`, singletonSeconds: 60 }))
 
     if (scheduled.length > 0 && !this.stopped) {
       await this.manager.insert(QUEUES.SEND_IT, scheduled)

package/src/tools.js

@@ -2,7 +2,22 @@ const { setTimeout } = require('node:timers/promises')
 
 module.exports = {
   delay,
-  resolveWithinSeconds
+  resolveWithinSeconds,
+  unwrapSQLResult
+}
+
+/**
+ * When sql contains multiple queries, result is an array of objects with rows property
+ * This function unwraps the result into a single object with rows property
+ * @param {{rows: Array<Object>} | Array<{rows: Array<Object>}>} result
+ * @returns {{rows: Array<Object>}}
+*/
+function unwrapSQLResult (result) {
+  if (result instanceof Array) {
+    return { rows: result.flatMap(i => i.rows) }
+  }
+
+  return result
 }
 
 function delay (ms, error) {

package/docker-compose.yaml

@@ -1,15 +0,0 @@
-services:
-  db:
-    image: postgres:18
-    ports:
-      - 5432:5432
-    volumes:
-      - db_volume:/var/lib/postgresql/data18
-    environment:
-      - POSTGRES_DB=pgboss
-      - POSTGRES_NAME=pgboss
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-
-volumes:
-  db_volume: