Merge pull request #544 from keymanapp/feat/service-state

fix: handle https timeout by rejecting the promise

Author: mcdurdin

server/util/DataChangeTimingManager.ts

@@ -14,7 +14,7 @@ export class DataChangeTimingManager {
 
     if (this.started[id] || lastRunDelta < minInterval) {
       if(this.started[id]) {
-        consoleLog('timing', id, `Data change is still underway (started at ${this.formatDate(this.started[id])}); waiting ${minInterval} milliseconds`);
+        consoleLog('timing', id, `Data change has been underway for ${(new Date()).valueOf() - this.started[id].valueOf()} msec (started at ${this.formatDate(this.started[id])}); waiting ${minInterval} milliseconds`);
       } else {
         consoleLog('timing', id, `Data change was only ${lastRunDelta} msec ago (finished at ${this.formatDate(this.lastRun[id])}); waiting ${minInterval} milliseconds`);
       }

server/util/httppost.ts

@@ -24,16 +24,22 @@ export default function httppost(hostname, path, headers, data) {
       const req = https.request(options, res => {
         if(res.statusCode != 200) {
           consoleError('http-post', hostname, `statusCode for ${hostname}${path}: ${res.statusCode} ${res.statusMessage}`);
+          if(timeoutId) {
+            clearTimeout(timeoutId);
+          }
           reject(`statusCode for ${hostname}${path}: ${res.statusCode} ${res.statusMessage}`);
           return;
         }
 
         res.on('data', d => {
           chunk += d;
-          });
+        });
 
         res.on('end', () => {
           //console.log(chunk);
+          if(timeoutId) {
+            clearTimeout(timeoutId);
+          }
           resolve(chunk);
         });
       });
@@ -43,10 +49,16 @@ export default function httppost(hostname, path, headers, data) {
         reject(error);
       });
 
-      req.setTimeout(180000, () => {
+      const timeoutId = setTimeout(() => {
         consoleError('http-post', hostname, `timeout after 3 minutes on ${hostname}${path}`);
-        req.destroy();
-      })
+        req?.destroy();
+        reject(`timeout after 3 minutes on ${hostname}${path}`);
+      }, 180000);
+
+      // req.setTimeout(180000, () => {
+      //   consoleError('http-post', hostname, `timeout after 3 minutes on ${hostname}${path}`);
+      //   req.destroy();
+      // })
 
       req.write(data);
       req.end();