mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-06-03 02:55:39 +08:00
Compare commits
6 Commits
main
...
fix/router
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
639bc76b23 | ||
|
|
07e2348605 | ||
|
|
30c1579131 | ||
|
|
1dd395fdd6 | ||
|
|
92b468a39e | ||
|
|
48a4701d56 |
218
docs/nginx-subpath-template.conf
Normal file
218
docs/nginx-subpath-template.conf
Normal file
@@ -0,0 +1,218 @@
|
|||||||
|
# CloudCLI UI Nginx subpath deployment template.
|
||||||
|
#
|
||||||
|
# Purpose:
|
||||||
|
# Serve CloudCLI UI from a path prefix such as:
|
||||||
|
# http://localhost/ai/
|
||||||
|
# https://example.com/ai/
|
||||||
|
#
|
||||||
|
# CloudCLI itself still runs at the root of its own HTTP server, for example:
|
||||||
|
# http://127.0.0.1:3001/
|
||||||
|
#
|
||||||
|
# Nginx receives public requests under /ai, strips that prefix, and forwards the
|
||||||
|
# remaining path to CloudCLI. For example:
|
||||||
|
# /ai/ -> /
|
||||||
|
# /ai/session/abc -> /session/abc
|
||||||
|
# /ai/assets/index.js -> /assets/index.js
|
||||||
|
#
|
||||||
|
# Important Nginx limitation:
|
||||||
|
# Nginx does not allow variables in `location` matchers or `rewrite` regexes.
|
||||||
|
# The configurable variables below are still useful for proxy/filter values,
|
||||||
|
# but if you change /ai to a different subpath, also update every line marked:
|
||||||
|
# [SUBPATH LITERAL]
|
||||||
|
#
|
||||||
|
# To use a different subpath, replace these literal matchers:
|
||||||
|
# location = /ai
|
||||||
|
# location ^~ /ai/
|
||||||
|
# rewrite ^/ai(?<cloudcli_path>/.*)$ ...
|
||||||
|
#
|
||||||
|
# Recommended deployment shape:
|
||||||
|
# CloudCLI is the only app using /ai, while root paths /api, /ws, and /shell
|
||||||
|
# are also proxied because the current frontend still calls those endpoints
|
||||||
|
# with root-relative URLs.
|
||||||
|
|
||||||
|
worker_processes 1;
|
||||||
|
|
||||||
|
events {
|
||||||
|
# Maximum simultaneous connections handled by each worker process.
|
||||||
|
# The default is enough for local testing and small self-hosted deployments.
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
# WebSocket requests include an Upgrade header. Normal HTTP requests do not.
|
||||||
|
# This map gives us the right Connection header for both cases:
|
||||||
|
# Upgrade present -> "upgrade"
|
||||||
|
# Upgrade absent -> "close"
|
||||||
|
map $http_upgrade $connection_upgrade {
|
||||||
|
default upgrade;
|
||||||
|
'' close;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
# For HTTPS deployments, replace this with `listen 443 ssl http2;` and
|
||||||
|
# add ssl_certificate / ssl_certificate_key lines.
|
||||||
|
listen 80 default_server;
|
||||||
|
|
||||||
|
# Use your real hostname in production, for example:
|
||||||
|
# server_name cloudcli.example.com;
|
||||||
|
server_name localhost 127.0.0.1;
|
||||||
|
|
||||||
|
# ---- User settings -------------------------------------------------
|
||||||
|
#
|
||||||
|
# Public path prefix where users access CloudCLI.
|
||||||
|
# Do not add a trailing slash.
|
||||||
|
#
|
||||||
|
# This variable can be used in redirects and response rewrites. It
|
||||||
|
# cannot be used in `location` matchers, so update the [SUBPATH LITERAL]
|
||||||
|
# lines too if you change it.
|
||||||
|
set $cloudcli_subpath /ai;
|
||||||
|
|
||||||
|
# Private upstream URL where the CloudCLI server is listening.
|
||||||
|
# For a default local server this is usually http://127.0.0.1:3001.
|
||||||
|
set $cloudcli_upstream http://127.0.0.1:3001;
|
||||||
|
|
||||||
|
# Allow larger file uploads through the code editor/project file APIs.
|
||||||
|
client_max_body_size 100m;
|
||||||
|
|
||||||
|
# Redirect /ai to /ai/ so relative browser URL resolution is stable.
|
||||||
|
# [SUBPATH LITERAL] Change `/ai` if you change $cloudcli_subpath.
|
||||||
|
location = /ai {
|
||||||
|
return 301 $cloudcli_subpath/;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main prefixed CloudCLI UI route.
|
||||||
|
#
|
||||||
|
# [SUBPATH LITERAL] Change `/ai/` and the `^/ai` rewrite if you change
|
||||||
|
# $cloudcli_subpath.
|
||||||
|
location ^~ /ai/ {
|
||||||
|
# Strip the public subpath before proxying. CloudCLI expects to see
|
||||||
|
# root paths such as /, /session/:id, /assets/..., /manifest.json.
|
||||||
|
rewrite ^/ai(?<cloudcli_path>/.*)$ $cloudcli_path break;
|
||||||
|
|
||||||
|
# Forward the rewritten request to the private CloudCLI server.
|
||||||
|
proxy_pass $cloudcli_upstream;
|
||||||
|
|
||||||
|
# Use HTTP/1.1 so WebSocket upgrade requests can pass through if a
|
||||||
|
# browser reaches a socket endpoint under the subpath.
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
|
||||||
|
# Preserve useful request metadata for logs and future app support.
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Prefix $cloudcli_subpath;
|
||||||
|
|
||||||
|
# WebSocket upgrade headers. Harmless for normal HTTP requests.
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
|
||||||
|
# Long-running agent and terminal sessions can stay open for a long
|
||||||
|
# time, so avoid closing idle proxied connections too aggressively.
|
||||||
|
proxy_read_timeout 3600s;
|
||||||
|
proxy_send_timeout 3600s;
|
||||||
|
|
||||||
|
# Disable gzip from the upstream response so sub_filter can inspect
|
||||||
|
# and rewrite HTML/JSON/JS response bodies.
|
||||||
|
proxy_set_header Accept-Encoding "";
|
||||||
|
|
||||||
|
# Rewrite browser-visible root-relative URLs so the runtime can
|
||||||
|
# discover that the app is mounted under the subpath.
|
||||||
|
#
|
||||||
|
# Examples:
|
||||||
|
# href="/manifest.json" -> href="/ai/manifest.json"
|
||||||
|
# src="/assets/app.js" -> src="/ai/assets/app.js"
|
||||||
|
#
|
||||||
|
# These rewrites are important for React Router basename detection.
|
||||||
|
sub_filter_once off;
|
||||||
|
sub_filter_types
|
||||||
|
application/json
|
||||||
|
application/manifest+json
|
||||||
|
application/javascript
|
||||||
|
text/javascript;
|
||||||
|
|
||||||
|
sub_filter 'href="/' 'href="$cloudcli_subpath/';
|
||||||
|
sub_filter 'src="/' 'src="$cloudcli_subpath/';
|
||||||
|
|
||||||
|
# The production HTML and JS register the service worker at /sw.js.
|
||||||
|
# Rewrite that registration so the worker is served from /ai/sw.js.
|
||||||
|
sub_filter "register('/sw.js')" "register('$cloudcli_subpath/sw.js')";
|
||||||
|
sub_filter 'register("/sw.js")' 'register("$cloudcli_subpath/sw.js")';
|
||||||
|
|
||||||
|
# The manifest and service worker contain root-relative paths too.
|
||||||
|
# Rewriting them keeps PWA metadata and cached manifest requests
|
||||||
|
# under the same public subpath.
|
||||||
|
sub_filter '"start_url": "/"' '"start_url": "$cloudcli_subpath/"';
|
||||||
|
sub_filter '"scope": "/"' '"scope": "$cloudcli_subpath/"';
|
||||||
|
sub_filter '"src": "/' '"src": "$cloudcli_subpath/';
|
||||||
|
sub_filter "'/manifest.json'" "'$cloudcli_subpath/manifest.json'";
|
||||||
|
sub_filter '"/manifest.json"' '"$cloudcli_subpath/manifest.json"';
|
||||||
|
}
|
||||||
|
|
||||||
|
# Root API proxy.
|
||||||
|
#
|
||||||
|
# The current CloudCLI frontend calls APIs with root-relative URLs such
|
||||||
|
# as /api/auth/login. Keep this location unless the frontend becomes
|
||||||
|
# fully prefix-aware for API requests.
|
||||||
|
location ^~ /api/ {
|
||||||
|
proxy_pass $cloudcli_upstream;
|
||||||
|
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Prefix $cloudcli_subpath;
|
||||||
|
|
||||||
|
proxy_read_timeout 3600s;
|
||||||
|
proxy_send_timeout 3600s;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main app WebSocket proxy.
|
||||||
|
#
|
||||||
|
# The frontend opens /ws for realtime chat/session/task updates.
|
||||||
|
location /ws {
|
||||||
|
proxy_pass $cloudcli_upstream;
|
||||||
|
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Prefix $cloudcli_subpath;
|
||||||
|
|
||||||
|
proxy_read_timeout 3600s;
|
||||||
|
proxy_send_timeout 3600s;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Shell WebSocket proxy.
|
||||||
|
#
|
||||||
|
# The browser terminal uses /shell. It requires the same WebSocket
|
||||||
|
# upgrade handling as /ws.
|
||||||
|
location /shell {
|
||||||
|
proxy_pass $cloudcli_upstream;
|
||||||
|
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Prefix $cloudcli_subpath;
|
||||||
|
|
||||||
|
proxy_read_timeout 3600s;
|
||||||
|
proxy_send_timeout 3600s;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Optional health endpoint proxy used by the frontend version checker.
|
||||||
|
location = /health {
|
||||||
|
proxy_pass $cloudcli_upstream;
|
||||||
|
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Prefix $cloudcli_subpath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
95
src/App.tsx
95
src/App.tsx
@@ -1,5 +1,6 @@
|
|||||||
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
|
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
|
||||||
import { I18nextProvider } from 'react-i18next';
|
import { I18nextProvider } from 'react-i18next';
|
||||||
|
|
||||||
import { ThemeProvider } from './contexts/ThemeContext';
|
import { ThemeProvider } from './contexts/ThemeContext';
|
||||||
import { AuthProvider, ProtectedRoute } from './components/auth';
|
import { AuthProvider, ProtectedRoute } from './components/auth';
|
||||||
import { TaskMasterProvider } from './contexts/TaskMasterContext';
|
import { TaskMasterProvider } from './contexts/TaskMasterContext';
|
||||||
@@ -9,7 +10,99 @@ import { PluginsProvider } from './contexts/PluginsContext';
|
|||||||
import AppContent from './components/app/AppContent';
|
import AppContent from './components/app/AppContent';
|
||||||
import i18n from './i18n/config.js';
|
import i18n from './i18n/config.js';
|
||||||
|
|
||||||
|
const DEPLOYMENT_ASSET_DIRECTORIES = new Set(['assets', 'static', 'icons', 'images']);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detect the router basename from explicit runtime config or deployment hints.
|
||||||
|
*
|
||||||
|
* CloudCLI can be served from a path prefix by a reverse proxy, for example:
|
||||||
|
* /ai/manifest.json
|
||||||
|
* /ai/assets/index-abc123.js
|
||||||
|
* /ai/icons/icon-192x192.png
|
||||||
|
*
|
||||||
|
* React Router needs that prefix as its basename, but the packaged app should
|
||||||
|
* also keep working when served directly from the domain root. The direct-root
|
||||||
|
* case is easy to misread because asset URLs such as /icons/icon-192x192.png
|
||||||
|
* contain a directory even though there is no application basename.
|
||||||
|
*/
|
||||||
|
function detectRouterBasename() {
|
||||||
|
const explicitBasename = typeof window !== 'undefined' ? window.__ROUTER_BASENAME__ || '' : '';
|
||||||
|
if (explicitBasename) {
|
||||||
|
// Keep the deployment escape hatch authoritative. A trailing slash is
|
||||||
|
// harmless for humans but React Router expects a normalized basename.
|
||||||
|
return explicitBasename.replace(/\/+$/, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof window === 'undefined' || typeof document === 'undefined') {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
const candidatePaths = [
|
||||||
|
{ kind: 'manifest' as const, value: document.querySelector('link[rel="manifest"]')?.getAttribute('href') },
|
||||||
|
{ kind: 'script' as const, value: document.querySelector('script[type="module"][src]')?.getAttribute('src') },
|
||||||
|
...Array.from(
|
||||||
|
document.querySelectorAll(
|
||||||
|
'link[rel~="icon"][href], link[rel="apple-touch-icon"][href], link[rel="apple-touch-icon-precomposed"][href], link[rel="mask-icon"][href]'
|
||||||
|
)
|
||||||
|
).map((node) => ({
|
||||||
|
kind: 'icon' as const,
|
||||||
|
value: node.getAttribute('href'),
|
||||||
|
})),
|
||||||
|
].filter((candidate): candidate is { kind: 'manifest' | 'script' | 'icon'; value: string } => Boolean(candidate.value));
|
||||||
|
|
||||||
|
let detectedBasename = '';
|
||||||
|
for (const candidate of candidatePaths) {
|
||||||
|
try {
|
||||||
|
const candidateUrl = new URL(candidate.value, document.baseURI || window.location.href);
|
||||||
|
if (candidateUrl.origin !== window.location.origin) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pathname = candidateUrl.pathname;
|
||||||
|
const normalizedPathname = pathname.replace(/\/+$/, '');
|
||||||
|
|
||||||
|
let normalized = '';
|
||||||
|
if (candidate.kind === 'script') {
|
||||||
|
const match = normalizedPathname.match(/^(.*)\/assets\//);
|
||||||
|
normalized = match?.[1] ? match[1].replace(/\/+$/, '') : '';
|
||||||
|
} else {
|
||||||
|
const manifestMatch = normalizedPathname.match(/^(.*)\/(?:manifest\.json|site\.webmanifest)$/);
|
||||||
|
const iconMatch = normalizedPathname.match(
|
||||||
|
/^(.*)\/(?:favicon(?:\.[^/]+)?|apple-touch-icon(?:-[^/]+)?(?:\.[^/]+)?|mask-icon(?:\.[^/]+)?|[^/]*icon[^/]*)$/
|
||||||
|
);
|
||||||
|
const match = candidate.kind === 'manifest' ? manifestMatch : iconMatch;
|
||||||
|
if (match?.[1]) {
|
||||||
|
const segments = match[1].split('/').filter(Boolean);
|
||||||
|
|
||||||
|
// Strip directories that describe where static files live, not where
|
||||||
|
// the app is mounted. This must also run for a single segment:
|
||||||
|
// /icons/icon-192x192.png -> ''
|
||||||
|
// /ai/icons/icon-192x192.png -> '/ai'
|
||||||
|
// The previous implementation only stripped while more than one
|
||||||
|
// segment remained, which incorrectly turned root deployments into a
|
||||||
|
// Router basename of /icons and caused a blank page after login.
|
||||||
|
while (segments.length > 0 && DEPLOYMENT_ASSET_DIRECTORIES.has(segments[segments.length - 1])) {
|
||||||
|
segments.pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
normalized = segments.length > 0 ? `/${segments.join('/')}` : '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (normalized.length > detectedBasename.length) {
|
||||||
|
detectedBasename = normalized;
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Ignore invalid candidate URLs and continue checking other hints.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return detectedBasename;
|
||||||
|
}
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
|
const routerBasename = detectRouterBasename();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<I18nextProvider i18n={i18n}>
|
<I18nextProvider i18n={i18n}>
|
||||||
<ThemeProvider>
|
<ThemeProvider>
|
||||||
@@ -19,7 +112,7 @@ export default function App() {
|
|||||||
<TasksSettingsProvider>
|
<TasksSettingsProvider>
|
||||||
<TaskMasterProvider>
|
<TaskMasterProvider>
|
||||||
<ProtectedRoute>
|
<ProtectedRoute>
|
||||||
<Router basename={window.__ROUTER_BASENAME__ || ''}>
|
<Router basename={routerBasename}>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<AppContent />} />
|
<Route path="/" element={<AppContent />} />
|
||||||
<Route path="/session/:sessionId" element={<AppContent />} />
|
<Route path="/session/:sessionId" element={<AppContent />} />
|
||||||
|
|||||||
Reference in New Issue
Block a user