From 5b716cbe60eff14e7ff8cc7689324b29fe1aaccd Mon Sep 17 00:00:00 2001 From: lohit Date: Mon, 8 Sep 2025 06:39:18 +0530 Subject: [PATCH] node vm fixes (#5519) --- .../bruno-js/src/runtime/script-runtime.js | 20 +++++++++---------- .../bruno-js/src/sandbox/node-vm/index.js | 14 ++----------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/packages/bruno-js/src/runtime/script-runtime.js b/packages/bruno-js/src/runtime/script-runtime.js index 145a08b96..83ef18276 100644 --- a/packages/bruno-js/src/runtime/script-runtime.js +++ b/packages/bruno-js/src/runtime/script-runtime.js @@ -113,7 +113,7 @@ class ScriptRuntime { } if (this.runtime === 'nodevm') { - const result = await runScriptInNodeVm({ + await runScriptInNodeVm({ script, context, collectionPath, @@ -122,12 +122,12 @@ class ScriptRuntime { return { request, - envVariables: cleanJson(result.envVariables), - runtimeVariables: cleanJson(result.runtimeVariables), + envVariables: cleanJson(envVariables), + runtimeVariables: cleanJson(runtimeVariables), persistentEnvVariables: bru.persistentEnvVariables, globalEnvironmentVariables: cleanJson(globalEnvironmentVariables), - results: cleanJson(result.results), - nextRequestName: result.nextRequestName, + results: cleanJson(__brunoTestResults.getResults()), + nextRequestName: bru.nextRequest, skipRequest: bru.skipRequest, stopExecution: bru.stopExecution }; @@ -283,7 +283,7 @@ class ScriptRuntime { } if (this.runtime === 'nodevm') { - const result = await runScriptInNodeVm({ + await runScriptInNodeVm({ script, context, collectionPath, @@ -292,12 +292,12 @@ class ScriptRuntime { return { response, - envVariables: cleanJson(result.envVariables), + envVariables: cleanJson(envVariables), persistentEnvVariables: cleanJson(bru.persistentEnvVariables), - runtimeVariables: cleanJson(result.runtimeVariables), + runtimeVariables: cleanJson(runtimeVariables), globalEnvironmentVariables: cleanJson(globalEnvironmentVariables), - results: cleanJson(result.results), - nextRequestName: result.nextRequestName, + results: cleanJson(__brunoTestResults.getResults()), + nextRequestName: bru.nextRequest, skipRequest: bru.skipRequest, stopExecution: bru.stopExecution }; diff --git a/packages/bruno-js/src/sandbox/node-vm/index.js b/packages/bruno-js/src/sandbox/node-vm/index.js index 5f5b488fe..82dd71702 100644 --- a/packages/bruno-js/src/sandbox/node-vm/index.js +++ b/packages/bruno-js/src/sandbox/node-vm/index.js @@ -32,12 +32,7 @@ async function runScriptInNodeVm({ scriptingConfig }) { if (script.trim().length === 0) { - return { - envVariables: cleanJson(context.bru.envVariables), - collectionVariables: cleanJson(context.bru.collectionVariables), - nextRequestName: context.bru.nextRequest, - results: context.__brunoTestResults ? cleanJson(context.__brunoTestResults.getResults()) : null - }; + return; } try { @@ -90,12 +85,7 @@ async function runScriptInNodeVm({ throw new ScriptError(error, script); } - return { - envVariables: cleanJson(context.bru.envVariables), - collectionVariables: cleanJson(context.bru.collectionVariables), - nextRequestName: context.bru.nextRequest, - results: context.__brunoTestResults ? cleanJson(context.__brunoTestResults.getResults()) : null - }; + return; }