|
|
@@ -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}`
|
|
|
}
|
|
|
}
|
|
|
}
|
fatedier