pg-boss 8.1.0 → 8.2.0

package/README.md

@@ -88,7 +88,7 @@ CREATE EXTENSION pgcrypto;
 
 If you use a different database name, username or password, or want to run the test suite against a database that is running on a remote machine then you will need to edit the `test/config.json` file with the appropriate connection values.
 
-You can then run the linter and test suite using:
+You can then run the linter and test suite using
 
 ```bash
 npm test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-boss",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "description": "Queueing jobs in Node.js using PostgreSQL like a boss",
   "main": "./src/index.js",
   "engines": {
@@ -10,9 +10,9 @@
     "cron-parser": "^4.0.0",
     "delay": "^5.0.0",
     "lodash.debounce": "^4.0.8",
-    "p-map": "^5.3.0",
+    "p-map": "^4.0.0",
     "pg": "^8.5.1",
-    "serialize-error": "^11.0.0",
+    "serialize-error": "^8.1.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {

package/src/index.js

@@ -90,8 +90,6 @@ class PgBoss extends EventEmitter {
   }
 
   async start () {
-    const { serializeError } = await import('serialize-error')
-
     if (!this.stopped) {
       return this
     }
@@ -106,7 +104,7 @@ class PgBoss extends EventEmitter {
 
     this.started = true
 
-    this.manager.start({ stringify: serializeError })
+    this.manager.start()
 
     if (!this.config.noSupervisor) {
       await this.boss.supervise()

package/src/manager.js

@@ -3,9 +3,10 @@ const EventEmitter = require('events')
 const delay = require('delay')
 const uuid = require('uuid')
 const debounce = require('lodash.debounce')
-
+const { serializeError: stringify } = require('serialize-error')
 const Attorney = require('./attorney')
 const Worker = require('./worker')
+const pMap = require('p-map')
 
 const { QUEUES: BOSS_QUEUES } = require('./boss')
 const { QUEUES: TIMEKEEPER_QUEUES } = require('./timekeeper')
@@ -44,8 +45,6 @@ class Manager extends EventEmitter {
   constructor (db, config) {
     super()
 
-    this.stringify = null
-
     this.config = config
     this.db = db
 
@@ -98,8 +97,7 @@ class Manager extends EventEmitter {
     this.emitWipThrottled = debounce(() => this.emit(events.wip, this.getWipData()), WIP_EVENT_INTERVAL, WIP_DEBOUNCE_OPTIONS)
   }
 
-  start ({ stringify }) {
-    this.stringify = stringify
+  start () {
     this.stopping = false
   }
 
@@ -213,8 +211,6 @@ class Manager extends EventEmitter {
     const fetch = () => this.fetch(name, batchSize || (teamSize - queueSize), { includeMetadata })
 
     const onFetch = async (jobs) => {
-      const { default: pMap } = await import('p-map')
-
       if (this.config.__test__throw_worker) {
         throw new Error('__test__throw_worker')
       }
@@ -524,7 +520,7 @@ class Manager extends EventEmitter {
       ? data
       : { value: data }
 
-    return this.stringify(result)
+    return stringify(result)
   }
 
   mapCompletionResponse (ids, result) {

package/src/timekeeper.js

@@ -2,6 +2,7 @@ const EventEmitter = require('events')
 const plans = require('./plans')
 const cronParser = require('cron-parser')
 const Attorney = require('./attorney')
+const pMap = require('p-map')
 
 const queues = {
   CRON: '__pgboss__cron',
@@ -125,8 +126,6 @@ class Timekeeper extends EventEmitter {
   async onCron () {
     if (this.stopped) return
 
-    const { default: pMap } = await import('p-map')
-
     try {
       if (this.config.__test__throw_clock_monitoring) {
         throw new Error('clock monitoring error')

package/types.d.ts

@@ -48,14 +48,14 @@ declare namespace PgBoss {
 
   type ConstructorOptions =
     DatabaseOptions
-      & QueueOptions
-      & SchedulingOptions
-      & MaintenanceOptions
-      & ExpirationOptions
-      & RetentionOptions
-      & RetryOptions
-      & JobPollingOptions
-      & CompletionOptions
+    & QueueOptions
+    & SchedulingOptions
+    & MaintenanceOptions
+    & ExpirationOptions
+    & RetentionOptions
+    & RetryOptions
+    & JobPollingOptions
+    & CompletionOptions
 
   interface CompletionOptions {
     onComplete?: boolean;
@@ -341,22 +341,22 @@ declare class PgBoss extends EventEmitter {
   fetchCompleted<T>(name: string, batchSize: number, options: PgBoss.FetchOptions & { includeMetadata: true }): Promise<PgBoss.JobWithMetadata<T>[] | null>;
   fetchCompleted<T>(name: string, batchSize: number, options: PgBoss.FetchOptions): Promise<PgBoss.Job<T>[] | null>;
 
-  cancel(id: string, options: PgBoss.ConnectionOptions): Promise<void>;
-  cancel(ids: string[], options: PgBoss.ConnectionOptions): Promise<void>;
+  cancel(id: string, options?: PgBoss.ConnectionOptions): Promise<void>;
+  cancel(ids: string[], options?: PgBoss.ConnectionOptions): Promise<void>;
 
-  resume(id: string, options: PgBoss.ConnectionOptions): Promise<void>;
-  resume(ids: string[], options: PgBoss.ConnectionOptions): Promise<void>;
+  resume(id: string, options?: PgBoss.ConnectionOptions): Promise<void>;
+  resume(ids: string[], options?: PgBoss.ConnectionOptions): Promise<void>;
 
-  complete(id: string, options: PgBoss.ConnectionOptions): Promise<void>;
-  complete(id: string, data: object, options: PgBoss.ConnectionOptions): Promise<void>;
-  complete(ids: string[], options: PgBoss.ConnectionOptions): Promise<void>;
+  complete(id: string, options?: PgBoss.ConnectionOptions): Promise<void>;
+  complete(id: string, data: object, options?: PgBoss.ConnectionOptions): Promise<void>;
+  complete(ids: string[], options?: PgBoss.ConnectionOptions): Promise<void>;
 
-  fail(id: string, options: PgBoss.ConnectionOptions): Promise<void>;
-  fail(id: string, data: object, options: PgBoss.ConnectionOptions): Promise<void>;
-  fail(ids: string[], options: PgBoss.ConnectionOptions): Promise<void>;
+  fail(id: string, options?: PgBoss.ConnectionOptions): Promise<void>;
+  fail(id: string, data: object, options?: PgBoss.ConnectionOptions): Promise<void>;
+  fail(ids: string[], options?: PgBoss.ConnectionOptions): Promise<void>;
 
   getQueueSize(name: string, options?: object): Promise<number>;
-  getJobById(id: string, options: PgBoss.ConnectionOptions): Promise<PgBoss.JobWithMetadata | null>;
+  getJobById(id: string, options?: PgBoss.ConnectionOptions): Promise<PgBoss.JobWithMetadata | null>;
 
   deleteQueue(name: string): Promise<void>;
   deleteAllQueues(): Promise<void>;