@reproapp/node-sdk 0.0.18 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reproapp/node-sdk",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,8 +12,8 @@
     "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-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-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/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js",
-    "test:containers": "npm run build && node test/runtime-no-double-invoke.testcontainers.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-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-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/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.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"
   },
   "peerDependencies": {
     "express": "^5.1.0",

package/test/runtime-no-double-invoke.testcontainers.test.js

@@ -7,7 +7,7 @@ const { trace } = require('../tracer/runtime');
 async function startMongo() {
     return new GenericContainer('mongo:7')
         .withExposedPorts(27017)
-        .withTmpFs({ '/data/db': 'rw,noexec,nosuid,size=256m' })
+        .withTmpFs({ '/data/db': 'rw,noexec,nosuid,size=1g' })
         .withCommand(['mongod', '--bind_ip_all', '--setParameter', 'diagnosticDataCollectionEnabled=false'])
         .withWaitStrategy(Wait.forListeningPorts())
         .start();

package/test/wrap-plugin-super-call.test.js

@@ -0,0 +1,80 @@
+const assert = require('assert');
+const vm = require('vm');
+const babel = require('@babel/core');
+const makeWrapPlugin = require('../tracer/wrap-plugin');
+require('../tracer/runtime');
+
+function transform(source, filename) {
+    return babel.transformSync(source, {
+        filename,
+        plugins: [makeWrapPlugin(filename, {})],
+        parserOpts: { sourceType: 'script', plugins: ['typescript'] },
+        generatorOpts: { retainLines: true },
+    }).code;
+}
+
+function loadInstrumentedModule(source, filename) {
+    const code = transform(source, filename);
+    const module = { exports: {} };
+    const context = {
+        module,
+        exports: module.exports,
+        require,
+        console,
+        __trace: global.__trace,
+        __repro_call: global.__repro_call,
+        Promise,
+        Buffer,
+        setTimeout,
+        clearTimeout,
+        setImmediate,
+        clearImmediate,
+    };
+
+    vm.runInNewContext(code, context, { filename });
+    return { exports: module.exports, code };
+}
+
+function toPlainJson(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+
+async function main() {
+    const filename = '/tmp/wrap-plugin-super-call.fixture.js';
+    const { exports: mod, code } = loadInstrumentedModule(`
+        class BaseNotificationGenerator {
+            async resolveNotificationConfig(params) {
+                return { source: 'base', params };
+            }
+        }
+
+        class SubjectNotificationGenerator extends BaseNotificationGenerator {
+            async resolveNotificationConfig(params, preloaded) {
+                return preloaded
+                    ? Promise.resolve(preloaded)
+                    : super.resolveNotificationConfig(params);
+            }
+        }
+
+        module.exports = { SubjectNotificationGenerator };
+    `, filename);
+
+    assert(!code.includes('= super'), `transformed code must not assign super into a temp:\n${code}`);
+
+    const generator = new mod.SubjectNotificationGenerator();
+    assert.deepStrictEqual(
+        toPlainJson(await generator.resolveNotificationConfig({ id: 'S_1' }, null)),
+        { source: 'base', params: { id: 'S_1' } },
+    );
+    assert.deepStrictEqual(
+        toPlainJson(await generator.resolveNotificationConfig({ id: 'S_2' }, { source: 'preloaded' })),
+        { source: 'preloaded' },
+    );
+
+    console.log('wrap-plugin super call OK');
+}
+
+main().catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+});

package/test/wrap-plugin-super-call.testcontainers.test.js

@@ -0,0 +1,116 @@
+const assert = require('assert');
+const vm = require('vm');
+const babel = require('@babel/core');
+const mongoose = require('mongoose');
+const { GenericContainer, Wait } = require('testcontainers');
+
+const makeWrapPlugin = require('../tracer/wrap-plugin');
+require('../tracer/runtime');
+
+function transform(source, filename) {
+    return babel.transformSync(source, {
+        filename,
+        plugins: [makeWrapPlugin(filename, {})],
+        parserOpts: { sourceType: 'script', plugins: ['typescript'] },
+        generatorOpts: { retainLines: true },
+    }).code;
+}
+
+function loadInstrumentedModule(source, filename) {
+    const code = transform(source, filename);
+    const module = { exports: {} };
+    const context = {
+        module,
+        exports: module.exports,
+        require,
+        console,
+        __trace: global.__trace,
+        __repro_call: global.__repro_call,
+        Promise,
+        Buffer,
+        setTimeout,
+        clearTimeout,
+        setImmediate,
+        clearImmediate,
+    };
+
+    vm.runInNewContext(code, context, { filename });
+    return module.exports;
+}
+
+function toPlainJson(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+
+async function startMongo() {
+    return new GenericContainer('mongo:7')
+        .withExposedPorts(27017)
+        .withTmpFs({ '/data/db': 'rw,noexec,nosuid,size=1g' })
+        .withCommand(['mongod', '--bind_ip_all', '--setParameter', 'diagnosticDataCollectionEnabled=false'])
+        .withWaitStrategy(Wait.forListeningPorts())
+        .start();
+}
+
+async function main() {
+    let container;
+    let connection;
+
+    try {
+        container = await startMongo();
+        const uri = `mongodb://${container.getHost()}:${container.getMappedPort(27017)}/repro_node_sdk_super_test`;
+        connection = await mongoose.createConnection(uri).asPromise();
+        const Notification = connection.model('Notification', new mongoose.Schema({
+            name: { type: String, required: true },
+        }));
+
+        const { SubjectNotificationGenerator } = loadInstrumentedModule(`
+            class BaseNotificationGenerator {
+                constructor(model) {
+                    this.model = model;
+                }
+
+                async resolveNotificationConfig(params) {
+                    await this.model.create({ name: params.name });
+                    return { source: 'base', name: params.name };
+                }
+            }
+
+            class SubjectNotificationGenerator extends BaseNotificationGenerator {
+                async resolveNotificationConfig(params, preloaded) {
+                    return preloaded
+                        ? Promise.resolve(preloaded)
+                        : super.resolveNotificationConfig(params);
+                }
+            }
+
+            module.exports = { SubjectNotificationGenerator };
+        `, '/tmp/wrap-plugin-super-call-container.fixture.js');
+
+        const generator = new SubjectNotificationGenerator(Notification);
+        assert.deepStrictEqual(
+            toPlainJson(await generator.resolveNotificationConfig({ name: 'created-through-super' }, null)),
+            { source: 'base', name: 'created-through-super' },
+        );
+        assert.deepStrictEqual(
+            toPlainJson(await generator.resolveNotificationConfig({ name: 'not-created' }, { source: 'preloaded' })),
+            { source: 'preloaded' },
+        );
+
+        assert.strictEqual(await Notification.countDocuments({ name: 'created-through-super' }), 1);
+        assert.strictEqual(await Notification.countDocuments({ name: 'not-created' }), 0);
+
+        console.log('wrap-plugin super call testcontainers OK');
+    } finally {
+        if (connection) {
+            await connection.close().catch(() => {});
+        }
+        if (container) {
+            await container.stop().catch(() => {});
+        }
+    }
+}
+
+main().catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+});

package/tracer/wrap-plugin.js

@@ -49,6 +49,13 @@ module.exports = function makeWrapPlugin(filenameForMeta, opts = {}) {
             return '';
         }
 
+        function isSuperMemberCall(callee) {
+            if (!callee) return false;
+            if (t.isMemberExpression(callee) && t.isSuper(callee.object)) return true;
+            if (t.isOptionalMemberExpression && t.isOptionalMemberExpression(callee) && t.isSuper(callee.object)) return true;
+            return false;
+        }
+
         const obj = kv => t.objectExpression(
             Object.entries(kv)
                 .filter(([, v]) => v != null)
@@ -451,6 +458,7 @@ module.exports = function makeWrapPlugin(filenameForMeta, opts = {}) {
             if (t.isIdentifier(n.callee, { name: '__awaiter' })) return;
             if (t.isIdentifier(n.callee, { name: '__generator' })) return;
             if (t.isSuper(n.callee)) return;
+            if (isSuperMemberCall(n.callee)) return;
             if (t.isImport(n.callee)) return;
 
             if (t.isMemberExpression(n.callee) && t.isIdentifier(n.callee.object, { name: '__trace' })) {
@@ -559,6 +567,7 @@ module.exports = function makeWrapPlugin(filenameForMeta, opts = {}) {
             if (t.isIdentifier(n.callee, { name: '__awaiter' })) return;
             if (t.isIdentifier(n.callee, { name: '__generator' })) return;
             if (t.isSuper(n.callee)) return;
+            if (isSuperMemberCall(n.callee)) return;
             if (t.isImport(n.callee)) return;
 
             const loc = n.loc?.start || null;