@constructive-io/job-scheduler 2.0.0 → 2.0.1

package/esm/index.js

@@ -147,54 +147,55 @@ export default class Scheduler {
             }
         }
     }
-    listen() {
+    async listen() {
         if (this.stopped)
             return;
-        const listenForChanges = (err, client, release) => {
-            if (err) {
-                log.error('Error connecting with notify listener', err);
-                if (err instanceof Error && err.stack) {
-                    log.debug(err.stack);
-                }
-                // Try again in 5 seconds
-                // should this really be done in the node process?
-                if (!this.stopped) {
-                    setTimeout(this.listen, 5000);
-                }
-                return;
+        let client;
+        let release;
+        try {
+            client = await this.pgPool.connect();
+            release = () => client.release();
+        }
+        catch (err) {
+            log.error('Error connecting with notify listener', err);
+            if (err instanceof Error && err.stack) {
+                log.debug(err.stack);
+            }
+            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) {
+                // Must be idle, do something!
+                this.doNext(client);
             }
+        });
+        client.query('LISTEN "scheduled_jobs:insert"');
+        client.on('error', (e) => {
             if (this.stopped) {
                 release();
                 return;
             }
-            this.listenClient = client;
-            this.listenRelease = release;
-            client.on('notification', () => {
-                log.info('a NEW scheduled JOB!');
-                if (this.doNextTimer) {
-                    // Must be idle, do something!
-                    this.doNext(client);
-                }
-            });
-            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();
-                if (!this.stopped) {
-                    this.listen();
-                }
-            });
-            log.info(`${this.workerId} connected and looking for scheduled jobs...`);
-            this.doNext(client);
-        };
-        this.pgPool.connect(listenForChanges);
+            log.error('Error with database notify listener', e);
+            if (e instanceof Error && e.stack) {
+                log.debug(e.stack);
+            }
+            release();
+            if (!this.stopped) {
+                this.listen();
+            }
+        });
+        log.info(`${this.workerId} connected and looking for scheduled jobs...`);
+        this.doNext(client);
     }
     async stop() {
         this.stopped = true;

package/index.d.ts

@@ -42,7 +42,7 @@ export default class Scheduler {
     }): Promise<void>;
     scheduleJob(client: PgClientLike, job: ScheduledJobRow): Promise<void>;
     doNext(client: PgClientLike): Promise<void>;
-    listen(): void;
+    listen(): Promise<void>;
     stop(): Promise<void>;
 }
 export { Scheduler };

package/index.js

@@ -186,54 +186,55 @@ class Scheduler {
             }
         }
     }
-    listen() {
+    async listen() {
         if (this.stopped)
             return;
-        const listenForChanges = (err, client, release) => {
-            if (err) {
-                log.error('Error connecting with notify listener', err);
-                if (err instanceof Error && err.stack) {
-                    log.debug(err.stack);
-                }
-                // Try again in 5 seconds
-                // should this really be done in the node process?
-                if (!this.stopped) {
-                    setTimeout(this.listen, 5000);
-                }
-                return;
+        let client;
+        let release;
+        try {
+            client = await this.pgPool.connect();
+            release = () => client.release();
+        }
+        catch (err) {
+            log.error('Error connecting with notify listener', err);
+            if (err instanceof Error && err.stack) {
+                log.debug(err.stack);
+            }
+            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) {
+                // Must be idle, do something!
+                this.doNext(client);
             }
+        });
+        client.query('LISTEN "scheduled_jobs:insert"');
+        client.on('error', (e) => {
             if (this.stopped) {
                 release();
                 return;
             }
-            this.listenClient = client;
-            this.listenRelease = release;
-            client.on('notification', () => {
-                log.info('a NEW scheduled JOB!');
-                if (this.doNextTimer) {
-                    // Must be idle, do something!
-                    this.doNext(client);
-                }
-            });
-            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();
-                if (!this.stopped) {
-                    this.listen();
-                }
-            });
-            log.info(`${this.workerId} connected and looking for scheduled jobs...`);
-            this.doNext(client);
-        };
-        this.pgPool.connect(listenForChanges);
+            log.error('Error with database notify listener', e);
+            if (e instanceof Error && e.stack) {
+                log.debug(e.stack);
+            }
+            release();
+            if (!this.stopped) {
+                this.listen();
+            }
+        });
+        log.info(`${this.workerId} connected and looking for scheduled jobs...`);
+        this.doNext(client);
     }
     async stop() {
         this.stopped = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/job-scheduler",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "job scheduler",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-scheduler#readme",
@@ -39,7 +39,7 @@
     "@constructive-io/job-pg": "^2.0.0",
     "@constructive-io/job-utils": "^2.0.0",
     "@pgpmjs/logger": "^2.1.0",
-    "node-schedule": "1.3.2"
+    "node-schedule": "^2.1.1"
   },
-  "gitHead": "b2daeefe49cdefb3d01ea63cf778fb9b847ab5fe"
+  "gitHead": "c05d6bd3dfa36690aefe21079042666dfae801a1"
 }