pg-boss 11.0.3 → 11.0.5

package/package.json

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

package/src/manager.js

@@ -637,24 +637,24 @@ class Manager extends EventEmitter {
     const { table, partition } = await this.getQueueCache(name)
 
     if (partition) {
-      const sql = plans.deleteAllJobs(this.config.schema, table)
-      await this.db.executeSql(sql, [name])
-    } else {
       const sql = plans.truncateTable(this.config.schema, table)
       await this.db.executeSql(sql)
+    } else {
+      const sql = plans.deleteAllJobs(this.config.schema, table)
+      await this.db.executeSql(sql, [name])
     }
   }
 
   async getQueueStats (name) {
     Attorney.assertQueueName(name)
 
-    const { table } = await this.getQueueCache(name)
+    const queue = await this.getQueueCache(name)
 
-    const sql = plans.getQueueStats(this.config.schema, table, [name])
+    const sql = plans.getQueueStats(this.config.schema, queue.table, [name])
 
     const { rows } = await this.db.executeSql(sql)
 
-    return rows.at(0) || null
+    return Object.assign(queue, rows.at(0) || {})
   }
 
   async getJobById (name, id, options = {}) {
@@ -680,7 +680,9 @@ class Manager extends EventEmitter {
       return options.db
     }
 
-    assert(this.db._pgbdb && this.db.opened, 'Database connection is not opened')
+    if (this.db._pgbdb) {
+      assert(this.db.opened, 'Database connection is not opened')
+    }
 
     return this.db
   }

package/types.d.ts

@@ -17,7 +17,7 @@ declare namespace PgBoss {
     singleton: 'singleton',
     stately: 'stately'
   }
-  
+
   interface Db {
     executeSql(text: string, values: any[]): Promise<{ rows: any[] }>;
   }
@@ -59,7 +59,7 @@ declare namespace PgBoss {
   interface QueueOptions {
     expireInSeconds?: number;
     retentionSeconds?: number;
-    deleteAfterSeconds?: number;    
+    deleteAfterSeconds?: number;
     retryLimit?: number;
     retryDelay?: number;
     retryBackoff?: boolean;
@@ -97,7 +97,7 @@ declare namespace PgBoss {
     deferredCount: number;
     queuedCount: number;
     activeCount: number;
-    completedCount: number;
+    totalCount: number
     table: number;
     createdOn: Date;
     updatedOn: Date;
@@ -236,6 +236,9 @@ declare class PgBoss extends EventEmitter {
   on(event: "wip", handler: (data: PgBoss.Worker[]) => void): this;
   off(event: "wip", handler: (data: PgBoss.Worker[]) => void): this;
 
+  on(event: "stopped", handler: () => void): this;
+  off(event: "stopped", handler: () => void): this;
+
   start(): Promise<PgBoss>;
   stop(options?: PgBoss.StopOptions): Promise<void>;
 
@@ -297,16 +300,18 @@ declare class PgBoss extends EventEmitter {
 
   getJobById<T>(name: string, id: string, options?: PgBoss.ConnectionOptions): Promise<PgBoss.JobWithMetadata<T> | null>;
 
-  createQueue(name: string, options?: PgBoss.Queue): Promise<void>;
-  updateQueue(name: string, options?: PgBoss.Queue): Promise<void>;
+  createQueue(name: string, options?: Omit<PgBoss.Queue, 'name'>): Promise<void>;
+  createQueue(options: PgBoss.Queue): Promise<void>;
+  updateQueue(name: string, options?: Omit<PgBoss.Queue, 'name'>): Promise<void>;
+  updateQueue(options: PgBoss.Queue): Promise<void>;
   deleteQueue(name: string): Promise<void>;
   getQueues(): Promise<PgBoss.QueueResult[]>;
   getQueue(name: string): Promise<PgBoss.QueueResult | null>;
-  getQueueStats(name: string): Promise<number>;
+  getQueueStats(name: string): Promise<PgBoss.QueueResult>;
 
   supervise(name?: string): Promise<void>;
-  isInstalled(): Promise<Boolean>;
-  schemaVersion(): Promise<Number>;
+  isInstalled(): Promise<boolean>;
+  schemaVersion(): Promise<number>;
 
   schedule(name: string, cron: string, data?: object, options?: PgBoss.ScheduleOptions): Promise<void>;
   unschedule(name: string, key?: string): Promise<void>;