Remove explicit events for variable syncing

And include syncing and communication of variables as part of runRequest function invocation

Author: deve-sh

lib/runner/extensions/event.command.js

@@ -22,11 +22,11 @@ var _ = require('lodash'),
     EXECUTION_ERROR_EVENT_BASE = 'execution.error.',
     EXECUTION_COOKIES_EVENT_BASE = 'execution.cookies.',
     EXECUTION_SKIP_REQUEST_EVENT_BASE = 'execution.skipRequest.',
-    EXECUTION_GET_VARIABLES_FROM_THIS_EXECUTION = 'execution.get_variables_from_this_execution.',
-    EXECUTION_REPLY_TO_VARIABLES_REQUEST = 'execution.response_to_variables_request.',
 
     EXECUTION_VAULT_BASE = 'execution.vault.',
 
+    CONTEXT_VARIABLE_SCOPES = ['_variables', 'environment', 'globals'],
+
     COOKIES_EVENT_STORE_ACTION = 'store',
     COOKIE_STORE_PUT_METHOD = 'putCookie',
     COOKIE_STORE_UPDATE_METHOD = 'updateCookie',
@@ -515,7 +515,7 @@ module.exports = {
 
                         // Should fetch the request from the enclosing Postman App & resolve scripts and variables
                         containerRequestPassedOptions.requestResolverBridge(requestToRunId,
-                            async function (err, collectionWithReqToRun) {
+                            function (err, collectionWithReqToRun) {
                                 if (err) {
                                     return dispatchErrorToListener(err);
                                 }
@@ -531,39 +531,31 @@ module.exports = {
                                 // variables set by the parent using pm.<variable-form>.set do not reflect
                                 // in postman-runtime's scope immediately. They are present inside postman-sandbox
                                 // till the parent request's script execution ends.
-                                const variablesRequestUniqueId = uuid.v4(),
+                                const variableValues = nestedRequestOptions.currentScopeVariableValues || {},
                                     globals = { values: [] },
                                     localVariables = { values: [] },
                                     environment = { values: [] },
                                     collectionVariables = { values: [] };
 
-                                await new Promise((resolve) => {
-                                    self.host.once(EXECUTION_REPLY_TO_VARIABLES_REQUEST + variablesRequestUniqueId,
-                                        function (variableValues) {
-                                            if (variableValues.globals && variableValues.globals.length) {
-                                                globals.values = variableValues.globals;
-                                            }
-                                            if (variableValues.environment && variableValues.environment.length) {
-                                                environment.values = variableValues.environment;
-                                            }
-                                            if (variableValues._variables && variableValues._variables.length) {
-                                                localVariables.values = variableValues._variables;
-                                            }
-                                            // Merge the root request's collection variables as globals
-                                            // for nested requests. For all further nested requests, globals
-                                            // will continue to have these values useful for resolution
-                                            // unless overridden.
-                                            if (!self.state.isNestedRequest &&
-                                                variableValues.collectionVariables &&
-                                                variableValues.collectionVariables.length) {
-                                                collectionVariables.values = variableValues.collectionVariables;
-                                            }
-                                            resolve();
-                                        });
+                                if (variableValues.globals && variableValues.globals.length) {
+                                    globals.values = variableValues.globals;
+                                }
+                                if (variableValues.environment && variableValues.environment.length) {
+                                    environment.values = variableValues.environment;
+                                }
+                                if (variableValues._variables && variableValues._variables.length) {
+                                    localVariables.values = variableValues._variables;
+                                }
 
-                                    self.host.dispatch(EXECUTION_GET_VARIABLES_FROM_THIS_EXECUTION + executionId,
-                                        variablesRequestUniqueId);
-                                });
+                                // Merge the root request's collection variables as globals
+                                // for nested requests. For all further nested requests, globals
+                                // will continue to have these values useful for resolution
+                                // unless overridden.
+                                if (!self.state.isNestedRequest &&
+                                    variableValues.collectionVariables &&
+                                    variableValues.collectionVariables.length) {
+                                    collectionVariables.values = variableValues.collectionVariables;
+                                }
 
                                 // Merge provided local variables with the variables provided in reference request opts
                                 const collectionRequestRunner = require('../../runner'),
@@ -613,15 +605,15 @@ module.exports = {
                                     function (err, run) {
                                         let exceptionForThisRequest = null,
                                             responseForThisRequest = null,
-                                            variableMutationsFromThisScriptExecution = {};
+                                            variableMutationsFromThisExecution = {};
 
                                         if (err) {
                                             return self.host
                                                 .dispatch(EXECUTION_RUN_REQUEST_RESPONSE_EVENT_BASE + eventId,
                                                     requestId, err);
                                         }
                                         run.start({
-                                            script (_err, _cursor, result, _script, event) {
+                                            script (_err, _cursor, result) {
                                                 // This is to sync changes to pm.variables, pm.environment & pm.globals
                                                 // that happened inside the nested request's script
                                                 // back to parent request's scripts still currently executing.
@@ -631,11 +623,15 @@ module.exports = {
                                                 // All other global variables defined by syntax like 'a=1'
                                                 // are anyway synced as the sandbox's common scope is shared across runs
                                                 if (result) {
-                                                    variableMutationsFromThisScriptExecution[event.listen] = {
-                                                        _variables: result._variables.mutations,
-                                                        environment: result.environment.mutations,
-                                                        globals: result.globals.mutations
-                                                    };
+                                                    CONTEXT_VARIABLE_SCOPES.forEach(function (type) {
+                                                        variableMutationsFromThisExecution[type] =
+                                                            !variableMutationsFromThisExecution[type] ?
+                                                                [result[type].mutations] :
+                                                                [
+                                                                    ...variableMutationsFromThisExecution[type],
+                                                                    result[type].mutations
+                                                                ];
+                                                    });
                                                 }
                                             },
                                             exception (_, err) {
@@ -672,8 +668,7 @@ module.exports = {
                                                 return self.host.dispatch(runRequestRespEvent,
                                                     requestId, error || null,
                                                     responseForThisRequest,
-                                                    { variableMutationStages:
-                                                        variableMutationsFromThisScriptExecution });
+                                                    { variableMutations: variableMutationsFromThisExecution });
                                             }
                                         });
                                     });