@constructive-io/knative-job-worker 1.1.1 → 2.0.1

package/esm/index.js

@@ -134,53 +134,54 @@ export default class Worker {
             }
         }
     }
-    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', () => {
+            if (this.doNextTimer) {
+                // Must be idle, do something!
+                this.doNext(client);
+            }
+        });
+        client.query('LISTEN "jobs:insert"');
+        client.on('error', (e) => {
             if (this.stopped) {
                 release();
                 return;
             }
-            this.listenClient = client;
-            this.listenRelease = release;
-            client.on('notification', () => {
-                if (this.doNextTimer) {
-                    // Must be idle, do something!
-                    this.doNext(client);
-                }
-            });
-            client.query('LISTEN "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 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 jobs...`);
+        this.doNext(client);
     }
     async stop() {
         this.stopped = true;

package/esm/req.js

@@ -1,4 +1,6 @@
-import requestLib from 'request';
+import http from 'node:http';
+import https from 'node:https';
+import { URL } from 'node:url';
 import { getCallbackBaseUrl, getJobGatewayConfig, getJobGatewayDevMap, getNodeEnvironment } from '@constructive-io/job-utils';
 import { Logger } from '@pgpmjs/logger';
 const log = new Logger('jobs:req');
@@ -26,30 +28,47 @@ const request = (fn, { body, databaseId, workerId, jobId }) => {
         databaseId
     });
     return new Promise((resolve, reject) => {
-        requestLib.post({
+        let parsed;
+        try {
+            parsed = new URL(url);
+        }
+        catch (e) {
+            return reject(e);
+        }
+        const isHttps = parsed.protocol === 'https:';
+        const client = isHttps ? https : http;
+        const payload = JSON.stringify(body);
+        const req = client.request({
+            hostname: parsed.hostname,
+            port: parsed.port || (isHttps ? 443 : 80),
+            path: parsed.pathname + parsed.search,
+            method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(payload),
                 // these are used by job-worker/job-fn
                 'X-Worker-Id': workerId,
-                'X-Job-Id': jobId,
+                'X-Job-Id': String(jobId),
                 'X-Database-Id': databaseId,
                 // async HTTP completion callback
                 'X-Callback-Url': completeUrl
-            },
-            url,
-            json: true,
-            body
-        }, function (error) {
-            if (error) {
-                log.error(`request error for job[${jobId}] fn[${fn}]`, error);
-                if (error instanceof Error && error.stack) {
-                    log.debug(error.stack);
-                }
-                return reject(error);
             }
-            log.debug(`request success for job[${jobId}] fn[${fn}]`);
-            return resolve(true);
+        }, (res) => {
+            res.on('data', () => { });
+            res.on('end', () => {
+                log.debug(`request success for job[${jobId}] fn[${fn}]`);
+                resolve(true);
+            });
         });
+        req.on('error', (error) => {
+            log.error(`request error for job[${jobId}] fn[${fn}]`, error);
+            if (error.stack) {
+                log.debug(error.stack);
+            }
+            reject(error);
+        });
+        req.write(payload);
+        req.end();
     });
 };
 export { request };

package/index.d.ts

@@ -39,7 +39,7 @@ export default class Worker {
     }): Promise<void>;
     doWork(job: JobRow): Promise<void>;
     doNext(client: PgClientLike): Promise<void>;
-    listen(): void;
+    listen(): Promise<void>;
     stop(): Promise<void>;
 }
 export { Worker };

package/index.js

@@ -173,53 +173,54 @@ class Worker {
             }
         }
     }
-    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', () => {
+            if (this.doNextTimer) {
+                // Must be idle, do something!
+                this.doNext(client);
             }
+        });
+        client.query('LISTEN "jobs:insert"');
+        client.on('error', (e) => {
             if (this.stopped) {
                 release();
                 return;
             }
-            this.listenClient = client;
-            this.listenRelease = release;
-            client.on('notification', () => {
-                if (this.doNextTimer) {
-                    // Must be idle, do something!
-                    this.doNext(client);
-                }
-            });
-            client.query('LISTEN "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 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 jobs...`);
+        this.doNext(client);
     }
     async stop() {
         this.stopped = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/knative-job-worker",
-  "version": "1.1.1",
+  "version": "2.0.1",
   "description": "knative job worker",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/jobs/tree/master/packages/knative-job-worker#readme",
@@ -37,18 +37,17 @@
     "url": "https://github.com/constructive-io/jobs/issues"
   },
   "dependencies": {
-    "@constructive-io/job-pg": "^1.1.0",
-    "@constructive-io/job-utils": "^1.1.0",
+    "@constructive-io/job-pg": "^2.0.0",
+    "@constructive-io/job-utils": "^2.0.0",
     "@pgpmjs/logger": "^2.1.0",
-    "pg": "8.17.1",
-    "request": "2.88.2"
+    "pg": "8.17.1"
   },
   "devDependencies": {
     "@pgpm/database-jobs": "^0.16.0",
     "@pgpm/verify": "^0.16.0",
-    "@pgpmjs/core": "^5.2.1",
+    "@pgpmjs/core": "^6.0.0",
     "makage": "^0.1.12",
-    "pgsql-test": "^3.1.1"
+    "pgsql-test": "^4.0.0"
   },
-  "gitHead": "49049ad3ddd762d35625f657cb42fa0862b829a0"
+  "gitHead": "c05d6bd3dfa36690aefe21079042666dfae801a1"
 }

package/req.js

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = void 0;
-const request_1 = __importDefault(require("request"));
+const node_http_1 = __importDefault(require("node:http"));
+const node_https_1 = __importDefault(require("node:https"));
+const node_url_1 = require("node:url");
 const job_utils_1 = require("@constructive-io/job-utils");
 const logger_1 = require("@pgpmjs/logger");
 const log = new logger_1.Logger('jobs:req');
@@ -32,30 +34,47 @@ const request = (fn, { body, databaseId, workerId, jobId }) => {
         databaseId
     });
     return new Promise((resolve, reject) => {
-        request_1.default.post({
+        let parsed;
+        try {
+            parsed = new node_url_1.URL(url);
+        }
+        catch (e) {
+            return reject(e);
+        }
+        const isHttps = parsed.protocol === 'https:';
+        const client = isHttps ? node_https_1.default : node_http_1.default;
+        const payload = JSON.stringify(body);
+        const req = client.request({
+            hostname: parsed.hostname,
+            port: parsed.port || (isHttps ? 443 : 80),
+            path: parsed.pathname + parsed.search,
+            method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(payload),
                 // these are used by job-worker/job-fn
                 'X-Worker-Id': workerId,
-                'X-Job-Id': jobId,
+                'X-Job-Id': String(jobId),
                 'X-Database-Id': databaseId,
                 // async HTTP completion callback
                 'X-Callback-Url': completeUrl
-            },
-            url,
-            json: true,
-            body
-        }, function (error) {
-            if (error) {
-                log.error(`request error for job[${jobId}] fn[${fn}]`, error);
-                if (error instanceof Error && error.stack) {
-                    log.debug(error.stack);
-                }
-                return reject(error);
             }
-            log.debug(`request success for job[${jobId}] fn[${fn}]`);
-            return resolve(true);
+        }, (res) => {
+            res.on('data', () => { });
+            res.on('end', () => {
+                log.debug(`request success for job[${jobId}] fn[${fn}]`);
+                resolve(true);
+            });
         });
+        req.on('error', (error) => {
+            log.error(`request error for job[${jobId}] fn[${fn}]`, error);
+            if (error.stack) {
+                log.debug(error.stack);
+            }
+            reject(error);
+        });
+        req.write(payload);
+        req.end();
     });
 };
 exports.request = request;