@nsshunt/stsinstrumentmanagerclient 1.0.13 → 1.0.15

package/dist/index.cjs

@@ -149,10 +149,8 @@ class RequestLoggerMiddleware extends stsutils.STSOptionsBase {
       "UpdateInstrument_AR_DEC"
       /* UpdateInstrument_AR_DEC */
     );
-    let timeInMs = 0;
-    const end = process.hrtime(start);
-    timeInMs = (end[0] * 1e9 + end[1]) / 1e6;
-    timeInMs = parseFloat(timeInMs.toFixed(4));
+    const end = performance.now() - start;
+    const timeInMs = parseFloat(end.toFixed(4));
     this.#tinyEmitter.emit("UpdateInstrument_DH_VAL", timeInMs);
     this.#tinyEmitter.emit("UpdateInstrument_D_VAL", timeInMs);
     console.log(`-->>ZZZ: ${timeInMs}`);
@@ -171,9 +169,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 = process.hrtime();
+    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 */
@@ -188,12 +192,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();
   };