pg-boss 8.4.0 → 8.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-boss",
-  "version": "8.4.0",
+  "version": "8.4.2",
   "description": "Queueing jobs in Node.js using PostgreSQL like a boss",
   "main": "./src/index.js",
   "engines": {

package/src/attorney.js

@@ -387,6 +387,14 @@ function applyMonitoringConfig (config) {
     ('cronMonitorIntervalSeconds' in config)
       ? config.cronMonitorIntervalSeconds
       : 60
+
+  assert(!('cronWorkerIntervalSeconds' in config) || (config.cronWorkerIntervalSeconds >= 1 && config.cronWorkerIntervalSeconds <= 60),
+    'configuration assert: cronWorkerIntervalSeconds must be between 1 and 60 seconds')
+
+  config.cronWorkerIntervalSeconds =
+    ('cronWorkerIntervalSeconds' in config)
+      ? config.cronWorkerIntervalSeconds
+      : 4
 }
 
 function applyUuidConfig (config) {

package/src/boss.js

@@ -78,11 +78,19 @@ class Boss extends EventEmitter {
 
   metaMonitor () {
     this.metaMonitorInterval = setInterval(async () => {
-      const { secondsAgo } = await this.getMaintenanceTime()
-
-      if (secondsAgo > this.maintenanceIntervalSeconds * 2) {
-        await this.manager.deleteQueue(queues.MAINTENANCE, { before: states.completed })
-        await this.maintenanceAsync()
+      try {
+        if (this.config.__test__throw_meta_monitor) {
+          throw new Error(this.config.__test__throw_meta_monitor)
+        }
+
+        const { secondsAgo } = await this.getMaintenanceTime()
+
+        if (secondsAgo > this.maintenanceIntervalSeconds * 2) {
+          await this.manager.deleteQueue(queues.MAINTENANCE, { before: states.completed })
+          await this.maintenanceAsync()
+        }
+      } catch (err) {
+        this.emit(events.error, err)
       }
     }, this.maintenanceIntervalSeconds * 2 * 1000)
   }
@@ -116,7 +124,7 @@ class Boss extends EventEmitter {
   async onMaintenance (job) {
     try {
       if (this.config.__test__throw_maint) {
-        throw new Error('__test__throw_maint')
+        throw new Error(this.config.__test__throw_maint)
       }
 
       const started = Date.now()
@@ -143,7 +151,7 @@ class Boss extends EventEmitter {
   async onMonitorStates (job) {
     try {
       if (this.config.__test__throw_monitor) {
-        throw new Error('__test__throw_monitor')
+        throw new Error(this.config.__test__throw_monitor)
       }
 
       const states = await this.countStates()
@@ -161,7 +169,7 @@ class Boss extends EventEmitter {
 
   async stop () {
     if (this.config.__test__throw_stop) {
-      throw new Error('__test__throw_stop')
+      throw new Error(this.config.__test__throw_stop)
     }
 
     if (!this.stopped) {

package/src/manager.js

@@ -341,7 +341,7 @@ class Manager extends EventEmitter {
   }
 
   async sendOnce (name, data, options, key) {
-    options = options || {}
+    options = options ? { ...options } : {}
 
     options.singletonKey = key || name
 
@@ -351,7 +351,7 @@ class Manager extends EventEmitter {
   }
 
   async sendSingleton (name, data, options) {
-    options = options || {}
+    options = options ? { ...options } : {}
 
     options.singletonKey = SINGLETON_QUEUE_KEY
 
@@ -361,7 +361,7 @@ class Manager extends EventEmitter {
   }
 
   async sendAfter (name, data, options, after) {
-    options = options || {}
+    options = options ? { ...options } : {}
     options.startAfter = after
 
     const result = Attorney.checkSendArgs([name, data, options], this.config)
@@ -370,7 +370,7 @@ class Manager extends EventEmitter {
   }
 
   async sendThrottled (name, data, options, seconds, key) {
-    options = options || {}
+    options = options ? { ...options } : {}
     options.singletonSeconds = seconds
     options.singletonNextSlot = false
     options.singletonKey = key
@@ -381,7 +381,7 @@ class Manager extends EventEmitter {
   }
 
   async sendDebounced (name, data, options, seconds, key) {
-    options = options || {}
+    options = options ? { ...options } : {}
     options.singletonSeconds = seconds
     options.singletonNextSlot = true
     options.singletonKey = key

package/src/timekeeper.js

@@ -52,8 +52,8 @@ class Timekeeper extends EventEmitter {
     // cache the clock skew from the db server
     await this.cacheClockSkew()
 
-    await this.manager.work(queues.CRON, { newJobCheckIntervalSeconds: 4 }, (job) => this.onCron(job))
-    await this.manager.work(queues.SEND_IT, { newJobCheckIntervalSeconds: 4, teamSize: 50, teamConcurrency: 5 }, (job) => this.onSendIt(job))
+    await this.manager.work(queues.CRON, { newJobCheckIntervalSeconds: this.config.cronWorkerIntervalSeconds }, (job) => this.onCron(job))
+    await this.manager.work(queues.SEND_IT, { newJobCheckIntervalSeconds: this.config.cronWorkerIntervalSeconds, teamSize: 50, teamConcurrency: 5 }, (job) => this.onSendIt(job))
 
     // uses sendDebounced() to enqueue a cron check
     await this.checkSchedulesAsync()
@@ -88,29 +88,47 @@ class Timekeeper extends EventEmitter {
   }
 
   async monitorCron () {
-    const { secondsAgo } = await this.getCronTime()
+    try {
+      if (this.config.__test__force_cron_monitoring_error) {
+        throw new Error(this.config.__test__force_cron_monitoring_error)
+      }
 
-    if (secondsAgo > 60) {
-      await this.checkSchedulesAsync()
+      const { secondsAgo } = await this.getCronTime()
+
+      if (secondsAgo > 60) {
+        await this.checkSchedulesAsync()
+      }
+    } catch (err) {
+      this.emit(this.events.error, err)
     }
   }
 
   async cacheClockSkew () {
-    const { rows } = await this.db.executeSql(this.getTimeCommand)
+    let skew = 0
+
+    try {
+      if (this.config.__test__force_clock_monitoring_error) {
+        throw new Error(this.config.__test__force_clock_monitoring_error)
+      }
 
-    const local = Date.now()
+      const { rows } = await this.db.executeSql(this.getTimeCommand)
 
-    const dbTime = parseFloat(rows[0].time)
+      const local = Date.now()
 
-    const skew = dbTime - local
+      const dbTime = parseFloat(rows[0].time)
 
-    const skewSeconds = Math.abs(skew) / 1000
+      skew = dbTime - local
 
-    if (skewSeconds >= 60 || this.config.__test__force_clock_skew_warning) {
-      Attorney.warnClockSkew(`Instance clock is ${skewSeconds}s ${skew > 0 ? 'slower' : 'faster'} than database.`)
-    }
+      const skewSeconds = Math.abs(skew) / 1000
 
-    this.clockSkew = skew
+      if (skewSeconds >= 60 || this.config.__test__force_clock_skew_warning) {
+        Attorney.warnClockSkew(`Instance clock is ${skewSeconds}s ${skew > 0 ? 'slower' : 'faster'} than database.`)
+      }
+    } catch (err) {
+      this.emit(this.events.error, err)
+    } finally {
+      this.clockSkew = skew
+    }
   }
 
   async checkSchedulesAsync () {
@@ -128,7 +146,7 @@ class Timekeeper extends EventEmitter {
 
     try {
       if (this.config.__test__throw_clock_monitoring) {
-        throw new Error('clock monitoring error')
+        throw new Error(this.config.__test__throw_clock_monitoring)
       }
 
       const items = await this.getSchedules()