Make pm.require synchronous

postmanlabs · Dec 4, 2023 · 9e87272 · 9e87272
1 parent 9b1ca8b
commit 9e87272
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.cache/bootcode.browser.js b/.cache/bootcode.browser.js
diff --git a/.cache/bootcode.js b/.cache/bootcode.js
diff --git a/lib/postman-sandbox.js b/lib/postman-sandbox.js
@@ -126,7 +126,8 @@ class PostmanSandbox extends UniversalVM {
             cursor: cursor,
             debug: debugMode,
             timeout: executionTimeout,
-            legacy: _.get(options, 'legacy')
+            legacy: _.get(options, 'legacy'),
+            fileCache: _.get(options, 'fileCache')
         });
     }
 

diff --git a/lib/sandbox/execute.js b/lib/sandbox/execute.js
@@ -229,7 +229,8 @@ module.exports = function (bridge, glob) {
                     dispatchAssertions,
                     new PostmanCookieStore(id, bridge, timers),
                     {
-                        disabledAPIs: initializationOptions.disabledAPIs
+                        disabledAPIs: initializationOptions.disabledAPIs,
+                        fileCache: options.fileCache
                     })
             ),
             dispatchAssertions,

diff --git a/lib/sandbox/pmapi.js b/lib/sandbox/pmapi.js
@@ -279,7 +279,9 @@ function Postman (execution, onRequest, onSkipRequest, onAssertion, cookieStore,
          * @param {String} path - path to the script file
          */
         require: function (path) {
-            return postmanRequire(path);
+            return postmanRequire(path, null, {
+                fileCache: options.fileCache
+            });
         }
     }, options.disabledAPIs);
 

diff --git a/lib/sandbox/require.js b/lib/sandbox/require.js
@@ -1,17 +1,13 @@
 const path = require('path');
 
-function readFileSync (path) {
-    return `
-        const parent = require('.');
-
-        module.exports = {
-            name: "${path}",
-            module: module,
-            sum: function (a, b) {
-                return a + b;
-            }
-        };
-    `;
+function readFileFromCache (path, options) {
+    const cache = options.fileCache;
+
+    if (!cache || !cache[path]) {
+        throw new Error('Count not find file in cache: ' + path);
+    }
+
+    return cache[path];
 }
 
 class Module {
@@ -35,13 +31,13 @@ class Module {
     }
 }
 
-function postmanRequire (filePath, parentModule) {
+function postmanRequire (filePath, parentModule, options) {
     if (filePath in postmanRequire.cache) {
         return postmanRequire.cache[filePath].exports;
     }
 
     const module = new Module(filePath, parentModule),
-        code = readFileSync(filePath),
+        code = readFileFromCache(filePath, options),
 
         // TODO: is this safe??
         wrapperFn = new Function('exports', 'require', 'module', '__filename',
@@ -55,7 +51,7 @@ function postmanRequire (filePath, parentModule) {
         require = function require (id) {
             this.cache = postmanRequire.cache;
 
-            return postmanRequire(id, module);
+            return postmanRequire(id, module, options);
         };
 
     // cache it before evaluating because circular dependencies should not call