fix encryption and compresion in dashboard (#3682)

1 year ago · 6d4d8e616d
parent a7ad967231
commit 6d4d8e616d
4 changed files with 13 additions and 19 deletions
--- a/Release.md
+++ b/Release.md
@ -1 +1,3 @@
 ### Fixes
+
+* Encryption and compression are not displayed correctly in the dashboard.
--- a/assets/frps/static/index-c322b7dd.js
+++ b/assets/frps/static/index-c322b7dd.js
--- a/assets/frps/static/index.html
+++ b/assets/frps/static/index.html
@ -4,7 +4,7 @@
 <head>
    <meta charset="utf-8">
    <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">
 </head>

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