@angelitosystems/nest-devtools 1.0.11 → 1.0.13

package/dist/index.js

@@ -923,10 +923,20 @@ var DatabaseInstrumentation = class {
   attach() {
     const cleanup = [];
     if (!this.config.capture.database) return () => cleanup.forEach((fn) => fn());
-    if (this.tryAttachTypeOrm()) cleanup.push(this.detachTypeOrm());
-    if (this.tryAttachPrisma()) cleanup.push(this.detachPrisma());
-    if (this.tryAttachMongoose()) cleanup.push(this.detachMongoose());
-    return () => cleanup.forEach((fn) => fn());
+    let disposed = false;
+    queueMicrotask(() => {
+      if (disposed) return;
+      try {
+        if (this.tryAttachTypeOrm()) cleanup.push(this.detachTypeOrm());
+        if (this.tryAttachPrisma()) cleanup.push(this.detachPrisma());
+        if (this.tryAttachMongoose()) cleanup.push(this.detachMongoose());
+      } catch {
+      }
+    });
+    return () => {
+      disposed = true;
+      cleanup.splice(0).forEach((fn) => fn());
+    };
   }
   tryAttachTypeOrm() {
     try {
@@ -1019,6 +1029,12 @@ var DatabaseInstrumentation = class {
         });
         return true;
       }
+      if (typeof prisma.$on === "function") {
+        prisma.$on("query", (event) => {
+          this.endQuery(event.query ?? "prisma.query", event.params ? [event.params] : [], event.duration ?? 0);
+        });
+        return true;
+      }
       const original = prisma.$queryRaw ?? prisma.$executeRaw ?? null;
       if (!original) return false;
       const wrapped = (query, parameters) => {
@@ -1162,7 +1178,7 @@ var DatabaseInstrumentation = class {
   }
   resolveTypeOrmDataSource(app) {
     try {
-      const dataSource = this.findProvider(app, (value) => typeof value?.query === "function" && typeof value?.manager === "object");
+      const dataSource = this.findProvider(app, /data.?source|typeorm/i, (value) => typeof value?.query === "function" && typeof value?.manager === "object");
       if (dataSource) return dataSource;
       return null;
     } catch {
@@ -1171,8 +1187,12 @@ var DatabaseInstrumentation = class {
   }
   resolvePrismaClient(app) {
     try {
-      const prisma = this.safeGet(app, "PrismaService") ?? this.safeGet(app, "PrismaClient") ?? this.safeGet(app, "prisma") ?? this.findProvider(app, (value) => typeof value?.$queryRaw === "function");
-      if (prisma && typeof prisma.$queryRaw === "function") return prisma;
+      const prisma = this.findProvider(
+        app,
+        /prisma/i,
+        (value) => typeof value?.$queryRaw === "function" && typeof value?.$connect === "function" && typeof value?.$disconnect === "function"
+      );
+      if (prisma && typeof prisma.$queryRaw === "function" && typeof prisma.$connect === "function") return prisma;
       return null;
     } catch {
       return null;
@@ -1180,27 +1200,25 @@ var DatabaseInstrumentation = class {
   }
   resolveMongoose(app) {
     try {
-      const mongoose = this.safeGet(app, "MongooseService") ?? this.safeGet(app, "Mongoose") ?? this.safeGet(app, "mongoose") ?? this.findProvider(app, (value) => typeof value?.plugin === "function");
+      const mongoose = this.findProvider(app, /mongoose/i, (value) => typeof value?.plugin === "function");
       if (mongoose && typeof mongoose.plugin === "function") return mongoose;
       return null;
     } catch {
       return null;
     }
   }
-  safeGet(app, token) {
-    try {
-      return app?.get?.(token, { strict: false }) ?? null;
-    } catch {
-      return null;
-    }
-  }
-  findProvider(app, predicate) {
+  findProvider(app, namePattern, predicate) {
     try {
       const modules = app?.container?.getModules?.() ?? /* @__PURE__ */ new Map();
       for (const module of modules.values()) {
-        for (const wrapper of module.providers?.values?.() ?? []) {
-          const instance = wrapper?.instance;
-          if (instance && predicate(instance)) return instance;
+        for (const [token, wrapper] of module.providers?.entries?.() ?? []) {
+          const name = String(wrapper?.name ?? wrapper?.metatype?.name ?? token ?? "");
+          if (!namePattern.test(name)) continue;
+          try {
+            const instance = wrapper?.instance;
+            if (instance && predicate(instance)) return instance;
+          } catch {
+          }
         }
       }
       return null;
@@ -1380,7 +1398,7 @@ function detectNestJsVersion() {
 }
 
 // src/version.ts
-var SDK_VERSION = "1.0.11";
+var SDK_VERSION = "1.0.13";
 
 // src/banner.ts
 var RESET = "\x1B[0m";
@@ -1565,7 +1583,7 @@ var NestDevTools = class {
       registerCleanup(new WebsocketInstrumentation({ config, projectInfo }).attach());
     }
     if (config.capture.database) {
-      registerCleanup(new DatabaseInstrumentation({ config, projectInfo }).attach());
+      registerCleanup(new DatabaseInstrumentation({ config, projectInfo, app }).attach());
     }
     registerCleanup(new QueueEventInstrumentation({ config, projectInfo }).attach());
     printStartupBanner({