@nmakarov/cli-toolkit 0.37.0 → 0.40.0

package/dist/cli-runner.cjs

@@ -3263,23 +3263,90 @@ var Db = class _Db {
     }
     this.queriesLog = [];
     this.knexInstance.queriesLog = this.queriesLog;
-    this.knexInstance.on("query", (query) => {
-      query.__startTime = process.hrtime();
-    });
-    this.knexInstance.on("query-response", (_response, query) => {
-      const [seconds, nanoseconds] = process.hrtime(query.__startTime);
-      const executionTimeMs = (seconds * 1e3 + nanoseconds / 1e6).toFixed(2);
+    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();
+    };
+    const isTimeoutError = (error) => error?.name === "KnexTimeoutError" || /query timeout|timeout exceeded/i.test(String(error?.message ?? ""));
+    const logQueryEntry = (query, start, { error } = {}) => {
+      let executionTimeMs;
+      if (start) {
+        const [seconds, nanoseconds] = process.hrtime(start);
+        executionTimeMs = (seconds * 1e3 + nanoseconds / 1e6).toFixed(2);
+      } else if (error?.timeout != null) {
+        executionTimeMs = Number(error.timeout).toFixed(2);
+      } else {
+        executionTimeMs = "?";
+      }
+      let status = "ok";
+      if (error) {
+        status = isTimeoutError(error) ? "timeout" : "error";
+      }
       const logEntry = {
-        sql: query.sql,
-        bindings: query.bindings || [],
-        executionTimeMs
+        sql: query?.sql,
+        bindings: query?.bindings || [],
+        executionTimeMs,
+        status
       };
+      if (error) {
+        logEntry.error = error.message ?? String(error);
+      }
       this.queriesLog.push(logEntry);
-      this.logger.debug?.(`[Db] Query: ${query.sql} | Duration: ${executionTimeMs}ms`);
+      const suffix = error ? ` | ${status}: ${logEntry.error}` : "";
+      this.logger.debug?.(
+        `[Db] Query: ${query?.sql} | Duration: ${executionTimeMs}ms${suffix}`
+      );
+    };
+    const handleQueryError = (error, query) => {
+      const start = popStart(query);
+      logQueryEntry(query, start, { error });
+      this.logger.error?.(`[Db] Query failed: ${query?.sql}`, error);
+    };
+    this.knexInstance.on("query", (query) => {
+      pushStart(query);
+    });
+    this.knexInstance.on("query-response", (_response, query) => {
+      const start = popStart(query);
+      if (!start) {
+        return;
+      }
+      logQueryEntry(query, start);
     });
     this.knexInstance.on("query-error", (error, query) => {
-      this.logger.error?.(`[Db] Query failed: ${query.sql}`, error);
+      handleQueryError(error, query);
     });
+    const hookBuilder = (builder) => {
+      if (!builder || builder.__dbProfilerHooked) {
+        return;
+      }
+      builder.__dbProfilerHooked = true;
+      builder.on("query", pushStart);
+      builder.on("query-error", handleQueryError);
+    };
+    const client = this.knexInstance.client;
+    if (client && !client.__dbProfilerPatched) {
+      client.__dbProfilerPatched = true;
+      if (typeof client.queryBuilder === "function") {
+        const origQueryBuilder = client.queryBuilder.bind(client);
+        client.queryBuilder = (...args) => {
+          const builder = origQueryBuilder(...args);
+          hookBuilder(builder);
+          return builder;
+        };
+      }
+    }
   }
   getQueryLog() {
     return [...this.queriesLog];