Skip to content

Fix hardcoded production URLs to use request origin #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jah-yee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix hardcoded production URLs to use request origin #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,10 @@ async function handlePng(
}

// Use Cloudflare Browser Rendering to screenshot the SVG
const origin = new URL(request.url).origin;
const selfParam = selfUser ? `&self=${selfUser}` : "";
const themeParam = theme === "dark" ? `&theme=dark` : "";
const svgUrl = `https://codewar.dev/api/svg?users=${usernames.join(",")}&range=${range}${selfParam}${themeParam}`;
const svgUrl = `${origin}/api/svg?users=${usernames.join(",")}&range=${range}${selfParam}${themeParam}`;

const browser = await puppeteer.launch(env.BROWSER);
const page = await browser.newPage();
Expand Down Expand Up @@ -261,10 +262,11 @@ async function handlePageWithOgTags(
return env.ASSETS.fetch(request);
}

// Build image URLs
// Build image URLs using current origin (works for self-hosted deployments)
const origin = new URL(request.url).origin;
const selfParam = selfUser ? `&self=${selfUser}` : "";
const pngUrl = `https://codewar.dev/api/png?users=${allUsers.join(",")}&range=${range}${selfParam}`;
const pageUrl = `https://codewar.dev/${url.search}`;
const pngUrl = `${origin}/api/png?users=${allUsers.join(",")}&range=${range}${selfParam}`;
const pageUrl = `${origin}/${url.search}`;

const ogTags = `
<meta property="og:type" content="website">
Expand Down