From cb0d6381dca5a23d8b959028a1bd35eadc65d230 Mon Sep 17 00:00:00 2001 From: Samuel Kopp <62482066+boywithkeyboard@users.noreply.github.com> Date: Sat, 6 Apr 2024 23:23:40 +0200 Subject: [PATCH] refactor: set base url as env variable --- .github/workflows/test.yml | 1 + registry/env.d.ts | 1 + registry/index.ts | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1a5dfb..0c47803 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,7 @@ jobs: - name: Run Test env: + BASE_URL: ${{ secrets.TEST_BASE_URL }} R2_HOSTNAME: ${{ secrets.TEST_R2_HOSTNAME }} S3_ACCESS_KEY_ID: ${{ secrets.TEST_S3_ACCESS_KEY_ID }} S3_BUCKET: ${{ secrets.TEST_S3_BUCKET }} diff --git a/registry/env.d.ts b/registry/env.d.ts index 0a1c0b2..ae9218c 100644 --- a/registry/env.d.ts +++ b/registry/env.d.ts @@ -2,6 +2,7 @@ declare global { namespace NodeJS { interface ProcessEnv { R2_HOSTNAME: string + BASE_URL: string S3_BUCKET: string S3_ENDPOINT: string S3_ACCESS_KEY_ID: string diff --git a/registry/index.ts b/registry/index.ts index 895ada5..a3896dc 100644 --- a/registry/index.ts +++ b/registry/index.ts @@ -89,7 +89,7 @@ app.setNotFoundHandler(async (req, res) => { return await respondWith(res, 307, null, { headers: { - Location: 'https://deno.re' + arr.join('/') + Location: process.env.BASE_URL + arr.join('/') } }) } @@ -173,10 +173,10 @@ app.setNotFoundHandler(async (req, res) => { content = Buffer.from(content, 'base64').toString('utf-8') } else if (entryPoint.endsWith('ts')) { contentType = filePathToContentType('.ts') - content = `export * from 'https://deno.re/${user}/${repo}@${tag}${entryPoint}'` + content = `export * from '${process.env.BASE_URL}/${user}/${repo}@${tag}${entryPoint}'` } else { contentType = filePathToContentType('.js') - content = `export * from 'https://deno.re/${user}/${repo}@${tag}${entryPoint}'` + content = `export * from '${process.env.BASE_URL}/${user}/${repo}@${tag}${entryPoint}'` } } @@ -190,7 +190,7 @@ app.setNotFoundHandler(async (req, res) => { 'Cache-Control': 'public, max-age=2592000, immutable', // a month 'Content-Type': contentType + '; charset=utf-8', 'ETag': checksum, - ...(typeHeader && { 'X-TypeScript-Types': 'https://deno.re/' + user + '/' + repo + '@' + tag + typeHeader }) + ...(typeHeader && { 'X-TypeScript-Types': process.env.BASE_URL + '/' + user + '/' + repo + '@' + tag + typeHeader }) }, resolve }) @@ -202,7 +202,7 @@ app.setNotFoundHandler(async (req, res) => { 'Cache-Control': 'public, max-age=2592000, immutable', // a month 'Content-Type': contentType + '; charset=utf-8', 'ETag': checksum, - ...(typeHeader && { 'X-TypeScript-Types': 'https://deno.re/' + user + '/' + repo + '@' + tag + typeHeader }) + ...(typeHeader && { 'X-TypeScript-Types': process.env.BASE_URL + '/' + user + '/' + repo + '@' + tag + typeHeader }) }, resolve })