postman-runtime 7.52.0 → 7.54.0

package/lib/runner/extensions/event.command.js

@@ -24,6 +24,7 @@ var _ = require('lodash'),
     EXECUTION_SKIP_REQUEST_EVENT_BASE = 'execution.skipRequest.',
 
     EXECUTION_VAULT_BASE = 'execution.vault.',
+    EXECUTION_DATASETS_BASE = 'execution.datasets.',
 
     COOKIES_EVENT_STORE_ACTION = 'store',
     COOKIE_STORE_PUT_METHOD = 'putCookie',
@@ -487,6 +488,40 @@ module.exports = {
                     dispatch(null, vaultSecrets[cmd](...args));
                 }.bind(this));
 
+                this.host.on(EXECUTION_DATASETS_BASE + executionId, function (id, cmd, datasetId, ...args) {
+                    const datasetsResolver = _.get(this, 'options.script.datasetsResolver'),
+
+                        // Ensure error is string
+                        // TODO identify why error objects are not being serialized correctly
+                        dispatch = (e, r) => {
+                            this.host.dispatch(EXECUTION_DATASETS_BASE + executionId, id, e, r);
+                        };
+
+                    if (!datasetsResolver) {
+                        return dispatch('Datasets API is not available');
+                    }
+
+                    if (!['executeView', 'executeQuery'].includes(cmd)) {
+                        return dispatch(`Invalid datasets command: ${cmd}`);
+                    }
+
+                    try {
+                        datasetsResolver(cmd, datasetId, args, function (err, result) {
+                            if (err) {
+                                return dispatch(err instanceof Error ? err.message :
+                                    (typeof err === 'string' ? err : String(err && err.message || err)));
+                            }
+
+                            dispatch(null, result);
+                        });
+                    }
+                    catch (error) {
+                        const detail = error && error.message ? `: ${error.message}` : '';
+
+                        dispatch(`Datasets: error executing "${cmd}"${detail}`);
+                    }
+                }.bind(this));
+
                 this.host.on(EXECUTION_REQUEST_EVENT_BASE + executionId,
                     function (scriptCursor, id, requestId, request) {
                         // remove files in request body if any
@@ -570,8 +605,12 @@ module.exports = {
                             context: contextToUse,
                             resolvedPackages: resolvedPackages,
 
-                            disabledAPIs: !_.get(this, 'options.script.requestResolver') ?
-                                ['execution.runRequest'] : [],
+                            disabledAPIs: [
+                                ...(!_.get(this, 'options.script.requestResolver') ?
+                                    ['execution.runRequest'] : []),
+                                ...(!_.get(this, 'options.script.datasetsResolver') ?
+                                    ['datasets'] : [])
+                            ],
 
                             // legacy options
                             legacy: {
@@ -589,6 +628,7 @@ module.exports = {
                             this.host.removeAllListeners(EXECUTION_ERROR_EVENT_BASE + executionId);
                             this.host.removeAllListeners(EXECUTION_SKIP_REQUEST_EVENT_BASE + executionId);
                             this.host.removeAllListeners(EXECUTION_VAULT_BASE + executionId);
+                            this.host.removeAllListeners(EXECUTION_DATASETS_BASE + executionId);
 
                             // Handle async errors as well.
                             // If there was an error running the script itself, that takes precedence

package/lib/runner/index.js

@@ -79,15 +79,15 @@ _.assign(Runner.prototype, {
      * the request being resolved
      * @param {Number} [options.nestedRequest.hasVaultAccess] - Mutated and set by any nested or parent request
      * to indicate whether vault access check has been performed.
-     * @param {Number} [options.nestedRequest.invocationCount] - The number of requests currently accummulated
-     * by the nested request chain.
+     * @param {Array} [options.nestedRequest.callStack] - The current stack of nested request item ids
+     * used to enforce max nested depth. Internally set and used.
      * @param {Object} [options.requester] - Options specific to the requester
      * @param {Function} [options.script.requestResolver] - Resolver that receives an id from
      * pm.execution.runRequest and returns the JSON for the request collection.
      * Should return a postman-collection compatible collection JSON with `item` containing the request to run,
      * `variable` array containing list of request-specific-collection variables and `event` with scripts to execute.
-     * @param {Number} [options.maxInvokableNestedRequests] - The maximum number of nested requests
-     * that a script can invoke, combined in total and recursively nested
+     * @param {Number} [options.maxInvokableNestedRequests] - The maximum nested depth
+     * that a script can invoke via pm.execution.runRequest
      * @param {Number} [options.iterationCount] -
      * @param {CertificateList} [options.certificates] -
      * @param {ProxyConfigList} [options.proxies] -

package/lib/runner/nested-request.js

@@ -11,9 +11,27 @@ function runNestedRequest ({ executionId, isExecutionSkipped, vaultSecrets, item
         const self = this,
             requestResolver = _.get(self, 'options.script.requestResolver'),
             runRequestRespEvent = EXECUTION_RUN_REQUEST_RESPONSE_EVENT_BASE + eventId,
-            maxInvokableNestedRequests = _.get(self, 'options.maxInvokableNestedRequests');
+            maxInvokableNestedRequests = _.get(self, 'options.maxInvokableNestedRequests'),
+            itemId = item.id,
+            currentItemState = { isPoppedFromCallStack: false },
+            popCurrentItemFromCallStack = () => {
+                if (currentItemState.isPoppedFromCallStack) { return; }
+
+                currentItemState.isPoppedFromCallStack = true;
+
+                if (!self.state.nestedRequest.callStack.length) { return; }
+
+                const { callStack } = self.state.nestedRequest,
+                    itemIndex = callStack.lastIndexOf(itemId);
+
+                if (itemIndex !== -1) {
+                    self.state.nestedRequest.callStack.splice(itemIndex, 1);
+                }
+            };
 
         function dispatchErrorToListener (err) {
+            popCurrentItemFromCallStack();
+
             const error = serialisedError(err);
 
             delete error.stack;
@@ -28,15 +46,15 @@ function runNestedRequest ({ executionId, isExecutionSkipped, vaultSecrets, item
             isNestedRequest: true,
             rootCursor: cursor,
             rootItem: item,
-            invocationCount: 0
+            callStack: []
         });
 
-        self.state.nestedRequest.invocationCount++;
+        self.state.nestedRequest.callStack.push(itemId);
 
-        // No more than maxInvokableNestedRequests runRequest calls per script or any of its nested request scripts
-        if (self.state.nestedRequest.invocationCount > maxInvokableNestedRequests) {
-            return dispatchErrorToListener(new Error('The maximum number of pm.execution.runRequest()' +
-                ' calls have been reached for this request.'));
+        // No more than maxInvokableNestedRequests nested depth
+        if (self.state.nestedRequest.callStack.length > maxInvokableNestedRequests) {
+            return dispatchErrorToListener(new Error('Max pm.execution.runRequest depth of ' +
+                maxInvokableNestedRequests + ' has been reached.'));
         }
 
         let rootRequestEventsList = self.state.nestedRequest.rootItem.events?.all?.() || [],
@@ -137,6 +155,8 @@ function runNestedRequest ({ executionId, isExecutionSkipped, vaultSecrets, item
                         variableMutationsFromThisExecution = {};
 
                     if (err) {
+                        popCurrentItemFromCallStack();
+
                         return self.host
                             .dispatch(EXECUTION_RUN_REQUEST_RESPONSE_EVENT_BASE + eventId,
                                 requestId, err);
@@ -206,6 +226,8 @@ function runNestedRequest ({ executionId, isExecutionSkipped, vaultSecrets, item
                                 delete error.stack;
                             }
 
+                            popCurrentItemFromCallStack();
+
                             return self.host.dispatch(runRequestRespEvent,
                                 requestId, error || null,
                                 responseForThisRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postman-runtime",
-  "version": "7.52.0",
+  "version": "7.54.0",
   "description": "Underlying library of executing Postman Collections",
   "author": "Postman Inc.",
   "license": "Apache-2.0",
@@ -45,18 +45,18 @@
     "@postman/tough-cookie": "4.1.3-postman.1",
     "async": "3.2.6",
     "aws4": "1.13.2",
-    "handlebars": "4.7.8",
+    "handlebars": "4.7.9",
     "httpntlm": "1.8.13",
     "jose": "5.10.0",
     "js-sha512": "0.9.0",
     "lodash": "4.17.23",
     "mime-types": "2.1.35",
-    "node-forge": "1.3.3",
+    "node-forge": "1.4.0",
     "node-oauth1": "1.3.0",
     "performance-now": "2.1.0",
     "postman-collection": "5.3.0",
     "postman-request": "2.88.1-postman.48",
-    "postman-sandbox": "6.6.1",
+    "postman-sandbox": "6.7.0",
     "postman-url-encoder": "3.0.8",
     "serialised-error": "1.1.3",
     "strip-json-comments": "3.1.1",