@webiny/handler 6.0.0-alpha.5 → 6.0.0-rc.0

package/README.md

@@ -1,15 +1,11 @@
 # @webiny/handler
-[![](https://img.shields.io/npm/dw/@webiny/handler.svg)](https://www.npmjs.com/package/@webiny/handler) 
-[![](https://img.shields.io/npm/v/@webiny/handler.svg)](https://www.npmjs.com/package/@webiny/handler)
-[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
-
-## Install
-```
-npm install --save @webiny/handler
-```
-
-Or if you prefer yarn: 
-```
-yarn add @webiny/handler
-```
+
+> [!NOTE]
+> This package is part of the [Webiny](https://www.webiny.com) monorepo.
+> It’s **included in every Webiny project by default** and is not meant to be used as a standalone package.
+
+📘 **Documentation:** [https://www.webiny.com/docs](https://www.webiny.com/docs)
+
+---
+
+_This README file is automatically generated during the publish process._

package/ResponseHeaders.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type * as http from "http";
 type ExtraHeaders = {
     "content-type"?: string | undefined;

package/ResponseHeaders.js

@@ -1,15 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ResponseHeaders = void 0;
 // Extract known standard headers, and remove all non-string keys.
 
 function isFunction(setter) {
   return typeof setter === "function";
 }
-class ResponseHeaders {
+export class ResponseHeaders {
   headers = new Map();
   constructor(initialHeaders) {
     if (initialHeaders) {
@@ -41,6 +35,5 @@ class ResponseHeaders {
     return new ResponseHeaders(initialHeaders);
   }
 }
-exports.ResponseHeaders = ResponseHeaders;
 
 //# sourceMappingURL=ResponseHeaders.js.map

package/ResponseHeaders.js.map

@@ -1 +1 @@
-{"version":3,"names":["isFunction","setter","ResponseHeaders","headers","Map","constructor","initialHeaders","Object","keys","forEach","key","set","header","previousValue","get","newValue","merge","create","getHeaders","fromEntries","exports"],"sources":["ResponseHeaders.ts"],"sourcesContent":["import type * as http from \"http\";\n\ntype ExtraHeaders = {\n    \"content-type\"?: string | undefined;\n    \"x-webiny-version\"?: http.OutgoingHttpHeader | undefined;\n};\n\ntype AllHeaders = http.OutgoingHttpHeaders & ExtraHeaders;\n\nexport type StandardHeaderValue = http.OutgoingHttpHeader | undefined;\n\n// Extract known standard headers, and remove all non-string keys.\nexport type StandardHeaders = {\n    [K in keyof AllHeaders as string extends K\n        ? never\n        : number extends K\n        ? never\n        : K]: http.OutgoingHttpHeaders[K];\n} & {\n    [name: string]: StandardHeaderValue;\n};\n\nfunction isFunction<T>(setter: unknown): setter is (value: T) => T {\n    return typeof setter === \"function\";\n}\n\ntype Setter<T> = ((value: T) => T) | T;\n\nexport class ResponseHeaders {\n    private readonly headers = new Map<keyof StandardHeaders, StandardHeaderValue>();\n\n    private constructor(initialHeaders?: StandardHeaders) {\n        if (initialHeaders) {\n            (Object.keys(initialHeaders) as Array<keyof StandardHeaders>).forEach(key => {\n                this.headers.set(key, initialHeaders[key]);\n            });\n        }\n    }\n\n    set<T extends keyof StandardHeaders>(header: T, setter: Setter<StandardHeaders[T]>) {\n        if (isFunction<StandardHeaders[T]>(setter)) {\n            const previousValue = this.headers.get(header) as StandardHeaders[T];\n            const newValue = setter(previousValue);\n            this.headers.set(header, newValue);\n            return this;\n        }\n\n        this.headers.set(header, setter);\n\n        return this;\n    }\n\n    merge(headers: ResponseHeaders) {\n        return ResponseHeaders.create({ ...this.getHeaders(), ...headers.getHeaders() });\n    }\n\n    getHeaders() {\n        return Object.fromEntries(this.headers);\n    }\n\n    static create(initialHeaders?: StandardHeaders) {\n        return new ResponseHeaders(initialHeaders);\n    }\n}\n"],"mappings":";;;;;;AAWA;;AAWA,SAASA,UAAUA,CAAIC,MAAe,EAA6B;EAC/D,OAAO,OAAOA,MAAM,KAAK,UAAU;AACvC;AAIO,MAAMC,eAAe,CAAC;EACRC,OAAO,GAAG,IAAIC,GAAG,CAA6C,CAAC;EAExEC,WAAWA,CAACC,cAAgC,EAAE;IAClD,IAAIA,cAAc,EAAE;MACfC,MAAM,CAACC,IAAI,CAACF,cAAc,CAAC,CAAkCG,OAAO,CAACC,GAAG,IAAI;QACzE,IAAI,CAACP,OAAO,CAACQ,GAAG,CAACD,GAAG,EAAEJ,cAAc,CAACI,GAAG,CAAC,CAAC;MAC9C,CAAC,CAAC;IACN;EACJ;EAEAC,GAAGA,CAAkCC,MAAS,EAAEX,MAAkC,EAAE;IAChF,IAAID,UAAU,CAAqBC,MAAM,CAAC,EAAE;MACxC,MAAMY,aAAa,GAAG,IAAI,CAACV,OAAO,CAACW,GAAG,CAACF,MAAM,CAAuB;MACpE,MAAMG,QAAQ,GAAGd,MAAM,CAACY,aAAa,CAAC;MACtC,IAAI,CAACV,OAAO,CAACQ,GAAG,CAACC,MAAM,EAAEG,QAAQ,CAAC;MAClC,OAAO,IAAI;IACf;IAEA,IAAI,CAACZ,OAAO,CAACQ,GAAG,CAACC,MAAM,EAAEX,MAAM,CAAC;IAEhC,OAAO,IAAI;EACf;EAEAe,KAAKA,CAACb,OAAwB,EAAE;IAC5B,OAAOD,eAAe,CAACe,MAAM,CAAC;MAAE,GAAG,IAAI,CAACC,UAAU,CAAC,CAAC;MAAE,GAAGf,OAAO,CAACe,UAAU,CAAC;IAAE,CAAC,CAAC;EACpF;EAEAA,UAAUA,CAAA,EAAG;IACT,OAAOX,MAAM,CAACY,WAAW,CAAC,IAAI,CAAChB,OAAO,CAAC;EAC3C;EAEA,OAAOc,MAAMA,CAACX,cAAgC,EAAE;IAC5C,OAAO,IAAIJ,eAAe,CAACI,cAAc,CAAC;EAC9C;AACJ;AAACc,OAAA,CAAAlB,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["isFunction","setter","ResponseHeaders","headers","Map","constructor","initialHeaders","Object","keys","forEach","key","set","header","previousValue","get","newValue","merge","create","getHeaders","fromEntries"],"sources":["ResponseHeaders.ts"],"sourcesContent":["import type * as http from \"http\";\n\ntype ExtraHeaders = {\n    \"content-type\"?: string | undefined;\n    \"x-webiny-version\"?: http.OutgoingHttpHeader | undefined;\n};\n\ntype AllHeaders = http.OutgoingHttpHeaders & ExtraHeaders;\n\nexport type StandardHeaderValue = http.OutgoingHttpHeader | undefined;\n\n// Extract known standard headers, and remove all non-string keys.\nexport type StandardHeaders = {\n    [K in keyof AllHeaders as string extends K\n        ? never\n        : number extends K\n          ? never\n          : K]: http.OutgoingHttpHeaders[K];\n} & {\n    [name: string]: StandardHeaderValue;\n};\n\nfunction isFunction<T>(setter: unknown): setter is (value: T) => T {\n    return typeof setter === \"function\";\n}\n\ntype Setter<T> = ((value: T) => T) | T;\n\nexport class ResponseHeaders {\n    private readonly headers = new Map<keyof StandardHeaders, StandardHeaderValue>();\n\n    private constructor(initialHeaders?: StandardHeaders) {\n        if (initialHeaders) {\n            (Object.keys(initialHeaders) as Array<keyof StandardHeaders>).forEach(key => {\n                this.headers.set(key, initialHeaders[key]);\n            });\n        }\n    }\n\n    set<T extends keyof StandardHeaders>(header: T, setter: Setter<StandardHeaders[T]>) {\n        if (isFunction<StandardHeaders[T]>(setter)) {\n            const previousValue = this.headers.get(header) as StandardHeaders[T];\n            const newValue = setter(previousValue);\n            this.headers.set(header, newValue);\n            return this;\n        }\n\n        this.headers.set(header, setter);\n\n        return this;\n    }\n\n    merge(headers: ResponseHeaders) {\n        return ResponseHeaders.create({ ...this.getHeaders(), ...headers.getHeaders() });\n    }\n\n    getHeaders() {\n        return Object.fromEntries(this.headers);\n    }\n\n    static create(initialHeaders?: StandardHeaders) {\n        return new ResponseHeaders(initialHeaders);\n    }\n}\n"],"mappings":"AAWA;;AAWA,SAASA,UAAUA,CAAIC,MAAe,EAA6B;EAC/D,OAAO,OAAOA,MAAM,KAAK,UAAU;AACvC;AAIA,OAAO,MAAMC,eAAe,CAAC;EACRC,OAAO,GAAG,IAAIC,GAAG,CAA6C,CAAC;EAExEC,WAAWA,CAACC,cAAgC,EAAE;IAClD,IAAIA,cAAc,EAAE;MACfC,MAAM,CAACC,IAAI,CAACF,cAAc,CAAC,CAAkCG,OAAO,CAACC,GAAG,IAAI;QACzE,IAAI,CAACP,OAAO,CAACQ,GAAG,CAACD,GAAG,EAAEJ,cAAc,CAACI,GAAG,CAAC,CAAC;MAC9C,CAAC,CAAC;IACN;EACJ;EAEAC,GAAGA,CAAkCC,MAAS,EAAEX,MAAkC,EAAE;IAChF,IAAID,UAAU,CAAqBC,MAAM,CAAC,EAAE;MACxC,MAAMY,aAAa,GAAG,IAAI,CAACV,OAAO,CAACW,GAAG,CAACF,MAAM,CAAuB;MACpE,MAAMG,QAAQ,GAAGd,MAAM,CAACY,aAAa,CAAC;MACtC,IAAI,CAACV,OAAO,CAACQ,GAAG,CAACC,MAAM,EAAEG,QAAQ,CAAC;MAClC,OAAO,IAAI;IACf;IAEA,IAAI,CAACZ,OAAO,CAACQ,GAAG,CAACC,MAAM,EAAEX,MAAM,CAAC;IAEhC,OAAO,IAAI;EACf;EAEAe,KAAKA,CAACb,OAAwB,EAAE;IAC5B,OAAOD,eAAe,CAACe,MAAM,CAAC;MAAE,GAAG,IAAI,CAACC,UAAU,CAAC,CAAC;MAAE,GAAGf,OAAO,CAACe,UAAU,CAAC;IAAE,CAAC,CAAC;EACpF;EAEAA,UAAUA,CAAA,EAAG;IACT,OAAOX,MAAM,CAACY,WAAW,CAAC,IAAI,CAAChB,OAAO,CAAC;EAC3C;EAEA,OAAOc,MAAMA,CAACX,cAAgC,EAAE;IAC5C,OAAO,IAAIJ,eAAe,CAACI,cAAc,CAAC;EAC9C;AACJ","ignoreList":[]}

package/abstractions/Reply.d.ts

@@ -0,0 +1,5 @@
+import type { Reply as IReply } from "../types.js";
+export declare const Reply: import("@webiny/di").Abstraction<IReply>;
+export declare namespace Reply {
+    type Interface = IReply;
+}

package/abstractions/Reply.js

@@ -0,0 +1,4 @@
+import { createAbstraction } from "@webiny/feature/api";
+export const Reply = createAbstraction("Reply");
+
+//# sourceMappingURL=Reply.js.map

package/abstractions/Reply.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createAbstraction","Reply"],"sources":["Reply.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { Reply as IReply } from \"~/types.js\";\n\nexport const Reply = createAbstraction<IReply>(\"Reply\");\n\nexport namespace Reply {\n    export type Interface = IReply;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AAGvD,OAAO,MAAMC,KAAK,GAAGD,iBAAiB,CAAS,OAAO,CAAC","ignoreList":[]}

package/abstractions/Request.d.ts

@@ -0,0 +1,5 @@
+import type { Request as IRequest } from "../types.js";
+export declare const Request: import("@webiny/di").Abstraction<IRequest>;
+export declare namespace Request {
+    type Interface = IRequest;
+}

package/abstractions/Request.js

@@ -0,0 +1,4 @@
+import { createAbstraction } from "@webiny/feature/api";
+export const Request = createAbstraction("Request");
+
+//# sourceMappingURL=Request.js.map

package/abstractions/Request.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createAbstraction","Request"],"sources":["Request.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { Request as IRequest } from \"~/types.js\";\n\nexport const Request = createAbstraction<IRequest>(\"Request\");\n\nexport namespace Request {\n    export type Interface = IRequest;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AAGvD,OAAO,MAAMC,OAAO,GAAGD,iBAAiB,CAAW,SAAS,CAAC","ignoreList":[]}

package/fastify.d.ts

@@ -1,10 +1,11 @@
-/// <reference types="node" />
-import type { PluginCollection } from "@webiny/plugins/types";
-import { PluginsContainer } from "@webiny/plugins/types";
+import type { PluginCollection } from "@webiny/plugins/types.js";
+import { PluginsContainer } from "@webiny/plugins/types.js";
 import type { FastifyInstance, FastifyServerOptions as ServerOptions } from "fastify";
 export interface CreateHandlerParams {
     plugins: PluginCollection | PluginsContainer;
     options?: ServerOptions;
     debug?: boolean;
 }
-export declare const createHandler: (params: CreateHandlerParams) => FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>>;
+export declare const createHandler: (params: CreateHandlerParams) => FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>> & {
+    __linterBrands: "SafePromiseLike";
+};

package/fastify.js

@@ -1,48 +1,48 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createHandler = void 0;
-var _types = require("@webiny/plugins/types");
-var _fastify = _interopRequireDefault(require("fastify"));
-var _utils = require("@webiny/utils");
-var _Context = require("./Context");
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _RoutePlugin = require("./plugins/RoutePlugin");
-var _handlerClient = require("@webiny/handler-client");
-var _cookie = _interopRequireDefault(require("@fastify/cookie"));
-var _compress = _interopRequireDefault(require("@fastify/compress"));
-var _api = require("@webiny/api");
-var _BeforeHandlerPlugin = require("./plugins/BeforeHandlerPlugin");
-var _HandlerResultPlugin = require("./plugins/HandlerResultPlugin");
-var _HandlerErrorPlugin = require("./plugins/HandlerErrorPlugin");
-var _ModifyFastifyPlugin = require("./plugins/ModifyFastifyPlugin");
-var _HandlerOnRequestPlugin = require("./plugins/HandlerOnRequestPlugin");
-var _ResponseHeaders = require("./ResponseHeaders");
-var _ModifyResponseHeadersPlugin = require("./plugins/ModifyResponseHeadersPlugin");
-var _SetDefaultHeaders = require("./PreHandler/SetDefaultHeaders");
-var _PreHandler = require("./PreHandler/PreHandler");
-var _stringifyError = require("./stringifyError");
-var _ProcessHandlerOnRequestPlugins = require("./PreHandler/ProcessHandlerOnRequestPlugins");
-var _ProcessContextPlugins = require("./PreHandler/ProcessContextPlugins");
-var _IfNotOptionsRequest = require("./PreHandler/IfNotOptionsRequest");
-var _ProcessBeforeHandlerPlugins = require("./PreHandler/ProcessBeforeHandlerPlugins");
-var _IfOptionsRequest = require("./PreHandler/IfOptionsRequest");
-var _SendEarlyOptionsResponse = require("./PreHandler/SendEarlyOptionsResponse");
-var _OnRequestTimeoutPlugin = require("./plugins/OnRequestTimeoutPlugin.js");
-var _OnRequestResponseSendPlugin = require("./plugins/OnRequestResponseSendPlugin.js");
+import { PluginsContainer } from "@webiny/plugins/types.js";
+import fastify from "fastify";
+import { middleware } from "@webiny/utils";
+import { Context } from "./Context.js";
+import WebinyError from "@webiny/error";
+import { RoutePlugin } from "./plugins/RoutePlugin.js";
+import { createHandlerClient } from "@webiny/handler-client";
+import fastifyCookie from "@fastify/cookie";
+import fastifyCompress from "@fastify/compress";
+import { ContextPlugin } from "@webiny/api";
+import { BeforeHandlerPlugin } from "./plugins/BeforeHandlerPlugin.js";
+import { HandlerResultPlugin } from "./plugins/HandlerResultPlugin.js";
+import { HandlerErrorPlugin } from "./plugins/HandlerErrorPlugin.js";
+import { ModifyFastifyPlugin } from "./plugins/ModifyFastifyPlugin.js";
+import { HandlerOnRequestPlugin } from "./plugins/HandlerOnRequestPlugin.js";
+import { ResponseHeaders } from "./ResponseHeaders.js";
+import { ModifyResponseHeadersPlugin } from "./plugins/ModifyResponseHeadersPlugin.js";
+import { SetDefaultHeaders } from "./PreHandler/SetDefaultHeaders.js";
+import { PreHandler } from "./PreHandler/PreHandler.js";
+import { stringifyError } from "./stringifyError.js";
+import { ProcessHandlerOnRequestPlugins } from "./PreHandler/ProcessHandlerOnRequestPlugins.js";
+import { ProcessContextPlugins } from "./PreHandler/ProcessContextPlugins.js";
+import { IfNotOptionsRequest } from "./PreHandler/IfNotOptionsRequest.js";
+import { ProcessBeforeHandlerPlugins } from "./PreHandler/ProcessBeforeHandlerPlugins.js";
+import { IfOptionsRequest } from "./PreHandler/IfOptionsRequest.js";
+import { SendEarlyOptionsResponse } from "./PreHandler/SendEarlyOptionsResponse.js";
+import { OnRequestTimeoutPlugin } from "./plugins/OnRequestTimeoutPlugin.js";
+import { OnRequestResponseSendPlugin } from "./plugins/OnRequestResponseSendPlugin.js";
+import { Request } from "./abstractions/Request.js";
+import { Reply } from "./abstractions/Reply.js";
 const modifyResponseHeaders = (app, request, reply) => {
-  const modifyHeaders = app.webiny.plugins.byType(_ModifyResponseHeadersPlugin.ModifyResponseHeadersPlugin.type);
+  const modifyHeaders = app.webiny.plugins.byType(ModifyResponseHeadersPlugin.type);
   const replyHeaders = reply.getHeaders();
-  const headers = _ResponseHeaders.ResponseHeaders.create(replyHeaders);
+  const headers = ResponseHeaders.create(replyHeaders);
   modifyHeaders.forEach(plugin => {
     plugin.modify(request, headers);
   });
-  reply.headers(headers.getHeaders());
+
+  // Exclude 'set-cookie' header to avoid duplication.
+  // Cookies are managed by @fastify/cookie and calling reply.headers() with 'set-cookie' duplicates them.
+  const headersToSet = headers.getHeaders();
+  delete headersToSet["set-cookie"];
+  reply.headers(headersToSet);
 };
-const createHandler = params => {
+export const createHandler = params => {
   const definedRoutes = {
     POST: [],
     GET: [],
@@ -75,7 +75,7 @@ const createHandler = params => {
       }
       console.error(`Error while registering onAll route. One of the routes is already defined.`);
       console.error(JSON.stringify(all));
-      throw new _error.default(`You cannot override a route with onAll() method, please remove unnecessary route from the system.`, "OVERRIDE_ROUTE_ERROR", {
+      throw new WebinyError(`You cannot override a route with onAll() method, please remove unnecessary route from the system.`, "OVERRIDE_ROUTE_ERROR", {
         type,
         path
       });
@@ -85,7 +85,7 @@ const createHandler = params => {
       return;
     }
     console.error(`Error while trying to override route: [${type}] ${path}`);
-    throw new _error.default(`When you are trying to override existing route, you must send "override" parameter when adding that route.`, "OVERRIDE_ROUTE_ERROR", {
+    throw new WebinyError(`When you are trying to override existing route, you must send "override" parameter when adding that route.`, "OVERRIDE_ROUTE_ERROR", {
       type,
       path
     });
@@ -103,10 +103,11 @@ const createHandler = params => {
   /**
    * We must attach the server to our internal context if we want to have it accessible.
    */
-  const app = (0, _fastify.default)({
+  const app = fastify({
     bodyLimit: 536870912,
     // 512MB
     disableRequestLogging: true,
+    allowErrorHandlerOverride: true,
     ...(params.options || {})
   });
 
@@ -132,7 +133,7 @@ const createHandler = params => {
    *
    * https://github.com/fastify/fastify-cookie
    */
-  app.register(_cookie.default, {
+  app.register(fastifyCookie, {
     parseOptions: {} // options for parsing cookies
   });
   /**
@@ -140,7 +141,7 @@ const createHandler = params => {
    *
    * https://github.com/fastify/fastify-compress
    */
-  app.register(_compress.default, {
+  app.register(fastifyCompress, {
     global: true,
     threshold: 1024,
     onUnsupportedEncoding: (encoding, _, reply) => {
@@ -188,15 +189,15 @@ const createHandler = params => {
     }
   };
   let context;
-  const plugins = new _types.PluginsContainer([
+  const plugins = new PluginsContainer([
   /**
    * We must have handlerClient by default.
    * And it must be one of the first context plugins applied.
    */
-  (0, _handlerClient.createHandlerClient)()]);
+  createHandlerClient()]);
   plugins.merge(params.plugins || []);
   try {
-    context = new _Context.Context({
+    context = new Context({
       plugins,
       /**
        * Inserted via webpack at build time.
@@ -206,7 +207,7 @@ const createHandler = params => {
     });
   } catch (ex) {
     console.error(`Error while constructing the Context.`);
-    console.error((0, _stringifyError.stringifyError)(ex));
+    console.error(stringifyError(ex));
     throw ex;
   }
 
@@ -215,6 +216,26 @@ const createHandler = params => {
    */
   app.decorate("webiny", context);
 
+  /**
+   * To prevent Unsupported Media Type errors on OPTIONS requests with a body,
+   * we need to have a custom parser
+   */
+  app.addContentTypeParser("application/json", {
+    parseAs: "string",
+    bodyLimit: 1024 * 1024
+  }, (req, body, done) => {
+    if (req.method === "OPTIONS") {
+      done(null, undefined);
+      return;
+    }
+    try {
+      const json = typeof body === "string" ? body : body.toString("utf8");
+      done(null, JSON.parse(json));
+    } catch (err) {
+      done(err);
+    }
+  });
+
   /**
    * With this we ensure that an undefined request body is not parsed on OPTIONS requests,
    * in case there's a `content-type` header set for whatever reason.
@@ -238,20 +259,26 @@ const createHandler = params => {
   app.addHook("preHandler", async (request, reply) => {
     app.webiny.request = request;
     app.webiny.reply = reply;
+
+    // Bind request and reply to DI container for runtime access
+    if (app.webiny.container) {
+      app.webiny.container.registerInstance(Request, request);
+      app.webiny.container.registerInstance(Reply, reply);
+    }
     /**
      * Default code to 200 - so we do not need to set it again.
      * Usually we set errors manually when we use reply.send.
      */
     reply.code(200);
-    const handlerOnRequestPlugins = app.webiny.plugins.byType(_HandlerOnRequestPlugin.HandlerOnRequestPlugin.type);
-    const contextPlugins = app.webiny.plugins.byType(_api.ContextPlugin.type);
-    const beforeHandlerPlugins = app.webiny.plugins.byType(_BeforeHandlerPlugin.BeforeHandlerPlugin.type);
-    const modifyHeadersPlugins = app.webiny.plugins.byType(_ModifyResponseHeadersPlugin.ModifyResponseHeadersPlugin.type);
-    const preHandler = new _PreHandler.PreHandler([new _SetDefaultHeaders.SetDefaultHeaders(definedRoutes), new _ProcessHandlerOnRequestPlugins.ProcessHandlerOnRequestPlugins(handlerOnRequestPlugins), new _IfNotOptionsRequest.IfNotOptionsRequest([new _ProcessContextPlugins.ProcessContextPlugins(app.webiny, contextPlugins), new _ProcessBeforeHandlerPlugins.ProcessBeforeHandlerPlugins(app.webiny, beforeHandlerPlugins)]), new _IfOptionsRequest.IfOptionsRequest([new _SendEarlyOptionsResponse.SendEarlyOptionsResponse(modifyHeadersPlugins)])]);
+    const handlerOnRequestPlugins = app.webiny.plugins.byType(HandlerOnRequestPlugin.type);
+    const contextPlugins = app.webiny.plugins.byType(ContextPlugin.type);
+    const beforeHandlerPlugins = app.webiny.plugins.byType(BeforeHandlerPlugin.type);
+    const modifyHeadersPlugins = app.webiny.plugins.byType(ModifyResponseHeadersPlugin.type);
+    const preHandler = new PreHandler([new SetDefaultHeaders(definedRoutes), new ProcessHandlerOnRequestPlugins(handlerOnRequestPlugins), new IfNotOptionsRequest([new ProcessContextPlugins(app.webiny, contextPlugins), new ProcessBeforeHandlerPlugins(app.webiny, beforeHandlerPlugins)]), new IfOptionsRequest([new SendEarlyOptionsResponse(modifyHeadersPlugins)])]);
     await preHandler.execute(request, reply, app.webiny);
   });
   app.addHook("preSerialization", async (_, __, payload) => {
-    const plugins = app.webiny.plugins.byType(_HandlerResultPlugin.HandlerResultPlugin.type);
+    const plugins = app.webiny.plugins.byType(HandlerResultPlugin.type);
     let name;
     try {
       for (const plugin of plugins) {
@@ -260,7 +287,7 @@ const createHandler = params => {
       }
     } catch (ex) {
       console.error(`Error while running the "HandlerResultPlugin" ${name ? `(${name})` : ""} plugin in the preSerialization hook.`);
-      console.error((0, _stringifyError.stringifyError)(ex));
+      console.error(stringifyError(ex));
       throw ex;
     }
     return payload;
@@ -273,6 +300,22 @@ const createHandler = params => {
       console.warn("Reply already sent, cannot send the result (handler:setErrorHandler).");
       return reply;
     }
+    if (error.code?.startsWith("Authentication/")) {
+      return reply.status(401).headers({
+        "Cache-Control": "no-store"
+      }).send(JSON.stringify({
+        message: error.message,
+        code: error.code
+      }));
+    }
+    if (error.code === "Tenancy/TenantDisabled") {
+      return reply.status(503).headers({
+        "Cache-Control": "no-store"
+      }).send(JSON.stringify({
+        message: error.message,
+        code: error.code
+      }));
+    }
     return reply.status(500).headers({
       "Cache-Control": "no-store"
     }).send(
@@ -286,13 +329,13 @@ const createHandler = params => {
     }));
   });
   app.addHook("onError", async (_, reply, error) => {
-    const plugins = app.webiny.plugins.byType(_HandlerErrorPlugin.HandlerErrorPlugin.type);
+    const plugins = app.webiny.plugins.byType(HandlerErrorPlugin.type);
     /**
      * Log error to cloud, as these can be extremely annoying to debug!
      */
     console.error("Logging error in @webiny/handler");
     try {
-      console.error((0, _stringifyError.stringifyError)(error));
+      console.error(stringifyError(error));
     } catch (ex) {
       console.warn("Could not stringify error:");
       console.log(error);
@@ -316,7 +359,7 @@ const createHandler = params => {
     } else {
       console.warn("Reply already sent, cannot send the result (handler:addHook:onError).");
     }
-    const handler = (0, _utils.middleware)(plugins.map(pl => {
+    const handler = middleware(plugins.map(pl => {
       return (context, error, next) => {
         return pl.handle(context, error, next);
       };
@@ -330,7 +373,7 @@ const createHandler = params => {
    */
   app.addHook("onSend", async (request, reply, input) => {
     modifyResponseHeaders(app, request, reply);
-    const plugins = app.webiny.plugins.byType(_OnRequestResponseSendPlugin.OnRequestResponseSendPlugin.type);
+    const plugins = app.webiny.plugins.byType(OnRequestResponseSendPlugin.type);
     let payload = input;
     for (const plugin of plugins) {
       payload = await plugin.exec(request, reply, payload);
@@ -345,7 +388,7 @@ const createHandler = params => {
     await context.benchmark.output();
   });
   app.addHook("onTimeout", async (request, reply) => {
-    const plugins = app.webiny.plugins.byType(_OnRequestTimeoutPlugin.OnRequestTimeoutPlugin.type);
+    const plugins = app.webiny.plugins.byType(OnRequestTimeoutPlugin.type);
     for (const plugin of plugins) {
       await plugin.exec(request, reply);
     }
@@ -355,7 +398,7 @@ const createHandler = params => {
   /**
    * With these plugins we give users possibility to do anything they want on our fastify instance.
    */
-  const modifyPlugins = app.webiny.plugins.byType(_ModifyFastifyPlugin.ModifyFastifyPlugin.type);
+  const modifyPlugins = app.webiny.plugins.byType(ModifyFastifyPlugin.type);
   let modifyFastifyPluginName;
   try {
     for (const plugin of modifyPlugins) {
@@ -364,7 +407,7 @@ const createHandler = params => {
     }
   } catch (ex) {
     console.error(`Error while running the "ModifyFastifyPlugin" ${modifyFastifyPluginName ? `(${modifyFastifyPluginName})` : ""} plugin in the end of the "createHandler" callable.`);
-    console.error((0, _stringifyError.stringifyError)(ex));
+    console.error(stringifyError(ex));
     throw ex;
   }
 
@@ -375,7 +418,7 @@ const createHandler = params => {
    *
    * Routes are registered in fastify but events must be handled in package which implements cloud specific methods.
    */
-  const routePlugins = app.webiny.plugins.byType(_RoutePlugin.RoutePlugin.type);
+  const routePlugins = app.webiny.plugins.byType(RoutePlugin.type);
 
   /**
    * Add routes to the system.
@@ -391,11 +434,10 @@ const createHandler = params => {
     }
   } catch (ex) {
     console.error(`Error while running the "RoutePlugin" ${routePluginName ? `(${routePluginName})` : ""} plugin in the beginning of the "createHandler" callable.`);
-    console.error((0, _stringifyError.stringifyError)(ex));
+    console.error(stringifyError(ex));
     throw ex;
   }
   return app;
 };
-exports.createHandler = createHandler;
 
 //# sourceMappingURL=fastify.js.map