scope-reuse

postmanlabs · Jan 24, 2024 · aac8010 · aac8010
1 parent 3d1294f
commit aac8010
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/lib/sandbox/execute.js b/lib/sandbox/execute.js
@@ -225,6 +225,7 @@ module.exports = function (bridge, glob) {
                     },
                     dispatchAssertions,
                     options.requireFileResolver,
+                    scope,
                     new PostmanCookieStore(id, bridge, timers),
                     {
                         disabledAPIs: initializationOptions.disabledAPIs

diff --git a/lib/sandbox/pmapi.js b/lib/sandbox/pmapi.js
@@ -50,7 +50,7 @@ const _ = require('lodash'),
  * @param {Object} [options] - options
  * @param {Array.<String>} [options.disabledAPIs] - list of disabled APIs
  */
-function Postman (execution, onRequest, onSkipRequest, onAssertion, requireFileResolver, cookieStore, options = {}) {
+function Postman (execution, onRequest, onSkipRequest, onAssertion, requireFileResolver, scope, cookieStore, options = {}) {
     // @todo - ensure runtime passes data in a scope format
     let iterationData = new VariableScope();
 
@@ -299,15 +299,25 @@ function Postman (execution, onRequest, onSkipRequest, onAssertion, requireFileR
                     exports: {}
                 };
 
-            const fn = new Function('module', 'exports', file);
-            const pm = this;
-            const globalScope = {
-                pm
-            }; // how to access this?
+            const codeToExecute = [
+                '(function (module, exports) {',
+                file,
+                '})(moduleObj, moduleObj.exports);'
+            ].join('\n');
 
-            fn.call(globalScope, module, module.exports);
+            const moduleObj = {
+                exports: {}
+            };
 
-            return module.exports;
+            scope.import({
+                moduleObj: moduleObj
+            });
+
+            scope.exec(codeToExecute, (err) => {});
+
+            // TODO: clean up moduleObj
+
+            return moduleObj.exports;
         }
     }, options.disabledAPIs);
 

diff --git a/lib/sandbox/postman-require.js b/lib/sandbox/postman-require.js
@@ -0,0 +1,23 @@
+const Scope = require('uniscope'),
+    executeContext = require('./execute-context');
+
+function createPostmanRequire (requireFileResolver, scope, execution, pmApi, pmConsole, timers, dispatchAssertions) {
+    return function postmanRequire (path) {
+        var file = requireFileResolver[path],
+            module = {
+                exports: {}
+            };
+
+        // const scope = Scope.create({
+        //     eval: true,
+        //     ignore: ['require'],
+        //     block: ['bridge']
+        // });
+
+        scope.exec(file, () => {});
+
+        return module.exports;
+    };
+}
+
+module.exports = createPostmanRequire;