Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions src/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ const prefersMarkdown = (acceptHeader: string | null) => {
);
};

const addVaryAccept = (response: Response) => {
const headers = new Headers(response.headers);
const addVaryAccept = (headers: Headers) => {
const vary = headers.get('Vary');

if (!vary) {
Expand All @@ -112,26 +111,12 @@ const addVaryAccept = (response: Response) => {
) {
headers.set('Vary', `${vary}, Accept`);
}

return new Response(response.body, {
status: response.status,
statusText: response.statusText,
headers,
});
};

const addMarkdownCharset = (response: Response) => {
const headers = new Headers(response.headers);

const addMarkdownCharset = (headers: Headers) => {
if (headers.get('Content-Type')?.split(';', 1)[0] === 'text/markdown') {
headers.set('Content-Type', 'text/markdown; charset=utf-8');
}

return new Response(response.body, {
status: response.status,
statusText: response.statusText,
headers,
});
};

export default {
Expand All @@ -140,26 +125,39 @@ export default {
const isNegotiable =
(request.method === 'GET' || request.method === 'HEAD') &&
POSTS_PATH_PATTERN.test(url.pathname);
const isMarkdown =
isNegotiable && prefersMarkdown(request.headers.get('Accept'));
let assetRequest = request;

if (isNegotiable && prefersMarkdown(request.headers.get('Accept'))) {
if (isMarkdown) {
const markdownUrl = new URL(request.url);
markdownUrl.pathname = `${url.pathname.replace(/\/$/, '')}.md`;

const response = await env.ASSETS.fetch(
new Request(markdownUrl, request),
);
assetRequest = new Request(markdownUrl, request);
}

const response = await env.ASSETS.fetch(assetRequest);
const needsMarkdownCharset =
isMarkdown || MARKDOWN_POSTS_PATH_PATTERN.test(url.pathname);

return addVaryAccept(addMarkdownCharset(response));
if (!isNegotiable && !needsMarkdownCharset) {
return response;
}

const response = await env.ASSETS.fetch(request);
const headers = new Headers(response.headers);

if (needsMarkdownCharset) {
addMarkdownCharset(headers);
}

if (isNegotiable) {
return addVaryAccept(response);
addVaryAccept(headers);
}

return MARKDOWN_POSTS_PATH_PATTERN.test(url.pathname)
? addMarkdownCharset(response)
: response;
return new Response(response.body, {
status: response.status,
statusText: response.statusText,
headers,
});
},
};
Loading