wood/clash-and-dashboard
1
0
Fork 0
mirror of https://github.com/woodchen-ink/clash-and-dashboard.git synced 2025-07-18 05:51:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加启动脚本，反代9090端口api，反代ws

Browse Source
This commit is contained in:
LaoYutang 2023-05-28 20:58:25 +08:00
parent 65c1f42c9a
commit 4c6d6068eb
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Dockerfile
View File

@ -6,5 +6,6 @@ RUN apk update && apk add nginx
COPY ./dist/ /dashboard COPY ./dist/ /dashboard
COPY ./build/nginx.conf /etc/nginx COPY ./build/nginx.conf /etc/nginx
COPY ./build/start.sh /
CMD nginx && /clash ENTRYPOINT [ "sh", "/start.sh" ]

7
build/nginx.conf
View File

@ -19,6 +19,13 @@ http {
root /dashboard; root /dashboard;
} }
location /api {
rewrite ^/api(.*)$ $1 break;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://localhost:9090;
}
error_page 404 /404.html; error_page 404 /404.html;
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;
} }

2
build/start.sh Normal file
View File

@ -0,0 +1,2 @@
nginx
/clash

4
src/stores/jotai.ts
View File

@ -265,7 +265,7 @@ export function useLogsStreamReader () {
if (level) { if (level) {
const apiInfo = apiInfoRef.current const apiInfo = apiInfoRef.current
const protocol = apiInfo.protocol === 'http:' ? 'ws:' : 'wss:' const protocol = apiInfo.protocol === 'http:' ? 'ws:' : 'wss:'
const logUrl = `${protocol}//${apiInfo.hostname}:${apiInfo.port}/logs?level=${level}&token=${encodeURIComponent(apiInfo.secret)}` const logUrl = `${protocol}//${window.location.host}/api/logs?level=${level}&token=${encodeURIComponent(apiInfo.secret)}`
item.connect(logUrl) item.connect(logUrl)
} }
}, [apiInfoRef, item, level, previousKey]) }, [apiInfoRef, item, level, previousKey])
@ -279,7 +279,7 @@ export function useConnectionStreamReader () {
const connection = useRef(new StreamReader<API.Snapshot>({ bufferLength: 200 })) const connection = useRef(new StreamReader<API.Snapshot>({ bufferLength: 200 }))
const protocol = apiInfo.protocol === 'http:' ? 'ws:' : 'wss:' const protocol = apiInfo.protocol === 'http:' ? 'ws:' : 'wss:'
const url = `${protocol}//${apiInfo.hostname}:${apiInfo.port}/connections?token=${encodeURIComponent(apiInfo.secret)}` const url = `${protocol}//${window.location.host}/api/connections?token=${encodeURIComponent(apiInfo.secret)}`
useEffect(() => { useEffect(() => {
connection.current.connect(url) connection.current.connect(url)

11
src/stores/request.ts
View File

@ -91,20 +91,15 @@ const clientAtom = atom({
}) })
export function useClient () { export function useClient () {
const { const { secret } = useAPIInfo()
hostname,
port,
secret,
protocol,
} = useAPIInfo()
const [item, setItem] = useAtom(clientAtom) const [item, setItem] = useAtom(clientAtom)
const key = `${protocol}//${hostname}:${port}?secret=${secret}` const key = `/api?secret=${secret}`
if (item.key === key) { if (item.key === key) {
return item.instance! return item.instance!
} }
const client = new Client(`${protocol}//${hostname}:${port}`, secret) const client = new Client('/api', secret)
setItem({ key, instance: client }) setItem({ key, instance: client })
return client return client