Skip to content

Commit

Permalink
✨ add CF function for getting SLUG.config.json
Browse files Browse the repository at this point in the history
  • Loading branch information
@danyx23
danyx23 committed Aug 15, 2024
1 parent 1a54936 commit b6f5d2e
Show file tree
Hide file tree
Showing 2 changed files with 165 additions and 43 deletions.
56 changes: 42 additions & 14 deletions functions/_common/grapherRenderer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import LatoMedium from "../_common/fonts/LatoLatin-Medium.ttf.bin"
import LatoBold from "../_common/fonts/LatoLatin-Bold.ttf.bin"
import PlayfairSemiBold from "../_common/fonts/PlayfairDisplayLatin-SemiBold.ttf.bin"
import { Env } from "../grapher/thumbnail/[slug].js"
import { createProxy } from "./proxy.js"

declare global {
// eslint-disable-next-line no-var
Expand Down Expand Up @@ -159,18 +158,11 @@ async function fetchFromR2(
return primaryResponse
}

async function fetchAndRenderGrapherToSvg(
export async function fetchGrapherConfig(
slug: string,
options: ImageOptions,
searchParams: URLSearchParams,
env: Env,
etag?: string
) {
const grapherLogger = new TimeLogger("grapher")

const url = new URL(`/grapher/${slug}`, env.url)
const slugOnly = url.pathname.split("/").pop()

etag: string
): Promise<GrapherInterface | null> {
// The top level directory is either the bucket path (should be set in dev environments and production)
// or the branch name on preview staging environments
console.log("branch", env.CF_PAGES_BRANCH)
Expand All @@ -181,7 +173,7 @@ async function fetchAndRenderGrapherToSvg(
const key = excludeUndefined([
...topLevelDirectory,
R2GrapherConfigDirectory.publishedGrapherBySlug,
`${slugOnly}.json`,
`${slug}.json`,
]).join("/")

console.log("fetching grapher config from this key", key)
Expand All @@ -198,7 +190,7 @@ async function fetchAndRenderGrapherToSvg(
const fallbackKey = excludeUndefined([
...topLevelDirectory,
R2GrapherConfigDirectory.publishedGrapherBySlug,
`${slugOnly}.json`,
`${slug}.json`,
]).join("/")
fallbackUrl = new URL(
fallbackKey,
Expand All @@ -213,9 +205,21 @@ async function fetchAndRenderGrapherToSvg(
console.log("Failed to fetch grapher config", fetchResponse.status)
return null
}

const grapherConfig: GrapherInterface = await fetchResponse.json()
console.log("grapher title", grapherConfig.title)
return grapherConfig
}

async function fetchAndRenderGrapherToSvg(
slug: string,
options: ImageOptions,
searchParams: URLSearchParams,
env: Env,
etag: string
) {
const grapherLogger = new TimeLogger("grapher")

const grapherConfig = await fetchGrapherConfig(slug, env, etag)

const bounds = new Bounds(0, 0, options.svgWidth, options.svgHeight)
const grapher = new Grapher({
Expand Down Expand Up @@ -305,3 +309,27 @@ async function renderSvgToPng(svg: string, options: ImageOptions) {
pngLogger.log("svg2png")
return pngData
}

export async function getOptionalRedirectForSlug(
slug: string,
baseUrl: URL,
env: Env
) {
const redirects: Record<string, string> = await env.ASSETS.fetch(
new URL("/grapher/_grapherRedirects.json", baseUrl),
{ cf: { cacheTtl: 2 * 60 } }
)
.then((r): Promise<Record<string, string>> => r.json())
.catch((e) => {
console.error("Error fetching redirects", e)
return {}
})
return redirects[slug]
}

export function createRedirectResponse(redirSlug: string, currentUrl: URL) {
new Response(null, {
status: 302,
headers: { Location: `/grapher/${redirSlug}${currentUrl.search}` },
})
}
152 changes: 123 additions & 29 deletions functions/grapher/[slug].ts
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,73 @@
import { Env } from "./thumbnail/[slug].js"
import {
fetchGrapherConfig,
getOptionalRedirectForSlug,
createRedirectResponse,
} from "../_common/grapherRenderer.js"
import { IRequestStrict, Router, error, cors } from "itty-router"

const { preflight, corsify } = cors({
allowMethods: "GET",
})

const router = Router<IRequestStrict, [URL, Env, string]>({
before: [preflight],
finally: [corsify],
})
router
.get(
"/grapher/:slug.config.json",
async ({ params: { slug } }, { searchParams }, env, etag) =>
handleConfigRequest(slug, searchParams, env, etag)
)
.get(
"/grapher/:slug",
async ({ params: { slug } }, { searchParams }, env) =>
handleHtmlPageRequest(slug, searchParams, env)
)
.all("*", () => error(404, "Route not defined"))

export const onRequestGet: PagesFunction = async (context) => {
// Makes it so that if there's an error, we will just deliver the original page before the HTML rewrite.
// Only caveat is that redirects will not be taken into account for some reason; but on the other hand the worker is so simple that it's unlikely to fail.
context.passThroughOnException()
const { request, env } = context
const url = new URL(request.url)

return (
router
.fetch(
request,
url,
{ ...env, url },
request.headers.get("if-none-match")
)
// .then((resp: Response) => {
// if (shouldCache) {
// resp.headers.set(
// "Cache-Control",
// "public, s-maxage=3600, max-age=3600"
// )
// context.waitUntil(caches.default.put(request, resp.clone()))
// } else
// resp.headers.set(
// "Cache-Control",
// "public, s-maxage=0, max-age=0, must-revalidate"
// )
// return resp
// })
.catch((e) => error(500, e))
)
}

async function handleHtmlPageRequest(
slug: string,
searchParams: URLSearchParams,
env: Env
) {
const url = env.url
// Redirects handling is performed by the worker, and is done by fetching the (baked) _grapherRedirects.json file.
// That file is a mapping from old slug to new slug.
const getOptionalRedirectForSlug = async (slug: string, baseUrl: URL) => {
const redirects: Record<string, string> = await env.ASSETS.fetch(
new URL("/grapher/_grapherRedirects.json", baseUrl),
{ cf: { cacheTtl: 2 * 60 } }
)
.then((r): Promise<Record<string, string>> => r.json())
.catch((e) => {
console.error("Error fetching redirects", e)
return {}
})
return redirects[slug]
}

const createRedirectResponse = (redirSlug: string, currentUrl: URL) =>
new Response(null, {
status: 302,
headers: { Location: `/grapher/${redirSlug}${currentUrl.search}` },
})

const { request, env, params } = context

const originalSlug = params.slug as string
const url = new URL(request.url)

/**
* REDIRECTS HANDLING:
Expand All @@ -40,11 +80,12 @@ export const onRequestGet: PagesFunction = async (context) => {

// All our grapher slugs are lowercase by convention.
// To allow incoming links that may contain uppercase characters to work, we redirect to the lowercase version.
const lowerCaseSlug = originalSlug.toLowerCase()
if (lowerCaseSlug !== originalSlug) {
const lowerCaseSlug = slug.toLowerCase()
if (lowerCaseSlug !== slug) {
const redirectSlug = await getOptionalRedirectForSlug(
lowerCaseSlug,
url
url,
env
)

return createRedirectResponse(redirectSlug ?? lowerCaseSlug, url)
Expand All @@ -61,8 +102,8 @@ export const onRequestGet: PagesFunction = async (context) => {
if (grapherPageResp.status === 404) {
// If the request is a 404, we check if there's a redirect for it.
// If there is, we redirect to the new page.
const redirectSlug = await getOptionalRedirectForSlug(originalSlug, url)
if (redirectSlug && redirectSlug !== originalSlug) {
const redirectSlug = await getOptionalRedirectForSlug(slug, url, env)
if (redirectSlug && redirectSlug !== slug) {
return createRedirectResponse(redirectSlug, url)
} else {
// Otherwise we just return the 404 page.
Expand Down Expand Up @@ -106,5 +147,58 @@ export const onRequestGet: PagesFunction = async (context) => {
},
})

return rewriter.transform(grapherPageResp)
return rewriter.transform(grapherPageResp as unknown as Response)
}

async function handleConfigRequest(
slug: string,
_searchParams: URLSearchParams,
env: Env,
etag: string | undefined
) {
console.log("Preapring json response for ", slug)
// All our grapher slugs are lowercase by convention.
// To allow incoming links that may contain uppercase characters to work, we redirect to the lowercase version.
const lowerCaseSlug = slug.toLowerCase()
if (lowerCaseSlug !== slug) {
const redirectSlug = await getOptionalRedirectForSlug(
lowerCaseSlug,
env.url,
env
)

return createRedirectResponse(
redirectSlug ? `${redirectSlug}.config.json` : lowerCaseSlug,
env.url
)
}

const grapherPageResp = await fetchGrapherConfig(slug, env, etag)

console.log("Grapher page response", grapherPageResp?.title)

if (!grapherPageResp) {
// If the request is a 404, we check if there's a redirect for it.
// If there is, we redirect to the new page.
const redirectSlug = await getOptionalRedirectForSlug(
slug,
env.url,
env
)
if (redirectSlug && redirectSlug !== slug) {
return createRedirectResponse(
`${redirectSlug}.config.json`,
env.url
)
} else {
// Otherwise we just return the 404 page.
return new Response(null, { status: 404 })
}
}

return new Response(JSON.stringify(grapherPageResp), {
headers: {
"content-type": "application/json",
},
})
}

0 comments on commit b6f5d2e

Please sign in to comment.