@nsshunt/stsinstrumentmanagerclient 1.0.14 → 1.0.16

package/dist/index.cjs

@@ -153,7 +153,6 @@ class RequestLoggerMiddleware extends stsutils.STSOptionsBase {
     const timeInMs = parseFloat(end.toFixed(4));
     this.#tinyEmitter.emit("UpdateInstrument_DH_VAL", timeInMs);
     this.#tinyEmitter.emit("UpdateInstrument_D_VAL", timeInMs);
-    console.log(`-->>ZZZ: ${timeInMs}`);
   };
   // https://stackoverflow.com/questions/18031839/how-to-use-process-hrtime-to-get-execution-time-of-async-function/18031945
   /**
@@ -169,9 +168,15 @@ class RequestLoggerMiddleware extends stsutils.STSOptionsBase {
   */
   Middleware = async (req, res, next) => {
     if (this.options.ignoresocketio && req.originalUrl.includes("socket.io")) {
-      return;
+      return next();
     }
     const start = performance.now();
+    let completed = false;
+    const completeOnce = () => {
+      if (completed) return;
+      completed = true;
+      this.#RequestCompleted(start);
+    };
     this.#tinyEmitter.emit(
       "UpdateInstrument_AR_INC"
       /* UpdateInstrument_AR_INC */
@@ -186,12 +191,13 @@ class RequestLoggerMiddleware extends stsutils.STSOptionsBase {
     );
     req.on("aborted", () => {
     });
-    req.on("close", () => {
-      this.#RequestCompleted(start);
-    });
     req.on("end", () => {
     });
+    res.on("close", () => {
+      completeOnce();
+    });
     res.on("finish", () => {
+      completeOnce();
     });
     next();
   };