@n1k1t/mock-server 0.1.3 → 0.1.5

package/lib/src/server/middlewares/forward.middleware.d.ts

@@ -1,24 +1,26 @@
 import { Middleware } from '../models';
-declare const _default: Middleware<"expectation" | "manipulated" | "history", import("../models").HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+declare const _default: Middleware<"history" | "expectation" | "manipulated", import("../models").HttpRequestContext<unknown> & {
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
         manipulated?: import("../../expectations").IExpectationOperatorContext;
         forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
         history?: import("../history").History;
-    }, "expectation" | "manipulated" | "history">;
+    }, "history" | "expectation" | "manipulated">;
 }> & {
-    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
             manipulated?: import("../../expectations").IExpectationOperatorContext;
             forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
-        }, "expectation" | "manipulated" | "history">;
-    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+        }, "history" | "expectation" | "manipulated">;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
 //# sourceMappingURL=forward.middleware.d.ts.map

package/lib/src/server/middlewares/forward.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forward.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/forward.middleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,UAAU,EAAkC,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;AAE3F,wBAiFK"}
+{"version":3,"file":"forward.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/forward.middleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,UAAU,EAAkC,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAG3F,wBAsGK"}

package/lib/src/server/middlewares/forward.middleware.js

@@ -7,34 +7,28 @@ const axios_1 = __importDefault(require("axios"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
 const lodash_1 = __importDefault(require("lodash"));
 const models_1 = require("../models");
+const url_1 = require("url");
 exports.default = models_1.Middleware
     .build(__filename, ['expectation', 'manipulated', 'history'])
-    .assignHandler(async (context, next) => {
+    .assignHandler(async (context, { logger }) => {
     if (!context.shared.expectation.forward) {
-        return next();
+        return null;
     }
     const { url, baseUrl, timeout, proxy } = context.shared.expectation.forward;
     const forwarded = context.shared.manipulated;
     const incomingType = (0, models_1.extractPayloadType)(forwarded.incoming.headers);
     const body = forwarded.incoming.body === undefined ? forwarded.incoming.bodyRaw : forwarded.incoming.body;
     const bodyRaw = Buffer.from(typeof body === 'object' ? (0, models_1.serializePayload)(incomingType, body) : String(body));
-    Object.assign(forwarded.incoming, {
-        type: incomingType,
-        bodyRaw: bodyRaw.toString(),
+    const configuration = await context.server.plugins.exec('forward.request', {
+        timeout: timeout ?? 1000 * 30,
+        method: forwarded.incoming.method,
         headers: {
             'connection': 'close',
             ...forwarded.incoming.headers,
-            ...((!forwarded.incoming.headers?.['transfer-encoding'] && bodyRaw?.length) && {
+            ...((!forwarded.incoming.headers?.['transfer-encoding'] && bodyRaw.length) && {
                 'content-length': String(bodyRaw.length),
             }),
         },
-    });
-    const history = context.shared.history.extendForwarded(forwarded);
-    context.server.exchange.ws.publish('history:updated', history.toPlain());
-    const response = await (0, axios_1.default)({
-        timeout: timeout ?? 1000 * 30,
-        method: forwarded.incoming.method,
-        headers: forwarded.incoming.headers,
         ...(url && { url }),
         ...(baseUrl && { baseURL: baseUrl, url: forwarded.incoming.path }),
         data: bodyRaw,
@@ -44,28 +38,44 @@ exports.default = models_1.Middleware
             proxy,
             httpsAgent: (0, https_proxy_agent_1.default)(proxy.host)
         }),
-    }).catch((error) => {
+    }, context);
+    const forwardedType = (0, models_1.extractPayloadType)(configuration.headers ?? {});
+    Object.assign(forwarded.incoming, {
+        type: forwardedType,
+        path: new url_1.URL(configuration.url ?? forwarded.incoming.path, baseUrl).pathname,
+        method: configuration.method ?? forwarded.incoming.method,
+        headers: configuration.headers ?? {},
+        ...(configuration.params && { query: configuration.params }),
+        body: (0, models_1.parsePayload)(forwardedType, configuration.data instanceof Buffer ? configuration.data.toString() : configuration.data),
+        bodyRaw: configuration.data instanceof Buffer
+            ? configuration.data.toString()
+            : typeof configuration.data === 'string'
+                ? configuration.data
+                : '',
+    });
+    const history = context.shared.history.extendForwarded(forwarded);
+    context.server.exchange.ws.publish('history:updated', history.toPlain());
+    const response = await axios_1.default.request(configuration).catch((error) => {
         if (!error.response) {
-            history
-                .assign({ error: lodash_1.default.pick(error, ['message', 'code']) })
-                .changeState('finished');
+            history.assignError(lodash_1.default.pick(error, ['message', 'code'])).switchState('finished');
             context.server.exchange.ws.publish('history:updated', history.toPlain());
             context.reply.internalError(error.message);
+            logger.error('Got error while forwaring', error?.stack ?? error);
             throw error;
         }
         return error.response;
     });
+    const parsed = await context.server.plugins.exec('forward.response', response, context);
     const outgoingType = (0, models_1.extractPayloadType)(response.headers);
-    const dataRaw = response.data?.toString() ?? '';
     forwarded.outgoing = {
         type: outgoingType,
         status: response.status,
         headers: response.headers,
-        dataRaw,
-        data: (0, models_1.parsePayload)(outgoingType, dataRaw),
+        dataRaw: parsed.raw,
+        data: 'payload' in parsed ? parsed.payload : (0, models_1.parsePayload)(outgoingType, parsed.raw),
     };
     history.extendForwarded(forwarded);
     context.server.exchange.ws.publish('history:updated', history.toPlain());
-    return next({ forwarded });
+    context.share({ forwarded });
 });
 //# sourceMappingURL=forward.middleware.js.map

package/lib/src/server/middlewares/forward.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"forward.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/forward.middleware.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0C;AAC1C,0EAAgD;AAChD,oDAAuB;AAEvB,sCAA2F;AAE3F,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;KAC5D,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxC,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;IAE5E,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAA,2BAAkB,EAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC1G,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,yBAAgB,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE5G,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;QAChC,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;QAE3B,OAAO,EAAE;YACP,YAAY,EAAE,OAAO;YAErB,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO;YAC7B,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,IAAI,OAAO,EAAE,MAAM,CAAC,IAAI;gBAC7E,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACzC,CAAC;SACH;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEzE,MAAM,QAAQ,GAAG,MAAM,IAAA,eAAK,EAAC;QAC3B,OAAO,EAAE,OAAO,IAAI,IAAI,GAAG,EAAE;QAE7B,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM;QACjC,OAAO,EAA0B,SAAS,CAAC,QAAQ,CAAC,OAAO;QAE3D,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;QACnB,GAAG,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAElE,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;QAC9B,YAAY,EAAE,aAAa;QAE3B,GAAG,CAAC,KAAK,IAAI;YACX,KAAK;YACL,UAAU,EAAE,IAAA,2BAAe,EAAC,KAAK,CAAC,IAAI,CAAC;SACxC,CAAC;KACH,CAAC,CAAC,KAAK,CAAC,CAAC,KAAiB,EAAE,EAAE;QAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO;iBACJ,MAAM,CAAC,EAAE,KAAK,EAAE,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;iBACrD,WAAW,CAAC,UAAU,CAAC,CAAC;YAE3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACzE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE3C,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC,QAAQ,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAEhD,SAAS,CAAC,QAAQ,GAAG;QACnB,IAAI,EAAE,YAAY;QAElB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;QAEzB,OAAO;QACP,IAAI,EAAE,IAAA,qBAAY,EAAC,YAAY,EAAE,OAAO,CAAC;KAC1C,CAAC;IAEF,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEzE,OAAO,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"forward.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/forward.middleware.ts"],"names":[],"mappings":"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"}

package/lib/src/server/middlewares/history.middleware.d.ts

@@ -1,6 +1,6 @@
 import { Middleware } from '../models';
 declare const _default: Middleware<"expectation", import("../models").HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -9,8 +9,8 @@ declare const _default: Middleware<"expectation", import("../models").HttpReques
         history?: import("../history").History;
     }, "expectation">;
 }> & {
-    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -18,7 +18,9 @@ declare const _default: Middleware<"expectation", import("../models").HttpReques
             forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
         }, "expectation">;
-    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
 //# sourceMappingURL=history.middleware.d.ts.map

package/lib/src/server/middlewares/history.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/history.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;AAEvC,wBASK"}
+{"version":3,"file":"history.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/history.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAEvC,wBASK"}

package/lib/src/server/middlewares/history.middleware.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("../models");
 exports.default = models_1.Middleware
     .build(__filename, ['expectation'])
-    .assignHandler((context, next) => {
+    .assignHandler((context) => {
     const history = context.server.storage.history
         .register(context.toPlain({ locations: ['incoming'] }))
-        .assign({ expectation: context.shared.expectation });
+        .assignExpectation(context.shared.expectation);
     context.server.exchange.ws.publish('history:added', history.toPlain());
-    next({ history });
+    context.share({ history });
 });
 //# sourceMappingURL=history.middleware.js.map

package/lib/src/server/middlewares/history.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/history.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;KAClC,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;SAC3C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtD,MAAM,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAEvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACvE,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"history.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/history.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;KAClC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;SAC3C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtD,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAEjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACvE,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/index.d.ts

@@ -3,7 +3,7 @@ export { default as delayMiddleware } from './delay.middleware';
 export { default as destroyMiddleware } from './destroy.midleware';
 export { default as matchExpectationMiddleware } from './match-expectation.middleware';
 export { default as manipulateExpectationMiddleware } from './manipulate-expectation.middleware';
-export { default as handleInternalMiddleware } from './internal-route.middleware';
+export { default as internalMiddleware } from './internal.middleware';
 export { default as publicMiddleware } from './public.middleware';
 export { default as historyMiddleware } from './history.middleware';
 export { default as replyMiddleware } from './reply.middleware';

package/lib/src/server/middlewares/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC"}

package/lib/src/server/middlewares/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replyMiddleware = exports.historyMiddleware = exports.publicMiddleware = exports.handleInternalMiddleware = exports.manipulateExpectationMiddleware = exports.matchExpectationMiddleware = exports.destroyMiddleware = exports.delayMiddleware = exports.forwardMiddleware = void 0;
+exports.replyMiddleware = exports.historyMiddleware = exports.publicMiddleware = exports.internalMiddleware = exports.manipulateExpectationMiddleware = exports.matchExpectationMiddleware = exports.destroyMiddleware = exports.delayMiddleware = exports.forwardMiddleware = void 0;
 var forward_middleware_1 = require("./forward.middleware");
 Object.defineProperty(exports, "forwardMiddleware", { enumerable: true, get: function () { return __importDefault(forward_middleware_1).default; } });
 var delay_middleware_1 = require("./delay.middleware");
@@ -14,8 +14,8 @@ var match_expectation_middleware_1 = require("./match-expectation.middleware");
 Object.defineProperty(exports, "matchExpectationMiddleware", { enumerable: true, get: function () { return __importDefault(match_expectation_middleware_1).default; } });
 var manipulate_expectation_middleware_1 = require("./manipulate-expectation.middleware");
 Object.defineProperty(exports, "manipulateExpectationMiddleware", { enumerable: true, get: function () { return __importDefault(manipulate_expectation_middleware_1).default; } });
-var internal_route_middleware_1 = require("./internal-route.middleware");
-Object.defineProperty(exports, "handleInternalMiddleware", { enumerable: true, get: function () { return __importDefault(internal_route_middleware_1).default; } });
+var internal_middleware_1 = require("./internal.middleware");
+Object.defineProperty(exports, "internalMiddleware", { enumerable: true, get: function () { return __importDefault(internal_middleware_1).default; } });
 var public_middleware_1 = require("./public.middleware");
 Object.defineProperty(exports, "publicMiddleware", { enumerable: true, get: function () { return __importDefault(public_middleware_1).default; } });
 var history_middleware_1 = require("./history.middleware");

package/lib/src/server/middlewares/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAoE;AAA3D,wIAAA,OAAO,OAAqB;AACrC,uDAAgE;AAAvD,oIAAA,OAAO,OAAmB;AACnC,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,+EAAuF;AAA9E,2JAAA,OAAO,OAA8B;AAC9C,yFAAiG;AAAxF,qKAAA,OAAO,OAAmC;AACnD,yEAAkF;AAAzE,sJAAA,OAAO,OAA4B;AAC5C,yDAAkE;AAAzD,sIAAA,OAAO,OAAoB;AACpC,2DAAoE;AAA3D,wIAAA,OAAO,OAAqB;AACrC,uDAAgE;AAAvD,oIAAA,OAAO,OAAmB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAoE;AAA3D,wIAAA,OAAO,OAAqB;AACrC,uDAAgE;AAAvD,oIAAA,OAAO,OAAmB;AACnC,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,+EAAuF;AAA9E,2JAAA,OAAO,OAA8B;AAC9C,yFAAiG;AAAxF,qKAAA,OAAO,OAAmC;AACnD,6DAAsE;AAA7D,0IAAA,OAAO,OAAsB;AACtC,yDAAkE;AAAzD,sIAAA,OAAO,OAAoB;AACpC,2DAAoE;AAA3D,wIAAA,OAAO,OAAqB;AACrC,uDAAgE;AAAvD,oIAAA,OAAO,OAAmB"}

package/lib/src/server/middlewares/{internal-route.middleware.d.ts → internal.middleware.d.ts}

@@ -1,6 +1,6 @@
 import { Middleware } from '../models';
 declare const _default: Middleware<never, import("../models").HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -9,8 +9,8 @@ declare const _default: Middleware<never, import("../models").HttpRequestContext
         history?: import("../history").History;
     }, never>;
 }> & {
-    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -18,7 +18,9 @@ declare const _default: Middleware<never, import("../models").HttpRequestContext
             forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
         }, never>;
-    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
-//# sourceMappingURL=internal-route.middleware.d.ts.map
+//# sourceMappingURL=internal.middleware.d.ts.map

package/lib/src/server/middlewares/internal.middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/internal.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAGvC,wBAUK"}

package/lib/src/server/middlewares/{internal-route.middleware.js → internal.middleware.js}

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const router_1 = require("../router");
 const models_1 = require("../models");
+const router_1 = require("../router");
 exports.default = models_1.Middleware
     .build(__filename)
-    .assignHandler((context, next) => {
+    .assignHandler(async (context) => {
     const key = [context.incoming.method, context.incoming.path].join(':');
     const endpoint = router_1.routes[context.type][key];
-    return endpoint?.handler ? endpoint.handler(context) : next();
+    if (endpoint?.handler) {
+        await endpoint.handler(context);
+        context.complete();
+    }
 });
-//# sourceMappingURL=internal-route.middleware.js.map
+//# sourceMappingURL=internal.middleware.js.map

package/lib/src/server/middlewares/internal.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/internal.middleware.ts"],"names":[],"mappings":";;AAEA,sCAAuC;AACvC,sCAAmC;AAEnC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;QACtB,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/manipulate-expectation.middleware.d.ts

@@ -1,6 +1,6 @@
 import { Middleware } from '../models';
 declare const _default: Middleware<"expectation", import("../models").HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -9,8 +9,8 @@ declare const _default: Middleware<"expectation", import("../models").HttpReques
         history?: import("../history").History;
     }, "expectation">;
 }> & {
-    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -18,7 +18,9 @@ declare const _default: Middleware<"expectation", import("../models").HttpReques
             forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
         }, "expectation">;
-    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
 //# sourceMappingURL=manipulate-expectation.middleware.d.ts.map

package/lib/src/server/middlewares/manipulate-expectation.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manipulate-expectation.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/manipulate-expectation.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;AAEvC,wBAWK"}
+{"version":3,"file":"manipulate-expectation.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/manipulate-expectation.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAEvC,wBAWK"}

package/lib/src/server/middlewares/manipulate-expectation.middleware.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("../models");
 exports.default = models_1.Middleware
     .build(__filename, ['expectation'])
-    .assignHandler((context, next) => {
+    .assignHandler((context) => {
     const manipulated = context.shared.expectation.request?.manipulate(context.toPlain({ clone: true, locations: ['incoming'] }));
-    return next({
+    context.share({
         manipulated,
         ...(manipulated?.seed !== undefined && { seed: manipulated.seed }),
     });

package/lib/src/server/middlewares/manipulate-expectation.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"manipulate-expectation.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/manipulate-expectation.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;KAClC,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAChE,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAC1D,CAAC;IAEF,OAAO,IAAI,CAAC;QACV,WAAW;QACX,GAAG,CAAC,WAAW,EAAE,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;KACnE,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"manipulate-expectation.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/manipulate-expectation.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;KAClC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE;IACzB,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAChE,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAC1D,CAAC;IAEF,OAAO,CAAC,KAAK,CAAC;QACZ,WAAW;QACX,GAAG,CAAC,WAAW,EAAE,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;KACnE,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/match-expectation.middleware.d.ts

@@ -1,6 +1,6 @@
 import { Middleware } from '../models';
 declare const _default: Middleware<never, import("../models").HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -9,8 +9,8 @@ declare const _default: Middleware<never, import("../models").HttpRequestContext
         history?: import("../history").History;
     }, never>;
 }> & {
-    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -18,7 +18,9 @@ declare const _default: Middleware<never, import("../models").HttpRequestContext
             forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
         }, never>;
-    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
 //# sourceMappingURL=match-expectation.middleware.d.ts.map

package/lib/src/server/middlewares/match-expectation.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"match-expectation.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/match-expectation.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;AAEvC,wBAmBK"}
+{"version":3,"file":"match-expectation.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/match-expectation.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAGhE,wBAyBK"}

package/lib/src/server/middlewares/match-expectation.middleware.js

@@ -1,20 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("../models");
+const utils_1 = require("../../utils");
 exports.default = models_1.Middleware
     .build(__filename)
-    .assignHandler((context, next) => {
-    const plain = context.toPlain({ locations: ['incoming'] });
+    .assignHandler((context, { logger }) => {
+    const plain = context.toPlain({ clone: true, locations: ['incoming'] });
     const expectation = context.server.storage.expectations.match('request', plain);
     if (!expectation) {
         const history = context.server.storage.history
-            .register(plain)
-            .changeState('finished');
+            .register(Object.assign(plain, {
+            outgoing: (0, utils_1.cast)({
+                type: 'json',
+                status: 404,
+                headers: {},
+            })
+        }))
+            .switchState('finished');
         context.server.exchange.ws.publish('history:added', history.toPlain());
         return context.reply.notFound();
     }
-    expectation.increaseExecutionsCounter();
+    logger.info('Has matched with', `"${expectation.name}" [${expectation.id}]`);
     context.server.exchange.ws.publish('expectation:updated', expectation.toPlain());
-    return next({ expectation });
+    context.share({ expectation });
 });
 //# sourceMappingURL=match-expectation.middleware.js.map

package/lib/src/server/middlewares/match-expectation.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"match-expectation.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/match-expectation.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAM,SAAS,EAAE,KAAK,CAAC,CAAC;IAErF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;aAC3C,QAAQ,CAAC,KAAK,CAAC;aACf,WAAW,CAAC,UAAU,CAAC,CAAC;QAE3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAClC,CAAC;IAED,WAAW,CAAC,yBAAyB,EAAE,CAAC;IACxC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;IAEjF,OAAO,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"match-expectation.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/match-expectation.middleware.ts"],"names":[],"mappings":";;AAEA,sCAAgE;AAChE,uCAAmC;AAEnC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACrC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAM,SAAS,EAAE,KAAK,CAAC,CAAC;IAErF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;aAC3C,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;YAC7B,QAAQ,EAAE,IAAA,YAAI,EAA0B;gBACtC,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,EAAE;aACZ,CAAC;SACH,CAAC,CAAC;aACF,WAAW,CAAC,UAAU,CAAC,CAAC;QAE3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,WAAW,CAAC,IAAI,MAAM,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC;IAE7E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/public.middleware.d.ts

@@ -1,6 +1,6 @@
 import { Middleware } from '../models';
 declare const _default: Middleware<never, import("../models").HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -9,8 +9,8 @@ declare const _default: Middleware<never, import("../models").HttpRequestContext
         history?: import("../history").History;
     }, never>;
 }> & {
-    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
@@ -18,7 +18,9 @@ declare const _default: Middleware<never, import("../models").HttpRequestContext
             forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
         }, never>;
-    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
 //# sourceMappingURL=public.middleware.d.ts.map

package/lib/src/server/middlewares/public.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/public.middleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;AAEvC,wBAgCK"}
+{"version":3,"file":"public.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/public.middleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAGvC,wBAiCK"}

package/lib/src/server/middlewares/public.middleware.js

@@ -7,31 +7,32 @@ const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
 const models_1 = require("../models");
+const config_1 = __importDefault(require("../../config"));
 exports.default = models_1.Middleware
     .build(__filename)
-    .assignHandler(async (context, next) => {
-    if (!context.incoming.path.includes(context.server.config.client.publicRoute)) {
-        return next();
+    .assignHandler(async (context) => {
+    const gui = config_1.default.get('gui');
+    const statics = config_1.default.get('statics');
+    if (!context.incoming.path.includes(gui.route)) {
+        return null;
     }
-    const requestPath = context.incoming.path.replace(context.server.config.client.publicRoute, '');
+    const requestPath = context.incoming.path.replace(gui.route, '');
     const requestPathDetails = path_1.default.parse(requestPath);
     if (!requestPath) {
-        return context.response
-            .writeHead(301, 'Moved', { Location: path_1.default.join(context.server.config.client.publicRoute, '/') })
-            .end();
+        context.response.writeHead(301, 'Moved', { Location: path_1.default.join(gui.route, '/') }).end();
+        return context.complete();
     }
     if (requestPathDetails.dir === '/' && !requestPathDetails.ext) {
         context.response.writeHead(200, 'Ok', { 'Content-type': 'text/html;charset=utf-8' });
-        return (0, fs_1.createReadStream)(path_1.default.join(context.server.config.client.publicDirPath, '/index.html'))
-            .pipe(context.response);
+        (0, fs_1.createReadStream)(path_1.default.join(statics.public.dir, '/index.html')).pipe(context.response);
+        return context.complete();
     }
-    const fileStat = await promises_1.default.stat(path_1.default.join(context.server.config.client.publicDirPath, requestPath)).catch(() => null);
+    const fileStat = await promises_1.default.stat(path_1.default.join(statics.public.dir, requestPath)).catch(() => null);
     if (fileStat === null) {
-        return context.response
-            .writeHead(404, 'Not found')
-            .end();
+        context.response.writeHead(404, 'Not found').end();
+        return context.complete();
     }
-    return (0, fs_1.createReadStream)(path_1.default.join(context.server.config.client.publicDirPath, requestPath))
-        .pipe(context.response);
+    (0, fs_1.createReadStream)(path_1.default.join(statics.public.dir, requestPath)).pipe(context.response);
+    context.complete();
 });
 //# sourceMappingURL=public.middleware.js.map

package/lib/src/server/middlewares/public.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"public.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/public.middleware.ts"],"names":[],"mappings":";;;;;AAAA,2BAAsC;AACtC,gDAAwB;AACxB,2DAA6B;AAG7B,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACrC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9E,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAChG,MAAM,kBAAkB,GAAG,cAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,OAAO,CAAC,QAAQ;aACpB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC;aAC/F,GAAG,EAAE,CAAC;IACX,CAAC;IAED,IAAI,kBAAkB,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAErF,OAAO,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;aAC1F,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrH,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC,QAAQ;aACpB,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;aAC3B,GAAG,EAAE,CAAC;IACX,CAAC;IAED,OAAO,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SACxF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"public.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/public.middleware.ts"],"names":[],"mappings":";;;;;AAAA,2BAAsC;AACtC,gDAAwB;AACxB,2DAA6B;AAG7B,sCAAuC;AACvC,0DAAkC;AAElC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,GAAG,GAAG,gBAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,gBAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACjE,MAAM,kBAAkB,GAAG,cAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QACxF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,kBAAkB,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAErF,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC7F,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpF,OAAO,CAAC,QAAQ,EAAE,CAAC;AACrB,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/reply.middleware.d.ts

@@ -1,24 +1,26 @@
 import { HttpRequestContext, Middleware } from '../models';
-declare const _default: Middleware<"expectation" | "history", HttpRequestContext<unknown> & {
-    shared: SetRequiredKeys<{
+declare const _default: Middleware<"history" | "expectation", HttpRequestContext<unknown> & {
+    shared: import("../..").SetRequiredKeys<{
         state: Record<string, unknown>;
         seed?: number;
         expectation?: import("../../expectations").Expectation<Pick<HttpRequestContext, "incoming" | "outgoing">>;
         manipulated?: import("../../expectations").IExpectationOperatorContext;
         forwarded?: Pick<HttpRequestContext, "incoming" | "outgoing">;
         history?: import("../history").History;
-    }, "expectation" | "history">;
+    }, "history" | "expectation">;
 }> & {
-    handler: TFunction<unknown, [HttpRequestContext<unknown> & {
-        shared: SetRequiredKeys<{
+    handler: import("../..").TFunction<unknown, [HttpRequestContext<unknown> & {
+        shared: import("../..").SetRequiredKeys<{
             state: Record<string, unknown>;
             seed?: number;
             expectation?: import("../../expectations").Expectation<Pick<HttpRequestContext, "incoming" | "outgoing">>;
             manipulated?: import("../../expectations").IExpectationOperatorContext;
             forwarded?: Pick<HttpRequestContext, "incoming" | "outgoing">;
             history?: import("../history").History;
-        }, "expectation" | "history">;
-    }, (shared?: Partial<HttpRequestContext["shared"]>) => unknown]>;
+        }, "history" | "expectation">;
+    }, {
+        logger: import("../..").Logger;
+    }]>;
 };
 export default _default;
 //# sourceMappingURL=reply.middleware.d.ts.map

package/lib/src/server/middlewares/reply.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reply.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/reply.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,kBAAkB,EAGlB,UAAU,EAEX,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;AAkBnB,wBAgCK"}
+{"version":3,"file":"reply.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/reply.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,kBAAkB,EAGlB,UAAU,EAEX,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAkBnB,wBAgCK"}