@constructive-io/job-scheduler 0.3.22 → 0.4.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.4.0](https://github.com/constructive-io/jobs/compare/@constructive-io/job-scheduler@0.3.23...@constructive-io/job-scheduler@0.4.0) (2026-01-18)
+
+**Note:** Version bump only for package @constructive-io/job-scheduler
+
+## [0.3.23](https://github.com/constructive-io/jobs/compare/@constructive-io/job-scheduler@0.3.22...@constructive-io/job-scheduler@0.3.23) (2026-01-18)
+
+**Note:** Version bump only for package @constructive-io/job-scheduler
+
 ## [0.3.22](https://github.com/constructive-io/jobs/compare/@constructive-io/job-scheduler@0.3.21...@constructive-io/job-scheduler@0.3.22) (2026-01-09)
 
 **Note:** Version bump only for package @constructive-io/job-scheduler

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import type { PgClientLike } from '@constructive-io/job-utils';
-import type { Pool } from 'pg';
+import type { Pool, PoolClient } from 'pg';
 export interface ScheduledJobRow {
     id: number | string;
     task_identifier: string;
@@ -16,6 +16,9 @@ export default class Scheduler {
     pgPool: Pool;
     jobs: Record<ScheduledJobRow['id'], SchedulerJobHandle>;
     _initialized?: boolean;
+    listenClient?: PoolClient;
+    listenRelease?: () => void;
+    stopped?: boolean;
     constructor({ tasks, idleDelay, pgPool, workerId }: {
         tasks: string[];
         idleDelay?: number;
@@ -40,5 +43,6 @@ export default class Scheduler {
     scheduleJob(client: PgClientLike, job: ScheduledJobRow): Promise<void>;
     doNext(client: PgClientLike): Promise<void>;
     listen(): void;
+    stop(): Promise<void>;
 }
 export { Scheduler };

package/dist/index.js

@@ -50,6 +50,9 @@ class Scheduler {
     pgPool;
     jobs;
     _initialized;
+    listenClient;
+    listenRelease;
+    stopped;
     constructor({ tasks, idleDelay = 15000, pgPool = job_pg_1.default.getPool(), workerId = 'scheduler-0' }) {
         /*
          * idleDelay: This is how long to wait between polling for jobs.
@@ -128,6 +131,8 @@ class Scheduler {
         this.jobs[id] = j;
     }
     async doNext(client) {
+        if (this.stopped)
+            return;
         if (!this._initialized) {
             return await this.initialize(client);
         }
@@ -143,7 +148,9 @@ class Scheduler {
                     : this.supportedTaskNames
             });
             if (!job || !job.id) {
-                this.doNextTimer = setTimeout(() => this.doNext(client), this.idleDelay);
+                if (!this.stopped) {
+                    this.doNextTimer = setTimeout(() => this.doNext(client), this.idleDelay);
+                }
                 return;
             }
             const start = process.hrtime();
@@ -168,13 +175,20 @@ class Scheduler {
             catch (fatalError) {
                 await this.handleFatalError(client, { err, fatalError, jobId });
             }
-            return this.doNext(client);
+            if (!this.stopped) {
+                return this.doNext(client);
+            }
+            return;
         }
         catch (err) {
-            this.doNextTimer = setTimeout(() => this.doNext(client), this.idleDelay);
+            if (!this.stopped) {
+                this.doNextTimer = setTimeout(() => this.doNext(client), this.idleDelay);
+            }
         }
     }
     listen() {
+        if (this.stopped)
+            return;
         const listenForChanges = (err, client, release) => {
             if (err) {
                 log.error('Error connecting with notify listener', err);
@@ -183,9 +197,17 @@ class Scheduler {
                 }
                 // Try again in 5 seconds
                 // should this really be done in the node process?
-                setTimeout(this.listen, 5000);
+                if (!this.stopped) {
+                    setTimeout(this.listen, 5000);
+                }
+                return;
+            }
+            if (this.stopped) {
+                release();
                 return;
             }
+            this.listenClient = client;
+            this.listenRelease = release;
             client.on('notification', () => {
                 log.info('a NEW scheduled JOB!');
                 if (this.doNextTimer) {
@@ -195,18 +217,48 @@ class Scheduler {
             });
             client.query('LISTEN "scheduled_jobs:insert"');
             client.on('error', (e) => {
+                if (this.stopped) {
+                    release();
+                    return;
+                }
                 log.error('Error with database notify listener', e);
                 if (e instanceof Error && e.stack) {
                     log.debug(e.stack);
                 }
                 release();
-                this.listen();
+                if (!this.stopped) {
+                    this.listen();
+                }
             });
             log.info(`${this.workerId} connected and looking for scheduled jobs...`);
             this.doNext(client);
         };
         this.pgPool.connect(listenForChanges);
     }
+    async stop() {
+        this.stopped = true;
+        if (this.doNextTimer) {
+            clearTimeout(this.doNextTimer);
+            this.doNextTimer = undefined;
+        }
+        Object.values(this.jobs).forEach((job) => job.cancel());
+        this.jobs = {};
+        const client = this.listenClient;
+        const release = this.listenRelease;
+        this.listenClient = undefined;
+        this.listenRelease = undefined;
+        if (client && release) {
+            client.removeAllListeners('notification');
+            client.removeAllListeners('error');
+            try {
+                await client.query('UNLISTEN "scheduled_jobs:insert"');
+            }
+            catch {
+                // Ignore listener cleanup errors during shutdown.
+            }
+            release();
+        }
+    }
 }
 exports.default = Scheduler;
 exports.Scheduler = Scheduler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/job-scheduler",
-  "version": "0.3.22",
+  "version": "0.4.0",
   "description": "job scheduler",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-scheduler#readme",
@@ -28,10 +28,10 @@
     "url": "https://github.com/constructive-io/jobs/issues"
   },
   "dependencies": {
-    "@constructive-io/job-pg": "^0.3.20",
-    "@constructive-io/job-utils": "^0.5.15",
-    "@pgpmjs/logger": "^1.3.7",
+    "@constructive-io/job-pg": "^0.4.0",
+    "@constructive-io/job-utils": "^0.6.0",
+    "@pgpmjs/logger": "^1.4.0",
     "node-schedule": "1.3.2"
   },
-  "gitHead": "cb4af2cf6c23dad24cd951c232d3e2006b81aa3d"
+  "gitHead": "481b3a50b4eec2da6b376c4cd1868065e1e28edb"
 }

package/src/index.ts

@@ -25,6 +25,9 @@ export default class Scheduler {
   pgPool: Pool;
   jobs: Record<ScheduledJobRow['id'], SchedulerJobHandle>;
   _initialized?: boolean;
+  listenClient?: PoolClient;
+  listenRelease?: () => void;
+  stopped?: boolean;
 
   constructor({
     tasks,
@@ -135,6 +138,7 @@ export default class Scheduler {
     this.jobs[id] = j as SchedulerJobHandle;
   }
   async doNext(client: PgClientLike): Promise<void> {
+    if (this.stopped) return;
     if (!this._initialized) {
       return await this.initialize(client);
     }
@@ -151,10 +155,12 @@ export default class Scheduler {
           : this.supportedTaskNames
       });
       if (!job || !job.id) {
-        this.doNextTimer = setTimeout(
-          () => this.doNext(client),
-          this.idleDelay
-        );
+        if (!this.stopped) {
+          this.doNextTimer = setTimeout(
+            () => this.doNext(client),
+            this.idleDelay
+          );
+        }
         return;
       }
       const start = process.hrtime();
@@ -180,12 +186,21 @@ export default class Scheduler {
       } catch (fatalError: unknown) {
         await this.handleFatalError(client, { err, fatalError, jobId });
       }
-      return this.doNext(client);
+      if (!this.stopped) {
+        return this.doNext(client);
+      }
+      return;
     } catch (err: unknown) {
-      this.doNextTimer = setTimeout(() => this.doNext(client), this.idleDelay);
+      if (!this.stopped) {
+        this.doNextTimer = setTimeout(
+          () => this.doNext(client),
+          this.idleDelay
+        );
+      }
     }
   }
   listen() {
+    if (this.stopped) return;
     const listenForChanges = (
       err: Error | null,
       client: PoolClient,
@@ -198,9 +213,17 @@ export default class Scheduler {
         }
         // Try again in 5 seconds
         // should this really be done in the node process?
-        setTimeout(this.listen, 5000);
+        if (!this.stopped) {
+          setTimeout(this.listen, 5000);
+        }
+        return;
+      }
+      if (this.stopped) {
+        release();
         return;
       }
+      this.listenClient = client;
+      this.listenRelease = release;
       client.on('notification', () => {
         log.info('a NEW scheduled JOB!');
         if (this.doNextTimer) {
@@ -210,12 +233,18 @@ export default class Scheduler {
       });
       client.query('LISTEN "scheduled_jobs:insert"');
       client.on('error', (e: unknown) => {
+        if (this.stopped) {
+          release();
+          return;
+        }
         log.error('Error with database notify listener', e);
         if (e instanceof Error && e.stack) {
           log.debug(e.stack);
         }
         release();
-        this.listen();
+        if (!this.stopped) {
+          this.listen();
+        }
       });
       log.info(
         `${this.workerId} connected and looking for scheduled jobs...`
@@ -224,6 +253,32 @@ export default class Scheduler {
     };
     this.pgPool.connect(listenForChanges);
   }
+
+  async stop(): Promise<void> {
+    this.stopped = true;
+    if (this.doNextTimer) {
+      clearTimeout(this.doNextTimer);
+      this.doNextTimer = undefined;
+    }
+    Object.values(this.jobs).forEach((job) => job.cancel());
+    this.jobs = {};
+
+    const client = this.listenClient;
+    const release = this.listenRelease;
+    this.listenClient = undefined;
+    this.listenRelease = undefined;
+
+    if (client && release) {
+      client.removeAllListeners('notification');
+      client.removeAllListeners('error');
+      try {
+        await client.query('UNLISTEN "scheduled_jobs:insert"');
+      } catch {
+        // Ignore listener cleanup errors during shutdown.
+      }
+      release();
+    }
+  }
 }
 
 export { Scheduler };