@pact-foundation/pact 13.1.4 → 13.1.5

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+### [13.1.5](https://github.com/pact-foundation/pact-js/compare/v13.1.4...v13.1.5) (2024-11-14)
+
+
+### Fixes and Improvements
+
+* allow hooks to run only once per interaction ([#1243](https://github.com/pact-foundation/pact-js/issues/1243)) ([b238fd0](https://github.com/pact-foundation/pact-js/commit/b238fd040031107cdd700e4ff43ab18dedf69859))
+* package.json & package-lock.json to reduce vulnerabilities ([99e101c](https://github.com/pact-foundation/pact-js/commit/99e101c3eebadab146c526770440f0d1df177195))
+* replace basic auth pact broker with bearer token ([0c1af06](https://github.com/pact-foundation/pact-js/commit/0c1af06f664f73e9014b23dc6d58e97efebdfb7d))
+
 ### [13.1.4](https://github.com/pact-foundation/pact-js/compare/v13.1.3...v13.1.4) (2024-10-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact",
-  "version": "13.1.4",
+  "version": "13.1.5",
   "description": "Pact for all things Javascript",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -21,10 +21,10 @@
     "pretest": "bash scripts/install-plugins.sh",
     "docker:alpine:build": "docker build --build-arg NODE_VERSION=${NODE_VERSION:-current} -f Dockerfile.alpine -t pact-js:alpine .",
     "docker:debian:build": "docker build --build-arg NODE_VERSION=${NODE_VERSION:-current} -f Dockerfile.debian -t pact-js:debian .",
-    "docker:alpine:run": "docker run -e LOG_LEVEL=${LOG_LEVEL:-info} -e GIT_REF=${GIT_REF:-test} -e GITHUB_ACTIONS=${GITHUB_ACTIONS:-false} -e SKIP_EXAMPLES=${SKIP_EXAMPLES:-''} -w /home -v $(pwd):/home --rm pact-js:alpine",
-    "docker:debian:run": "docker run -e LOG_LEVEL=${LOG_LEVEL:-info} -e GIT_REF=${GIT_REF:-test} -e GITHUB_ACTIONS=${GITHUB_ACTIONS:-false} -e SKIP_EXAMPLES=${SKIP_EXAMPLES:-''} -w /home -v $(pwd):/home --rm pact-js:debian",
-    "docker:alpine:attach": "docker run -w /home -v $(pwd):/home --entrypoint /bin/bash --rm -it pact-js:alpine",
-    "docker:debian:attach": "docker run -w /home -v $(pwd):/home --entrypoint /bin/bash --rm -it pact-js:debian"
+    "docker:alpine:run": "docker run -e LOG_LEVEL=${LOG_LEVEL:-info} -e GIT_REF=${GIT_REF:-test} -e GITHUB_ACTIONS=${GITHUB_ACTIONS:-false} -e SKIP_EXAMPLES=${SKIP_EXAMPLES:-''} -e PACT_BROKER_BASE_URL -e PACT_BROKER_TOKEN -w /home -v $(pwd):/home --rm pact-js:alpine",
+    "docker:debian:run": "docker run -e LOG_LEVEL=${LOG_LEVEL:-info} -e GIT_REF=${GIT_REF:-test} -e GITHUB_ACTIONS=${GITHUB_ACTIONS:-false} -e SKIP_EXAMPLES=${SKIP_EXAMPLES:-''} -e PACT_BROKER_BASE_URL -e PACT_BROKER_TOKEN  -w /home -v $(pwd):/home --rm pact-js:debian",
+    "docker:alpine:attach": "docker run -e PACT_BROKER_BASE_URL -e PACT_BROKER_TOKEN -w /home -v $(pwd):/home --entrypoint /bin/bash --rm -it pact-js:alpine",
+    "docker:debian:attach": "docker run -e PACT_BROKER_BASE_URL -e PACT_BROKER_TOKEN -w /home -v $(pwd):/home --entrypoint /bin/bash --rm -it pact-js:debian"
   },
   "repository": {
     "type": "git",
@@ -106,7 +106,7 @@
     "axios": "^1.7.4",
     "body-parser": "^1.20.3",
     "cli-color": "^2.0.1",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
     "graphql": "^14.0.0",
     "graphql-tag": "^2.9.1",
     "http-proxy": "^1.18.1",

package/scripts/ci/build-and-test.sh

@@ -13,9 +13,6 @@ cp package.json ./dist
 
 export GIT_BRANCH=${GITHUB_HEAD_REF:-${GIT_REF#refs/heads/}}
 
-export PACT_BROKER_USERNAME="dXfltyFMgNOFZAxr8io9wJ37iUpY42M"
-export PACT_BROKER_PASSWORD="O5AIZWxelWbLvqMd8PkAVycBJh2Psyg1"
-
 "${SCRIPT_DIR}"/lib/prepare-release.sh
 
 echo "--> Running coverage checks"

package/src/dsl/verifier/proxy/hooks.d.ts

@@ -1,4 +1,14 @@
-import express from 'express';
-import { ProxyOptions } from './types';
-export declare const registerBeforeHook: (app: express.Express, config: ProxyOptions, stateSetupPath: string) => void;
-export declare const registerAfterHook: (app: express.Express, config: ProxyOptions, stateSetupPath: string) => void;
+/**
+ * These handlers assume that the number of "setup" and "teardown" requests to
+ * `/_pactSetup` are always sequential and balanced, i.e. if 3 "setup" actions
+ * are received prior to an interaction being executed, then 3 "teardown"
+ * actions will be received after that interaction has ended.
+ */
+import { RequestHandler } from 'express';
+import { Hook } from './types';
+export type HooksState = {
+    setupCounter: number;
+};
+export declare const registerHookStateTracking: (hooksState: HooksState) => RequestHandler;
+export declare const registerBeforeHook: (beforeEach: Hook, hooksState: HooksState) => RequestHandler;
+export declare const registerAfterHook: (afterEach: Hook, hooksState: HooksState) => RequestHandler;

package/src/dsl/verifier/proxy/hooks.js

@@ -39,74 +39,93 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerAfterHook = exports.registerBeforeHook = void 0;
+exports.registerAfterHook = exports.registerBeforeHook = exports.registerHookStateTracking = void 0;
 var logger_1 = __importDefault(require("../../../common/logger"));
-var registerBeforeHook = function (app, config, stateSetupPath) {
-    if (config.beforeEach)
-        logger_1.default.trace("registered 'beforeEach' hook");
-    app.use(function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
-        var e_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(req.path === stateSetupPath && config.beforeEach)) return [3 /*break*/, 5];
-                    logger_1.default.debug("executing 'beforeEach' hook");
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, config.beforeEach()];
-                case 2:
-                    _a.sent();
-                    next();
-                    return [3 /*break*/, 4];
-                case 3:
-                    e_1 = _a.sent();
-                    logger_1.default.error("error executing 'beforeEach' hook: ".concat(e_1.message));
-                    logger_1.default.debug("Stack trace was: ".concat(e_1.stack));
-                    next(new Error("error executing 'beforeEach' hook: ".concat(e_1.message)));
-                    return [3 /*break*/, 4];
-                case 4: return [3 /*break*/, 6];
-                case 5:
-                    next();
-                    _a.label = 6;
-                case 6: return [2 /*return*/];
-            }
+var registerHookStateTracking = function (hooksState) {
+    return function (_a, res, next) {
+        var body = _a.body;
+        return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_b) {
+                if ((body === null || body === void 0 ? void 0 : body.action) === 'setup')
+                    hooksState.setupCounter += 1;
+                if ((body === null || body === void 0 ? void 0 : body.action) === 'teardown')
+                    hooksState.setupCounter -= 1;
+                logger_1.default.debug("hooks state counter is ".concat(hooksState.setupCounter, " after receiving \"").concat(body === null || body === void 0 ? void 0 : body.action, "\" action"));
+                next();
+                return [2 /*return*/];
+            });
+        });
+    };
+};
+exports.registerHookStateTracking = registerHookStateTracking;
+var registerBeforeHook = function (beforeEach, hooksState) {
+    return function (_a, res, next) {
+        var body = _a.body;
+        return __awaiter(void 0, void 0, void 0, function () {
+            var e_1;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!((body === null || body === void 0 ? void 0 : body.action) === 'setup' && hooksState.setupCounter === 1)) return [3 /*break*/, 5];
+                        logger_1.default.debug("executing 'beforeEach' hook");
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, beforeEach()];
+                    case 2:
+                        _b.sent();
+                        next();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_1 = _b.sent();
+                        logger_1.default.error("error executing 'beforeEach' hook: ".concat(e_1.message));
+                        logger_1.default.debug("Stack trace was: ".concat(e_1.stack));
+                        next(new Error("error executing 'beforeEach' hook: ".concat(e_1.message)));
+                        return [3 /*break*/, 4];
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
+                        next();
+                        _b.label = 6;
+                    case 6: return [2 /*return*/];
+                }
+            });
         });
-    }); });
+    };
 };
 exports.registerBeforeHook = registerBeforeHook;
-var registerAfterHook = function (app, config, stateSetupPath) {
-    if (config.afterEach)
-        logger_1.default.trace("registered 'afterEach' hook");
-    app.use(function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
-        var e_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(req.path !== stateSetupPath && config.afterEach)) return [3 /*break*/, 5];
-                    logger_1.default.debug("executing 'afterEach' hook");
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, config.afterEach()];
-                case 2:
-                    _a.sent();
-                    next();
-                    return [3 /*break*/, 4];
-                case 3:
-                    e_2 = _a.sent();
-                    logger_1.default.error("error executing 'afterEach' hook: ".concat(e_2.message));
-                    logger_1.default.debug("Stack trace was: ".concat(e_2.stack));
-                    next(new Error("error executing 'afterEach' hook: ".concat(e_2.message)));
-                    return [3 /*break*/, 4];
-                case 4: return [3 /*break*/, 6];
-                case 5:
-                    next();
-                    _a.label = 6;
-                case 6: return [2 /*return*/];
-            }
+var registerAfterHook = function (afterEach, hooksState) {
+    return function (_a, res, next) {
+        var body = _a.body;
+        return __awaiter(void 0, void 0, void 0, function () {
+            var e_2;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!((body === null || body === void 0 ? void 0 : body.action) === 'teardown' && hooksState.setupCounter === 0)) return [3 /*break*/, 5];
+                        logger_1.default.debug("executing 'afterEach' hook");
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, afterEach()];
+                    case 2:
+                        _b.sent();
+                        next();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_2 = _b.sent();
+                        logger_1.default.error("error executing 'afterEach' hook: ".concat(e_2.message));
+                        logger_1.default.debug("Stack trace was: ".concat(e_2.stack));
+                        next(new Error("error executing 'afterEach' hook: ".concat(e_2.message)));
+                        return [3 /*break*/, 4];
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
+                        next();
+                        _b.label = 6;
+                    case 6: return [2 /*return*/];
+                }
+            });
         });
-    }); });
+    };
 };
 exports.registerAfterHook = registerAfterHook;
 //# sourceMappingURL=hooks.js.map

package/src/dsl/verifier/proxy/hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/hooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA4C;AAGrC,IAAM,kBAAkB,GAAG,UAChC,GAAoB,EACpB,MAAoB,EACpB,cAAsB;IAEtB,IAAI,MAAM,CAAC,UAAU;QAAE,gBAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACpE,GAAG,CAAC,GAAG,CAAC,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;yBACvB,CAAA,GAAG,CAAC,IAAI,KAAK,cAAc,IAAI,MAAM,CAAC,UAAU,CAAA,EAAhD,wBAAgD;oBAClD,gBAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;oBAE1C,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAAzB,SAAyB,CAAC;oBAC1B,IAAI,EAAE,CAAC;;;;oBAEP,gBAAM,CAAC,KAAK,CAAC,6CAAsC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC;oBAChE,gBAAM,CAAC,KAAK,CAAC,2BAAoB,GAAC,CAAC,KAAK,CAAE,CAAC,CAAC;oBAC5C,IAAI,CAAC,IAAI,KAAK,CAAC,6CAAsC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC;;;;oBAGrE,IAAI,EAAE,CAAC;;;;;SAEV,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B;AAEK,IAAM,iBAAiB,GAAG,UAC/B,GAAoB,EACpB,MAAoB,EACpB,cAAsB;IAEtB,IAAI,MAAM,CAAC,SAAS;QAAE,gBAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAClE,GAAG,CAAC,GAAG,CAAC,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;yBACvB,CAAA,GAAG,CAAC,IAAI,KAAK,cAAc,IAAI,MAAM,CAAC,SAAS,CAAA,EAA/C,wBAA+C;oBACjD,gBAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;;;;oBAEzC,qBAAM,MAAM,CAAC,SAAS,EAAE,EAAA;;oBAAxB,SAAwB,CAAC;oBACzB,IAAI,EAAE,CAAC;;;;oBAEP,gBAAM,CAAC,KAAK,CAAC,4CAAqC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC;oBAC/D,gBAAM,CAAC,KAAK,CAAC,2BAAoB,GAAC,CAAC,KAAK,CAAE,CAAC,CAAC;oBAC5C,IAAI,CAAC,IAAI,KAAK,CAAC,4CAAqC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC;;;;oBAGpE,IAAI,EAAE,CAAC;;;;;SAEV,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,iBAAiB,qBAqB5B"}
+{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/hooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,kEAA4C;AAOrC,IAAM,yBAAyB,GACpC,UAAC,UAAsB;IACvB,OAAA,UAAO,EAAQ,EAAE,GAAG,EAAE,IAAI;YAAjB,IAAI,UAAA;;;gBACX,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,MAAK,OAAO;oBAAE,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC;gBAC3D,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,MAAK,UAAU;oBAAE,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC;gBAE9D,gBAAM,CAAC,KAAK,CACV,iCAA0B,UAAU,CAAC,YAAY,gCAAqB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,cAAU,CAC7F,CAAC;gBAEF,IAAI,EAAE,CAAC;;;;KACR;AATD,CASC,CAAC;AAXS,QAAA,yBAAyB,6BAWlC;AAEG,IAAM,kBAAkB,GAC7B,UAAC,UAAgB,EAAE,UAAsB;IACzC,OAAA,UAAO,EAAQ,EAAE,GAAG,EAAE,IAAI;YAAjB,IAAI,UAAA;;;;;;6BACP,CAAA,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,MAAK,OAAO,IAAI,UAAU,CAAC,YAAY,KAAK,CAAC,CAAA,EAAzD,wBAAyD;wBAC3D,gBAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;wBAE1C,qBAAM,UAAU,EAAE,EAAA;;wBAAlB,SAAkB,CAAC;wBACnB,IAAI,EAAE,CAAC;;;;wBAEP,gBAAM,CAAC,KAAK,CAAC,6CAAsC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC;wBAChE,gBAAM,CAAC,KAAK,CAAC,2BAAoB,GAAC,CAAC,KAAK,CAAE,CAAC,CAAC;wBAC5C,IAAI,CAAC,IAAI,KAAK,CAAC,6CAAsC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC;;;;wBAGrE,IAAI,EAAE,CAAC;;;;;;KAEV;AAdD,CAcC,CAAC;AAhBS,QAAA,kBAAkB,sBAgB3B;AAEG,IAAM,iBAAiB,GAC5B,UAAC,SAAe,EAAE,UAAsB;IACxC,OAAA,UAAO,EAAQ,EAAE,GAAG,EAAE,IAAI;YAAjB,IAAI,UAAA;;;;;;6BACP,CAAA,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,MAAK,UAAU,IAAI,UAAU,CAAC,YAAY,KAAK,CAAC,CAAA,EAA5D,wBAA4D;wBAC9D,gBAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;;;;wBAEzC,qBAAM,SAAS,EAAE,EAAA;;wBAAjB,SAAiB,CAAC;wBAClB,IAAI,EAAE,CAAC;;;;wBAEP,gBAAM,CAAC,KAAK,CAAC,4CAAqC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC;wBAC/D,gBAAM,CAAC,KAAK,CAAC,2BAAoB,GAAC,CAAC,KAAK,CAAE,CAAC,CAAC;wBAC5C,IAAI,CAAC,IAAI,KAAK,CAAC,4CAAqC,GAAC,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC;;;;wBAGpE,IAAI,EAAE,CAAC;;;;;;KAEV;AAdD,CAcC,CAAC;AAhBS,QAAA,iBAAiB,qBAgB1B"}

package/src/dsl/verifier/proxy/hooks.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/src/dsl/verifier/proxy/hooks.spec.js

@@ -0,0 +1,214 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var chai_1 = require("chai");
+var sinon_1 = require("sinon");
+var hooks_1 = require("./hooks");
+// This mimics the proxy setup (src/dsl/verifier/proxy/proxy.ts), whereby the
+// state handling middleware is run regardless of whether a hook is registered
+// or not.
+var doRequest = function (action, hooksState, hookHandler) { return __awaiter(void 0, void 0, void 0, function () {
+    var hooksStateHandler, hookRequestHandler, request;
+    return __generator(this, function (_a) {
+        hooksStateHandler = (0, hooks_1.registerHookStateTracking)(hooksState);
+        hookRequestHandler = hookHandler || (function (req, res, next) { return next(); });
+        request = {
+            body: {
+                action: action,
+            },
+        };
+        return [2 /*return*/, new Promise(function (resolve) {
+                hooksStateHandler(request, null, function () {
+                    hookRequestHandler(request, null, resolve);
+                });
+            })];
+    });
+}); };
+describe('Verifier', function () {
+    describe('#registerBeforeHook', function () {
+        describe('when the state setup routine is called multiple times before the next teardown', function () {
+            it('it executes the beforeEach hook only once', function () { return __awaiter(void 0, void 0, void 0, function () {
+                var hooksState, hook, hookHandler;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            hooksState = { setupCounter: 0 };
+                            hook = (0, sinon_1.stub)().resolves();
+                            hookHandler = (0, hooks_1.registerBeforeHook)(hook, hooksState);
+                            return [4 /*yield*/, doRequest('setup', hooksState, hookHandler)];
+                        case 1:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('setup', hooksState, hookHandler)];
+                        case 2:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState)];
+                        case 3:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState)];
+                        case 4:
+                            _a.sent();
+                            (0, chai_1.expect)(hook).to.be.calledOnce;
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+        });
+    });
+    describe('#registerAfterHook', function () {
+        describe('when the state teardown routine is called multiple times before the next setup', function () {
+            it('it executes the afterEach hook only once', function () { return __awaiter(void 0, void 0, void 0, function () {
+                var hooksState, hook, hookHandler;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            hooksState = { setupCounter: 0 };
+                            hook = (0, sinon_1.stub)().resolves();
+                            hookHandler = (0, hooks_1.registerAfterHook)(hook, hooksState);
+                            return [4 /*yield*/, doRequest('setup', hooksState)];
+                        case 1:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('setup', hooksState)];
+                        case 2:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, hookHandler)];
+                        case 3:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, hookHandler)];
+                        case 4:
+                            _a.sent();
+                            (0, chai_1.expect)(hook).to.be.calledOnce;
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+        });
+    });
+    describe('#registerBeforeHook and #registerAfterHook', function () {
+        describe('when the state teardown routine is called multiple times before the next setup', function () {
+            it('it executes the beforeEach and afterEach hooks only once', function () { return __awaiter(void 0, void 0, void 0, function () {
+                var hooksState, beforeHook, afterHook, beforeHookHandler, afterHookHandler;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            hooksState = { setupCounter: 0 };
+                            beforeHook = (0, sinon_1.stub)().resolves();
+                            afterHook = (0, sinon_1.stub)().resolves();
+                            beforeHookHandler = (0, hooks_1.registerBeforeHook)(beforeHook, hooksState);
+                            afterHookHandler = (0, hooks_1.registerAfterHook)(afterHook, hooksState);
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 1:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 2:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 3:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 4:
+                            _a.sent();
+                            (0, chai_1.expect)(beforeHook).to.be.calledOnce;
+                            (0, chai_1.expect)(afterHook).to.be.calledOnce;
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+        });
+        describe('when multiple interactions are executed', function () {
+            it('it executes the beforeEach and afterEach hooks once for each interaction', function () { return __awaiter(void 0, void 0, void 0, function () {
+                var hooksState, beforeHook, afterHook, beforeHookHandler, afterHookHandler;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            hooksState = { setupCounter: 0 };
+                            beforeHook = (0, sinon_1.stub)().resolves();
+                            afterHook = (0, sinon_1.stub)().resolves();
+                            beforeHookHandler = (0, hooks_1.registerBeforeHook)(beforeHook, hooksState);
+                            afterHookHandler = (0, hooks_1.registerAfterHook)(afterHook, hooksState);
+                            // Interaction 1 (two "given" states)
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 1:
+                            // Interaction 1 (two "given" states)
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 2:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 3:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 4:
+                            _a.sent();
+                            // Interaction 2 (one "given" state)
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 5:
+                            // Interaction 2 (one "given" state)
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 6:
+                            _a.sent();
+                            // Interaction 3 (three "given" states)
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 7:
+                            // Interaction 3 (three "given" states)
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 8:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('setup', hooksState, beforeHookHandler)];
+                        case 9:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 10:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 11:
+                            _a.sent();
+                            return [4 /*yield*/, doRequest('teardown', hooksState, afterHookHandler)];
+                        case 12:
+                            _a.sent();
+                            (0, chai_1.expect)(beforeHook).to.be.calledThrice;
+                            (0, chai_1.expect)(afterHook).to.be.calledThrice;
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+        });
+    });
+});
+//# sourceMappingURL=hooks.spec.js.map

package/src/dsl/verifier/proxy/hooks.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.spec.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/hooks.spec.ts"],"names":[],"mappings":"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"}

package/src/dsl/verifier/proxy/proxy.js

@@ -63,8 +63,19 @@ var createProxy = function (config, stateSetupPath, messageTransportPath) {
     }));
     app.use(body_parser_1.default.urlencoded({ extended: true }));
     app.use('/*', body_parser_1.default.raw({ type: '*/*' }));
-    (0, hooks_1.registerBeforeHook)(app, config, stateSetupPath);
-    (0, hooks_1.registerAfterHook)(app, config, stateSetupPath);
+    // Hooks
+    var hooksState = {
+        setupCounter: 0,
+    };
+    app.use(stateSetupPath, (0, hooks_1.registerHookStateTracking)(hooksState));
+    if (config.beforeEach) {
+        logger_1.default.trace("registered 'beforeEach' hook");
+        app.use(stateSetupPath, (0, hooks_1.registerBeforeHook)(config.beforeEach, hooksState));
+    }
+    if (config.afterEach) {
+        logger_1.default.trace("registered 'afterEach' hook");
+        app.use(stateSetupPath, (0, hooks_1.registerAfterHook)(config.afterEach, hooksState));
+    }
     // Trace req/res logging
     if (config.logLevel === 'debug' || config.logLevel === 'trace') {
         logger_1.default.info('debug request/response logging enabled');

package/src/dsl/verifier/proxy/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/proxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/proxy.ts"],"names":[],"mappings":"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"}