@nmakarov/cli-toolkit 0.37.0 → 0.39.0

package/dist/index.js

@@ -3920,11 +3920,31 @@ var Db = class _Db {
     }
     this.queriesLog = [];
     this.knexInstance.queriesLog = this.queriesLog;
+    const startsByConnection = /* @__PURE__ */ new Map();
+    const pushStart = (query) => {
+      const uid = query?.__knexUid ?? "";
+      if (!startsByConnection.has(uid)) {
+        startsByConnection.set(uid, []);
+      }
+      startsByConnection.get(uid).push(process.hrtime());
+    };
+    const popStart = (query) => {
+      const uid = query?.__knexUid ?? "";
+      const stack = startsByConnection.get(uid);
+      if (!stack?.length) {
+        return null;
+      }
+      return stack.pop();
+    };
     this.knexInstance.on("query", (query) => {
-      query.__startTime = process.hrtime();
+      pushStart(query);
     });
     this.knexInstance.on("query-response", (_response, query) => {
-      const [seconds, nanoseconds] = process.hrtime(query.__startTime);
+      const start = popStart(query);
+      if (!start) {
+        return;
+      }
+      const [seconds, nanoseconds] = process.hrtime(start);
       const executionTimeMs = (seconds * 1e3 + nanoseconds / 1e6).toFixed(2);
       const logEntry = {
         sql: query.sql,
@@ -3935,6 +3955,7 @@ var Db = class _Db {
       this.logger.debug?.(`[Db] Query: ${query.sql} | Duration: ${executionTimeMs}ms`);
     });
     this.knexInstance.on("query-error", (error, query) => {
+      popStart(query);
       this.logger.error?.(`[Db] Query failed: ${query.sql}`, error);
     });
   }