@reproapp/node-sdk 0.0.30 → 0.0.31

package/dist/index.js

@@ -6,6 +6,7 @@ const async_hooks_1 = require("async_hooks");
 const crypto_1 = require("crypto");
 const module_1 = require("module");
 const path_1 = require("path");
+const url_1 = require("url");
 const client_1 = require("./ingest/client");
 const privacy_1 = require("./privacy");
 /**
@@ -7599,6 +7600,8 @@ function patchRedis(cfg) {
 exports.patchRedis = patchRedis;
 const mongoDbPatchConfigs = [];
 let mongoDbRequireHookInstalled = false;
+let mongoDbImportHookInstalled = false;
+let mongoDbImportHookReady = null;
 const MONGODB_PROMISE_OPS = [
     'insertOne',
     'insertMany',
@@ -7618,6 +7621,11 @@ const MONGODB_PROMISE_OPS = [
 ];
 const MONGODB_CURSOR_OPS = ['find', 'aggregate'];
 const MONGODB_CURSOR_TERMINALS = ['toArray', 'next', 'forEach'];
+function registerMongoDbPatchConfig(cfg) {
+    if (!mongoDbPatchConfigs.includes(cfg)) {
+        mongoDbPatchConfigs.push(cfg);
+    }
+}
 function resolveMongoDbRuntimeContext(cfg) {
     const ctx = getCtx();
     const fallback = cfg.resolveContext?.() ?? {};
@@ -7627,6 +7635,18 @@ function resolveMongoDbRuntimeContext(cfg) {
         aid: ctx.aid ?? fallback.aid ?? null,
     };
 }
+function resolveMongoDbCaptureContext() {
+    for (let i = mongoDbPatchConfigs.length - 1; i >= 0; i -= 1) {
+        const cfg = mongoDbPatchConfigs[i];
+        if (!cfg)
+            continue;
+        const { sid, aid } = resolveMongoDbRuntimeContext(cfg);
+        if (sid) {
+            return { cfg, sid, aid };
+        }
+    }
+    return null;
+}
 function resolveMongoCollectionName(collection) {
     const candidates = [
         collection?.collectionName,
@@ -7911,10 +7931,11 @@ function patchMongoCollectionMethod(proto, op, cursorOp, cfg) {
         if (isNativeMongoSuppressed(collection, op)) {
             return original.apply(this, args);
         }
-        const { sid, aid } = resolveMongoDbRuntimeContext(cfg);
-        if (!sid) {
+        const captureContext = resolveMongoDbCaptureContext();
+        if (!captureContext) {
             return original.apply(this, args);
         }
+        const { cfg: activeCfg, sid, aid } = captureContext;
         const spanContext = captureSpanContextFromTracer(this);
         const t0 = Date.now();
         const dbName = resolveMongoDbName(this);
@@ -7925,7 +7946,7 @@ function patchMongoCollectionMethod(proto, op, cursorOp, cfg) {
             if (emitted)
                 return;
             emitted = true;
-            emitDbQuery(cfg, sid, aid ?? undefined, {
+            emitDbQuery(activeCfg, sid, aid ?? undefined, {
                 type: 'mongo',
                 collection,
                 op,
@@ -7943,7 +7964,7 @@ function patchMongoCollectionMethod(proto, op, cursorOp, cfg) {
             if (emitted)
                 return;
             emitted = true;
-            emitDbQuery(cfg, sid, aid ?? undefined, {
+            emitDbQuery(activeCfg, sid, aid ?? undefined, {
                 type: 'mongo',
                 collection,
                 op,
@@ -7968,7 +7989,7 @@ function patchMongoCollectionMethod(proto, op, cursorOp, cfg) {
             const result = original.apply(this, actualArgs);
             if (cursorOp) {
                 return patchMongoCursorInstance(result, {
-                    cfg,
+                    cfg: activeCfg,
                     sid,
                     aid,
                     collection,
@@ -8053,6 +8074,7 @@ function patchMongoClientPrototype(proto, cfg) {
     };
 }
 function patchMongoDbFromModuleExports(mongoModule, cfg) {
+    registerMongoDbPatchConfig(cfg);
     if (!mongoModule)
         return;
     const constructors = new Set();
@@ -8108,9 +8130,46 @@ function installMongoDbRequireHook() {
     }
     catch { }
 }
+function installMongoDbImportHook() {
+    if (mongoDbImportHookInstalled)
+        return mongoDbImportHookReady ?? Promise.resolve();
+    mongoDbImportHookInstalled = true;
+    mongoDbImportHookReady = (async () => {
+        try {
+            const nodeModule = requireOptionalHostModule('node:module') ?? requireOptionalHostModule('module');
+            if (typeof nodeModule?.register !== 'function')
+                return;
+            const iitm = requireOptionalHostModule('import-in-the-middle');
+            const Hook = iitm?.Hook ?? iitm;
+            if (typeof Hook !== 'function')
+                return;
+            let waitForAllMessagesAcknowledged;
+            let registerOptions = { data: { include: ['mongodb'] } };
+            if (typeof iitm?.createAddHookMessageChannel === 'function') {
+                const channel = iitm.createAddHookMessageChannel();
+                registerOptions = channel.registerOptions;
+                waitForAllMessagesAcknowledged = channel.waitForAllMessagesAcknowledged;
+            }
+            nodeModule.register('import-in-the-middle/hook.mjs', (0, url_1.pathToFileURL)(__filename), registerOptions);
+            // eslint-disable-next-line no-new
+            new Hook(['mongodb'], (exports) => {
+                for (const cfg of mongoDbPatchConfigs) {
+                    patchMongoDbFromModuleExports(exports, cfg);
+                }
+                return exports;
+            });
+            if (waitForAllMessagesAcknowledged) {
+                await waitForAllMessagesAcknowledged();
+            }
+        }
+        catch { }
+    })();
+    return mongoDbImportHookReady;
+}
 function patchMongoDb(cfg) {
-    mongoDbPatchConfigs.push(cfg);
+    registerMongoDbPatchConfig(cfg);
     installMongoDbRequireHook();
+    void installMongoDbImportHook();
     const mongoModules = new Set();
     for (const loadedMongoModule of getLoadedModuleExportsByPackage('mongodb')) {
         mongoModules.add(loadedMongoModule);
@@ -8628,6 +8687,7 @@ async function initRepro(cfg) {
     patchAmqplib(integrationCfg);
     patchRedis(integrationCfg);
     patchMongoDb(integrationCfg);
+    await installMongoDbImportHook();
     patchSendgridMail(integrationCfg);
     patchMongooseIntegration(reproAutoMiddlewareConfig);
     await initializeRuntimePrivacyPolicyAtStartup(reproAutoMiddlewareConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reproapp/node-sdk",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "prepublishOnly": "npm run build",
-    "test": "npm run build && node test/unawaited.test.js && node test/integration-unawaited.js && node test/request-flush-timing.test.js && node test/request-capture-background.test.js && node test/init-auto-http-server.test.js && node test/client-performance-regression.test.js && node test/request-manifest-priority.test.js && node test/runtime-no-double-invoke.test.js && node test/express-trace-http-args.test.js && node test/trace-batch-size.test.js && node test/sdk-background-priority.test.js && node test/ingest-queue-retention.test.js && node test/ingest-high-priority-retention.test.js && node test/ingest-critical-retention.test.js && node test/ingest-critical-retry-retention.test.js && node test/ingest-timeout.test.js && node -r ./tracer/register test/promise-map.test.js && node test/disable-subtree.test.js && node test/circular-capture.test.js && node test/wrap-plugin-arrow-args.test.js && node test/wrap-plugin-super-call.test.js && node test/function-arg-identity.test.js && node test/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js && node test/amqplib-integration.test.js && node test/mongodb-integration.test.js",
+    "test": "npm run build && node test/unawaited.test.js && node test/integration-unawaited.js && node test/request-flush-timing.test.js && node test/request-capture-background.test.js && node test/init-auto-http-server.test.js && node test/client-performance-regression.test.js && node test/request-manifest-priority.test.js && node test/runtime-no-double-invoke.test.js && node test/express-trace-http-args.test.js && node test/trace-batch-size.test.js && node test/sdk-background-priority.test.js && node test/ingest-queue-retention.test.js && node test/ingest-high-priority-retention.test.js && node test/ingest-critical-retention.test.js && node test/ingest-critical-retry-retention.test.js && node test/ingest-timeout.test.js && node -r ./tracer/register test/promise-map.test.js && node test/disable-subtree.test.js && node test/circular-capture.test.js && node test/wrap-plugin-arrow-args.test.js && node test/wrap-plugin-super-call.test.js && node test/function-arg-identity.test.js && node test/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js && node test/amqplib-integration.test.js && node test/mongodb-integration.test.js && node test/mongodb-esm-import-hook.test.js",
     "test:containers": "npm run build && node test/runtime-no-double-invoke.testcontainers.test.js && node test/wrap-plugin-super-call.testcontainers.test.js && node test/function-arg-identity.testcontainers.test.js"
   },
   "peerDependencies": {

package/src/index.ts

@@ -5,6 +5,7 @@ import { AsyncLocalStorage } from 'async_hooks';
 import { randomUUID } from 'crypto';
 import { createRequire } from 'module';
 import { join } from 'path';
+import { pathToFileURL } from 'url';
 import {
     configureIngestQueueDrain,
     enqueueIngestEntries,
@@ -8810,6 +8811,8 @@ export type MongoDbPatchConfig = ReproMiddlewareConfig & {
 
 const mongoDbPatchConfigs: MongoDbPatchConfig[] = [];
 let mongoDbRequireHookInstalled = false;
+let mongoDbImportHookInstalled = false;
+let mongoDbImportHookReady: Promise<void> | null = null;
 
 const MONGODB_PROMISE_OPS = [
     'insertOne',
@@ -8832,6 +8835,12 @@ const MONGODB_PROMISE_OPS = [
 const MONGODB_CURSOR_OPS = ['find', 'aggregate'] as const;
 const MONGODB_CURSOR_TERMINALS = ['toArray', 'next', 'forEach'] as const;
 
+function registerMongoDbPatchConfig(cfg: MongoDbPatchConfig): void {
+    if (!mongoDbPatchConfigs.includes(cfg)) {
+        mongoDbPatchConfigs.push(cfg);
+    }
+}
+
 function resolveMongoDbRuntimeContext(cfg: MongoDbPatchConfig) {
     const ctx = getCtx();
     const fallback = cfg.resolveContext?.() ?? {};
@@ -8842,6 +8851,18 @@ function resolveMongoDbRuntimeContext(cfg: MongoDbPatchConfig) {
     };
 }
 
+function resolveMongoDbCaptureContext(): { cfg: MongoDbPatchConfig; sid: string; aid: string | null } | null {
+    for (let i = mongoDbPatchConfigs.length - 1; i >= 0; i -= 1) {
+        const cfg = mongoDbPatchConfigs[i];
+        if (!cfg) continue;
+        const { sid, aid } = resolveMongoDbRuntimeContext(cfg);
+        if (sid) {
+            return { cfg, sid, aid };
+        }
+    }
+    return null;
+}
+
 function resolveMongoCollectionName(collection: any): string {
     const candidates = [
         collection?.collectionName,
@@ -9142,10 +9163,11 @@ function patchMongoCollectionMethod(proto: any, op: string, cursorOp: boolean, c
             return original.apply(this, args);
         }
 
-        const { sid, aid } = resolveMongoDbRuntimeContext(cfg);
-        if (!sid) {
+        const captureContext = resolveMongoDbCaptureContext();
+        if (!captureContext) {
             return original.apply(this, args);
         }
+        const { cfg: activeCfg, sid, aid } = captureContext;
 
         const spanContext = captureSpanContextFromTracer(this);
         const t0 = Date.now();
@@ -9157,7 +9179,7 @@ function patchMongoCollectionMethod(proto: any, op: string, cursorOp: boolean, c
         const emitSuccess = (result: any) => {
             if (emitted) return;
             emitted = true;
-            emitDbQuery(cfg, sid, aid ?? undefined, {
+            emitDbQuery(activeCfg, sid, aid ?? undefined, {
                 type: 'mongo',
                 collection,
                 op,
@@ -9174,7 +9196,7 @@ function patchMongoCollectionMethod(proto: any, op: string, cursorOp: boolean, c
         const emitFailure = (error: any) => {
             if (emitted) return;
             emitted = true;
-            emitDbQuery(cfg, sid, aid ?? undefined, {
+            emitDbQuery(activeCfg, sid, aid ?? undefined, {
                 type: 'mongo',
                 collection,
                 op,
@@ -9199,7 +9221,7 @@ function patchMongoCollectionMethod(proto: any, op: string, cursorOp: boolean, c
             const result = original.apply(this, actualArgs);
             if (cursorOp) {
                 return patchMongoCursorInstance(result, {
-                    cfg,
+                    cfg: activeCfg,
                     sid,
                     aid,
                     collection,
@@ -9283,6 +9305,7 @@ function patchMongoClientPrototype(proto: any, cfg: MongoDbPatchConfig): void {
 }
 
 function patchMongoDbFromModuleExports(mongoModule: any, cfg: MongoDbPatchConfig): void {
+    registerMongoDbPatchConfig(cfg);
     if (!mongoModule) return;
     const constructors = new Set<any>();
     const addCtor = (candidate: any) => {
@@ -9343,9 +9366,50 @@ function installMongoDbRequireHook(): void {
     } catch {}
 }
 
+function installMongoDbImportHook(): Promise<void> {
+    if (mongoDbImportHookInstalled) return mongoDbImportHookReady ?? Promise.resolve();
+    mongoDbImportHookInstalled = true;
+
+    mongoDbImportHookReady = (async () => {
+        try {
+            const nodeModule = requireOptionalHostModule('node:module') ?? requireOptionalHostModule('module');
+            if (typeof nodeModule?.register !== 'function') return;
+
+            const iitm = requireOptionalHostModule('import-in-the-middle');
+            const Hook = iitm?.Hook ?? iitm;
+            if (typeof Hook !== 'function') return;
+
+            let waitForAllMessagesAcknowledged: undefined | (() => Promise<void>);
+            let registerOptions: any = { data: { include: ['mongodb'] } };
+            if (typeof iitm?.createAddHookMessageChannel === 'function') {
+                const channel = iitm.createAddHookMessageChannel();
+                registerOptions = channel.registerOptions;
+                waitForAllMessagesAcknowledged = channel.waitForAllMessagesAcknowledged;
+            }
+
+            nodeModule.register('import-in-the-middle/hook.mjs', pathToFileURL(__filename), registerOptions);
+
+            // eslint-disable-next-line no-new
+            new Hook(['mongodb'], (exports: any) => {
+                for (const cfg of mongoDbPatchConfigs) {
+                    patchMongoDbFromModuleExports(exports, cfg);
+                }
+                return exports;
+            });
+
+            if (waitForAllMessagesAcknowledged) {
+                await waitForAllMessagesAcknowledged();
+            }
+        } catch {}
+    })();
+
+    return mongoDbImportHookReady;
+}
+
 export function patchMongoDb(cfg: MongoDbPatchConfig): void {
-    mongoDbPatchConfigs.push(cfg);
+    registerMongoDbPatchConfig(cfg);
     installMongoDbRequireHook();
+    void installMongoDbImportHook();
 
     const mongoModules = new Set<any>();
     for (const loadedMongoModule of getLoadedModuleExportsByPackage('mongodb')) {
@@ -9867,6 +9931,7 @@ export async function initRepro(cfg: ReproInitConfig): Promise<void> {
     patchAmqplib(integrationCfg);
     patchRedis(integrationCfg);
     patchMongoDb(integrationCfg);
+    await installMongoDbImportHook();
     patchSendgridMail(integrationCfg);
     patchMongooseIntegration(reproAutoMiddlewareConfig);
 

package/test/mongodb-esm-import-hook.test.js

@@ -0,0 +1,207 @@
+process.env.REPRO_INGEST_REQUEST_TIMEOUT_MS = '50';
+process.env.REPRO_SDK_BACKGROUND_MAX_DEFER_MS = '25';
+process.env.REPRO_SDK_BACKGROUND_IDLE_DELAY_MS = '0';
+process.env.REPRO_SDK_BACKGROUND_BUSY_IDLE_DELAY_MS = '0';
+process.env.TRACE_IDLE_FLUSH_MS = '10';
+process.env.TRACE_LINGER_AFTER_FINISH_MS = '0';
+
+const assert = require('assert');
+const { EventEmitter } = require('events');
+const { pathToFileURL } = require('url');
+const { join } = require('path');
+const { mkdtempSync, mkdirSync, rmSync, writeFileSync } = require('fs');
+const { tmpdir } = require('os');
+const { initRepro, reproMiddleware, __reproTestHooks } = require('../dist');
+const { flushIngestQueue } = require('../dist/ingest/client');
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+async function waitFor(predicate, timeoutMs = 3000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (predicate()) return;
+        await sleep(20);
+    }
+    assert(predicate(), 'timed out waiting for expected ingest payload');
+}
+
+function flattenEvents(posts) {
+    return posts.flatMap((body) => Array.isArray(body?.events) ? body.events : []);
+}
+
+function dbChanges(events) {
+    return events
+        .filter((event) => event.event_type === 'db_change')
+        .flatMap((event) => Array.isArray(event.payload?.db) ? event.payload.db : []);
+}
+
+function makeReqRes() {
+    const req = new EventEmitter();
+    req.method = 'POST';
+    req.url = '/native-mongodb-esm';
+    req.originalUrl = '/native-mongodb-esm';
+    req.headers = {
+        'x-bug-session-id': 'S_mongo_esm',
+        'x-bug-action-id': 'A_mongo_esm',
+    };
+    req.query = {};
+    req.params = {};
+    req.body = undefined;
+
+    const res = new EventEmitter();
+    res.statusCode = 200;
+    res.getHeader = () => undefined;
+    res.getHeaders = () => ({});
+    res.write = () => true;
+    res.end = function end() {
+        this.emit('finish');
+        return this;
+    };
+
+    return { req, res };
+}
+
+function createEsmMongoFixture() {
+    const root = mkdtempSync(join(tmpdir(), 'repro-node-sdk-esm-mongodb-'));
+    const packageDir = join(root, 'node_modules', 'mongodb');
+    mkdirSync(packageDir, { recursive: true });
+    writeFileSync(join(packageDir, 'package.json'), JSON.stringify({
+        name: 'mongodb',
+        version: '99.0.0-repro-fixture',
+        type: 'module',
+        exports: './index.mjs',
+    }, null, 2));
+    writeFileSync(join(packageDir, 'index.mjs'), `
+export class Collection {
+  constructor(dbName, collectionName) {
+    this.dbName = dbName;
+    this.collectionName = collectionName;
+  }
+
+  async insertOne(doc, options) {
+    if (options?.session?.id !== 'esm-native-session-1') {
+      throw new Error(\`unexpected session \${options?.session?.id}\`);
+    }
+    doc._id = doc._id ?? 'subject-esm-1';
+    return { acknowledged: true, insertedId: doc._id };
+  }
+}
+
+export class Db {
+  constructor(dbName) {
+    this.databaseName = dbName;
+  }
+
+  collection(collectionName) {
+    return new Collection(this.databaseName, collectionName);
+  }
+}
+
+export class MongoClient {
+  constructor(uri) {
+    this.uri = uri;
+  }
+
+  db(dbName) {
+    return new Db(dbName);
+  }
+}
+`);
+    const appFile = join(root, 'app.mjs');
+    writeFileSync(appFile, `
+import { MongoClient } from 'mongodb';
+
+const dbClient = new MongoClient('mongodb://127.0.0.1:27017/clinical');
+
+export async function insertSubject() {
+  const subjectsCollection = dbClient.db('clinical').collection('subjects');
+  return subjectsCollection.insertOne(
+    { subjectNumber: '10013038', status: 'screened' },
+    {
+      session: {
+        id: 'esm-native-session-1',
+        hasEnded: false,
+        inTransaction: () => true,
+      },
+    },
+  );
+}
+`);
+    return { root, appFile };
+}
+
+async function main() {
+    const capturedBodies = [];
+    const originalFetch = global.fetch;
+    let fixtureRoot = null;
+    global.fetch = async (_url, init) => {
+        capturedBodies.push(JSON.parse(String(init?.body ?? '{}')));
+        return {
+            ok: true,
+            status: 202,
+            json: async () => ({ ok: true }),
+            text: async () => '{"ok":true}',
+        };
+    };
+
+    try {
+        const cfg = {
+            tenantId: 'TENANT_test',
+            appId: 'APP_test',
+            appSecret: 'secret',
+            captureHeaders: false,
+            privacy: { environment: 'dev', captureRaw: true },
+            ingestBase: 'http://127.0.0.1:65535',
+        };
+        await initRepro(cfg);
+
+        const fixture = createEsmMongoFixture();
+        fixtureRoot = fixture.root;
+        const fixtureUrl = pathToFileURL(fixture.appFile).href;
+        const { insertSubject } = await import(`${fixtureUrl}?run=${Date.now()}`);
+
+        const middleware = reproMiddleware(cfg);
+        const { req, res } = makeReqRes();
+        await new Promise((resolve, reject) => {
+            middleware(req, res, (err) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                Promise.resolve(insertSubject()).then(resolve, reject);
+            });
+        });
+        res.end();
+
+        await waitFor(() => dbChanges(flattenEvents(capturedBodies)).length === 1);
+        await __reproTestHooks.drainSdkBackgroundQueueForTest();
+        await flushIngestQueue();
+
+        const [change] = dbChanges(flattenEvents(capturedBodies));
+        assert.strictEqual(change.type, 'mongo');
+        assert.strictEqual(change.collection, 'subjects');
+        assert.strictEqual(change.op, 'insertOne');
+        assert.strictEqual(change.pk._id, 'subject-esm-1');
+        assert.strictEqual(change.query.driver, 'mongodb');
+        assert.strictEqual(change.query.db, 'clinical');
+        assert.strictEqual(change.query.doc.subjectNumber, '10013038');
+        assert.strictEqual(change.query.options.session.__kind, 'mongodb_client_session');
+        assert.strictEqual(change.query.options.session.id, 'esm-native-session-1');
+        assert.strictEqual(change.after.subjectNumber, '10013038');
+        assert.strictEqual(change.resultMeta.insertedId, 'subject-esm-1');
+
+        console.log('mongodb esm import hook OK');
+    } finally {
+        await __reproTestHooks.drainSdkBackgroundQueueForTest();
+        await flushIngestQueue();
+        if (fixtureRoot) {
+            try { rmSync(fixtureRoot, { recursive: true, force: true }); } catch {}
+        }
+        global.fetch = originalFetch;
+    }
+}
+
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});