Use in-server proxy for local development

package.json

@@ -10,7 +10,7 @@
   "packageManager": "[email protected]",
   "scripts": {
     "test": "FORCE_COLOR=1 pnpm run -r --include-workspace-root /^test:/",
-    "start": "FORCE_COLOR=1 pnpm run -F server -F web -F proxy start",
+    "start": "FORCE_COLOR=1 pnpm run -F server -F web start",
     "format": "pnpm run -r --include-workspace-root /^format:/",
     "clean": "pnpm run -r --include-workspace-root /^clean:/",
     "build": "pnpm run -r build",

proxy/index.ts

@@ -19,8 +19,7 @@ export interface ProxyConfig {
   timeout: number
 }
 
-export const DEFAULT_PROXY_CONFIG: ProxyConfig = {
-  allowsFrom: process.env.PROXY_ORIGIN ?? '^http:\\/\\/localhost:5173',
+export const DEFAULT_PROXY_CONFIG: Omit<ProxyConfig, 'allowsFrom'> = {
   maxSize: 10 * 1024 * 1024,
   timeout: 2500
 }

proxy/server.ts

@@ -5,15 +5,18 @@ import { createProxy, DEFAULT_PROXY_CONFIG } from './index.ts'
 
 const PORT = process.env.PORT ?? 5284
 
-let allowsFrom: string
+let allowsFrom: string | undefined
 if (process.env.NODE_ENV !== 'production') {
   allowsFrom = '^http:\\/\\/localhost:5173'
 } else if (process.env.STAGING) {
-  allowsFrom =
-    '^https:\\/\\/dev.slowreader.app' +
-    '|https:\\/\\/(preview-\\d+---)?staging-web-jfj4bxwwxq-ew.a.run.app'
-} else {
-  allowsFrom = '^https:\\/\\/slowreader.app'
+  allowsFrom = process.env.PROXY_ORIGIN
+}
+
+if (!allowsFrom) {
+  process.stderr.write(
+    styleText('red', 'Set PROXY_ORIGIN environment variable\n')
+  )
+  process.exit(0)
 }
 
 let proxy = createServer(createProxy({ ...DEFAULT_PROXY_CONFIG, allowsFrom }))

server/config.ts

@@ -5,6 +5,7 @@ type AssetsPaths =
 export type Config = {
   db: string
   env: 'development' | 'production' | 'test'
+  proxyOrigin: string | undefined
   staging: boolean
 } & AssetsPaths
 
@@ -33,9 +34,14 @@ export function getConfig(from: Record<string, string | undefined>): Config {
   if (env !== 'test' && env !== 'production' && env !== 'development') {
     throw new Error('Unknown NODE_ENV')
   }
+  let proxyOrigin = from.PROXY_ORIGIN
+  if (!proxyOrigin && env === 'development') {
+    proxyOrigin = '^http:\\/\\/localhost:5173'
+  }
   return {
     db: from.DATABASE_URL ?? getDefaultDatabase(env),
     env,
+    proxyOrigin,
     staging: !!from.STAGING,
     ...getPaths(from)
   }

server/modules/proxy.ts

@@ -5,9 +5,16 @@ import {
   type ProxyConfig
 } from '@slowreader/proxy'
 
+import { config } from '../config.ts'
+
 export default (server: BaseServer, opts: Partial<ProxyConfig> = {}): void => {
-  if (!process.env.PROXY_ORIGIN) return
-  let proxy = createProxy({ ...DEFAULT_PROXY_CONFIG, ...opts })
+  let allowsFrom = config.proxyOrigin ?? opts.allowsFrom
+  if (!allowsFrom) return
+  let proxy = createProxy({
+    ...DEFAULT_PROXY_CONFIG,
+    ...opts,
+    allowsFrom
+  })
   server.http((req, res) => {
     if (req.url!.startsWith('/proxy/')) {
       proxy(req, res)

server/test/config.test.ts

@@ -41,18 +41,39 @@ test('checks environment', () => {
   equal(getConfig({ STAGING: '1' }).staging, true)
 })
 
+test('sets proxy origin', () => {
+  equal(
+    getConfig({ NODE_ENV: 'development' }).proxyOrigin,
+    '^http:\\/\\/localhost:5173'
+  )
+  equal(
+    getConfig({ DATABASE_URL, NODE_ENV: 'production' }).proxyOrigin,
+    undefined
+  )
+  equal(
+    getConfig({
+      DATABASE_URL,
+      NODE_ENV: 'production',
+      PROXY_ORIGIN: '^http:\\/\\/slowreader.app'
+    }).proxyOrigin,
+    '^http:\\/\\/slowreader.app'
+  )
+})
+
 test('passes keys', () => {
   deepStrictEqual(
     getConfig({
       ASSETS_DIR: './dist/',
       DATABASE_URL,
       NODE_ENV: 'production',
+      PROXY_ORIGIN: '^http:\\/\\/slowreader.app',
       ROUTES_FILE: './routes.regexp'
     }),
     {
       assets: './dist/',
       db: DATABASE_URL,
       env: 'production',
+      proxyOrigin: '^http:\\/\\/slowreader.app',
       routes: './routes.regexp',
       staging: false
     }

web/main/environment.ts

@@ -17,7 +17,7 @@ enableWarnings()
 
 let PROXY_URL: string
 if (location.hostname === 'localhost') {
-  PROXY_URL = 'http://localhost:5284/'
+  PROXY_URL = 'http://localhost:31337/proxy/'
 } else if (location.hostname === 'slowreader.app') {
   PROXY_URL = 'https://proxy.slowreader.app/'
 } else {