Change env var from PORT to API_PORT, fixed some web UI configuration, added env var for public facing URLs

auravoid · auravoid · commit a1067bb2cbb7 · 2026-03-19T19:42:22.000-04:00
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Run locally:
 
 ```bash
 go build -o short-it ./cmd/short-it
-APP_TOKEN=your-secret-token DB_PATH=short-it.db PORT=8080 ./short-it
+APP_TOKEN=your-secret-token DB_PATH=short-it.db API_PORT=8080 ./short-it
 ```
 
 Run with Docker:
@@ -36,7 +36,7 @@ docker-compose up -d
 # edit docker-compose.yml to set APP_TOKEN or update the environment
 ```
 
-The server listens on `PORT` (default `8080`) and stores the BoltDB file at `DB_PATH` (default `short-it.db`).
+The server listens on `API_PORT` (default `8080`) and stores the BoltDB file at `DB_PATH` (default `short-it.db`).
 
 Or deploy it in one click:
 
@@ -47,19 +47,21 @@ Or deploy it in one click:
 Environment variables:
 
 - `APP_TOKEN` (required): token used for authorization on protected endpoints
-- `PORT` (optional): HTTP port (default `8080`)
+- `API_PORT` (optional): HTTP port (default `8080`)
+- `API_URL` (optional): URL to access the API (default `http://localhost:8080`)
 - `DB_PATH` (optional): path to BoltDB file (default `short-it.db`)
 - `WEB_UI` (optional): set to `true` to host a small link-creation webpage
+- `WEB_UI_URL` (optional): URL to access the web UI (default `http://localhost:8090`)
 - `WEB_UI_PORT` (optional): port for the web UI server (default `8080`)
 - `RYBBIT_SITE_ID` (optional): Site ID provided by Rybbit
 - `RYBBIT_SITE_KEY` (optional): API key found in account settings for Rybbit
 - `RYBBIT_SITE_URL` (optional): Base URL for your Rybbit instance
 
 Notes for `WEB_UI`:
 
-- The API server still listens on `PORT`.
+- The API server still listens on `API_PORT`.
 - The web UI starts only when `WEB_UI=true`.
-- If `WEB_UI_PORT` is the same value as `PORT`, the UI is skipped to avoid interfering with the API process.
+- If `WEB_UI_PORT` is the same value as `API_PORT`, the UI is skipped to avoid interfering with the API process.
 
 ## HTTP API
 
diff --git a/cmd/short-it/main.go b/cmd/short-it/main.go
@@ -33,16 +33,18 @@ const maxPageSize = 100
 
 const envAppToken = "APP_TOKEN"
 const envDBPath = "DB_PATH"
-const envPort = "PORT"
+const envPort = "API_PORT"
+const envAPIBaseURL = "API_URL"
 const envWebUI = "WEB_UI"
+const envWebUIPath = "WEB_UI_URL"
 const envWebUIPort = "WEB_UI_PORT"
 
 const envRybbitSiteID = "RYBBIT_SITE_ID"
 const envRybbitSiteKey = "RYBBIT_SITE_KEY"
 const envRybbitSiteURL = "RYBBIT_SITE_URL"
 
 const defaultAPIPort = "8080"
-const defaultWebUIPort = "8080"
+const defaultWebUIPort = "8090"
 const defaultDBPath = "short-it.db"
 
 const webUIPage = `<!doctype html>
@@ -118,6 +120,34 @@ func envOrDefault(key, fallback string) string {
 	return v
 }
 
+func normalizeBaseURL(raw string) string {
+	return strings.TrimRight(strings.TrimSpace(raw), "/")
+}
+
+func resolveAPIBaseURL(r *http.Request) string {
+	if base := normalizeBaseURL(os.Getenv(envAPIBaseURL)); base != "" {
+		return base
+	}
+
+	host := r.Host
+	if h, _, err := net.SplitHostPort(r.Host); err == nil {
+		host = h
+	}
+	if host == "" {
+		host = "localhost"
+	}
+
+	return fmt.Sprintf("http://%s:%s", host, envOrDefault(envPort, defaultAPIPort))
+}
+
+func resolveWebUIBaseURL(webUIPort string) string {
+	if base := normalizeBaseURL(os.Getenv(envWebUIPath)); base != "" {
+		return base
+	}
+
+	return fmt.Sprintf("http://localhost:%s", webUIPort)
+}
+
 func writeJSON(w http.ResponseWriter, status int, body any) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(status)
@@ -528,17 +558,7 @@ func handleWebUICreate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	host := r.Host
-	if h, _, err := net.SplitHostPort(r.Host); err == nil {
-		host = h
-	}
-	if host == "" {
-		host = "localhost"
-	}
-
-	apiPort := envOrDefault(envPort, defaultAPIPort)
-
-	shortURL := fmt.Sprintf("http://%s:%s/%s", host, apiPort, key)
+	shortURL := fmt.Sprintf("%s/%s", resolveAPIBaseURL(r), key)
 
 	writeJSON(w, http.StatusOK, map[string]string{
 		"key":       key,
@@ -584,15 +604,19 @@ func main() {
 			webUIMux.HandleFunc("/api/create", handleWebUICreate)
 
 			go func() {
-				log.Printf("[web-ui] listening on :%s", webUIPort)
+				log.Printf("[web-ui] listening on :%s (public %s)", webUIPort, resolveWebUIBaseURL(webUIPort))
 				if err := http.ListenAndServe(":"+webUIPort, webUIMux); err != nil {
 					log.Printf("[web-ui] server stopped: %v", err)
 				}
 			}()
 		}
 	}
 
-	log.Printf("[api] listening on :%s", port)
+	apiBase := normalizeBaseURL(os.Getenv(envAPIBaseURL))
+	if apiBase == "" {
+		apiBase = fmt.Sprintf("http://localhost:%s", port)
+	}
+	log.Printf("[api] listening on :%s (public %s)", port, apiBase)
 	log.Fatal(http.ListenAndServe(":"+port, apiMux))
 }
 
diff --git a/cmd/short-it/main_test.go b/cmd/short-it/main_test.go
@@ -267,6 +267,82 @@ func TestDeleteURL(t *testing.T) {
 	}
 }
 
+func TestHandleWebUICreateUsesAPIURL(t *testing.T) {
+	testDB := setupTestDB(t)
+	defer teardownTestDB(testDB, t)
+
+	originalDB := db
+	originalToken := authToken
+	db = testDB
+	authToken = "test-token"
+	defer func() {
+		db = originalDB
+		authToken = originalToken
+	}()
+
+	t.Setenv(envAPIBaseURL, "https://short.example.com")
+	t.Setenv(envPort, "8080")
+
+	body := `{"token":"test-token","url":"https://example.com","custom_path":"blog"}`
+	req := httptest.NewRequest(http.MethodPost, "/api/create", strings.NewReader(body))
+	req.Header.Set("Content-Type", "application/json")
+	req.Host = "web-link.example.com:8090"
+	w := httptest.NewRecorder()
+
+	handleWebUICreate(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("Expected 200, got %d", w.Code)
+	}
+
+	var response map[string]string
+	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
+		t.Fatalf("Failed to decode response: %v", err)
+	}
+
+	if got, want := response["short_url"], "https://short.example.com/blog"; got != want {
+		t.Fatalf("Expected short_url %q, got %q", want, got)
+	}
+}
+
+func TestHandleWebUICreateFallsBackToHostAndAPIPort(t *testing.T) {
+	testDB := setupTestDB(t)
+	defer teardownTestDB(testDB, t)
+
+	originalDB := db
+	originalToken := authToken
+	db = testDB
+	authToken = "test-token"
+	defer func() {
+		db = originalDB
+		authToken = originalToken
+	}()
+
+	t.Setenv(envAPIBaseURL, "")
+	t.Setenv(envPort, "8080")
+
+	body := `{"token":"test-token","url":"https://example.com","custom_path":"blog"}`
+	req := httptest.NewRequest(http.MethodPost, "/api/create", strings.NewReader(body))
+	req.Header.Set("Content-Type", "application/json")
+	req.Host = "web-link.example.com:8090"
+	w := httptest.NewRecorder()
+
+	handleWebUICreate(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("Expected 200, got %d", w.Code)
+	}
+
+	var response map[string]string
+	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
+		t.Fatalf("Failed to decode response: %v", err)
+	}
+
+	if got, want := response["short_url"], "http://web-link.example.com:8080/blog"; got != want {
+		t.Fatalf("Expected short_url %q, got %q", want, got)
+	}
+}
+
 func TestListURLs(t *testing.T) {
 	testDB := setupTestDB(t)
 	defer teardownTestDB(testDB, t)
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,21 +2,23 @@ version: '3.8'
 
 services:
   short-it:
-    image: ghcr.io/auravoid/short-it:latest
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile
+    # image: ghcr.io/auravoid/short-it:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
     ports:
       - "8080:8080"
       - "8090:8090"
     environment:
       #- RYBBIT_SITE_ID=YOUR_SITE_ID_HERE
       #- RYBBIT_SITE_KEY=YOUR_API_KEY_HERE
       #- RYBBIT_SITE_URL=https://your-rybbit-instance.example.com
-      - WEB_UI=false
+      - WEB_UI=true
       - WEB_UI_PORT=8090
+      - WEB_UI_URL=http://localhost:8090
       - APP_TOKEN=YOUR_TOKEN_HERE
-      - PORT=8080
+      - API_PORT=8080
+      - API_URL=http://localhost:8080
       - DB_PATH=/data/short-it.db
     volumes:
       - short-it-data:/data
