@alignable/bifrost-fastify 1.0.16 → 1.0.18-4933dfc

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 (4) hide show
  1. package/dist/index.d.ts +8 -3
  2. package/dist/index.js +18 -5
  3. package/dist/index.js.map +1 -1
  4. package/package.json +2 -2
package/dist/index.d.ts CHANGED
@@ -1,9 +1,11 @@
1
- import { FastifyPluginAsync } from 'fastify';
2
- import { FastifyRequest } from 'fastify/types/request';
1
+ import { FastifyPluginAsync, RawServerBase, FastifyReply, RouteGenericInterface } from 'fastify';
2
+ import { FastifyRequest, RequestGenericInterface } from 'fastify/types/request';
3
3
  import { FastifyHttpProxyOptions } from '@fastify/http-proxy';
4
4
  import { GetLayout } from '@alignable/bifrost/config';
5
5
  import { renderPage } from 'vike/server';
6
6
  import { PageContextServer } from 'vike/types';
7
+ import { Http2ServerRequest } from 'http2';
8
+ import { IncomingMessage } from 'http';
7
9
 
8
10
  type RenderedPageContext = Awaited<ReturnType<typeof renderPage<{
9
11
  isClientSideNavigation?: boolean;
@@ -12,7 +14,9 @@ type RenderedPageContext = Awaited<ReturnType<typeof renderPage<{
12
14
  }>>>;
13
15
  declare module "fastify" {
14
16
  interface FastifyRequest {
15
- bifrostPageId?: string | null;
17
+ bifrostProxyMode?: Vike.Config["proxyMode"];
18
+ bifrostSentProxyHeaders?: boolean;
19
+ bifrostProxyLayout?: Vike.ProxyLayoutInfo | null;
16
20
  vikePageContext?: Partial<PageContextServer> | null;
17
21
  getLayout: GetLayout | null;
18
22
  customPageContextInit: Partial<Omit<PageContextServer, "headers">> | null;
@@ -23,6 +27,7 @@ interface ViteProxyPluginOptions extends Omit<FastifyHttpProxyOptions, "upstream
23
27
  host: URL;
24
28
  onError?: (error: any, pageContext: RenderedPageContext) => void;
25
29
  buildPageContextInit?: (req: FastifyRequest) => Promise<Partial<Omit<PageContextServer, "headers">>>;
30
+ beforeWrappedRender?: (req: FastifyRequest<RequestGenericInterface, RawServerBase>, reply: FastifyReply<RouteGenericInterface, RawServerBase, IncomingMessage | Http2ServerRequest>) => void;
26
31
  }
27
32
  /**
28
33
  * Fastify plugin that wraps @fasitfy/http-proxy to proxy Rails/Turbolinks server into a vike site.
package/dist/index.js CHANGED
@@ -38,7 +38,7 @@ import { Http2ServerRequest } from "http2";
38
38
  import { text } from "stream/consumers";
39
39
  import { parse as parseContentType } from "fast-content-type-parse";
40
40
  var viteProxyPlugin = async (fastify, opts) => {
41
- const { upstream, host, onError, buildPageContextInit } = opts;
41
+ const { upstream, host, onError, buildPageContextInit, beforeWrappedRender } = opts;
42
42
  async function replyWithPage(reply, pageContext) {
43
43
  const { httpResponse } = pageContext;
44
44
  if (onError && httpResponse?.statusCode === 500 && pageContext.errorWhileRendering) {
@@ -51,7 +51,9 @@ var viteProxyPlugin = async (fastify, opts) => {
51
51
  return reply.status(statusCode).headers(Object.fromEntries(headers)).send(await getBody());
52
52
  }
53
53
  await fastify.register(accepts);
54
- fastify.decorateRequest("bifrostPageId", null);
54
+ fastify.decorateRequest("bifrostProxyMode", false);
55
+ fastify.decorateRequest("bifrostProxyLayout", null);
56
+ fastify.decorateRequest("bifrostSentProxyHeaders", false);
55
57
  fastify.decorateRequest("vikePageContext", null);
56
58
  fastify.decorateRequest("getLayout", null);
57
59
  fastify.decorateRequest("customPageContextInit", null);
@@ -68,13 +70,13 @@ var viteProxyPlugin = async (fastify, opts) => {
68
70
  ...req.customPageContextInit
69
71
  };
70
72
  const pageContext = await renderPage(pageContextInit);
71
- req.bifrostPageId = pageContext.pageId;
72
- req.vikePageContext = pageContext;
73
- const proxyMode = pageContext.config?.proxyMode;
73
+ let proxyMode = pageContext.config?.proxyMode;
74
74
  if (!proxyMode) {
75
+ req.vikePageContext = pageContext;
75
76
  req.log.info(`bifrost: rendering page ${pageContext.pageId}`);
76
77
  return replyWithPage(reply, pageContext);
77
78
  }
79
+ req.bifrostProxyMode = "passthru";
78
80
  switch (proxyMode) {
79
81
  case "passthru": {
80
82
  req.log.info(`bifrost: passthru proxy to backend`);
@@ -101,6 +103,7 @@ var viteProxyPlugin = async (fastify, opts) => {
101
103
  if (!proxyHeadersAlreadySet) {
102
104
  req.raw._bfproxy = true;
103
105
  req.getLayout = pageContext.config.getLayout;
106
+ req.bifrostSentProxyHeaders = true;
104
107
  }
105
108
  } else {
106
109
  req.log.error(
@@ -147,6 +150,7 @@ var viteProxyPlugin = async (fastify, opts) => {
147
150
  }
148
151
  }
149
152
  const proxyLayoutInfo = req.getLayout?.(reply.getHeaders());
153
+ req.bifrostProxyLayout = proxyLayoutInfo;
150
154
  if (!proxyLayoutInfo) {
151
155
  return reply.send("stream" in res ? res.stream : res);
152
156
  }
@@ -159,6 +163,13 @@ var viteProxyPlugin = async (fastify, opts) => {
159
163
  if (!bodyInnerHtml || !headInnerHtml) {
160
164
  return reply.send(html);
161
165
  }
166
+ try {
167
+ beforeWrappedRender?.(req, reply);
168
+ } catch (e) {
169
+ req.log.error(
170
+ `Error in beforeWrappedRender: ${e.message}`
171
+ );
172
+ }
162
173
  const pageContextInit = {
163
174
  urlOriginal: reply.request.url,
164
175
  headersOriginal: req.headers,
@@ -173,6 +184,8 @@ var viteProxyPlugin = async (fastify, opts) => {
173
184
  ...req.customPageContextInit
174
185
  };
175
186
  const pageContext = await renderPage(pageContextInit);
187
+ req.vikePageContext = pageContext;
188
+ req.bifrostProxyMode = "wrapped";
176
189
  return replyWithPage(reply, pageContext);
177
190
  }
178
191
  }
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../index.ts","../lib/extractDomElements.ts"],"sourcesContent":["// Note that this file isn't processed by Vite, see https://github.com/brillout/vike/issues/562\nimport {\n FastifyReply,\n RawServerBase,\n FastifyPluginAsync,\n RouteGenericInterface,\n} from \"fastify\";\nimport { FastifyRequest, RequestGenericInterface } from \"fastify/types/request\";\nimport proxy, { type FastifyHttpProxyOptions } from \"@fastify/http-proxy\";\nimport accepts from \"@fastify/accepts\";\nimport forwarded from \"@fastify/forwarded\";\nimport type { GetLayout, WrappedServerOnly } from \"@alignable/bifrost/config\";\nimport { PassThrough, Writable } from \"stream\";\nimport { renderPage } from \"vike/server\";\nimport { PageContextServer } from \"vike/types\";\nimport { extractDomElements } from \"./lib/extractDomElements\";\nimport { Http2ServerRequest } from \"http2\";\nimport { IncomingMessage } from \"http\";\nimport { text } from \"node:stream/consumers\";\nimport { parse as parseContentType } from \"fast-content-type-parse\";\n\ntype RenderedPageContext = Awaited<\n ReturnType<\n typeof renderPage<\n {\n isClientSideNavigation?: boolean;\n },\n { urlOriginal: string }\n >\n >\n>;\n\ndeclare module \"fastify\" {\n interface FastifyRequest {\n bifrostPageId?: string | null;\n vikePageContext?: Partial<PageContextServer> | null;\n getLayout: GetLayout | null;\n customPageContextInit: Partial<Omit<PageContextServer, \"headers\">> | null;\n }\n}\n\ntype RawRequestExtendedWithProxy = FastifyRequest<\n RequestGenericInterface,\n RawServerBase\n>[\"raw\"] & {\n _bfproxy?: boolean;\n};\n\ninterface ViteProxyPluginOptions\n extends Omit<\n FastifyHttpProxyOptions,\n \"upstream\" | \"preHandler\" | \"replyOptions\"\n > {\n upstream: URL;\n host: URL;\n onError?: (error: any, pageContext: RenderedPageContext) => void;\n buildPageContextInit?: (\n req: FastifyRequest\n ) => Promise<Partial<Omit<PageContextServer, \"headers\">>>;\n}\n/**\n * Fastify plugin that wraps @fasitfy/http-proxy to proxy Rails/Turbolinks server into a vike site.\n */\nexport const viteProxyPlugin: FastifyPluginAsync<\n ViteProxyPluginOptions\n> = async (fastify, opts) => {\n const { upstream, host, onError, buildPageContextInit } = opts;\n async function replyWithPage(\n reply: FastifyReply<RouteGenericInterface, RawServerBase>,\n pageContext: RenderedPageContext\n ): Promise<FastifyReply> {\n const { httpResponse } = pageContext;\n\n if (\n onError &&\n httpResponse?.statusCode === 500 &&\n pageContext.errorWhileRendering\n ) {\n onError(pageContext.errorWhileRendering, pageContext);\n }\n\n if (!httpResponse) {\n return reply.code(404).type(\"text/html\").send(\"Not Found\");\n }\n\n const { statusCode, headers, getBody } = httpResponse;\n return (\n reply\n .status(statusCode)\n .headers(Object.fromEntries(headers))\n // This disables any possibility of real streaming. To re-enable streaming we should adopt vike-photon and rewrite wrapped proxy as a Vike middleware.\n // Why not pipe? Because Vike gives us `pipe` which sends data into a Writable, but Fastify's reply.send only accepts a ReadableStream. Passthrough can convert but causes race conditions\n // We would have to pipe into reply.raw, but that skips Fastify's reply handling (like onSend hooks)\n // Photon/universal-middleware solves this with some hacks around reply.body\n .send(await getBody())\n );\n }\n await fastify.register(accepts);\n fastify.decorateRequest(\"bifrostPageId\", null);\n fastify.decorateRequest(\"vikePageContext\", null);\n fastify.decorateRequest(\"getLayout\", null);\n fastify.decorateRequest(\"customPageContextInit\", null);\n await fastify.register(proxy, {\n ...opts,\n upstream: upstream.href,\n websocket: true,\n async preHandler(req, reply) {\n if (\n (req.method === \"GET\" || req.method === \"HEAD\") &&\n req.accepts().type([\"html\"]) === \"html\"\n ) {\n req.customPageContextInit = buildPageContextInit\n ? await buildPageContextInit(req)\n : {};\n\n const pageContextInit = {\n urlOriginal: req.url,\n headersOriginal: req.headers,\n ...req.customPageContextInit,\n };\n\n const pageContext = await renderPage(pageContextInit);\n\n // this does not handle getting the original pageId when errors are thrown: https://github.com/vikejs/vike/issues/1112\n req.bifrostPageId = pageContext.pageId;\n req.vikePageContext = pageContext;\n\n const proxyMode = pageContext.config?.proxyMode;\n if (!proxyMode) {\n req.log.info(`bifrost: rendering page ${pageContext.pageId}`);\n return replyWithPage(reply, pageContext);\n }\n\n switch (proxyMode) {\n case \"passthru\": {\n req.log.info(`bifrost: passthru proxy to backend`);\n break;\n }\n case \"wrapped\": {\n req.log.info(`bifrost: proxy route matched, proxying to backend`);\n if (!!pageContext.isClientSideNavigation) {\n // This should never happen because wrapped proxy routes have no onBeforeRender. onRenderClient should make a request to the legacy backend.\n req.log.error(\n \"Wrapped proxy route is requesting index.pageContext.json. Something is wrong with the client.\"\n );\n return reply.redirect(\n req.url.replace(\"/index.pageContext.json\", \"\")\n );\n }\n if (pageContext.config?.getLayout) {\n let proxyHeadersAlreadySet = true;\n for (const [key, val] of Object.entries(\n pageContext.config?.proxyHeaders || {}\n )) {\n proxyHeadersAlreadySet &&=\n req.headers[key.toLowerCase()] == val;\n req.headers[key.toLowerCase()] = val;\n }\n // If proxy headers set, this is a client navigation meant to go direct to legacy backend.\n // ALB CANNOT be used for this. see `onBeforeRenderClient` for details\n // Only set getLayout and _bfproxy if we didn't already set proxy headers\n if (!proxyHeadersAlreadySet) {\n // setting _bfproxy tells onResponse we're in wrapped mode\n (req.raw as RawRequestExtendedWithProxy)._bfproxy = true;\n req.getLayout = pageContext.config.getLayout;\n }\n } else {\n req.log.error(\n \"Config missing getLayout on wrapped route! Falling back to passthru proxy\"\n );\n }\n break;\n }\n }\n\n if (pageContext.urlParsed) {\n const { options } = reply.fromParameters(pageContext.urlParsed.href);\n return reply.from(pageContext.urlParsed.href, options as any);\n }\n }\n },\n replyOptions: {\n rewriteRequestHeaders(request, headers) {\n if (!(request.raw instanceof Http2ServerRequest)) {\n const fwd = forwarded(request.raw).reverse();\n headers[\"X-Forwarded-For\"] = fwd.join(\", \");\n headers[\"X-Forwarded-Host\"] = host.host;\n headers[\"X-Forwarded-Proto\"] = host.protocol;\n }\n\n if ((request.raw as RawRequestExtendedWithProxy)._bfproxy) {\n // Proxying and wrapping\n\n // Delete cache headers\n delete headers[\"if-modified-since\"];\n delete headers[\"if-none-match\"];\n delete headers[\"if-unmodified-since\"];\n delete headers[\"if-none-match\"];\n delete headers[\"if-range\"];\n }\n return headers;\n },\n async onResponse(req, reply, res) {\n if ([301, 302, 303, 307, 308].includes(reply.statusCode)) {\n const location = reply.getHeader(\"location\") as string;\n if (location) {\n const url = new URL(location, host.href);\n if (url.host === upstream.host || url.host === host.host) {\n // rewrite redirect on upstream's host to the proxy host\n url.host = host.host;\n url.protocol = host.protocol;\n }\n reply.header(\"location\", url);\n return reply.send(\"stream\" in res ? res.stream : res);\n }\n }\n\n const proxyLayoutInfo = req.getLayout?.(reply.getHeaders());\n if (!proxyLayoutInfo) {\n return reply.send(\"stream\" in res ? res.stream : res);\n }\n\n const contentType = reply.getHeader(\"content-type\") as\n | string\n | undefined;\n\n if (\n !contentType ||\n parseContentType(contentType).type !== \"text/html\"\n ) {\n return reply.send(\"stream\" in res ? res.stream : res);\n }\n\n const html = await text(res.stream);\n\n const { bodyAttributes, bodyInnerHtml, headInnerHtml } =\n extractDomElements(html);\n\n if (!bodyInnerHtml || !headInnerHtml) {\n return reply.send(html);\n }\n\n const pageContextInit = {\n urlOriginal: reply.request.url,\n headersOriginal: req.headers,\n // Critical that we don't set any passToClient values in pageContextInit\n // If we do, Vike re-requests pageContext on client navigation. This breaks wrapped proxy.\n _wrappedServerOnly: {\n bodyAttributes,\n bodyInnerHtml,\n headInnerHtml,\n proxyLayoutInfo,\n } satisfies WrappedServerOnly,\n ...req.customPageContextInit,\n };\n const pageContext = await renderPage(pageContextInit);\n return replyWithPage(reply, pageContext);\n },\n },\n });\n};\n","import { Parser } from \"htmlparser2\";\nimport { DomHandler, type Element } from \"domhandler\";\nimport { findOne } from \"domutils\";\nimport render from \"dom-serializer\";\n\nfunction getInnerHtml(element: Element): string {\n return element.children.map((c) => render(c)).join(\"\");\n}\n\nexport function extractDomElements(html: string): {\n bodyInnerHtml: string | null;\n headInnerHtml: string | null;\n bodyAttributes: Record<string, string>;\n} {\n let bodyInnerHtml: string | null = null;\n let headInnerHtml: string | null = null;\n let bodyAttributes: Record<string, string> = {};\n const handler = new DomHandler((error, dom) => {\n if (!error) {\n const body = findOne((elem) => elem.name === \"body\", dom);\n const head = findOne((elem) => elem.name === \"head\", dom);\n if (body && head) {\n bodyAttributes = body.attribs;\n bodyInnerHtml = getInnerHtml(body);\n headInnerHtml = getInnerHtml(head);\n }\n }\n });\n const parser = new Parser(handler);\n parser.write(html);\n parser.end();\n return { bodyInnerHtml, headInnerHtml, bodyAttributes };\n}\n"],"mappings":";AAQA,OAAO,WAA6C;AACpD,OAAO,aAAa;AACpB,OAAO,eAAe;AAGtB,SAAS,kBAAkB;;;ACb3B,SAAS,cAAc;AACvB,SAAS,kBAAgC;AACzC,SAAS,eAAe;AACxB,OAAO,YAAY;AAEnB,SAAS,aAAa,SAA0B;AAC9C,SAAO,QAAQ,SAAS,IAAI,CAAC,MAAM,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE;AACvD;AAEO,SAAS,mBAAmB,MAIjC;AACA,MAAI,gBAA+B;AACnC,MAAI,gBAA+B;AACnC,MAAI,iBAAyC,CAAC;AAC9C,QAAM,UAAU,IAAI,WAAW,CAAC,OAAO,QAAQ;AAC7C,QAAI,CAAC,OAAO;AACV,YAAM,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS,QAAQ,GAAG;AACxD,YAAM,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS,QAAQ,GAAG;AACxD,UAAI,QAAQ,MAAM;AAChB,yBAAiB,KAAK;AACtB,wBAAgB,aAAa,IAAI;AACjC,wBAAgB,aAAa,IAAI;AAAA,MACnC;AAAA,IACF;AAAA,EACF,CAAC;AACD,QAAM,SAAS,IAAI,OAAO,OAAO;AACjC,SAAO,MAAM,IAAI;AACjB,SAAO,IAAI;AACX,SAAO,EAAE,eAAe,eAAe,eAAe;AACxD;;;ADhBA,SAAS,0BAA0B;AAEnC,SAAS,YAAY;AACrB,SAAS,SAAS,wBAAwB;AA4CnC,IAAM,kBAET,OAAO,SAAS,SAAS;AAC3B,QAAM,EAAE,UAAU,MAAM,SAAS,qBAAqB,IAAI;AAC1D,iBAAe,cACb,OACA,aACuB;AACvB,UAAM,EAAE,aAAa,IAAI;AAEzB,QACE,WACA,cAAc,eAAe,OAC7B,YAAY,qBACZ;AACA,cAAQ,YAAY,qBAAqB,WAAW;AAAA,IACtD;AAEA,QAAI,CAAC,cAAc;AACjB,aAAO,MAAM,KAAK,GAAG,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW;AAAA,IAC3D;AAEA,UAAM,EAAE,YAAY,SAAS,QAAQ,IAAI;AACzC,WACE,MACG,OAAO,UAAU,EACjB,QAAQ,OAAO,YAAY,OAAO,CAAC,EAKnC,KAAK,MAAM,QAAQ,CAAC;AAAA,EAE3B;AACA,QAAM,QAAQ,SAAS,OAAO;AAC9B,UAAQ,gBAAgB,iBAAiB,IAAI;AAC7C,UAAQ,gBAAgB,mBAAmB,IAAI;AAC/C,UAAQ,gBAAgB,aAAa,IAAI;AACzC,UAAQ,gBAAgB,yBAAyB,IAAI;AACrD,QAAM,QAAQ,SAAS,OAAO;AAAA,IAC5B,GAAG;AAAA,IACH,UAAU,SAAS;AAAA,IACnB,WAAW;AAAA,IACX,MAAM,WAAW,KAAK,OAAO;AAC3B,WACG,IAAI,WAAW,SAAS,IAAI,WAAW,WACxC,IAAI,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,QACjC;AACA,YAAI,wBAAwB,uBACxB,MAAM,qBAAqB,GAAG,IAC9B,CAAC;AAEL,cAAM,kBAAkB;AAAA,UACtB,aAAa,IAAI;AAAA,UACjB,iBAAiB,IAAI;AAAA,UACrB,GAAG,IAAI;AAAA,QACT;AAEA,cAAM,cAAc,MAAM,WAAW,eAAe;AAGpD,YAAI,gBAAgB,YAAY;AAChC,YAAI,kBAAkB;AAEtB,cAAM,YAAY,YAAY,QAAQ;AACtC,YAAI,CAAC,WAAW;AACd,cAAI,IAAI,KAAK,2BAA2B,YAAY,QAAQ;AAC5D,iBAAO,cAAc,OAAO,WAAW;AAAA,QACzC;AAEA,gBAAQ,WAAW;AAAA,UACjB,KAAK,YAAY;AACf,gBAAI,IAAI,KAAK,oCAAoC;AACjD;AAAA,UACF;AAAA,UACA,KAAK,WAAW;AACd,gBAAI,IAAI,KAAK,mDAAmD;AAChE,gBAAI,CAAC,CAAC,YAAY,wBAAwB;AAExC,kBAAI,IAAI;AAAA,gBACN;AAAA,cACF;AACA,qBAAO,MAAM;AAAA,gBACX,IAAI,IAAI,QAAQ,2BAA2B,EAAE;AAAA,cAC/C;AAAA,YACF;AACA,gBAAI,YAAY,QAAQ,WAAW;AACjC,kBAAI,yBAAyB;AAC7B,yBAAW,CAAC,KAAK,GAAG,KAAK,OAAO;AAAA,gBAC9B,YAAY,QAAQ,gBAAgB,CAAC;AAAA,cACvC,GAAG;AACD,oEACE,IAAI,QAAQ,IAAI,YAAY,CAAC,KAAK;AACpC,oBAAI,QAAQ,IAAI,YAAY,CAAC,IAAI;AAAA,cACnC;AAIA,kBAAI,CAAC,wBAAwB;AAE3B,gBAAC,IAAI,IAAoC,WAAW;AACpD,oBAAI,YAAY,YAAY,OAAO;AAAA,cACrC;AAAA,YACF,OAAO;AACL,kBAAI,IAAI;AAAA,gBACN;AAAA,cACF;AAAA,YACF;AACA;AAAA,UACF;AAAA,QACF;AAEA,YAAI,YAAY,WAAW;AACzB,gBAAM,EAAE,QAAQ,IAAI,MAAM,eAAe,YAAY,UAAU,IAAI;AACnE,iBAAO,MAAM,KAAK,YAAY,UAAU,MAAM,OAAc;AAAA,QAC9D;AAAA,MACF;AAAA,IACF;AAAA,IACA,cAAc;AAAA,MACZ,sBAAsB,SAAS,SAAS;AACtC,YAAI,EAAE,QAAQ,eAAe,qBAAqB;AAChD,gBAAM,MAAM,UAAU,QAAQ,GAAG,EAAE,QAAQ;AAC3C,kBAAQ,iBAAiB,IAAI,IAAI,KAAK,IAAI;AAC1C,kBAAQ,kBAAkB,IAAI,KAAK;AACnC,kBAAQ,mBAAmB,IAAI,KAAK;AAAA,QACtC;AAEA,YAAK,QAAQ,IAAoC,UAAU;AAIzD,iBAAO,QAAQ,mBAAmB;AAClC,iBAAO,QAAQ,eAAe;AAC9B,iBAAO,QAAQ,qBAAqB;AACpC,iBAAO,QAAQ,eAAe;AAC9B,iBAAO,QAAQ,UAAU;AAAA,QAC3B;AACA,eAAO;AAAA,MACT;AAAA,MACA,MAAM,WAAW,KAAK,OAAO,KAAK;AAChC,YAAI,CAAC,KAAK,KAAK,KAAK,KAAK,GAAG,EAAE,SAAS,MAAM,UAAU,GAAG;AACxD,gBAAM,WAAW,MAAM,UAAU,UAAU;AAC3C,cAAI,UAAU;AACZ,kBAAM,MAAM,IAAI,IAAI,UAAU,KAAK,IAAI;AACvC,gBAAI,IAAI,SAAS,SAAS,QAAQ,IAAI,SAAS,KAAK,MAAM;AAExD,kBAAI,OAAO,KAAK;AAChB,kBAAI,WAAW,KAAK;AAAA,YACtB;AACA,kBAAM,OAAO,YAAY,GAAG;AAC5B,mBAAO,MAAM,KAAK,YAAY,MAAM,IAAI,SAAS,GAAG;AAAA,UACtD;AAAA,QACF;AAEA,cAAM,kBAAkB,IAAI,YAAY,MAAM,WAAW,CAAC;AAC1D,YAAI,CAAC,iBAAiB;AACpB,iBAAO,MAAM,KAAK,YAAY,MAAM,IAAI,SAAS,GAAG;AAAA,QACtD;AAEA,cAAM,cAAc,MAAM,UAAU,cAAc;AAIlD,YACE,CAAC,eACD,iBAAiB,WAAW,EAAE,SAAS,aACvC;AACA,iBAAO,MAAM,KAAK,YAAY,MAAM,IAAI,SAAS,GAAG;AAAA,QACtD;AAEA,cAAM,OAAO,MAAM,KAAK,IAAI,MAAM;AAElC,cAAM,EAAE,gBAAgB,eAAe,cAAc,IACnD,mBAAmB,IAAI;AAEzB,YAAI,CAAC,iBAAiB,CAAC,eAAe;AACpC,iBAAO,MAAM,KAAK,IAAI;AAAA,QACxB;AAEA,cAAM,kBAAkB;AAAA,UACtB,aAAa,MAAM,QAAQ;AAAA,UAC3B,iBAAiB,IAAI;AAAA;AAAA;AAAA,UAGrB,oBAAoB;AAAA,YAClB;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,UACA,GAAG,IAAI;AAAA,QACT;AACA,cAAM,cAAc,MAAM,WAAW,eAAe;AACpD,eAAO,cAAc,OAAO,WAAW;AAAA,MACzC;AAAA,IACF;AAAA,EACF,CAAC;AACH;","names":[]}
1
+ {"version":3,"sources":["../index.ts","../lib/extractDomElements.ts"],"sourcesContent":["// Note that this file isn't processed by Vite, see https://github.com/brillout/vike/issues/562\nimport {\n FastifyReply,\n RawServerBase,\n FastifyPluginAsync,\n RouteGenericInterface,\n} from \"fastify\";\nimport { FastifyRequest, RequestGenericInterface } from \"fastify/types/request\";\nimport proxy, { type FastifyHttpProxyOptions } from \"@fastify/http-proxy\";\nimport accepts from \"@fastify/accepts\";\nimport forwarded from \"@fastify/forwarded\";\nimport type { GetLayout, WrappedServerOnly } from \"@alignable/bifrost/config\";\nimport { renderPage } from \"vike/server\";\nimport { PageContextServer } from \"vike/types\";\nimport { extractDomElements } from \"./lib/extractDomElements\";\nimport { Http2ServerRequest } from \"http2\";\nimport { text } from \"node:stream/consumers\";\nimport { parse as parseContentType } from \"fast-content-type-parse\";\nimport { IncomingMessage } from \"http\";\n\ntype RenderedPageContext = Awaited<\n ReturnType<\n typeof renderPage<\n {\n isClientSideNavigation?: boolean;\n },\n { urlOriginal: string }\n >\n >\n>;\n\ndeclare module \"fastify\" {\n interface FastifyRequest {\n /// Actual ProxyMode after processing backend server results, which can tell us to fallback to passthru or redirect\n bifrostProxyMode?: Vike.Config[\"proxyMode\"];\n /// whether we sent proxy headers to legacy backend\n bifrostSentProxyHeaders?: boolean;\n bifrostProxyLayout?: Vike.ProxyLayoutInfo | null;\n /// Only set when proxy mode is false or wrapped\n vikePageContext?: Partial<PageContextServer> | null;\n getLayout: GetLayout | null;\n customPageContextInit: Partial<Omit<PageContextServer, \"headers\">> | null;\n }\n}\n\ntype RawRequestExtendedWithProxy = FastifyRequest<\n RequestGenericInterface,\n RawServerBase\n>[\"raw\"] & {\n _bfproxy?: boolean;\n};\n\ninterface ViteProxyPluginOptions extends Omit<\n FastifyHttpProxyOptions,\n \"upstream\" | \"preHandler\" | \"replyOptions\"\n> {\n upstream: URL;\n host: URL;\n onError?: (error: any, pageContext: RenderedPageContext) => void;\n buildPageContextInit?: (\n req: FastifyRequest\n ) => Promise<Partial<Omit<PageContextServer, \"headers\">>>;\n beforeWrappedRender?: (\n req: FastifyRequest<RequestGenericInterface, RawServerBase>,\n reply: FastifyReply<\n RouteGenericInterface,\n RawServerBase,\n IncomingMessage | Http2ServerRequest\n >\n ) => void;\n}\n/**\n * Fastify plugin that wraps @fasitfy/http-proxy to proxy Rails/Turbolinks server into a vike site.\n */\nexport const viteProxyPlugin: FastifyPluginAsync<\n ViteProxyPluginOptions\n> = async (fastify, opts) => {\n const { upstream, host, onError, buildPageContextInit, beforeWrappedRender } =\n opts;\n async function replyWithPage(\n reply: FastifyReply<RouteGenericInterface, RawServerBase>,\n pageContext: RenderedPageContext\n ): Promise<FastifyReply> {\n const { httpResponse } = pageContext;\n\n if (\n onError &&\n httpResponse?.statusCode === 500 &&\n pageContext.errorWhileRendering\n ) {\n onError(pageContext.errorWhileRendering, pageContext);\n }\n\n if (!httpResponse) {\n return reply.code(404).type(\"text/html\").send(\"Not Found\");\n }\n\n const { statusCode, headers, getBody } = httpResponse;\n return (\n reply\n .status(statusCode)\n .headers(Object.fromEntries(headers))\n // This disables any possibility of real streaming. To re-enable streaming we should adopt vike-photon and rewrite wrapped proxy as a Vike middleware.\n // Why not pipe? Because Vike gives us `pipe` which sends data into a Writable, but Fastify's reply.send only accepts a ReadableStream. Passthrough can convert but causes race conditions\n // We would have to pipe into reply.raw, but that skips Fastify's reply handling (like onSend hooks)\n // Photon/universal-middleware solves this with some hacks around reply.body\n .send(await getBody())\n );\n }\n await fastify.register(accepts);\n fastify.decorateRequest(\"bifrostProxyMode\", false);\n fastify.decorateRequest(\"bifrostProxyLayout\", null);\n fastify.decorateRequest(\"bifrostSentProxyHeaders\", false);\n fastify.decorateRequest(\"vikePageContext\", null);\n fastify.decorateRequest(\"getLayout\", null);\n fastify.decorateRequest(\"customPageContextInit\", null);\n await fastify.register(proxy, {\n ...opts,\n upstream: upstream.href,\n websocket: true,\n async preHandler(req, reply) {\n if (\n (req.method === \"GET\" || req.method === \"HEAD\") &&\n req.accepts().type([\"html\"]) === \"html\"\n ) {\n req.customPageContextInit = buildPageContextInit\n ? await buildPageContextInit(req)\n : {};\n\n const pageContextInit = {\n urlOriginal: req.url,\n headersOriginal: req.headers,\n ...req.customPageContextInit,\n };\n\n const pageContext = await renderPage(pageContextInit);\n\n let proxyMode = pageContext.config?.proxyMode;\n if (!proxyMode) {\n req.vikePageContext = pageContext;\n req.log.info(`bifrost: rendering page ${pageContext.pageId}`);\n return replyWithPage(reply, pageContext);\n }\n\n req.bifrostProxyMode = \"passthru\";\n switch (proxyMode) {\n case \"passthru\": {\n req.log.info(`bifrost: passthru proxy to backend`);\n break;\n }\n case \"wrapped\": {\n req.log.info(`bifrost: proxy route matched, proxying to backend`);\n if (!!pageContext.isClientSideNavigation) {\n // This should never happen because wrapped proxy routes have no onBeforeRender. onRenderClient should make a request to the legacy backend.\n req.log.error(\n \"Wrapped proxy route is requesting index.pageContext.json. Something is wrong with the client.\"\n );\n return reply.redirect(\n req.url.replace(\"/index.pageContext.json\", \"\")\n );\n }\n if (pageContext.config?.getLayout) {\n let proxyHeadersAlreadySet = true;\n for (const [key, val] of Object.entries(\n pageContext.config?.proxyHeaders || {}\n )) {\n proxyHeadersAlreadySet &&=\n req.headers[key.toLowerCase()] == val;\n req.headers[key.toLowerCase()] = val;\n }\n // If proxy headers set, this is a client navigation meant to go direct to legacy backend.\n // ALB CANNOT be used for this. see `onBeforeRenderClient` for details\n // Only set getLayout and _bfproxy if we didn't already set proxy headers\n if (!proxyHeadersAlreadySet) {\n // setting _bfproxy tells onResponse we're in wrapped mode\n (req.raw as RawRequestExtendedWithProxy)._bfproxy = true;\n req.getLayout = pageContext.config.getLayout;\n req.bifrostSentProxyHeaders = true;\n }\n } else {\n req.log.error(\n \"Config missing getLayout on wrapped route! Falling back to passthru proxy\"\n );\n }\n break;\n }\n }\n\n if (pageContext.urlParsed) {\n const { options } = reply.fromParameters(pageContext.urlParsed.href);\n return reply.from(pageContext.urlParsed.href, options as any);\n }\n }\n },\n replyOptions: {\n rewriteRequestHeaders(request, headers) {\n if (!(request.raw instanceof Http2ServerRequest)) {\n const fwd = forwarded(request.raw).reverse();\n headers[\"X-Forwarded-For\"] = fwd.join(\", \");\n headers[\"X-Forwarded-Host\"] = host.host;\n headers[\"X-Forwarded-Proto\"] = host.protocol;\n }\n\n if ((request.raw as RawRequestExtendedWithProxy)._bfproxy) {\n // Proxying and wrapping\n\n // Delete cache headers\n delete headers[\"if-modified-since\"];\n delete headers[\"if-none-match\"];\n delete headers[\"if-unmodified-since\"];\n delete headers[\"if-none-match\"];\n delete headers[\"if-range\"];\n }\n return headers;\n },\n async onResponse(req, reply, res) {\n if ([301, 302, 303, 307, 308].includes(reply.statusCode)) {\n const location = reply.getHeader(\"location\") as string;\n if (location) {\n const url = new URL(location, host.href);\n if (url.host === upstream.host || url.host === host.host) {\n // rewrite redirect on upstream's host to the proxy host\n url.host = host.host;\n url.protocol = host.protocol;\n }\n reply.header(\"location\", url);\n return reply.send(\"stream\" in res ? res.stream : res);\n }\n }\n\n const proxyLayoutInfo = req.getLayout?.(reply.getHeaders());\n req.bifrostProxyLayout = proxyLayoutInfo;\n if (!proxyLayoutInfo) {\n return reply.send(\"stream\" in res ? res.stream : res);\n }\n\n const contentType = reply.getHeader(\"content-type\") as\n | string\n | undefined;\n\n if (\n !contentType ||\n parseContentType(contentType).type !== \"text/html\"\n ) {\n return reply.send(\"stream\" in res ? res.stream : res);\n }\n\n const html = await text(res.stream);\n\n const { bodyAttributes, bodyInnerHtml, headInnerHtml } =\n extractDomElements(html);\n\n if (!bodyInnerHtml || !headInnerHtml) {\n return reply.send(html);\n }\n\n try {\n beforeWrappedRender?.(req, reply);\n } catch (e) {\n req.log.error(\n `Error in beforeWrappedRender: ${(e as Error).message}`\n );\n }\n\n const pageContextInit = {\n urlOriginal: reply.request.url,\n headersOriginal: req.headers,\n // Critical that we don't set any passToClient values in pageContextInit\n // If we do, Vike re-requests pageContext on client navigation. This breaks wrapped proxy.\n _wrappedServerOnly: {\n bodyAttributes,\n bodyInnerHtml,\n headInnerHtml,\n proxyLayoutInfo,\n } satisfies WrappedServerOnly,\n ...req.customPageContextInit,\n };\n const pageContext = await renderPage(pageContextInit);\n req.vikePageContext = pageContext;\n req.bifrostProxyMode = \"wrapped\";\n return replyWithPage(reply, pageContext);\n },\n },\n });\n};\n","import { Parser } from \"htmlparser2\";\nimport { DomHandler, type Element } from \"domhandler\";\nimport { findOne } from \"domutils\";\nimport render from \"dom-serializer\";\n\nfunction getInnerHtml(element: Element): string {\n return element.children.map((c) => render(c)).join(\"\");\n}\n\nexport function extractDomElements(html: string): {\n bodyInnerHtml: string | null;\n headInnerHtml: string | null;\n bodyAttributes: Record<string, string>;\n} {\n let bodyInnerHtml: string | null = null;\n let headInnerHtml: string | null = null;\n let bodyAttributes: Record<string, string> = {};\n const handler = new DomHandler((error, dom) => {\n if (!error) {\n const body = findOne((elem) => elem.name === \"body\", dom);\n const head = findOne((elem) => elem.name === \"head\", dom);\n if (body && head) {\n bodyAttributes = body.attribs;\n bodyInnerHtml = getInnerHtml(body);\n headInnerHtml = getInnerHtml(head);\n }\n }\n });\n const parser = new Parser(handler);\n parser.write(html);\n parser.end();\n return { bodyInnerHtml, headInnerHtml, bodyAttributes };\n}\n"],"mappings":"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","names":[]}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@alignable/bifrost-fastify",
3
3
  "repository": "https://github.com/Alignable/bifrost.git",
4
- "version": "1.0.16",
4
+ "version": "1.0.18-4933dfc",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
7
7
  "types": "./dist/index.d.ts",
@@ -17,7 +17,7 @@
17
17
  "htmlparser2": "^10.0.0"
18
18
  },
19
19
  "peerDependencies": {
20
- "@alignable/bifrost": "1.0.16",
20
+ "@alignable/bifrost": "1.0.18-4933dfc",
21
21
  "fastify": "^5.0.0",
22
22
  "vike": ">=0.4.251",
23
23
  "vite": ">=6"