guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix encryption and compresion in dashboard (#3682)

This commit is contained in:
fatedier 2023-10-16 11:22:12 +08:00 committed by GitHub
parent a7ad967231
commit 6d4d8e616d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Release.md
View File

@ -1 +1,3 @@
### Fixes ### Fixes
* Encryption and compression are not displayed correctly in the dashboard.

2
assets/frps/static/index-9465253b.js → assets/frps/static/index-c322b7dd.js
View File

File diff suppressed because one or more lines are too long

2
assets/frps/static/index.html
View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>frps dashboard</title> <title>frps dashboard</title>
<script type="module" crossorigin src="./index-9465253b.js"></script> <script type="module" crossorigin src="./index-c322b7dd.js"></script>
<link rel="stylesheet" href="./index-1e0c7400.css"> <link rel="stylesheet" href="./index-1e0c7400.css">
</head> </head>

26
web/frps/src/utils/proxy.ts
View File

@ -23,12 +23,8 @@ class BaseProxy {
this.type = '' this.type = ''
this.encryption = false this.encryption = false
this.compression = false this.compression = false
if (proxyStats.conf != null && proxyStats.conf.useEncryption != null) { this.encryption = (proxyStats.conf?.transport?.useEncryption) || this.encryption;
this.encryption = proxyStats.conf.useEncryption this.compression = (proxyStats.conf?.transport?.useCompression) || this.compression;
}
if (proxyStats.conf != null && proxyStats.conf.useCompression != null) {
this.compression = proxyStats.conf.useCompression
}
this.conns = proxyStats.curConns this.conns = proxyStats.curConns
this.trafficIn = proxyStats.todayTrafficIn this.trafficIn = proxyStats.todayTrafficIn
this.trafficOut = proxyStats.todayTrafficOut this.trafficOut = proxyStats.todayTrafficOut
@ -79,14 +75,12 @@ class HTTPProxy extends BaseProxy {
super(proxyStats) super(proxyStats)
this.type = 'http' this.type = 'http'
this.port = port this.port = port
if (proxyStats.conf != null) { if (proxyStats.conf) {
if (proxyStats.conf.customDomains != null) { this.customDomains = proxyStats.conf.customDomains || this.customDomains;
this.customDomains = proxyStats.conf.customDomains
}
this.hostHeaderRewrite = proxyStats.conf.hostHeaderRewrite this.hostHeaderRewrite = proxyStats.conf.hostHeaderRewrite
this.locations = proxyStats.conf.locations this.locations = proxyStats.conf.locations
if (proxyStats.conf.subdomain != null && proxyStats.conf.subdomain != '') { if (proxyStats.conf.subdomain) {
this.subdomain = proxyStats.conf.subdomain + '.' + subdomainHost this.subdomain = `${proxyStats.conf.subdomain}.${subdomainHost}`
} }
} }
} }
@ -98,11 +92,9 @@ class HTTPSProxy extends BaseProxy {
this.type = 'https' this.type = 'https'
this.port = port this.port = port
if (proxyStats.conf != null) { if (proxyStats.conf != null) {
if (proxyStats.conf.customDomains != null) { this.customDomains = proxyStats.conf.customDomains || this.customDomains;
this.customDomains = proxyStats.conf.customDomains if (proxyStats.conf.subdomain) {
} this.subdomain = `${proxyStats.conf.subdomain}.${subdomainHost}`
if (proxyStats.conf.subdomain != null && proxyStats.conf.subdomain != '') {
this.subdomain = proxyStats.conf.subdomain + '.' + subdomainHost
} }
} }
} }