@webiny/handler 0.0.0-unstable.13771d80a8 → 0.0.0-unstable.2696f9d9e8

package/Context.d.ts

@@ -1,14 +1,21 @@
-import { Context as BaseContext, ContextParams as BaseContextParams } from "@webiny/api";
-import { Context as BaseContextType } from "./types";
+import { Context as BaseContext, ContextParams as BaseContextParams, ContextPlugin as BaseContextPlugin, ContextPluginCallable as BaseContextPluginCallable } from "@webiny/api";
+import { Context as ContextInterface } from "./types";
 export interface ContextParams extends BaseContextParams {
-    server: BaseContextType["server"];
-    routes: BaseContextType["routes"];
+    routes: ContextInterface["routes"];
 }
-export declare class Context extends BaseContext implements BaseContextType {
-    readonly server: BaseContextType["server"];
-    readonly routes: BaseContextType["routes"];
-    handlerClient: BaseContextType["handlerClient"];
-    request: BaseContextType["request"];
-    reply: BaseContextType["reply"];
+export declare class Context extends BaseContext implements ContextInterface {
+    readonly routes: ContextInterface["routes"];
+    handlerClient: ContextInterface["handlerClient"];
+    request: ContextInterface["request"];
+    reply: ContextInterface["reply"];
     constructor(params: ContextParams);
 }
+/**
+ * We need to extend and reexport the ContextPlugin, ContextPluginCallable and createContextPlugin to support extended context.
+ *
+ * This can be removed when we introduce the type augmentation.
+ */
+export declare type ContextPluginCallable<T extends ContextInterface = ContextInterface> = BaseContextPluginCallable<T>;
+export declare class ContextPlugin<T extends ContextInterface = ContextInterface> extends BaseContextPlugin<T> {
+}
+export declare const createContextPlugin: <T extends ContextInterface = ContextInterface>(callable: ContextPluginCallable<T>) => BaseContextPlugin<T>;

package/Context.js

@@ -1,28 +1,34 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Context = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+exports.createContextPlugin = exports.ContextPlugin = exports.Context = void 0;
 var _api = require("@webiny/api");
 class Context extends _api.Context {
-  // @ts-ignore
+  // @ts-expect-error
 
-  // @ts-ignore
+  // @ts-expect-error
 
-  // @ts-ignore
+  // @ts-expect-error
 
   constructor(params) {
     super(params);
-    (0, _defineProperty2.default)(this, "server", void 0);
-    (0, _defineProperty2.default)(this, "routes", void 0);
-    (0, _defineProperty2.default)(this, "handlerClient", void 0);
-    (0, _defineProperty2.default)(this, "request", void 0);
-    (0, _defineProperty2.default)(this, "reply", void 0);
-    this.server = params.server;
     this.routes = params.routes;
   }
 }
-exports.Context = Context;
+
+/**
+ * We need to extend and reexport the ContextPlugin, ContextPluginCallable and createContextPlugin to support extended context.
+ *
+ * This can be removed when we introduce the type augmentation.
+ */
+exports.Context = Context;
+class ContextPlugin extends _api.ContextPlugin {}
+exports.ContextPlugin = ContextPlugin;
+const createContextPlugin = callable => {
+  return (0, _api.createContextPlugin)(callable);
+};
+exports.createContextPlugin = createContextPlugin;
+
+//# sourceMappingURL=Context.js.map

package/Context.js.map

@@ -1 +1 @@
-{"version":3,"names":["Context","BaseContext","constructor","params","server","routes"],"sources":["Context.ts"],"sourcesContent":["import { Context as BaseContext, ContextParams as BaseContextParams } from \"@webiny/api\";\nimport { Context as BaseContextType } from \"~/types\";\n\nexport interface ContextParams extends BaseContextParams {\n    server: BaseContextType[\"server\"];\n    routes: BaseContextType[\"routes\"];\n}\n\nexport class Context extends BaseContext implements BaseContextType {\n    public readonly server: BaseContextType[\"server\"];\n    public readonly routes: BaseContextType[\"routes\"];\n    // @ts-ignore\n    public handlerClient: BaseContextType[\"handlerClient\"];\n    // @ts-ignore\n    public request: BaseContextType[\"request\"];\n    // @ts-ignore\n    public reply: BaseContextType[\"reply\"];\n\n    public constructor(params: ContextParams) {\n        super(params);\n        this.server = params.server;\n        this.routes = params.routes;\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAQO,MAAMA,OAAO,SAASC,YAAW,CAA4B;EAGhE;;EAEA;;EAEA;;EAGOC,WAAW,CAACC,MAAqB,EAAE;IACtC,KAAK,CAACA,MAAM,CAAC;IAAC;IAAA;IAAA;IAAA;IAAA;IACd,IAAI,CAACC,MAAM,GAAGD,MAAM,CAACC,MAAM;IAC3B,IAAI,CAACC,MAAM,GAAGF,MAAM,CAACE,MAAM;EAC/B;AACJ;AAAC"}
+{"version":3,"names":["_api","require","Context","BaseContext","constructor","params","routes","exports","ContextPlugin","BaseContextPlugin","createContextPlugin","callable","baseCreateContextPlugin"],"sources":["Context.ts"],"sourcesContent":["import {\n    Context as BaseContext,\n    ContextParams as BaseContextParams,\n    ContextPlugin as BaseContextPlugin,\n    ContextPluginCallable as BaseContextPluginCallable,\n    createContextPlugin as baseCreateContextPlugin\n} from \"@webiny/api\";\nimport { Context as ContextInterface } from \"~/types\";\n\nexport interface ContextParams extends BaseContextParams {\n    routes: ContextInterface[\"routes\"];\n}\n\nexport class Context extends BaseContext implements ContextInterface {\n    public readonly routes: ContextInterface[\"routes\"];\n    // @ts-expect-error\n    public handlerClient: ContextInterface[\"handlerClient\"];\n    // @ts-expect-error\n    public request: ContextInterface[\"request\"];\n    // @ts-expect-error\n    public reply: ContextInterface[\"reply\"];\n\n    public constructor(params: ContextParams) {\n        super(params);\n        this.routes = params.routes;\n    }\n}\n\n/**\n * We need to extend and reexport the ContextPlugin, ContextPluginCallable and createContextPlugin to support extended context.\n *\n * This can be removed when we introduce the type augmentation.\n */\nexport type ContextPluginCallable<T extends ContextInterface = ContextInterface> =\n    BaseContextPluginCallable<T>;\n\nexport class ContextPlugin<\n    T extends ContextInterface = ContextInterface\n> extends BaseContextPlugin<T> {}\n\nexport const createContextPlugin = <T extends ContextInterface = ContextInterface>(\n    callable: ContextPluginCallable<T>\n) => {\n    return baseCreateContextPlugin<T>(callable);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AAaO,MAAMC,OAAO,SAASC,YAAW,CAA6B;EAEjE;;EAEA;;EAEA;;EAGOC,WAAWA,CAACC,MAAqB,EAAE;IACtC,KAAK,CAACA,MAAM,CAAC;IACb,IAAI,CAACC,MAAM,GAAGD,MAAM,CAACC,MAAM;EAC/B;AACJ;;AAEA;AACA;AACA;AACA;AACA;AAJAC,OAAA,CAAAL,OAAA,GAAAA,OAAA;AAQO,MAAMM,aAAa,SAEhBC,kBAAiB,CAAI;AAAEF,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAE1B,MAAME,mBAAmB,GAC5BC,QAAkC,IACjC;EACD,OAAO,IAAAC,wBAAuB,EAAID,QAAQ,CAAC;AAC/C,CAAC;AAACJ,OAAA,CAAAG,mBAAA,GAAAA,mBAAA"}

package/ResponseHeaders.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="node" />
+import * as http from "http";
+declare type ExtraHeaders = {
+    "content-type"?: string | undefined;
+    "x-webiny-version"?: http.OutgoingHttpHeader | undefined;
+};
+declare type AllHeaders = http.OutgoingHttpHeaders & ExtraHeaders;
+export declare type StandardHeaderValue = http.OutgoingHttpHeader | boolean | undefined;
+export declare type StandardHeaders = {
+    [K in keyof AllHeaders as string extends K ? never : number extends K ? never : K]: http.OutgoingHttpHeaders[K];
+} & {
+    [name: string]: StandardHeaderValue;
+};
+declare type Setter<T> = ((value: T) => T) | T;
+export declare class ResponseHeaders {
+    private readonly headers;
+    private constructor();
+    set<T extends keyof StandardHeaders>(header: T, setter: Setter<StandardHeaders[T]>): this;
+    merge(headers: ResponseHeaders): ResponseHeaders;
+    getHeaders(): {
+        [k: string]: StandardHeaderValue;
+    };
+    static create(initialHeaders?: StandardHeaders): ResponseHeaders;
+}
+export {};

package/ResponseHeaders.js

@@ -0,0 +1,46 @@
+"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 {
+  headers = new Map();
+  constructor(initialHeaders) {
+    if (initialHeaders) {
+      Object.keys(initialHeaders).forEach(key => {
+        this.headers.set(key, initialHeaders[key]);
+      });
+    }
+  }
+  set(header, setter) {
+    if (isFunction(setter)) {
+      const previousValue = this.headers.get(header);
+      const newValue = setter(previousValue);
+      this.headers.set(header, newValue);
+      return this;
+    }
+    this.headers.set(header, setter);
+    return this;
+  }
+  merge(headers) {
+    return ResponseHeaders.create({
+      ...this.getHeaders(),
+      ...headers.getHeaders()
+    });
+  }
+  getHeaders() {
+    return Object.fromEntries(this.headers);
+  }
+  static create(initialHeaders) {
+    return new ResponseHeaders(initialHeaders);
+  }
+}
+exports.ResponseHeaders = ResponseHeaders;
+
+//# sourceMappingURL=ResponseHeaders.js.map

package/ResponseHeaders.js.map

@@ -0,0 +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 * 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 | boolean | 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"}

package/fastify.d.ts

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

package/fastify.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createHandler = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _types = require("@webiny/plugins/types");
 var _fastify = _interopRequireDefault(require("fastify"));
 var _utils = require("@webiny/utils");
 var _Context = require("./Context");
@@ -21,35 +21,46 @@ var _HandlerResultPlugin = require("./plugins/HandlerResultPlugin");
 var _HandlerErrorPlugin = require("./plugins/HandlerErrorPlugin");
 var _ModifyFastifyPlugin = require("./plugins/ModifyFastifyPlugin");
 var _HandlerOnRequestPlugin = require("./plugins/HandlerOnRequestPlugin");
-const DEFAULT_HEADERS = (0, _objectSpread2.default)({
-  "Cache-Control": "no-store",
-  "Content-Type": "application/json; charset=utf-8",
-  "Access-Control-Allow-Origin": "*",
-  "Access-Control-Allow-Headers": "*",
-  "Access-Control-Allow-Methods": "OPTIONS,POST,GET,DELETE,PUT,PATCH"
-}, (0, _utils.getWebinyVersionHeaders)());
+var _ResponseHeaders = require("./ResponseHeaders");
+var _ModifyResponseHeadersPlugin = require("./plugins/ModifyResponseHeadersPlugin");
+function createDefaultHeaders() {
+  return _ResponseHeaders.ResponseHeaders.create({
+    "content-type": "application/json; charset=utf-8",
+    "cache-control": "no-store",
+    "access-control-allow-origin": "*",
+    "access-control-allow-headers": "*",
+    "access-control-allow-methods": "OPTIONS,POST,GET,DELETE,PUT,PATCH",
+    ...(0, _utils.getWebinyVersionHeaders)()
+  });
+}
+const getDefaultOptionsHeaders = () => {
+  return _ResponseHeaders.ResponseHeaders.create({
+    "access-control-max-age": "86400",
+    "cache-control": "public, max-age=86400"
+  });
+};
 const getDefaultHeaders = routes => {
+  const headers = createDefaultHeaders();
+
   /**
    * If we are accepting all headers, just output that one.
    */
   const keys = Object.keys(routes);
   const all = keys.every(key => routes[key].length > 0);
   if (all) {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, DEFAULT_HEADERS), {}, {
-      "Access-Control-Allow-Methods": "*"
-    });
-  }
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, DEFAULT_HEADERS), {}, {
-    "Access-Control-Allow-Methods": keys.filter(type => {
-      if (!routes[type] || Array.isArray(routes[type]) === false) {
+    headers.set("access-control-allow-methods", "*");
+  } else {
+    const allowedMethods = keys.filter(type => {
+      if (!routes[type] || !Array.isArray(routes[type])) {
         return false;
       }
       return routes[type].length > 0;
-    }).sort().join(",")
-  });
+    }).sort().join(",");
+    headers.set("access-control-allow-methods", allowedMethods);
+  }
+  return headers;
 };
 const stringifyError = error => {
-  var _error$constructor;
   const {
     name,
     message,
@@ -57,18 +68,15 @@ const stringifyError = error => {
     stack,
     data
   } = error;
-  return JSON.stringify((0, _objectSpread2.default)((0, _objectSpread2.default)({}, error), {}, {
-    constructorName: ((_error$constructor = error.constructor) === null || _error$constructor === void 0 ? void 0 : _error$constructor.name) || "UnknownError",
+  return JSON.stringify({
+    ...error,
+    constructorName: error.constructor?.name || "UnknownError",
     name: name || "No error name",
     message: message || "No error message",
     code: code || "NO_CODE",
     data,
     stack: process.env.DEBUG === "true" ? stack : "Turn on the debug flag to see the stack."
-  }));
-};
-const OPTIONS_HEADERS = {
-  "Access-Control-Max-Age": "86400",
-  "Cache-Control": "public, max-age=86400"
+  });
 };
 const createHandler = params => {
   const definedRoutes = {
@@ -98,18 +106,18 @@ const createHandler = params => {
       if (!all) {
         return;
       }
-      console.log(`Error while registering onAll route. One of the routes is already defined.`);
-      console.log(JSON.stringify(all));
+      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", {
         type,
         path
       });
     } else if (definedRoutes[type].includes(path) === false) {
       return;
-    } else if ((options === null || options === void 0 ? void 0 : options.override) === true) {
+    } else if (options?.override === true) {
       return;
     }
-    console.log(`Error while trying to override route: [${type}] ${path}`);
+    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", {
       type,
       path
@@ -126,7 +134,9 @@ const createHandler = params => {
   /**
    * We must attach the server to our internal context if we want to have it accessible.
    */
-  const app = (0, _fastify.default)((0, _objectSpread2.default)({}, params.options || {}));
+  const app = (0, _fastify.default)({
+    ...(params.options || {})
+  });
   /**
    * We need to register routes in our system so we can output headers later on and dissallow overriding routes.
    */
@@ -205,24 +215,25 @@ const createHandler = params => {
     }
   };
   let context;
+  const plugins = new _types.PluginsContainer([
+  /**
+   * We must have handlerClient by default.
+   * And it must be one of the first context plugins applied.
+   */
+  (0, _handlerClient.createHandlerClient)()]);
+  plugins.merge(params.plugins || []);
   try {
     context = new _Context.Context({
-      plugins: [
-      /**
-       * We must have handlerClient by default.
-       * And it must be one of the first context plugins applied.
-       */
-      (0, _handlerClient.createHandlerClient)(), ...(params.plugins || [])],
+      plugins,
       /**
-       * Inserted via webpack on build time.
+       * Inserted via webpack at build time.
        */
       WEBINY_VERSION: process.env.WEBINY_VERSION,
-      server: app,
       routes
     });
   } catch (ex) {
-    console.log(`Error while constructing the Context.`);
-    console.log(stringifyError(ex));
+    console.error(`Error while constructing the Context.`);
+    console.error(stringifyError(ex));
     throw ex;
   }
 
@@ -231,42 +242,18 @@ const createHandler = params => {
    */
   app.decorate("webiny", context);
 
-  /**
-   * We have few types of triggers:
-   *  * Events - EventPlugin
-   *  * Routes - RoutePlugin
-   *
-   * 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);
-
-  /**
-   * Add routes to the system.
-   */
-  let routePluginName;
-  try {
-    for (const plugin of routePlugins) {
-      routePluginName = plugin.name;
-      plugin.cb((0, _objectSpread2.default)((0, _objectSpread2.default)({}, app.webiny.routes), {}, {
-        context: app.webiny
-      }));
-    }
-  } catch (ex) {
-    console.log(`Error while running the "RoutePlugin" ${routePluginName ? `(${routePluginName})` : ""} plugin in the beginning of the "createHandler" callable.`);
-    console.log(stringifyError(ex));
-    throw ex;
-  }
-
   /**
    * On every request we add default headers, which can be changed later.
    * Also, if it is an options request, we skip everything after this hook and output options headers.
    */
   app.addHook("onRequest", async (request, reply) => {
+    const isOptionsRequest = request.method === "OPTIONS";
     /**
      * Our default headers are always set. Users can override them.
      */
     const defaultHeaders = getDefaultHeaders(definedRoutes);
-    reply.headers(defaultHeaders);
+    const initialHeaders = isOptionsRequest ? defaultHeaders.merge(getDefaultOptionsHeaders()) : defaultHeaders;
+    reply.headers(initialHeaders.getHeaders());
     /**
      * Users can define their own custom handlers for the onRequest event - so let's run them first.
      */
@@ -281,8 +268,8 @@ const createHandler = params => {
         }
       }
     } catch (ex) {
-      console.log(`Error while running the "HandlerOnRequestPlugin" ${name ? `(${name})` : ""} plugin in the onRequest hook.`);
-      console.log(stringifyError(ex));
+      console.error(`Error while running the "HandlerOnRequestPlugin" ${name ? `(${name})` : ""} plugin in the onRequest hook.`);
+      console.error(stringifyError(ex));
       throw ex;
     }
     /**
@@ -290,20 +277,20 @@ const createHandler = params => {
      *
      * Users can prevent this by creating their own HandlerOnRequestPlugin and returning false as the result of the callable.
      */
-    if (request.method !== "OPTIONS") {
+    if (!isOptionsRequest) {
       return;
     }
     if (reply.sent) {
       /**
        * At this point throwing an exception will not do anything with the response. So just log it.
        */
-      console.log(JSON.stringify({
+      console.error(JSON.stringify({
         message: `Output was already sent. Please check custom plugins of type "HandlerOnRequestPlugin".`,
         explanation: "This error can happen if the user plugin ended the reply, but did not return false as response."
       }));
       return;
     }
-    reply.headers((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultHeaders), OPTIONS_HEADERS)).code(204).send("").hijack();
+    reply.code(204).send("").hijack();
   });
   app.addHook("preParsing", async (request, reply) => {
     app.webiny.request = request;
@@ -316,8 +303,8 @@ const createHandler = params => {
         await plugin.apply(app.webiny);
       }
     } catch (ex) {
-      console.log(`Error while running the "ContextPlugin" ${name ? `(${name})` : ""} plugin in the preParsing hook.`);
-      console.log(stringifyError(ex));
+      console.error(`Error while running the "ContextPlugin" ${name ? `(${name})` : ""} plugin in the preParsing hook.`);
+      console.error(stringifyError(ex));
       throw ex;
     }
   });
@@ -333,8 +320,8 @@ const createHandler = params => {
         await plugin.apply(app.webiny);
       }
     } catch (ex) {
-      console.log(`Error while running the "BeforeHandlerPlugin" ${name ? `(${name})` : ""} plugin in the preHandler hook.`);
-      console.log(stringifyError(ex));
+      console.error(`Error while running the "BeforeHandlerPlugin" ${name ? `(${name})` : ""} plugin in the preHandler hook.`);
+      console.error(stringifyError(ex));
       throw ex;
     }
   });
@@ -351,8 +338,8 @@ const createHandler = params => {
         await plugin.handle(app.webiny, payload);
       }
     } catch (ex) {
-      console.log(`Error while running the "HandlerResultPlugin" ${name ? `(${name})` : ""} plugin in the preSerialization hook.`);
-      console.log(stringifyError(ex));
+      console.error(`Error while running the "HandlerResultPlugin" ${name ? `(${name})` : ""} plugin in the preSerialization hook.`);
+      console.error(stringifyError(ex));
       throw ex;
     }
     return payload;
@@ -376,8 +363,8 @@ const createHandler = params => {
     /**
      * Log error to cloud, as these can be extremely annoying to debug!
      */
-    console.log("@webiny/handler");
-    console.log(stringifyError(error));
+    console.error("@webiny/handler");
+    console.error(stringifyError(error));
     reply.status(500).headers({
       "Cache-Control": "no-store"
     }).send(
@@ -398,6 +385,29 @@ const createHandler = params => {
     return reply;
   });
 
+  /**
+   * Apply response headers modifier plugins.
+   */
+  app.addHook("onSend", async (request, reply, payload) => {
+    const modifyHeaders = app.webiny.plugins.byType(_ModifyResponseHeadersPlugin.ModifyResponseHeadersPlugin.type);
+    const headers = _ResponseHeaders.ResponseHeaders.create(reply.getHeaders());
+    modifyHeaders.forEach(plugin => {
+      plugin.modify(request, headers);
+    });
+    reply.headers(headers.getHeaders());
+    return payload;
+  });
+
+  /**
+   * We need to output the benchmark results at the end of the request in both response and timeout cases
+   */
+  app.addHook("onResponse", async () => {
+    await context.benchmark.output();
+  });
+  app.addHook("onTimeout", async () => {
+    await context.benchmark.output();
+  });
+
   /**
    * With these plugins we give users possibility to do anything they want on our fastify instance.
    */
@@ -409,10 +419,39 @@ const createHandler = params => {
       plugin.modify(app);
     }
   } catch (ex) {
-    console.log(`Error while running the "ModifyFastifyPlugin" ${modifyFastifyPluginName ? `(${modifyFastifyPluginName})` : ""} plugin in the end of the "createHandler" callable.`);
-    console.log(stringifyError(ex));
+    console.error(`Error while running the "ModifyFastifyPlugin" ${modifyFastifyPluginName ? `(${modifyFastifyPluginName})` : ""} plugin in the end of the "createHandler" callable.`);
+    console.error(stringifyError(ex));
+    throw ex;
+  }
+
+  /**
+   * We have few types of triggers:
+   *  * Events - EventPlugin
+   *  * Routes - RoutePlugin
+   *
+   * 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);
+
+  /**
+   * Add routes to the system.
+   */
+  let routePluginName;
+  try {
+    for (const plugin of routePlugins) {
+      routePluginName = plugin.name;
+      plugin.cb({
+        ...app.webiny.routes,
+        context: app.webiny
+      });
+    }
+  } catch (ex) {
+    console.error(`Error while running the "RoutePlugin" ${routePluginName ? `(${routePluginName})` : ""} plugin in the beginning of the "createHandler" callable.`);
+    console.error(stringifyError(ex));
     throw ex;
   }
   return app;
 };
-exports.createHandler = createHandler;
+exports.createHandler = createHandler;
+
+//# sourceMappingURL=fastify.js.map