Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/frpc/static/index-BAsh6RH1.js

Large diffs are not rendered by default.

42 changes: 0 additions & 42 deletions assets/frpc/static/index-HyKZ_pht.js

This file was deleted.

1 change: 1 addition & 0 deletions assets/frpc/static/index-JCcyRUo1.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion assets/frpc/static/index-iuf46MlF.css

This file was deleted.

6 changes: 3 additions & 3 deletions assets/frpc/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

<head>
<meta charset="utf-8">
<title>frp client admin UI</title>
<script type="module" crossorigin src="./index-HyKZ_pht.js"></script>
<link rel="stylesheet" crossorigin href="./index-iuf46MlF.css">
<title>frp client</title>
<script type="module" crossorigin src="./index-BAsh6RH1.js"></script>
<link rel="stylesheet" crossorigin href="./index-JCcyRUo1.css">
</head>

<body>
Expand Down
1 change: 1 addition & 0 deletions client/admin_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ func (svr *Service) apiStatus(w http.ResponseWriter, _ *http.Request) {
log.Infof("http request [/api/status]")
defer func() {
log.Infof("http response [/api/status]")
w.Header().Set("Content-Type", "application/json")
buf, _ = json.Marshal(&res)
_, _ = w.Write(buf)
}()
Expand Down
6 changes: 6 additions & 0 deletions server/dashboard_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ func (svr *Service) apiServerInfo(w http.ResponseWriter, r *http.Request) {
}()

log.Infof("http request: [%s]", r.URL.Path)
w.Header().Set("Content-Type", "application/json")
serverStats := mem.StatsCollector.GetServer()
svrResp := serverInfoResp{
Version: version.Full(),
Expand Down Expand Up @@ -155,6 +156,7 @@ func (svr *Service) apiClientList(w http.ResponseWriter, r *http.Request) {
res := GeneralResponse{Code: 200}
defer func() {
log.Infof("http response [%s]: code [%d]", r.URL.RequestURI(), res.Code)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(res.Code)
if len(res.Msg) > 0 {
_, _ = w.Write([]byte(res.Msg))
Expand Down Expand Up @@ -212,6 +214,7 @@ func (svr *Service) apiClientDetail(w http.ResponseWriter, r *http.Request) {
res := GeneralResponse{Code: 200}
defer func() {
log.Infof("http response [%s]: code [%d]", r.URL.RequestURI(), res.Code)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(res.Code)
if len(res.Msg) > 0 {
_, _ = w.Write([]byte(res.Msg))
Expand Down Expand Up @@ -332,6 +335,7 @@ func (svr *Service) apiProxyByType(w http.ResponseWriter, r *http.Request) {

defer func() {
log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(res.Code)
if len(res.Msg) > 0 {
_, _ = w.Write([]byte(res.Msg))
Expand Down Expand Up @@ -404,6 +408,7 @@ func (svr *Service) apiProxyByTypeAndName(w http.ResponseWriter, r *http.Request

defer func() {
log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(res.Code)
if len(res.Msg) > 0 {
_, _ = w.Write([]byte(res.Msg))
Expand Down Expand Up @@ -472,6 +477,7 @@ func (svr *Service) apiProxyTraffic(w http.ResponseWriter, r *http.Request) {

defer func() {
log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(res.Code)
if len(res.Msg) > 0 {
_, _ = w.Write([]byte(res.Msg))
Expand Down
10 changes: 6 additions & 4 deletions web/frpc/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ export {}

declare module 'vue' {
export interface GlobalComponents {
ClientConfigure: typeof import('./src/components/ClientConfigure.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElCol: typeof import('element-plus/es')['ElCol']
ElCard: typeof import('element-plus/es')['ElCard']
ElInput: typeof import('element-plus/es')['ElInput']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElRow: typeof import('element-plus/es')['ElRow']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
Overview: typeof import('./src/components/Overview.vue')['default']
ElTag: typeof import('element-plus/es')['ElTag']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}
export interface ComponentCustomProperties {
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
}
}
2 changes: 1 addition & 1 deletion web/frpc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="utf-8">
<title>frp client admin UI</title>
<title>frp client</title>
</head>

<body>
Expand Down
31 changes: 18 additions & 13 deletions web/frpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,30 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
},
"dependencies": {
"element-plus": "^2.5.3",
"vue": "^3.4.15",
"vue-router": "^4.2.5"
"element-plus": "^2.13.0",
"vue": "^3.5.26",
"vue-router": "^4.6.4"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.7.2",
"@types/node": "^18.11.12",
"@vitejs/plugin-vue": "^5.0.3",
"@rushstack/eslint-patch": "^1.15.0",
"@types/node": "24",
"@vitejs/plugin-vue": "^6.0.3",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/tsconfig": "^0.5.1",
"@vue/tsconfig": "^0.8.1",
"@vueuse/core": "^14.1.0",
"eslint": "^8.56.0",
"eslint-plugin-vue": "^9.21.0",
"eslint-plugin-vue": "^9.33.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.2.4",
"typescript": "~5.3.3",
"prettier": "^3.7.4",
"sass": "^1.97.2",
"terser": "^5.44.1",
"typescript": "^5.9.3",
"unplugin-auto-import": "^0.17.5",
"unplugin-element-plus": "^0.11.2",
"unplugin-vue-components": "^0.26.0",
"vite": "^5.0.12",
"vue-tsc": "^1.8.27"
"vite": "^7.3.0",
"vite-svg-loader": "^5.1.0",
"vue-tsc": "^3.2.2"
}
}
}
Loading