repro-nest 0.0.203 → 0.0.204

package/dist/index.js

@@ -92,9 +92,9 @@ function flushQueryFinalizers(query, value, threw, error) {
     }
     catch { }
 }
-function patchMongooseExecCapture() {
+function patchMongooseExecCapture(targetMongoose = mongoose) {
     try {
-        const Qp = mongoose.Query?.prototype;
+        const Qp = targetMongoose?.Query?.prototype;
         if (!Qp || Qp.__repro_exec_patched)
             return;
         const origExec = Qp.exec;
@@ -129,6 +129,26 @@ function patchMongooseExecCapture() {
     }
     catch { }
 }
+function patchAllKnownMongooseInstances() {
+    // Patch the SDK's bundled mongoose first.
+    patchMongooseExecCapture(mongoose);
+    // Also patch any other mongoose copies the host app might have installed (e.g., different versions).
+    try {
+        const cache = require?.cache || {};
+        const seen = new Set();
+        Object.keys(cache).forEach((key) => {
+            if (!/node_modules[\\/](mongoose)[\\/]/i.test(key))
+                return;
+            const mod = cache[key];
+            const exp = mod?.exports;
+            if (!exp || seen.has(exp))
+                return;
+            seen.add(exp);
+            patchMongooseExecCapture(exp);
+        });
+    }
+    catch { }
+}
 const REQUEST_START_HEADER = 'x-bug-request-start';
 function escapeRx(s) { return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); }
 let __TRACER__ = null;
@@ -384,7 +404,9 @@ function initReproTracing(opts) {
         tracerPkg.patchHttp?.();
         applyTraceLogPreference(tracerPkg);
         __TRACER_READY = true;
-        patchMongooseExecCapture();
+        patchAllKnownMongooseInstances();
+        // Patch again on the next tick to catch mongoose copies that load after init (different versions/copies).
+        setImmediate(() => patchAllKnownMongooseInstances());
     }
     catch {
         __TRACER__ = null; // SDK still works without tracer
@@ -1289,27 +1311,6 @@ function reproMiddleware(cfg) {
                                 depth: evt.depth,
                                 library: inferLibraryNameFromFile(evt.file),
                             };
-                            if (evt.type === 'exit') {
-                                // If the function returned a Mongoose Query, update the exit value when the query settles.
-                                const rv = ev.returnValue;
-                                const setReturnValue = (val) => {
-                                    try {
-                                        evt.returnValue = sanitizeTraceValue(val);
-                                    }
-                                    catch { }
-                                };
-                                const qp = rv && rv.__repro_result_promise;
-                                const hasResult = rv && Object.prototype.hasOwnProperty.call(rv, '__repro_result');
-                                if (hasResult) {
-                                    setReturnValue(rv.__repro_result);
-                                }
-                                else if (qp && typeof qp.then === 'function') {
-                                    try {
-                                        qp.then((val) => setReturnValue(val), () => { });
-                                    }
-                                    catch { }
-                                }
-                            }
                             const spanKey = normalizeSpanId(evt.spanId);
                             if (evt.type === 'enter') {
                                 lastEventAt = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repro-nest",
-  "version": "0.0.203",
+  "version": "0.0.204",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -86,9 +86,9 @@ function flushQueryFinalizers(query: any, value: any, threw: boolean, error: any
     } catch {}
 }
 
-function patchMongooseExecCapture() {
+function patchMongooseExecCapture(targetMongoose: any = mongoose) {
     try {
-        const Qp: any = (mongoose as any).Query?.prototype;
+        const Qp: any = targetMongoose?.Query?.prototype;
         if (!Qp || Qp.__repro_exec_patched) return;
         const origExec = Qp.exec;
         if (typeof origExec !== 'function') return;
@@ -117,6 +117,25 @@ function patchMongooseExecCapture() {
     } catch {}
 }
 
+function patchAllKnownMongooseInstances() {
+    // Patch the SDK's bundled mongoose first.
+    patchMongooseExecCapture(mongoose as any);
+
+    // Also patch any other mongoose copies the host app might have installed (e.g., different versions).
+    try {
+        const cache = (require as any)?.cache || {};
+        const seen = new Set<any>();
+        Object.keys(cache).forEach((key) => {
+            if (!/node_modules[\\/](mongoose)[\\/]/i.test(key)) return;
+            const mod = cache[key];
+            const exp = mod?.exports;
+            if (!exp || seen.has(exp)) return;
+            seen.add(exp);
+            patchMongooseExecCapture(exp);
+        });
+    } catch {}
+}
+
 // ====== tiny, safe tracer auto-init (no node_modules patches) ======
 type TracerApi = {
     init?: (opts: any) => void;
@@ -570,7 +589,9 @@ export function initReproTracing(opts?: ReproTracingInitOptions) {
         tracerPkg.patchHttp?.();
         applyTraceLogPreference(tracerPkg);
         __TRACER_READY = true;
-        patchMongooseExecCapture();
+        patchAllKnownMongooseInstances();
+        // Patch again on the next tick to catch mongoose copies that load after init (different versions/copies).
+        setImmediate(() => patchAllKnownMongooseInstances());
     } catch {
         __TRACER__ = null; // SDK still works without tracer
     } finally {
@@ -1499,26 +1520,6 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                                 library: inferLibraryNameFromFile(evt.file),
                             };
 
-                            if (evt.type === 'exit') {
-                                // If the function returned a Mongoose Query, update the exit value when the query settles.
-                                const rv: any = ev.returnValue;
-                                const setReturnValue = (val: any) => {
-                                    try { evt.returnValue = sanitizeTraceValue(val); } catch {}
-                                };
-                                const qp = rv && rv.__repro_result_promise;
-                                const hasResult = rv && Object.prototype.hasOwnProperty.call(rv, '__repro_result');
-                                if (hasResult) {
-                                    setReturnValue(rv.__repro_result);
-                                } else if (qp && typeof qp.then === 'function') {
-                                    try {
-                                        qp.then(
-                                            (val: any) => setReturnValue(val),
-                                            () => {}
-                                        );
-                                    } catch {}
-                                }
-                            }
-
                             const spanKey = normalizeSpanId(evt.spanId);
                             if (evt.type === 'enter') {
                                 lastEventAt = Date.now();

package/tracer/runtime.js

@@ -645,6 +645,11 @@ if (!global.__repro_call) {
                                 }
                             } catch {}
 
+                            if (isQuery) {
+                                runExit(exitDetailBase);
+                                return out;
+                            }
+
                             let settled = false;
                             const finalize = (value, threw, error) => {
                                 if (settled) return value;