@webiny/handler 6.0.0-rc.7 → 6.1.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/fastify.js +1 -7
  2. package/fastify.js.map +1 -1
  3. package/package.json +10 -11
  4. package/types.d.ts +2 -2
  5. package/types.js.map +1 -1
package/fastify.js CHANGED
@@ -4,7 +4,6 @@ import { middleware } from "@webiny/utils";
4
4
  import { Context } from "./Context.js";
5
5
  import WebinyError from "@webiny/error";
6
6
  import { RoutePlugin } from "./plugins/RoutePlugin.js";
7
- import { createHandlerClient } from "@webiny/handler-client";
8
7
  import fastifyCookie from "@fastify/cookie";
9
8
  import fastifyCompress from "@fastify/compress";
10
9
  import { ContextPlugin } from "@webiny/api";
@@ -189,12 +188,7 @@ export const createHandler = params => {
189
188
  }
190
189
  };
191
190
  let context;
192
- const plugins = new PluginsContainer([
193
- /**
194
- * We must have handlerClient by default.
195
- * And it must be one of the first context plugins applied.
196
- */
197
- createHandlerClient()]);
191
+ const plugins = new PluginsContainer([]);
198
192
  plugins.merge(params.plugins || []);
199
193
  try {
200
194
  context = new Context({
package/fastify.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["PluginsContainer","fastify","middleware","Context","WebinyError","RoutePlugin","createHandlerClient","fastifyCookie","fastifyCompress","ContextPlugin","BeforeHandlerPlugin","HandlerResultPlugin","HandlerErrorPlugin","ModifyFastifyPlugin","HandlerOnRequestPlugin","ResponseHeaders","ModifyResponseHeadersPlugin","SetDefaultHeaders","PreHandler","stringifyError","ProcessHandlerOnRequestPlugins","ProcessContextPlugins","IfNotOptionsRequest","ProcessBeforeHandlerPlugins","IfOptionsRequest","SendEarlyOptionsResponse","OnRequestTimeoutPlugin","OnRequestResponseSendPlugin","Request","Reply","modifyResponseHeaders","app","request","reply","modifyHeaders","webiny","plugins","byType","type","replyHeaders","getHeaders","headers","create","forEach","plugin","modify","headersToSet","createHandler","params","definedRoutes","POST","GET","OPTIONS","DELETE","PATCH","PUT","HEAD","COPY","LOCK","MKCOL","MOVE","PROPFIND","PROPPATCH","SEARCH","TRACE","UNLOCK","REPORT","MKCALENDAR","throwOnDefinedRoute","path","options","all","Object","keys","find","k","key","toUpperCase","routes","includes","console","error","JSON","stringify","override","addDefinedRoute","input","push","bodyLimit","disableRequestLogging","allowErrorHandlerOverride","addHook","route","method","Array","isArray","m","register","parseOptions","global","threshold","onUnsupportedEncoding","encoding","_","code","inflateIfDeflated","defined","onPost","handler","post","onGet","get","onOptions","onDelete","delete","onPatch","patch","onPut","put","onAll","onHead","head","context","merge","WEBINY_VERSION","process","env","ex","decorate","addContentTypeParser","parseAs","req","body","done","undefined","json","toString","parse","err","container","registerInstance","handlerOnRequestPlugins","contextPlugins","beforeHandlerPlugins","modifyHeadersPlugins","preHandler","execute","__","payload","name","handle","setErrorHandler","sent","warn","startsWith","status","send","message","data","log","map","pl","next","exec","benchmark","output","modifyPlugins","modifyFastifyPluginName","routePlugins","routePluginName","cb"],"sources":["fastify.ts"],"sourcesContent":["import type { PluginCollection } from \"@webiny/plugins/types.js\";\nimport { PluginsContainer } from \"@webiny/plugins/types.js\";\nimport type { FastifyInstance, FastifyServerOptions as ServerOptions } from \"fastify\";\nimport fastify from \"fastify\";\nimport type { MiddlewareCallable } from \"@webiny/utils\";\nimport { middleware } from \"@webiny/utils\";\nimport type {\n ContextRoutes,\n DefinedContextRoutes,\n HTTPMethods,\n RouteMethodOptions\n} from \"~/types.js\";\nimport { Context } from \"~/Context.js\";\nimport WebinyError from \"@webiny/error\";\nimport { RoutePlugin } from \"./plugins/RoutePlugin.js\";\nimport { createHandlerClient } from \"@webiny/handler-client\";\nimport fastifyCookie from \"@fastify/cookie\";\nimport fastifyCompress from \"@fastify/compress\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { BeforeHandlerPlugin } from \"./plugins/BeforeHandlerPlugin.js\";\nimport { HandlerResultPlugin } from \"./plugins/HandlerResultPlugin.js\";\nimport { HandlerErrorPlugin } from \"./plugins/HandlerErrorPlugin.js\";\nimport { ModifyFastifyPlugin } from \"~/plugins/ModifyFastifyPlugin.js\";\nimport { HandlerOnRequestPlugin } from \"~/plugins/HandlerOnRequestPlugin.js\";\nimport type { StandardHeaders } from \"~/ResponseHeaders.js\";\nimport { ResponseHeaders } from \"~/ResponseHeaders.js\";\nimport { ModifyResponseHeadersPlugin } from \"~/plugins/ModifyResponseHeadersPlugin.js\";\nimport { SetDefaultHeaders } from \"./PreHandler/SetDefaultHeaders.js\";\nimport { PreHandler } from \"./PreHandler/PreHandler.js\";\nimport { stringifyError } from \"./stringifyError.js\";\nimport { ProcessHandlerOnRequestPlugins } from \"./PreHandler/ProcessHandlerOnRequestPlugins.js\";\nimport { ProcessContextPlugins } from \"./PreHandler/ProcessContextPlugins.js\";\nimport { IfNotOptionsRequest } from \"./PreHandler/IfNotOptionsRequest.js\";\nimport { ProcessBeforeHandlerPlugins } from \"./PreHandler/ProcessBeforeHandlerPlugins.js\";\nimport { IfOptionsRequest } from \"./PreHandler/IfOptionsRequest.js\";\nimport { SendEarlyOptionsResponse } from \"./PreHandler/SendEarlyOptionsResponse.js\";\nimport { OnRequestTimeoutPlugin } from \"~/plugins/OnRequestTimeoutPlugin.js\";\nimport { OnRequestResponseSendPlugin } from \"~/plugins/OnRequestResponseSendPlugin.js\";\nimport { Request } from \"./abstractions/Request.js\";\nimport { Reply } from \"./abstractions/Reply.js\";\n\nconst modifyResponseHeaders = (\n app: FastifyInstance,\n request: Request.Interface,\n reply: Reply.Interface\n) => {\n const modifyHeaders = app.webiny.plugins.byType<ModifyResponseHeadersPlugin>(\n ModifyResponseHeadersPlugin.type\n );\n\n const replyHeaders = reply.getHeaders() as StandardHeaders;\n const headers = ResponseHeaders.create(replyHeaders);\n\n modifyHeaders.forEach(plugin => {\n plugin.modify(request, headers);\n });\n\n // Exclude 'set-cookie' header to avoid duplication.\n // Cookies are managed by @fastify/cookie and calling reply.headers() with 'set-cookie' duplicates them.\n const headersToSet = headers.getHeaders();\n delete headersToSet[\"set-cookie\"];\n\n reply.headers(headersToSet);\n};\n\nexport interface CreateHandlerParams {\n plugins: PluginCollection | PluginsContainer;\n options?: ServerOptions;\n debug?: boolean;\n}\n\nexport const createHandler = (params: CreateHandlerParams) => {\n const definedRoutes: DefinedContextRoutes = {\n POST: [],\n GET: [],\n OPTIONS: [],\n DELETE: [],\n PATCH: [],\n PUT: [],\n HEAD: [],\n COPY: [],\n LOCK: [],\n MKCOL: [],\n MOVE: [],\n PROPFIND: [],\n PROPPATCH: [],\n SEARCH: [],\n TRACE: [],\n UNLOCK: [],\n REPORT: [],\n MKCALENDAR: []\n };\n\n const throwOnDefinedRoute = (\n type: HTTPMethods | \"ALL\",\n path: string,\n options?: RouteMethodOptions\n ): void => {\n if (type === \"ALL\") {\n const all = Object.keys(definedRoutes).find(k => {\n const key = k.toUpperCase() as HTTPMethods;\n const routes = definedRoutes[key];\n return routes.includes(path);\n });\n if (!all) {\n return;\n }\n console.error(\n `Error while registering onAll route. One of the routes is already defined.`\n );\n console.error(JSON.stringify(all));\n throw new WebinyError(\n `You cannot override a route with onAll() method, please remove unnecessary route from the system.`,\n \"OVERRIDE_ROUTE_ERROR\",\n {\n type,\n path\n }\n );\n } else if (definedRoutes[type].includes(path) === false) {\n return;\n } else if (options?.override === true) {\n return;\n }\n console.error(`Error while trying to override route: [${type}] ${path}`);\n throw new WebinyError(\n `When you are trying to override existing route, you must send \"override\" parameter when adding that route.`,\n \"OVERRIDE_ROUTE_ERROR\",\n {\n type,\n path\n }\n );\n };\n\n const addDefinedRoute = (input: HTTPMethods, path: string): void => {\n const type = input.toUpperCase() as HTTPMethods;\n if (!definedRoutes[type]) {\n return;\n } else if (definedRoutes[type].includes(path)) {\n return;\n }\n definedRoutes[type].push(path);\n };\n\n /**\n * We must attach the server to our internal context if we want to have it accessible.\n */\n const app = fastify({\n bodyLimit: 536870912, // 512MB\n disableRequestLogging: true,\n allowErrorHandlerOverride: true,\n ...(params.options || {})\n });\n\n /**\n * We need to register routes in our system to output headers later on, and disallow route overriding.\n */\n app.addHook(\"onRoute\", route => {\n const method = route.method as HTTPMethods | HTTPMethods[];\n if (Array.isArray(method)) {\n for (const m of method) {\n addDefinedRoute(m, route.path);\n }\n return;\n }\n addDefinedRoute(method, route.path);\n });\n /**\n * ############################\n * Register the Fastify plugins.\n */\n /**\n * Package @fastify/cookie\n *\n * https://github.com/fastify/fastify-cookie\n */\n app.register(fastifyCookie, {\n parseOptions: {} // options for parsing cookies\n });\n /**\n * Package @fastify/compress\n *\n * https://github.com/fastify/fastify-compress\n */\n app.register(fastifyCompress, {\n global: true,\n threshold: 1024,\n onUnsupportedEncoding: (encoding, _, reply) => {\n reply.code(406);\n return `We do not support the ${encoding} encoding.`;\n },\n inflateIfDeflated: true\n });\n /**\n * Route helpers - mostly for users.\n */\n const routes: ContextRoutes = {\n defined: definedRoutes,\n onPost: (path, handler, options) => {\n throwOnDefinedRoute(\"POST\", path, options);\n app.post(path, handler);\n },\n onGet: (path, handler, options) => {\n throwOnDefinedRoute(\"GET\", path, options);\n app.get(path, handler);\n },\n onOptions: (path, handler, options) => {\n throwOnDefinedRoute(\"OPTIONS\", path, options);\n app.options(path, handler);\n },\n onDelete: (path, handler, options) => {\n throwOnDefinedRoute(\"DELETE\", path, options);\n app.delete(path, handler);\n },\n onPatch: (path, handler, options) => {\n throwOnDefinedRoute(\"PATCH\", path, options);\n app.patch(path, handler);\n },\n onPut: (path, handler, options) => {\n throwOnDefinedRoute(\"PUT\", path, options);\n app.put(path, handler);\n },\n onAll: (path, handler, options) => {\n throwOnDefinedRoute(\"ALL\", path, options);\n app.all(path, handler);\n },\n onHead: (path, handler, options) => {\n throwOnDefinedRoute(\"HEAD\", path, options);\n app.head(path, handler);\n }\n };\n let context: Context;\n\n const plugins = new PluginsContainer([\n /**\n * We must have handlerClient by default.\n * And it must be one of the first context plugins applied.\n */\n createHandlerClient()\n ]);\n plugins.merge(params.plugins || []);\n\n try {\n context = new Context({\n plugins,\n /**\n * Inserted via webpack at build time.\n */\n WEBINY_VERSION: process.env.WEBINY_VERSION as string,\n routes\n });\n } catch (ex) {\n console.error(`Error while constructing the Context.`);\n console.error(stringifyError(ex));\n throw ex;\n }\n\n /**\n * We are attaching our custom context to webiny variable on the fastify app, so it is accessible everywhere.\n */\n app.decorate(\"webiny\", context);\n\n /**\n * To prevent Unsupported Media Type errors on OPTIONS requests with a body,\n * we need to have a custom parser\n */\n app.addContentTypeParser(\n \"application/json\",\n { parseAs: \"string\", bodyLimit: 1024 * 1024 },\n (req, body, done) => {\n if (req.method === \"OPTIONS\") {\n done(null, undefined);\n return;\n }\n\n try {\n const json = typeof body === \"string\" ? body : body.toString(\"utf8\");\n done(null, JSON.parse(json));\n } catch (err) {\n done(err as Error);\n }\n }\n );\n\n /**\n * With this we ensure that an undefined request body is not parsed on OPTIONS requests,\n * in case there's a `content-type` header set for whatever reason.\n *\n * @see https://fastify.dev/docs/latest/Reference/ContentTypeParser/#content-type-parser\n */\n app.addHook(\"onRequest\", async request => {\n if (request.method === \"OPTIONS\" && request.body === undefined) {\n request.headers[\"content-type\"] = undefined;\n }\n });\n\n /**\n * At this point, request body is properly parsed, and we can execute Webiny business logic.\n * - set default headers\n * - process `HandlerOnRequestPlugin`\n * - if OPTIONS request, exit early\n * - process `ContextPlugin`\n * - process `BeforeHandlerPlugin`\n */\n app.addHook(\"preHandler\", async (request, reply) => {\n app.webiny.request = request;\n app.webiny.reply = reply;\n\n // Bind request and reply to DI container for runtime access\n if (app.webiny.container) {\n app.webiny.container.registerInstance(Request, request);\n app.webiny.container.registerInstance(Reply, reply);\n }\n /**\n * Default code to 200 - so we do not need to set it again.\n * Usually we set errors manually when we use reply.send.\n */\n reply.code(200);\n\n const handlerOnRequestPlugins = app.webiny.plugins.byType<HandlerOnRequestPlugin>(\n HandlerOnRequestPlugin.type\n );\n\n const contextPlugins = app.webiny.plugins.byType<ContextPlugin>(ContextPlugin.type);\n\n const beforeHandlerPlugins = app.webiny.plugins.byType<BeforeHandlerPlugin>(\n BeforeHandlerPlugin.type\n );\n\n const modifyHeadersPlugins = app.webiny.plugins.byType<ModifyResponseHeadersPlugin>(\n ModifyResponseHeadersPlugin.type\n );\n\n const preHandler = new PreHandler([\n new SetDefaultHeaders(definedRoutes),\n new ProcessHandlerOnRequestPlugins(handlerOnRequestPlugins),\n new IfNotOptionsRequest([\n new ProcessContextPlugins(app.webiny, contextPlugins),\n new ProcessBeforeHandlerPlugins(app.webiny, beforeHandlerPlugins)\n ]),\n new IfOptionsRequest([new SendEarlyOptionsResponse(modifyHeadersPlugins)])\n ]);\n\n await preHandler.execute(request, reply, app.webiny);\n });\n\n app.addHook(\"preSerialization\", async (_, __, payload) => {\n const plugins = app.webiny.plugins.byType<HandlerResultPlugin>(HandlerResultPlugin.type);\n let name: string | undefined;\n try {\n for (const plugin of plugins) {\n name = plugin.name;\n await plugin.handle(app.webiny, payload);\n }\n } catch (ex) {\n console.error(\n `Error while running the \"HandlerResultPlugin\" ${\n name ? `(${name})` : \"\"\n } plugin in the preSerialization hook.`\n );\n console.error(stringifyError(ex));\n throw ex;\n }\n return payload;\n });\n\n app.setErrorHandler<WebinyError>(async (error, _, reply) => {\n /**\n * IMPORTANT! Do not send anything if reply was already sent.\n */\n if (reply.sent) {\n console.warn(\"Reply already sent, cannot send the result (handler:setErrorHandler).\");\n return reply;\n }\n\n if (error.code?.startsWith(\"Authentication/\")) {\n return reply\n .status(401)\n .headers({ \"Cache-Control\": \"no-store\" })\n .send(\n JSON.stringify({\n message: error.message,\n code: error.code\n })\n );\n }\n\n if (error.code === \"Tenancy/TenantDisabled\") {\n return reply\n .status(503)\n .headers({ \"Cache-Control\": \"no-store\" })\n .send(\n JSON.stringify({\n message: error.message,\n code: error.code\n })\n );\n }\n\n return reply\n .status(500)\n .headers({\n \"Cache-Control\": \"no-store\"\n })\n .send(\n /**\n * When we are sending the error in the response, we cannot send the whole error object, as it might contain some sensitive data.\n */\n JSON.stringify({\n message: error.message,\n code: error.code,\n data: error.data\n })\n );\n });\n\n app.addHook(\"onError\", async (_, reply, error: any) => {\n const plugins = app.webiny.plugins.byType<HandlerErrorPlugin>(HandlerErrorPlugin.type);\n /**\n * Log error to cloud, as these can be extremely annoying to debug!\n */\n console.error(\"Logging error in @webiny/handler\");\n try {\n console.error(stringifyError(error));\n } catch (ex) {\n console.warn(\"Could not stringify error:\");\n console.log(error);\n console.error(\"Stringify error:\", ex);\n }\n /**\n * IMPORTANT! Do not send anything if reply was already sent.\n */\n if (!reply.sent) {\n reply\n .status(500)\n .headers({\n \"Cache-Control\": \"no-store\"\n })\n .send(\n /**\n * When we are sending the error in the response, we cannot send the whole error object, as it might contain some sensitive data.\n */\n JSON.stringify({\n message: error.message,\n code: error.code,\n data: error.data\n })\n );\n } else {\n console.warn(\"Reply already sent, cannot send the result (handler:addHook:onError).\");\n }\n\n const handler = middleware(\n plugins.map(pl => {\n return (context: Context, error: Error, next: MiddlewareCallable) => {\n return pl.handle(context, error, next);\n };\n })\n );\n await handler(app.webiny, error);\n\n return reply;\n });\n\n /**\n * Apply response headers modifier plugins.\n */\n app.addHook(\"onSend\", async (request, reply, input) => {\n modifyResponseHeaders(app, request, reply);\n const plugins = app.webiny.plugins.byType<OnRequestResponseSendPlugin>(\n OnRequestResponseSendPlugin.type\n );\n let payload = input;\n for (const plugin of plugins) {\n payload = await plugin.exec(request, reply, payload);\n }\n return payload;\n });\n\n /**\n * We need to output the benchmark results at the end of the request in both response and timeout cases\n */\n app.addHook(\"onResponse\", async () => {\n await context.benchmark.output();\n });\n\n app.addHook(\"onTimeout\", async (request, reply) => {\n const plugins = app.webiny.plugins.byType<OnRequestTimeoutPlugin>(\n OnRequestTimeoutPlugin.type\n );\n for (const plugin of plugins) {\n await plugin.exec(request, reply);\n }\n await context.benchmark.output();\n });\n\n /**\n * With these plugins we give users possibility to do anything they want on our fastify instance.\n */\n const modifyPlugins = app.webiny.plugins.byType<ModifyFastifyPlugin>(ModifyFastifyPlugin.type);\n\n let modifyFastifyPluginName: string | undefined;\n try {\n for (const plugin of modifyPlugins) {\n modifyFastifyPluginName = plugin.name;\n plugin.modify(app);\n }\n } catch (ex) {\n console.error(\n `Error while running the \"ModifyFastifyPlugin\" ${\n modifyFastifyPluginName ? `(${modifyFastifyPluginName})` : \"\"\n } plugin in the end of the \"createHandler\" callable.`\n );\n console.error(stringifyError(ex));\n throw ex;\n }\n\n /**\n * We have few types of triggers:\n * * Events - EventPlugin\n * * Routes - RoutePlugin\n *\n * Routes are registered in fastify but events must be handled in package which implements cloud specific methods.\n */\n const routePlugins = app.webiny.plugins.byType<RoutePlugin>(RoutePlugin.type);\n\n /**\n * Add routes to the system.\n */\n let routePluginName: string | undefined;\n try {\n for (const plugin of routePlugins) {\n routePluginName = plugin.name;\n plugin.cb({\n ...app.webiny.routes,\n context: app.webiny\n });\n }\n } catch (ex) {\n console.error(\n `Error while running the \"RoutePlugin\" ${\n routePluginName ? `(${routePluginName})` : \"\"\n } plugin in the beginning of the \"createHandler\" callable.`\n );\n console.error(stringifyError(ex));\n throw ex;\n }\n\n return app;\n};\n"],"mappings":"AACA,SAASA,gBAAgB,QAAQ,0BAA0B;AAE3D,OAAOC,OAAO,MAAM,SAAS;AAE7B,SAASC,UAAU,QAAQ,eAAe;AAO1C,SAASC,OAAO;AAChB,OAAOC,WAAW,MAAM,eAAe;AACvC,SAASC,WAAW;AACpB,SAASC,mBAAmB,QAAQ,wBAAwB;AAC5D,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,eAAe,MAAM,mBAAmB;AAC/C,SAASC,aAAa,QAAQ,aAAa;AAC3C,SAASC,mBAAmB;AAC5B,SAASC,mBAAmB;AAC5B,SAASC,kBAAkB;AAC3B,SAASC,mBAAmB;AAC5B,SAASC,sBAAsB;AAE/B,SAASC,eAAe;AACxB,SAASC,2BAA2B;AACpC,SAASC,iBAAiB;AAC1B,SAASC,UAAU;AACnB,SAASC,cAAc;AACvB,SAASC,8BAA8B;AACvC,SAASC,qBAAqB;AAC9B,SAASC,mBAAmB;AAC5B,SAASC,2BAA2B;AACpC,SAASC,gBAAgB;AACzB,SAASC,wBAAwB;AACjC,SAASC,sBAAsB;AAC/B,SAASC,2BAA2B;AACpC,SAASC,OAAO;AAChB,SAASC,KAAK;AAEd,MAAMC,qBAAqB,GAAGA,CAC1BC,GAAoB,EACpBC,OAA0B,EAC1BC,KAAsB,KACrB;EACD,MAAMC,aAAa,GAAGH,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAC3CrB,2BAA2B,CAACsB,IAChC,CAAC;EAED,MAAMC,YAAY,GAAGN,KAAK,CAACO,UAAU,CAAC,CAAoB;EAC1D,MAAMC,OAAO,GAAG1B,eAAe,CAAC2B,MAAM,CAACH,YAAY,CAAC;EAEpDL,aAAa,CAACS,OAAO,CAACC,MAAM,IAAI;IAC5BA,MAAM,CAACC,MAAM,CAACb,OAAO,EAAES,OAAO,CAAC;EACnC,CAAC,CAAC;;EAEF;EACA;EACA,MAAMK,YAAY,GAAGL,OAAO,CAACD,UAAU,CAAC,CAAC;EACzC,OAAOM,YAAY,CAAC,YAAY,CAAC;EAEjCb,KAAK,CAACQ,OAAO,CAACK,YAAY,CAAC;AAC/B,CAAC;AAQD,OAAO,MAAMC,aAAa,GAAIC,MAA2B,IAAK;EAC1D,MAAMC,aAAmC,GAAG;IACxCC,IAAI,EAAE,EAAE;IACRC,GAAG,EAAE,EAAE;IACPC,OAAO,EAAE,EAAE;IACXC,MAAM,EAAE,EAAE;IACVC,KAAK,EAAE,EAAE;IACTC,GAAG,EAAE,EAAE;IACPC,IAAI,EAAE,EAAE;IACRC,IAAI,EAAE,EAAE;IACRC,IAAI,EAAE,EAAE;IACRC,KAAK,EAAE,EAAE;IACTC,IAAI,EAAE,EAAE;IACRC,QAAQ,EAAE,EAAE;IACZC,SAAS,EAAE,EAAE;IACbC,MAAM,EAAE,EAAE;IACVC,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,EAAE;IACVC,MAAM,EAAE,EAAE;IACVC,UAAU,EAAE;EAChB,CAAC;EAED,MAAMC,mBAAmB,GAAGA,CACxB9B,IAAyB,EACzB+B,IAAY,EACZC,OAA4B,KACrB;IACP,IAAIhC,IAAI,KAAK,KAAK,EAAE;MAChB,MAAMiC,GAAG,GAAGC,MAAM,CAACC,IAAI,CAACxB,aAAa,CAAC,CAACyB,IAAI,CAACC,CAAC,IAAI;QAC7C,MAAMC,GAAG,GAAGD,CAAC,CAACE,WAAW,CAAC,CAAgB;QAC1C,MAAMC,MAAM,GAAG7B,aAAa,CAAC2B,GAAG,CAAC;QACjC,OAAOE,MAAM,CAACC,QAAQ,CAACV,IAAI,CAAC;MAChC,CAAC,CAAC;MACF,IAAI,CAACE,GAAG,EAAE;QACN;MACJ;MACAS,OAAO,CAACC,KAAK,CACT,4EACJ,CAAC;MACDD,OAAO,CAACC,KAAK,CAACC,IAAI,CAACC,SAAS,CAACZ,GAAG,CAAC,CAAC;MAClC,MAAM,IAAInE,WAAW,CACjB,mGAAmG,EACnG,sBAAsB,EACtB;QACIkC,IAAI;QACJ+B;MACJ,CACJ,CAAC;IACL,CAAC,MAAM,IAAIpB,aAAa,CAACX,IAAI,CAAC,CAACyC,QAAQ,CAACV,IAAI,CAAC,KAAK,KAAK,EAAE;MACrD;IACJ,CAAC,MAAM,IAAIC,OAAO,EAAEc,QAAQ,KAAK,IAAI,EAAE;MACnC;IACJ;IACAJ,OAAO,CAACC,KAAK,CAAC,0CAA0C3C,IAAI,KAAK+B,IAAI,EAAE,CAAC;IACxE,MAAM,IAAIjE,WAAW,CACjB,4GAA4G,EAC5G,sBAAsB,EACtB;MACIkC,IAAI;MACJ+B;IACJ,CACJ,CAAC;EACL,CAAC;EAED,MAAMgB,eAAe,GAAGA,CAACC,KAAkB,EAAEjB,IAAY,KAAW;IAChE,MAAM/B,IAAI,GAAGgD,KAAK,CAACT,WAAW,CAAC,CAAgB;IAC/C,IAAI,CAAC5B,aAAa,CAACX,IAAI,CAAC,EAAE;MACtB;IACJ,CAAC,MAAM,IAAIW,aAAa,CAACX,IAAI,CAAC,CAACyC,QAAQ,CAACV,IAAI,CAAC,EAAE;MAC3C;IACJ;IACApB,aAAa,CAACX,IAAI,CAAC,CAACiD,IAAI,CAAClB,IAAI,CAAC;EAClC,CAAC;;EAED;AACJ;AACA;EACI,MAAMtC,GAAG,GAAG9B,OAAO,CAAC;IAChBuF,SAAS,EAAE,SAAS;IAAE;IACtBC,qBAAqB,EAAE,IAAI;IAC3BC,yBAAyB,EAAE,IAAI;IAC/B,IAAI1C,MAAM,CAACsB,OAAO,IAAI,CAAC,CAAC;EAC5B,CAAC,CAAC;;EAEF;AACJ;AACA;EACIvC,GAAG,CAAC4D,OAAO,CAAC,SAAS,EAAEC,KAAK,IAAI;IAC5B,MAAMC,MAAM,GAAGD,KAAK,CAACC,MAAqC;IAC1D,IAAIC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EAAE;MACvB,KAAK,MAAMG,CAAC,IAAIH,MAAM,EAAE;QACpBR,eAAe,CAACW,CAAC,EAAEJ,KAAK,CAACvB,IAAI,CAAC;MAClC;MACA;IACJ;IACAgB,eAAe,CAACQ,MAAM,EAAED,KAAK,CAACvB,IAAI,CAAC;EACvC,CAAC,CAAC;EACF;AACJ;AACA;AACA;EACI;AACJ;AACA;AACA;AACA;EACItC,GAAG,CAACkE,QAAQ,CAAC1F,aAAa,EAAE;IACxB2F,YAAY,EAAE,CAAC,CAAC,CAAC;EACrB,CAAC,CAAC;EACF;AACJ;AACA;AACA;AACA;EACInE,GAAG,CAACkE,QAAQ,CAACzF,eAAe,EAAE;IAC1B2F,MAAM,EAAE,IAAI;IACZC,SAAS,EAAE,IAAI;IACfC,qBAAqB,EAAEA,CAACC,QAAQ,EAAEC,CAAC,EAAEtE,KAAK,KAAK;MAC3CA,KAAK,CAACuE,IAAI,CAAC,GAAG,CAAC;MACf,OAAO,yBAAyBF,QAAQ,YAAY;IACxD,CAAC;IACDG,iBAAiB,EAAE;EACvB,CAAC,CAAC;EACF;AACJ;AACA;EACI,MAAM3B,MAAqB,GAAG;IAC1B4B,OAAO,EAAEzD,aAAa;IACtB0D,MAAM,EAAEA,CAACtC,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MAChCF,mBAAmB,CAAC,MAAM,EAAEC,IAAI,EAAEC,OAAO,CAAC;MAC1CvC,GAAG,CAAC8E,IAAI,CAACxC,IAAI,EAAEuC,OAAO,CAAC;IAC3B,CAAC;IACDE,KAAK,EAAEA,CAACzC,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MAC/BF,mBAAmB,CAAC,KAAK,EAAEC,IAAI,EAAEC,OAAO,CAAC;MACzCvC,GAAG,CAACgF,GAAG,CAAC1C,IAAI,EAAEuC,OAAO,CAAC;IAC1B,CAAC;IACDI,SAAS,EAAEA,CAAC3C,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MACnCF,mBAAmB,CAAC,SAAS,EAAEC,IAAI,EAAEC,OAAO,CAAC;MAC7CvC,GAAG,CAACuC,OAAO,CAACD,IAAI,EAAEuC,OAAO,CAAC;IAC9B,CAAC;IACDK,QAAQ,EAAEA,CAAC5C,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MAClCF,mBAAmB,CAAC,QAAQ,EAAEC,IAAI,EAAEC,OAAO,CAAC;MAC5CvC,GAAG,CAACmF,MAAM,CAAC7C,IAAI,EAAEuC,OAAO,CAAC;IAC7B,CAAC;IACDO,OAAO,EAAEA,CAAC9C,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MACjCF,mBAAmB,CAAC,OAAO,EAAEC,IAAI,EAAEC,OAAO,CAAC;MAC3CvC,GAAG,CAACqF,KAAK,CAAC/C,IAAI,EAAEuC,OAAO,CAAC;IAC5B,CAAC;IACDS,KAAK,EAAEA,CAAChD,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MAC/BF,mBAAmB,CAAC,KAAK,EAAEC,IAAI,EAAEC,OAAO,CAAC;MACzCvC,GAAG,CAACuF,GAAG,CAACjD,IAAI,EAAEuC,OAAO,CAAC;IAC1B,CAAC;IACDW,KAAK,EAAEA,CAAClD,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MAC/BF,mBAAmB,CAAC,KAAK,EAAEC,IAAI,EAAEC,OAAO,CAAC;MACzCvC,GAAG,CAACwC,GAAG,CAACF,IAAI,EAAEuC,OAAO,CAAC;IAC1B,CAAC;IACDY,MAAM,EAAEA,CAACnD,IAAI,EAAEuC,OAAO,EAAEtC,OAAO,KAAK;MAChCF,mBAAmB,CAAC,MAAM,EAAEC,IAAI,EAAEC,OAAO,CAAC;MAC1CvC,GAAG,CAAC0F,IAAI,CAACpD,IAAI,EAAEuC,OAAO,CAAC;IAC3B;EACJ,CAAC;EACD,IAAIc,OAAgB;EAEpB,MAAMtF,OAAO,GAAG,IAAIpC,gBAAgB,CAAC;EACjC;AACR;AACA;AACA;EACQM,mBAAmB,CAAC,CAAC,CACxB,CAAC;EACF8B,OAAO,CAACuF,KAAK,CAAC3E,MAAM,CAACZ,OAAO,IAAI,EAAE,CAAC;EAEnC,IAAI;IACAsF,OAAO,GAAG,IAAIvH,OAAO,CAAC;MAClBiC,OAAO;MACP;AACZ;AACA;MACYwF,cAAc,EAAEC,OAAO,CAACC,GAAG,CAACF,cAAwB;MACpD9C;IACJ,CAAC,CAAC;EACN,CAAC,CAAC,OAAOiD,EAAE,EAAE;IACT/C,OAAO,CAACC,KAAK,CAAC,uCAAuC,CAAC;IACtDD,OAAO,CAACC,KAAK,CAAC9D,cAAc,CAAC4G,EAAE,CAAC,CAAC;IACjC,MAAMA,EAAE;EACZ;;EAEA;AACJ;AACA;EACIhG,GAAG,CAACiG,QAAQ,CAAC,QAAQ,EAAEN,OAAO,CAAC;;EAE/B;AACJ;AACA;AACA;EACI3F,GAAG,CAACkG,oBAAoB,CACpB,kBAAkB,EAClB;IAAEC,OAAO,EAAE,QAAQ;IAAE1C,SAAS,EAAE,IAAI,GAAG;EAAK,CAAC,EAC7C,CAAC2C,GAAG,EAAEC,IAAI,EAAEC,IAAI,KAAK;IACjB,IAAIF,GAAG,CAACtC,MAAM,KAAK,SAAS,EAAE;MAC1BwC,IAAI,CAAC,IAAI,EAAEC,SAAS,CAAC;MACrB;IACJ;IAEA,IAAI;MACA,MAAMC,IAAI,GAAG,OAAOH,IAAI,KAAK,QAAQ,GAAGA,IAAI,GAAGA,IAAI,CAACI,QAAQ,CAAC,MAAM,CAAC;MACpEH,IAAI,CAAC,IAAI,EAAEnD,IAAI,CAACuD,KAAK,CAACF,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,OAAOG,GAAG,EAAE;MACVL,IAAI,CAACK,GAAY,CAAC;IACtB;EACJ,CACJ,CAAC;;EAED;AACJ;AACA;AACA;AACA;AACA;EACI3G,GAAG,CAAC4D,OAAO,CAAC,WAAW,EAAE,MAAM3D,OAAO,IAAI;IACtC,IAAIA,OAAO,CAAC6D,MAAM,KAAK,SAAS,IAAI7D,OAAO,CAACoG,IAAI,KAAKE,SAAS,EAAE;MAC5DtG,OAAO,CAACS,OAAO,CAAC,cAAc,CAAC,GAAG6F,SAAS;IAC/C;EACJ,CAAC,CAAC;;EAEF;AACJ;AACA;AACA;AACA;AACA;AACA;AACA;EACIvG,GAAG,CAAC4D,OAAO,CAAC,YAAY,EAAE,OAAO3D,OAAO,EAAEC,KAAK,KAAK;IAChDF,GAAG,CAACI,MAAM,CAACH,OAAO,GAAGA,OAAO;IAC5BD,GAAG,CAACI,MAAM,CAACF,KAAK,GAAGA,KAAK;;IAExB;IACA,IAAIF,GAAG,CAACI,MAAM,CAACwG,SAAS,EAAE;MACtB5G,GAAG,CAACI,MAAM,CAACwG,SAAS,CAACC,gBAAgB,CAAChH,OAAO,EAAEI,OAAO,CAAC;MACvDD,GAAG,CAACI,MAAM,CAACwG,SAAS,CAACC,gBAAgB,CAAC/G,KAAK,EAAEI,KAAK,CAAC;IACvD;IACA;AACR;AACA;AACA;IACQA,KAAK,CAACuE,IAAI,CAAC,GAAG,CAAC;IAEf,MAAMqC,uBAAuB,GAAG9G,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CACrDvB,sBAAsB,CAACwB,IAC3B,CAAC;IAED,MAAMwG,cAAc,GAAG/G,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAAgB5B,aAAa,CAAC6B,IAAI,CAAC;IAEnF,MAAMyG,oBAAoB,GAAGhH,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAClD3B,mBAAmB,CAAC4B,IACxB,CAAC;IAED,MAAM0G,oBAAoB,GAAGjH,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAClDrB,2BAA2B,CAACsB,IAChC,CAAC;IAED,MAAM2G,UAAU,GAAG,IAAI/H,UAAU,CAAC,CAC9B,IAAID,iBAAiB,CAACgC,aAAa,CAAC,EACpC,IAAI7B,8BAA8B,CAACyH,uBAAuB,CAAC,EAC3D,IAAIvH,mBAAmB,CAAC,CACpB,IAAID,qBAAqB,CAACU,GAAG,CAACI,MAAM,EAAE2G,cAAc,CAAC,EACrD,IAAIvH,2BAA2B,CAACQ,GAAG,CAACI,MAAM,EAAE4G,oBAAoB,CAAC,CACpE,CAAC,EACF,IAAIvH,gBAAgB,CAAC,CAAC,IAAIC,wBAAwB,CAACuH,oBAAoB,CAAC,CAAC,CAAC,CAC7E,CAAC;IAEF,MAAMC,UAAU,CAACC,OAAO,CAAClH,OAAO,EAAEC,KAAK,EAAEF,GAAG,CAACI,MAAM,CAAC;EACxD,CAAC,CAAC;EAEFJ,GAAG,CAAC4D,OAAO,CAAC,kBAAkB,EAAE,OAAOY,CAAC,EAAE4C,EAAE,EAAEC,OAAO,KAAK;IACtD,MAAMhH,OAAO,GAAGL,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAAsB1B,mBAAmB,CAAC2B,IAAI,CAAC;IACxF,IAAI+G,IAAwB;IAC5B,IAAI;MACA,KAAK,MAAMzG,MAAM,IAAIR,OAAO,EAAE;QAC1BiH,IAAI,GAAGzG,MAAM,CAACyG,IAAI;QAClB,MAAMzG,MAAM,CAAC0G,MAAM,CAACvH,GAAG,CAACI,MAAM,EAAEiH,OAAO,CAAC;MAC5C;IACJ,CAAC,CAAC,OAAOrB,EAAE,EAAE;MACT/C,OAAO,CAACC,KAAK,CACT,iDACIoE,IAAI,GAAG,IAAIA,IAAI,GAAG,GAAG,EAAE,uCAE/B,CAAC;MACDrE,OAAO,CAACC,KAAK,CAAC9D,cAAc,CAAC4G,EAAE,CAAC,CAAC;MACjC,MAAMA,EAAE;IACZ;IACA,OAAOqB,OAAO;EAClB,CAAC,CAAC;EAEFrH,GAAG,CAACwH,eAAe,CAAc,OAAOtE,KAAK,EAAEsB,CAAC,EAAEtE,KAAK,KAAK;IACxD;AACR;AACA;IACQ,IAAIA,KAAK,CAACuH,IAAI,EAAE;MACZxE,OAAO,CAACyE,IAAI,CAAC,uEAAuE,CAAC;MACrF,OAAOxH,KAAK;IAChB;IAEA,IAAIgD,KAAK,CAACuB,IAAI,EAAEkD,UAAU,CAAC,iBAAiB,CAAC,EAAE;MAC3C,OAAOzH,KAAK,CACP0H,MAAM,CAAC,GAAG,CAAC,CACXlH,OAAO,CAAC;QAAE,eAAe,EAAE;MAAW,CAAC,CAAC,CACxCmH,IAAI,CACD1E,IAAI,CAACC,SAAS,CAAC;QACX0E,OAAO,EAAE5E,KAAK,CAAC4E,OAAO;QACtBrD,IAAI,EAAEvB,KAAK,CAACuB;MAChB,CAAC,CACL,CAAC;IACT;IAEA,IAAIvB,KAAK,CAACuB,IAAI,KAAK,wBAAwB,EAAE;MACzC,OAAOvE,KAAK,CACP0H,MAAM,CAAC,GAAG,CAAC,CACXlH,OAAO,CAAC;QAAE,eAAe,EAAE;MAAW,CAAC,CAAC,CACxCmH,IAAI,CACD1E,IAAI,CAACC,SAAS,CAAC;QACX0E,OAAO,EAAE5E,KAAK,CAAC4E,OAAO;QACtBrD,IAAI,EAAEvB,KAAK,CAACuB;MAChB,CAAC,CACL,CAAC;IACT;IAEA,OAAOvE,KAAK,CACP0H,MAAM,CAAC,GAAG,CAAC,CACXlH,OAAO,CAAC;MACL,eAAe,EAAE;IACrB,CAAC,CAAC,CACDmH,IAAI;IACD;AAChB;AACA;IACgB1E,IAAI,CAACC,SAAS,CAAC;MACX0E,OAAO,EAAE5E,KAAK,CAAC4E,OAAO;MACtBrD,IAAI,EAAEvB,KAAK,CAACuB,IAAI;MAChBsD,IAAI,EAAE7E,KAAK,CAAC6E;IAChB,CAAC,CACL,CAAC;EACT,CAAC,CAAC;EAEF/H,GAAG,CAAC4D,OAAO,CAAC,SAAS,EAAE,OAAOY,CAAC,EAAEtE,KAAK,EAAEgD,KAAU,KAAK;IACnD,MAAM7C,OAAO,GAAGL,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAAqBzB,kBAAkB,CAAC0B,IAAI,CAAC;IACtF;AACR;AACA;IACQ0C,OAAO,CAACC,KAAK,CAAC,kCAAkC,CAAC;IACjD,IAAI;MACAD,OAAO,CAACC,KAAK,CAAC9D,cAAc,CAAC8D,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,OAAO8C,EAAE,EAAE;MACT/C,OAAO,CAACyE,IAAI,CAAC,4BAA4B,CAAC;MAC1CzE,OAAO,CAAC+E,GAAG,CAAC9E,KAAK,CAAC;MAClBD,OAAO,CAACC,KAAK,CAAC,kBAAkB,EAAE8C,EAAE,CAAC;IACzC;IACA;AACR;AACA;IACQ,IAAI,CAAC9F,KAAK,CAACuH,IAAI,EAAE;MACbvH,KAAK,CACA0H,MAAM,CAAC,GAAG,CAAC,CACXlH,OAAO,CAAC;QACL,eAAe,EAAE;MACrB,CAAC,CAAC,CACDmH,IAAI;MACD;AACpB;AACA;MACoB1E,IAAI,CAACC,SAAS,CAAC;QACX0E,OAAO,EAAE5E,KAAK,CAAC4E,OAAO;QACtBrD,IAAI,EAAEvB,KAAK,CAACuB,IAAI;QAChBsD,IAAI,EAAE7E,KAAK,CAAC6E;MAChB,CAAC,CACL,CAAC;IACT,CAAC,MAAM;MACH9E,OAAO,CAACyE,IAAI,CAAC,uEAAuE,CAAC;IACzF;IAEA,MAAM7C,OAAO,GAAG1G,UAAU,CACtBkC,OAAO,CAAC4H,GAAG,CAACC,EAAE,IAAI;MACd,OAAO,CAACvC,OAAgB,EAAEzC,KAAY,EAAEiF,IAAwB,KAAK;QACjE,OAAOD,EAAE,CAACX,MAAM,CAAC5B,OAAO,EAAEzC,KAAK,EAAEiF,IAAI,CAAC;MAC1C,CAAC;IACL,CAAC,CACL,CAAC;IACD,MAAMtD,OAAO,CAAC7E,GAAG,CAACI,MAAM,EAAE8C,KAAK,CAAC;IAEhC,OAAOhD,KAAK;EAChB,CAAC,CAAC;;EAEF;AACJ;AACA;EACIF,GAAG,CAAC4D,OAAO,CAAC,QAAQ,EAAE,OAAO3D,OAAO,EAAEC,KAAK,EAAEqD,KAAK,KAAK;IACnDxD,qBAAqB,CAACC,GAAG,EAAEC,OAAO,EAAEC,KAAK,CAAC;IAC1C,MAAMG,OAAO,GAAGL,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CACrCV,2BAA2B,CAACW,IAChC,CAAC;IACD,IAAI8G,OAAO,GAAG9D,KAAK;IACnB,KAAK,MAAM1C,MAAM,IAAIR,OAAO,EAAE;MAC1BgH,OAAO,GAAG,MAAMxG,MAAM,CAACuH,IAAI,CAACnI,OAAO,EAAEC,KAAK,EAAEmH,OAAO,CAAC;IACxD;IACA,OAAOA,OAAO;EAClB,CAAC,CAAC;;EAEF;AACJ;AACA;EACIrH,GAAG,CAAC4D,OAAO,CAAC,YAAY,EAAE,YAAY;IAClC,MAAM+B,OAAO,CAAC0C,SAAS,CAACC,MAAM,CAAC,CAAC;EACpC,CAAC,CAAC;EAEFtI,GAAG,CAAC4D,OAAO,CAAC,WAAW,EAAE,OAAO3D,OAAO,EAAEC,KAAK,KAAK;IAC/C,MAAMG,OAAO,GAAGL,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CACrCX,sBAAsB,CAACY,IAC3B,CAAC;IACD,KAAK,MAAMM,MAAM,IAAIR,OAAO,EAAE;MAC1B,MAAMQ,MAAM,CAACuH,IAAI,CAACnI,OAAO,EAAEC,KAAK,CAAC;IACrC;IACA,MAAMyF,OAAO,CAAC0C,SAAS,CAACC,MAAM,CAAC,CAAC;EACpC,CAAC,CAAC;;EAEF;AACJ;AACA;EACI,MAAMC,aAAa,GAAGvI,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAAsBxB,mBAAmB,CAACyB,IAAI,CAAC;EAE9F,IAAIiI,uBAA2C;EAC/C,IAAI;IACA,KAAK,MAAM3H,MAAM,IAAI0H,aAAa,EAAE;MAChCC,uBAAuB,GAAG3H,MAAM,CAACyG,IAAI;MACrCzG,MAAM,CAACC,MAAM,CAACd,GAAG,CAAC;IACtB;EACJ,CAAC,CAAC,OAAOgG,EAAE,EAAE;IACT/C,OAAO,CAACC,KAAK,CACT,iDACIsF,uBAAuB,GAAG,IAAIA,uBAAuB,GAAG,GAAG,EAAE,qDAErE,CAAC;IACDvF,OAAO,CAACC,KAAK,CAAC9D,cAAc,CAAC4G,EAAE,CAAC,CAAC;IACjC,MAAMA,EAAE;EACZ;;EAEA;AACJ;AACA;AACA;AACA;AACA;AACA;EACI,MAAMyC,YAAY,GAAGzI,GAAG,CAACI,MAAM,CAACC,OAAO,CAACC,MAAM,CAAchC,WAAW,CAACiC,IAAI,CAAC;;EAE7E;AACJ;AACA;EACI,IAAImI,eAAmC;EACvC,IAAI;IACA,KAAK,MAAM7H,MAAM,IAAI4H,YAAY,EAAE;MAC/BC,eAAe,GAAG7H,MAAM,CAACyG,IAAI;MAC7BzG,MAAM,CAAC8H,EAAE,CAAC;QACN,GAAG3I,GAAG,CAACI,MAAM,CAAC2C,MAAM;QACpB4C,OAAO,EAAE3F,GAAG,CAACI;MACjB,CAAC,CAAC;IACN;EACJ,CAAC,CAAC,OAAO4F,EAAE,EAAE;IACT/C,OAAO,CAACC,KAAK,CACT,yCACIwF,eAAe,GAAG,IAAIA,eAAe,GAAG,GAAG,EAAE,2DAErD,CAAC;IACDzF,OAAO,CAACC,KAAK,CAAC9D,cAAc,CAAC4G,EAAE,CAAC,CAAC;IACjC,MAAMA,EAAE;EACZ;EAEA,OAAOhG,GAAG;AACd,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["PluginsContainer","fastify","middleware","Context","WebinyError","RoutePlugin","fastifyCookie","fastifyCompress","ContextPlugin","BeforeHandlerPlugin","HandlerResultPlugin","HandlerErrorPlugin","ModifyFastifyPlugin","HandlerOnRequestPlugin","ResponseHeaders","ModifyResponseHeadersPlugin","SetDefaultHeaders","PreHandler","stringifyError","ProcessHandlerOnRequestPlugins","ProcessContextPlugins","IfNotOptionsRequest","ProcessBeforeHandlerPlugins","IfOptionsRequest","SendEarlyOptionsResponse","OnRequestTimeoutPlugin","OnRequestResponseSendPlugin","Request","Reply","modifyResponseHeaders","app","request","reply","modifyHeaders","webiny","plugins","byType","type","replyHeaders","getHeaders","headers","create","forEach","plugin","modify","headersToSet","createHandler","params","definedRoutes","POST","GET","OPTIONS","DELETE","PATCH","PUT","HEAD","COPY","LOCK","MKCOL","MOVE","PROPFIND","PROPPATCH","SEARCH","TRACE","UNLOCK","REPORT","MKCALENDAR","throwOnDefinedRoute","path","options","all","Object","keys","find","k","key","toUpperCase","routes","includes","console","error","JSON","stringify","override","addDefinedRoute","input","push","bodyLimit","disableRequestLogging","allowErrorHandlerOverride","addHook","route","method","Array","isArray","m","register","parseOptions","global","threshold","onUnsupportedEncoding","encoding","_","code","inflateIfDeflated","defined","onPost","handler","post","onGet","get","onOptions","onDelete","delete","onPatch","patch","onPut","put","onAll","onHead","head","context","merge","WEBINY_VERSION","process","env","ex","decorate","addContentTypeParser","parseAs","req","body","done","undefined","json","toString","parse","err","container","registerInstance","handlerOnRequestPlugins","contextPlugins","beforeHandlerPlugins","modifyHeadersPlugins","preHandler","execute","__","payload","name","handle","setErrorHandler","sent","warn","startsWith","status","send","message","data","log","map","pl","next","exec","benchmark","output","modifyPlugins","modifyFastifyPluginName","routePlugins","routePluginName","cb"],"sources":["fastify.ts"],"sourcesContent":["import type { PluginCollection } from \"@webiny/plugins/types.js\";\nimport { PluginsContainer } from \"@webiny/plugins/types.js\";\nimport type { FastifyInstance, FastifyServerOptions as ServerOptions } from \"fastify\";\nimport fastify from \"fastify\";\nimport type { MiddlewareCallable } from \"@webiny/utils\";\nimport { middleware } from \"@webiny/utils\";\nimport type {\n ContextRoutes,\n DefinedContextRoutes,\n HTTPMethods,\n RouteMethodOptions\n} from \"~/types.js\";\nimport { Context } from \"~/Context.js\";\nimport WebinyError from \"@webiny/error\";\nimport { RoutePlugin } from \"./plugins/RoutePlugin.js\";\nimport fastifyCookie from \"@fastify/cookie\";\nimport fastifyCompress from \"@fastify/compress\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { BeforeHandlerPlugin } from \"./plugins/BeforeHandlerPlugin.js\";\nimport { HandlerResultPlugin } from \"./plugins/HandlerResultPlugin.js\";\nimport { HandlerErrorPlugin } from \"./plugins/HandlerErrorPlugin.js\";\nimport { ModifyFastifyPlugin } from \"~/plugins/ModifyFastifyPlugin.js\";\nimport { HandlerOnRequestPlugin } from \"~/plugins/HandlerOnRequestPlugin.js\";\nimport type { StandardHeaders } from \"~/ResponseHeaders.js\";\nimport { ResponseHeaders } from \"~/ResponseHeaders.js\";\nimport { ModifyResponseHeadersPlugin } from \"~/plugins/ModifyResponseHeadersPlugin.js\";\nimport { SetDefaultHeaders } from \"./PreHandler/SetDefaultHeaders.js\";\nimport { PreHandler } from \"./PreHandler/PreHandler.js\";\nimport { stringifyError } from \"./stringifyError.js\";\nimport { ProcessHandlerOnRequestPlugins } from \"./PreHandler/ProcessHandlerOnRequestPlugins.js\";\nimport { ProcessContextPlugins } from \"./PreHandler/ProcessContextPlugins.js\";\nimport { IfNotOptionsRequest } from \"./PreHandler/IfNotOptionsRequest.js\";\nimport { ProcessBeforeHandlerPlugins } from \"./PreHandler/ProcessBeforeHandlerPlugins.js\";\nimport { IfOptionsRequest } from \"./PreHandler/IfOptionsRequest.js\";\nimport { SendEarlyOptionsResponse } from \"./PreHandler/SendEarlyOptionsResponse.js\";\nimport { OnRequestTimeoutPlugin } from \"~/plugins/OnRequestTimeoutPlugin.js\";\nimport { OnRequestResponseSendPlugin } from \"~/plugins/OnRequestResponseSendPlugin.js\";\nimport { Request } from \"./abstractions/Request.js\";\nimport { Reply } from \"./abstractions/Reply.js\";\n\nconst modifyResponseHeaders = (\n app: FastifyInstance,\n request: Request.Interface,\n reply: Reply.Interface\n) => {\n const modifyHeaders = app.webiny.plugins.byType<ModifyResponseHeadersPlugin>(\n ModifyResponseHeadersPlugin.type\n );\n\n const replyHeaders = reply.getHeaders() as StandardHeaders;\n const headers = ResponseHeaders.create(replyHeaders);\n\n modifyHeaders.forEach(plugin => {\n plugin.modify(request, headers);\n });\n\n // Exclude 'set-cookie' header to avoid duplication.\n // Cookies are managed by @fastify/cookie and calling reply.headers() with 'set-cookie' duplicates them.\n const headersToSet = headers.getHeaders();\n delete headersToSet[\"set-cookie\"];\n\n reply.headers(headersToSet);\n};\n\nexport interface CreateHandlerParams {\n plugins: PluginCollection | PluginsContainer;\n options?: ServerOptions;\n debug?: boolean;\n}\n\nexport const createHandler = (params: CreateHandlerParams) => {\n const definedRoutes: DefinedContextRoutes = {\n POST: [],\n GET: [],\n OPTIONS: [],\n DELETE: [],\n PATCH: [],\n PUT: [],\n HEAD: [],\n COPY: [],\n LOCK: [],\n MKCOL: [],\n MOVE: [],\n PROPFIND: [],\n PROPPATCH: [],\n SEARCH: [],\n TRACE: [],\n UNLOCK: [],\n REPORT: [],\n MKCALENDAR: []\n };\n\n const throwOnDefinedRoute = (\n type: HTTPMethods | \"ALL\",\n path: string,\n options?: RouteMethodOptions\n ): void => {\n if (type === \"ALL\") {\n const all = Object.keys(definedRoutes).find(k => {\n const key = k.toUpperCase() as HTTPMethods;\n const routes = definedRoutes[key];\n return routes.includes(path);\n });\n if (!all) {\n return;\n }\n console.error(\n `Error while registering onAll route. One of the routes is already defined.`\n );\n console.error(JSON.stringify(all));\n throw new WebinyError(\n `You cannot override a route with onAll() method, please remove unnecessary route from the system.`,\n \"OVERRIDE_ROUTE_ERROR\",\n {\n type,\n path\n }\n );\n } else if (definedRoutes[type].includes(path) === false) {\n return;\n } else if (options?.override === true) {\n return;\n }\n console.error(`Error while trying to override route: [${type}] ${path}`);\n throw new WebinyError(\n `When you are trying to override existing route, you must send \"override\" parameter when adding that route.`,\n \"OVERRIDE_ROUTE_ERROR\",\n {\n type,\n path\n }\n );\n };\n\n const addDefinedRoute = (input: HTTPMethods, path: string): void => {\n const type = input.toUpperCase() as HTTPMethods;\n if (!definedRoutes[type]) {\n return;\n } else if (definedRoutes[type].includes(path)) {\n return;\n }\n definedRoutes[type].push(path);\n };\n\n /**\n * We must attach the server to our internal context if we want to have it accessible.\n */\n const app = fastify({\n bodyLimit: 536870912, // 512MB\n disableRequestLogging: true,\n allowErrorHandlerOverride: true,\n ...(params.options || {})\n });\n\n /**\n * We need to register routes in our system to output headers later on, and disallow route overriding.\n */\n app.addHook(\"onRoute\", route => {\n const method = route.method as HTTPMethods | HTTPMethods[];\n if (Array.isArray(method)) {\n for (const m of method) {\n addDefinedRoute(m, route.path);\n }\n return;\n }\n addDefinedRoute(method, route.path);\n });\n /**\n * ############################\n * Register the Fastify plugins.\n */\n /**\n * Package @fastify/cookie\n *\n * https://github.com/fastify/fastify-cookie\n */\n app.register(fastifyCookie, {\n parseOptions: {} // options for parsing cookies\n });\n /**\n * Package @fastify/compress\n *\n * https://github.com/fastify/fastify-compress\n */\n app.register(fastifyCompress, {\n global: true,\n threshold: 1024,\n onUnsupportedEncoding: (encoding, _, reply) => {\n reply.code(406);\n return `We do not support the ${encoding} encoding.`;\n },\n inflateIfDeflated: true\n });\n /**\n * Route helpers - mostly for users.\n */\n const routes: ContextRoutes = {\n defined: definedRoutes,\n onPost: (path, handler, options) => {\n throwOnDefinedRoute(\"POST\", path, options);\n app.post(path, handler);\n },\n onGet: (path, handler, options) => {\n throwOnDefinedRoute(\"GET\", path, options);\n app.get(path, handler);\n },\n onOptions: (path, handler, options) => {\n throwOnDefinedRoute(\"OPTIONS\", path, options);\n app.options(path, handler);\n },\n onDelete: (path, handler, options) => {\n throwOnDefinedRoute(\"DELETE\", path, options);\n app.delete(path, handler);\n },\n onPatch: (path, handler, options) => {\n throwOnDefinedRoute(\"PATCH\", path, options);\n app.patch(path, handler);\n },\n onPut: (path, handler, options) => {\n throwOnDefinedRoute(\"PUT\", path, options);\n app.put(path, handler);\n },\n onAll: (path, handler, options) => {\n throwOnDefinedRoute(\"ALL\", path, options);\n app.all(path, handler);\n },\n onHead: (path, handler, options) => {\n throwOnDefinedRoute(\"HEAD\", path, options);\n app.head(path, handler);\n }\n };\n let context: Context;\n\n const plugins = new PluginsContainer([]);\n plugins.merge(params.plugins || []);\n\n try {\n context = new Context({\n plugins,\n /**\n * Inserted via webpack at build time.\n */\n WEBINY_VERSION: process.env.WEBINY_VERSION as string,\n routes\n });\n } catch (ex) {\n console.error(`Error while constructing the Context.`);\n console.error(stringifyError(ex));\n throw ex;\n }\n\n /**\n * We are attaching our custom context to webiny variable on the fastify app, so it is accessible everywhere.\n */\n app.decorate(\"webiny\", context);\n\n /**\n * To prevent Unsupported Media Type errors on OPTIONS requests with a body,\n * we need to have a custom parser\n */\n app.addContentTypeParser(\n \"application/json\",\n { parseAs: \"string\", bodyLimit: 1024 * 1024 },\n (req, body, done) => {\n if (req.method === \"OPTIONS\") {\n done(null, undefined);\n return;\n }\n\n try {\n const json = typeof body === \"string\" ? body : body.toString(\"utf8\");\n done(null, JSON.parse(json));\n } catch (err) {\n done(err as Error);\n }\n }\n );\n\n /**\n * With this we ensure that an undefined request body is not parsed on OPTIONS requests,\n * in case there's a `content-type` header set for whatever reason.\n *\n * @see https://fastify.dev/docs/latest/Reference/ContentTypeParser/#content-type-parser\n */\n app.addHook(\"onRequest\", async request => {\n if (request.method === \"OPTIONS\" && request.body === undefined) {\n request.headers[\"content-type\"] = undefined;\n }\n });\n\n /**\n * At this point, request body is properly parsed, and we can execute Webiny business logic.\n * - set default headers\n * - process `HandlerOnRequestPlugin`\n * - if OPTIONS request, exit early\n * - process `ContextPlugin`\n * - process `BeforeHandlerPlugin`\n */\n app.addHook(\"preHandler\", async (request, reply) => {\n app.webiny.request = request;\n app.webiny.reply = reply;\n\n // Bind request and reply to DI container for runtime access\n if (app.webiny.container) {\n app.webiny.container.registerInstance(Request, request);\n app.webiny.container.registerInstance(Reply, reply);\n }\n /**\n * Default code to 200 - so we do not need to set it again.\n * Usually we set errors manually when we use reply.send.\n */\n reply.code(200);\n\n const handlerOnRequestPlugins = app.webiny.plugins.byType<HandlerOnRequestPlugin>(\n HandlerOnRequestPlugin.type\n );\n\n const contextPlugins = app.webiny.plugins.byType<ContextPlugin>(ContextPlugin.type);\n\n const beforeHandlerPlugins = app.webiny.plugins.byType<BeforeHandlerPlugin>(\n BeforeHandlerPlugin.type\n );\n\n const modifyHeadersPlugins = app.webiny.plugins.byType<ModifyResponseHeadersPlugin>(\n ModifyResponseHeadersPlugin.type\n );\n\n const preHandler = new PreHandler([\n new SetDefaultHeaders(definedRoutes),\n new ProcessHandlerOnRequestPlugins(handlerOnRequestPlugins),\n new IfNotOptionsRequest([\n new ProcessContextPlugins(app.webiny, contextPlugins),\n new ProcessBeforeHandlerPlugins(app.webiny, beforeHandlerPlugins)\n ]),\n new IfOptionsRequest([new SendEarlyOptionsResponse(modifyHeadersPlugins)])\n ]);\n\n await preHandler.execute(request, reply, app.webiny);\n });\n\n app.addHook(\"preSerialization\", async (_, __, payload) => {\n const plugins = app.webiny.plugins.byType<HandlerResultPlugin>(HandlerResultPlugin.type);\n let name: string | undefined;\n try {\n for (const plugin of plugins) {\n name = plugin.name;\n await plugin.handle(app.webiny, payload);\n }\n } catch (ex) {\n console.error(\n `Error while running the \"HandlerResultPlugin\" ${\n name ? `(${name})` : \"\"\n } plugin in the preSerialization hook.`\n );\n console.error(stringifyError(ex));\n throw ex;\n }\n return payload;\n });\n\n app.setErrorHandler<WebinyError>(async (error, _, reply) => {\n /**\n * IMPORTANT! Do not send anything if reply was already sent.\n */\n if (reply.sent) {\n console.warn(\"Reply already sent, cannot send the result (handler:setErrorHandler).\");\n return reply;\n }\n\n if (error.code?.startsWith(\"Authentication/\")) {\n return reply\n .status(401)\n .headers({ \"Cache-Control\": \"no-store\" })\n .send(\n JSON.stringify({\n message: error.message,\n code: error.code\n })\n );\n }\n\n if (error.code === \"Tenancy/TenantDisabled\") {\n return reply\n .status(503)\n .headers({ \"Cache-Control\": \"no-store\" })\n .send(\n JSON.stringify({\n message: error.message,\n code: error.code\n })\n );\n }\n\n return reply\n .status(500)\n .headers({\n \"Cache-Control\": \"no-store\"\n })\n .send(\n /**\n * When we are sending the error in the response, we cannot send the whole error object, as it might contain some sensitive data.\n */\n JSON.stringify({\n message: error.message,\n code: error.code,\n data: error.data\n })\n );\n });\n\n app.addHook(\"onError\", async (_, reply, error: any) => {\n const plugins = app.webiny.plugins.byType<HandlerErrorPlugin>(HandlerErrorPlugin.type);\n /**\n * Log error to cloud, as these can be extremely annoying to debug!\n */\n console.error(\"Logging error in @webiny/handler\");\n try {\n console.error(stringifyError(error));\n } catch (ex) {\n console.warn(\"Could not stringify error:\");\n console.log(error);\n console.error(\"Stringify error:\", ex);\n }\n /**\n * IMPORTANT! Do not send anything if reply was already sent.\n */\n if (!reply.sent) {\n reply\n .status(500)\n .headers({\n \"Cache-Control\": \"no-store\"\n })\n .send(\n /**\n * When we are sending the error in the response, we cannot send the whole error object, as it might contain some sensitive data.\n */\n JSON.stringify({\n message: error.message,\n code: error.code,\n data: error.data\n })\n );\n } else {\n console.warn(\"Reply already sent, cannot send the result (handler:addHook:onError).\");\n }\n\n const handler = middleware(\n plugins.map(pl => {\n return (context: Context, error: Error, next: MiddlewareCallable) => {\n return pl.handle(context, error, next);\n };\n })\n );\n await handler(app.webiny, error);\n\n return reply;\n });\n\n /**\n * Apply response headers modifier plugins.\n */\n app.addHook(\"onSend\", async (request, reply, input) => {\n modifyResponseHeaders(app, request, reply);\n const plugins = app.webiny.plugins.byType<OnRequestResponseSendPlugin>(\n OnRequestResponseSendPlugin.type\n );\n let payload = input;\n for (const plugin of plugins) {\n payload = await plugin.exec(request, reply, payload);\n }\n return payload;\n });\n\n /**\n * We need to output the benchmark results at the end of the request in both response and timeout cases\n */\n app.addHook(\"onResponse\", async () => {\n await context.benchmark.output();\n });\n\n app.addHook(\"onTimeout\", async (request, reply) => {\n const plugins = app.webiny.plugins.byType<OnRequestTimeoutPlugin>(\n OnRequestTimeoutPlugin.type\n );\n for (const plugin of plugins) {\n await plugin.exec(request, reply);\n }\n await context.benchmark.output();\n });\n\n /**\n * With these plugins we give users possibility to do anything they want on our fastify instance.\n */\n const modifyPlugins = app.webiny.plugins.byType<ModifyFastifyPlugin>(ModifyFastifyPlugin.type);\n\n let modifyFastifyPluginName: string | undefined;\n try {\n for (const plugin of modifyPlugins) {\n modifyFastifyPluginName = plugin.name;\n plugin.modify(app);\n }\n } catch (ex) {\n console.error(\n `Error while running the \"ModifyFastifyPlugin\" ${\n modifyFastifyPluginName ? `(${modifyFastifyPluginName})` : \"\"\n } plugin in the end of the \"createHandler\" callable.`\n );\n console.error(stringifyError(ex));\n throw ex;\n }\n\n /**\n * We have few types of triggers:\n * * Events - EventPlugin\n * * Routes - RoutePlugin\n *\n * Routes are registered in fastify but events must be handled in package which implements cloud specific methods.\n */\n const routePlugins = app.webiny.plugins.byType<RoutePlugin>(RoutePlugin.type);\n\n /**\n * Add routes to the system.\n */\n let routePluginName: string | undefined;\n try {\n for (const plugin of routePlugins) {\n routePluginName = plugin.name;\n plugin.cb({\n ...app.webiny.routes,\n context: app.webiny\n });\n }\n } catch (ex) {\n console.error(\n `Error while running the \"RoutePlugin\" ${\n routePluginName ? `(${routePluginName})` : \"\"\n } plugin in the beginning of the \"createHandler\" callable.`\n );\n console.error(stringifyError(ex));\n throw ex;\n }\n\n return app;\n};\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/handler",
3
- "version": "6.0.0-rc.7",
3
+ "version": "6.1.0-beta.0",
4
4
  "type": "module",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -15,23 +15,22 @@
15
15
  "dependencies": {
16
16
  "@fastify/compress": "8.3.1",
17
17
  "@fastify/cookie": "11.0.2",
18
- "@webiny/api": "6.0.0-rc.7",
19
- "@webiny/error": "6.0.0-rc.7",
20
- "@webiny/feature": "6.0.0-rc.7",
21
- "@webiny/handler-client": "6.0.0-rc.7",
22
- "@webiny/plugins": "6.0.0-rc.7",
23
- "@webiny/utils": "6.0.0-rc.7",
24
- "fastify": "5.8.2"
18
+ "@webiny/api": "6.1.0-beta.0",
19
+ "@webiny/error": "6.1.0-beta.0",
20
+ "@webiny/feature": "6.1.0-beta.0",
21
+ "@webiny/plugins": "6.1.0-beta.0",
22
+ "@webiny/utils": "6.1.0-beta.0",
23
+ "fastify": "5.8.4"
25
24
  },
26
25
  "devDependencies": {
27
- "@webiny/build-tools": "6.0.0-rc.7",
26
+ "@webiny/build-tools": "6.1.0-beta.0",
28
27
  "rimraf": "6.1.3",
29
28
  "typescript": "5.9.3",
30
- "vitest": "4.0.18"
29
+ "vitest": "4.1.2"
31
30
  },
32
31
  "publishConfig": {
33
32
  "access": "public",
34
33
  "directory": "dist"
35
34
  },
36
- "gitHead": "9c6892640a45679ff521e25cd6587dff57393a2e"
35
+ "gitHead": "a3bd3695c66c79238e380d7360d9731b5fcf9c87"
37
36
  }
package/types.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import "@fastify/cookie";
2
2
  import type { FastifyRequest, FastifyReply, HTTPMethods as BaseHttpMethods, RouteHandlerMethod } from "fastify";
3
3
  export type { FastifyInstance } from "fastify";
4
- import type { ClientContext } from "@webiny/handler-client/types.js";
4
+ import type { Context as BaseContext } from "@webiny/api/types.js";
5
5
  export interface RouteMethodOptions {
6
6
  override?: boolean;
7
7
  }
@@ -24,7 +24,7 @@ export interface ContextRoutes {
24
24
  onAll: RouteMethod;
25
25
  onHead: RouteMethod;
26
26
  }
27
- export interface Context extends ClientContext {
27
+ export interface Context extends BaseContext {
28
28
  /**
29
29
  * Current request. Must be set only once!
30
30
  */
package/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import \"@fastify/cookie\";\nimport type {\n FastifyRequest,\n FastifyReply,\n HTTPMethods as BaseHttpMethods,\n RouteHandlerMethod\n} from \"fastify\";\nexport type { FastifyInstance } from \"fastify\";\nimport type { ClientContext } from \"@webiny/handler-client/types.js\";\n\nexport interface RouteMethodOptions {\n override?: boolean;\n}\n\nexport type RouteMethodPath = `/${string}` | \"*\";\nexport interface RouteMethod {\n (path: RouteMethodPath, handler: RouteHandlerMethod, options?: RouteMethodOptions): void;\n}\n\nexport type Request = FastifyRequest;\nexport type Reply = FastifyReply;\n\nexport type HTTPMethods = Uppercase<BaseHttpMethods>;\n\nexport type DefinedContextRoutes = Record<HTTPMethods, string[]>;\n\nexport interface ContextRoutes {\n defined: DefinedContextRoutes;\n onGet: RouteMethod;\n onPost: RouteMethod;\n onPut: RouteMethod;\n onPatch: RouteMethod;\n onDelete: RouteMethod;\n onOptions: RouteMethod;\n onAll: RouteMethod;\n onHead: RouteMethod;\n}\n\nexport interface Context extends ClientContext {\n /**\n * Current request. Must be set only once!\n */\n request: FastifyRequest;\n /**\n * Current reply. Must be set only once!\n */\n reply: FastifyReply;\n /**\n * @internal\n */\n routes: ContextRoutes;\n}\n\ndeclare module \"fastify\" {\n interface FastifyInstance {\n webiny: Context;\n __webiny_raw_result: any;\n }\n}\n"],"mappings":"AAAA,OAAO,iBAAiB","ignoreList":[]}
1
+ {"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import \"@fastify/cookie\";\nimport type {\n FastifyRequest,\n FastifyReply,\n HTTPMethods as BaseHttpMethods,\n RouteHandlerMethod\n} from \"fastify\";\nexport type { FastifyInstance } from \"fastify\";\nimport type { Context as BaseContext } from \"@webiny/api/types.js\";\n\nexport interface RouteMethodOptions {\n override?: boolean;\n}\n\nexport type RouteMethodPath = `/${string}` | \"*\";\nexport interface RouteMethod {\n (path: RouteMethodPath, handler: RouteHandlerMethod, options?: RouteMethodOptions): void;\n}\n\nexport type Request = FastifyRequest;\nexport type Reply = FastifyReply;\n\nexport type HTTPMethods = Uppercase<BaseHttpMethods>;\n\nexport type DefinedContextRoutes = Record<HTTPMethods, string[]>;\n\nexport interface ContextRoutes {\n defined: DefinedContextRoutes;\n onGet: RouteMethod;\n onPost: RouteMethod;\n onPut: RouteMethod;\n onPatch: RouteMethod;\n onDelete: RouteMethod;\n onOptions: RouteMethod;\n onAll: RouteMethod;\n onHead: RouteMethod;\n}\n\nexport interface Context extends BaseContext {\n /**\n * Current request. Must be set only once!\n */\n request: FastifyRequest;\n /**\n * Current reply. Must be set only once!\n */\n reply: FastifyReply;\n /**\n * @internal\n */\n routes: ContextRoutes;\n}\n\ndeclare module \"fastify\" {\n interface FastifyInstance {\n webiny: Context;\n __webiny_raw_result: any;\n }\n}\n"],"mappings":"AAAA,OAAO,iBAAiB","ignoreList":[]}