diff options
| author | mhsanaei <ho3ein.sanaei@gmail.com> | 2025-03-12 22:13:51 +0300 |
|---|---|---|
| committer | mhsanaei <ho3ein.sanaei@gmail.com> | 2025-03-12 22:43:43 +0300 |
| commit | 0bde51b91ea505e38569ae3cbe575695abd2db60 (patch) | |
| tree | 3d27346586f5802d12cdbb7a1fe95c2b5d46156f | |
| parent | 280a22b57d14a372d99bcc49add515721290678b (diff) | |
Refactor: Use any instead of interface{}
| -rw-r--r-- | database/db.go | 2 | ||||
| -rw-r--r-- | logger/logger.go | 20 | ||||
| -rw-r--r-- | sub/subJsonService.go | 66 | ||||
| -rw-r--r-- | sub/subService.go | 190 | ||||
| -rw-r--r-- | util/common/err.go | 6 | ||||
| -rw-r--r-- | web/controller/util.go | 4 | ||||
| -rw-r--r-- | web/entity/entity.go | 6 | ||||
| -rw-r--r-- | web/job/check_client_ip_job.go | 9 | ||||
| -rw-r--r-- | web/job/xray_traffic_job.go | 2 | ||||
| -rw-r--r-- | web/locale/locale.go | 4 | ||||
| -rw-r--r-- | web/service/inbound.go | 146 | ||||
| -rw-r--r-- | web/service/outbound.go | 2 | ||||
| -rw-r--r-- | web/service/server.go | 8 | ||||
| -rw-r--r-- | web/service/setting.go | 38 | ||||
| -rw-r--r-- | web/service/tgbot.go | 16 | ||||
| -rw-r--r-- | web/service/user.go | 2 | ||||
| -rw-r--r-- | web/service/xray.go | 20 | ||||
| -rw-r--r-- | xray/api.go | 2 | ||||
| -rw-r--r-- | xray/process.go | 4 |
19 files changed, 267 insertions, 280 deletions
diff --git a/database/db.go b/database/db.go index 300a73c0..744f1401 100644 --- a/database/db.go +++ b/database/db.go @@ -26,7 +26,7 @@ const ( ) func initModels() error { - models := []interface{}{ + models := []any{ &model.User{}, &model.Inbound{}, &model.OutboundTraffics{}, diff --git a/logger/logger.go b/logger/logger.go index 35c5c0ac..3705c3df 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -47,52 +47,52 @@ func InitLogger(level logging.Level) { logger = newLogger } -func Debug(args ...interface{}) { +func Debug(args ...any) { logger.Debug(args...) addToBuffer("DEBUG", fmt.Sprint(args...)) } -func Debugf(format string, args ...interface{}) { +func Debugf(format string, args ...any) { logger.Debugf(format, args...) addToBuffer("DEBUG", fmt.Sprintf(format, args...)) } -func Info(args ...interface{}) { +func Info(args ...any) { logger.Info(args...) addToBuffer("INFO", fmt.Sprint(args...)) } -func Infof(format string, args ...interface{}) { +func Infof(format string, args ...any) { logger.Infof(format, args...) addToBuffer("INFO", fmt.Sprintf(format, args...)) } -func Notice(args ...interface{}) { +func Notice(args ...any) { logger.Notice(args...) addToBuffer("NOTICE", fmt.Sprint(args...)) } -func Noticef(format string, args ...interface{}) { +func Noticef(format string, args ...any) { logger.Noticef(format, args...) addToBuffer("NOTICE", fmt.Sprintf(format, args...)) } -func Warning(args ...interface{}) { +func Warning(args ...any) { logger.Warning(args...) addToBuffer("WARNING", fmt.Sprint(args...)) } -func Warningf(format string, args ...interface{}) { +func Warningf(format string, args ...any) { logger.Warningf(format, args...) addToBuffer("WARNING", fmt.Sprintf(format, args...)) } -func Error(args ...interface{}) { +func Error(args ...any) { logger.Error(args...) addToBuffer("ERROR", fmt.Sprint(args...)) } -func Errorf(format string, args ...interface{}) { +func Errorf(format string, args ...any) { logger.Errorf(format, args...) addToBuffer("ERROR", fmt.Sprintf(format, args...)) } diff --git a/sub/subJsonService.go b/sub/subJsonService.go index 8786541e..008e1658 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -18,7 +18,7 @@ import ( var defaultJson string type SubJsonService struct { - configJson map[string]interface{} + configJson map[string]any defaultOutbounds []json_util.RawMessage fragment string noises string @@ -29,10 +29,10 @@ type SubJsonService struct { } func NewSubJsonService(fragment string, noises string, mux string, rules string, subService *SubService) *SubJsonService { - var configJson map[string]interface{} + var configJson map[string]any var defaultOutbounds []json_util.RawMessage json.Unmarshal([]byte(defaultJson), &configJson) - if outboundSlices, ok := configJson["outbounds"].([]interface{}); ok { + if outboundSlices, ok := configJson["outbounds"].([]any); ok { for _, defaultOutbound := range outboundSlices { jsonBytes, _ := json.Marshal(defaultOutbound) defaultOutbounds = append(defaultOutbounds, jsonBytes) @@ -40,9 +40,9 @@ func NewSubJsonService(fragment string, noises string, mux string, rules string, } if rules != "" { - var newRules []interface{} - routing, _ := configJson["routing"].(map[string]interface{}) - defaultRules, _ := routing["rules"].([]interface{}) + var newRules []any + routing, _ := configJson["routing"].(map[string]any) + defaultRules, _ := routing["rules"].([]any) json.Unmarshal([]byte(rules), &newRules) defaultRules = append(newRules, defaultRules...) routing["rules"] = defaultRules @@ -148,10 +148,10 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, var newJsonArray []json_util.RawMessage stream := s.streamData(inbound.StreamSettings) - externalProxies, ok := stream["externalProxy"].([]interface{}) + externalProxies, ok := stream["externalProxy"].([]any) if !ok || len(externalProxies) == 0 { - externalProxies = []interface{}{ - map[string]interface{}{ + externalProxies = []any{ + map[string]any{ "forceTls": "same", "dest": host, "port": float64(inbound.Port), @@ -163,7 +163,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, delete(stream, "externalProxy") for _, ep := range externalProxies { - extPrxy := ep.(map[string]interface{}) + extPrxy := ep.(map[string]any) inbound.Listen = extPrxy["dest"].(string) inbound.Port = int(extPrxy["port"].(float64)) newStream := stream @@ -171,7 +171,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, case "tls": if newStream["security"] != "tls" { newStream["security"] = "tls" - newStream["tslSettings"] = map[string]interface{}{} + newStream["tslSettings"] = map[string]any{} } case "none": if newStream["security"] != "none" { @@ -191,7 +191,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, } newOutbounds = append(newOutbounds, s.defaultOutbounds...) - newConfigJson := make(map[string]interface{}) + newConfigJson := make(map[string]any) for key, value := range s.configJson { newConfigJson[key] = value } @@ -205,14 +205,14 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, return newJsonArray } -func (s *SubJsonService) streamData(stream string) map[string]interface{} { - var streamSettings map[string]interface{} +func (s *SubJsonService) streamData(stream string) map[string]any { + var streamSettings map[string]any json.Unmarshal([]byte(stream), &streamSettings) security, _ := streamSettings["security"].(string) if security == "tls" { - streamSettings["tlsSettings"] = s.tlsData(streamSettings["tlsSettings"].(map[string]interface{})) + streamSettings["tlsSettings"] = s.tlsData(streamSettings["tlsSettings"].(map[string]any)) } else if security == "reality" { - streamSettings["realitySettings"] = s.realityData(streamSettings["realitySettings"].(map[string]interface{})) + streamSettings["realitySettings"] = s.realityData(streamSettings["realitySettings"].(map[string]any)) } delete(streamSettings, "sockopt") @@ -233,17 +233,17 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} { return streamSettings } -func (s *SubJsonService) removeAcceptProxy(setting interface{}) map[string]interface{} { - netSettings, ok := setting.(map[string]interface{}) +func (s *SubJsonService) removeAcceptProxy(setting any) map[string]any { + netSettings, ok := setting.(map[string]any) if ok { delete(netSettings, "acceptProxyProtocol") } return netSettings } -func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interface{} { - tlsData := make(map[string]interface{}, 1) - tlsClientSettings, _ := tData["settings"].(map[string]interface{}) +func (s *SubJsonService) tlsData(tData map[string]any) map[string]any { + tlsData := make(map[string]any, 1) + tlsClientSettings, _ := tData["settings"].(map[string]any) tlsData["serverName"] = tData["serverName"] tlsData["alpn"] = tData["alpn"] @@ -256,9 +256,9 @@ func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interf return tlsData } -func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]interface{} { - rltyData := make(map[string]interface{}, 1) - rltyClientSettings, _ := rData["settings"].(map[string]interface{}) +func (s *SubJsonService) realityData(rData map[string]any) map[string]any { + rltyData := make(map[string]any, 1) + rltyClientSettings, _ := rData["settings"].(map[string]any) rltyData["show"] = false rltyData["publicKey"] = rltyClientSettings["publicKey"] @@ -266,13 +266,13 @@ func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]in // Set random data rltyData["spiderX"] = "/" + random.Seq(15) - shortIds, ok := rData["shortIds"].([]interface{}) + shortIds, ok := rData["shortIds"].([]any) if ok && len(shortIds) > 0 { rltyData["shortId"] = shortIds[random.Num(len(shortIds))].(string) } else { rltyData["shortId"] = "" } - serverNames, ok := rData["serverNames"].([]interface{}) + serverNames, ok := rData["serverNames"].([]any) if ok && len(serverNames) > 0 { rltyData["serverName"] = serverNames[random.Num(len(serverNames))].(string) } else { @@ -329,7 +329,7 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_u } if inbound.Protocol == model.Shadowsocks { - var inboundSettings map[string]interface{} + var inboundSettings map[string]any json.Unmarshal([]byte(inbound.Settings), &inboundSettings) method, _ := inboundSettings["method"].(string) serverData[0].Method = method @@ -357,12 +357,12 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_u } type Outbound struct { - Protocol string `json:"protocol"` - Tag string `json:"tag"` - StreamSettings json_util.RawMessage `json:"streamSettings"` - Mux json_util.RawMessage `json:"mux,omitempty"` - ProxySettings map[string]interface{} `json:"proxySettings,omitempty"` - Settings OutboundSettings `json:"settings,omitempty"` + Protocol string `json:"protocol"` + Tag string `json:"tag"` + StreamSettings json_util.RawMessage `json:"streamSettings"` + Mux json_util.RawMessage `json:"mux,omitempty"` + ProxySettings map[string]any `json:"proxySettings,omitempty"` + Settings OutboundSettings `json:"settings,omitempty"` } type OutboundSettings struct { diff --git a/sub/subService.go b/sub/subService.go index f52d4b67..9f26c0e0 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -141,9 +141,9 @@ func (s *SubService) getFallbackMaster(dest string, streamSettings string) (stri return "", 0, "", err } - var stream map[string]interface{} + var stream map[string]any json.Unmarshal([]byte(streamSettings), &stream) - var masterStream map[string]interface{} + var masterStream map[string]any json.Unmarshal([]byte(inbound.StreamSettings), &masterStream) stream["security"] = masterStream["security"] stream["tlsSettings"] = masterStream["tlsSettings"] @@ -171,66 +171,66 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string { if inbound.Protocol != model.VMESS { return "" } - obj := map[string]interface{}{ + obj := map[string]any{ "v": "2", "add": s.address, "port": inbound.Port, "type": "none", } - var stream map[string]interface{} + var stream map[string]any json.Unmarshal([]byte(inbound.StreamSettings), &stream) network, _ := stream["network"].(string) obj["net"] = network switch network { case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) + tcp, _ := stream["tcpSettings"].(map[string]any) + header, _ := tcp["header"].(map[string]any) typeStr, _ := header["type"].(string) obj["type"] = typeStr if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) + request := header["request"].(map[string]any) + requestPath, _ := request["path"].([]any) obj["path"] = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) + headers, _ := request["headers"].(map[string]any) obj["host"] = searchHost(headers) } case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) + kcp, _ := stream["kcpSettings"].(map[string]any) + header, _ := kcp["header"].(map[string]any) obj["type"], _ = header["type"].(string) obj["path"], _ = kcp["seed"].(string) case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) + ws, _ := stream["wsSettings"].(map[string]any) obj["path"] = ws["path"].(string) if host, ok := ws["host"].(string); ok && len(host) > 0 { obj["host"] = host } else { - headers, _ := ws["headers"].(map[string]interface{}) + headers, _ := ws["headers"].(map[string]any) obj["host"] = searchHost(headers) } case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) + grpc, _ := stream["grpcSettings"].(map[string]any) obj["path"] = grpc["serviceName"].(string) obj["authority"] = grpc["authority"].(string) if grpc["multiMode"].(bool) { obj["type"] = "multi" } case "httpupgrade": - httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{}) + httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any) obj["path"] = httpupgrade["path"].(string) if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 { obj["host"] = host } else { - headers, _ := httpupgrade["headers"].(map[string]interface{}) + headers, _ := httpupgrade["headers"].(map[string]any) obj["host"] = searchHost(headers) } case "xhttp": - xhttp, _ := stream["xhttpSettings"].(map[string]interface{}) + xhttp, _ := stream["xhttpSettings"].(map[string]any) obj["path"] = xhttp["path"].(string) if host, ok := xhttp["host"].(string); ok && len(host) > 0 { obj["host"] = host } else { - headers, _ := xhttp["headers"].(map[string]interface{}) + headers, _ := xhttp["headers"].(map[string]any) obj["host"] = searchHost(headers) } obj["mode"] = xhttp["mode"].(string) @@ -238,8 +238,8 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string { security, _ := stream["security"].(string) obj["tls"] = security if security == "tls" { - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) + tlsSetting, _ := stream["tlsSettings"].(map[string]any) + alpns, _ := tlsSetting["alpn"].([]any) if len(alpns) > 0 { var alpn []string for _, a := range alpns { @@ -273,14 +273,14 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string { obj["id"] = clients[clientIndex].ID obj["scy"] = clients[clientIndex].Security - externalProxies, _ := stream["externalProxy"].([]interface{}) + externalProxies, _ := stream["externalProxy"].([]any) if len(externalProxies) > 0 { links := "" for index, externalProxy := range externalProxies { - ep, _ := externalProxy.(map[string]interface{}) + ep, _ := externalProxy.(map[string]any) newSecurity, _ := ep["forceTls"].(string) - newObj := map[string]interface{}{} + newObj := map[string]any{} for key, value := range obj { if !(newSecurity == "none" && (key == "alpn" || key == "sni" || key == "fp" || key == "allowInsecure")) { newObj[key] = value @@ -313,7 +313,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { if inbound.Protocol != model.VLESS { return "" } - var stream map[string]interface{} + var stream map[string]any json.Unmarshal([]byte(inbound.StreamSettings), &stream) clients, _ := s.inboundService.GetClients(inbound) clientIndex := -1 @@ -331,54 +331,54 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { switch streamNetwork { case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) + tcp, _ := stream["tcpSettings"].(map[string]any) + header, _ := tcp["header"].(map[string]any) typeStr, _ := header["type"].(string) if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) + request := header["request"].(map[string]any) + requestPath, _ := request["path"].([]any) params["path"] = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) + headers, _ := request["headers"].(map[string]any) params["host"] = searchHost(headers) params["headerType"] = "http" } case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) + kcp, _ := stream["kcpSettings"].(map[string]any) + header, _ := kcp["header"].(map[string]any) params["headerType"] = header["type"].(string) params["seed"] = kcp["seed"].(string) case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) + ws, _ := stream["wsSettings"].(map[string]any) params["path"] = ws["path"].(string) if host, ok := ws["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := ws["headers"].(map[string]interface{}) + headers, _ := ws["headers"].(map[string]any) params["host"] = searchHost(headers) } case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) + grpc, _ := stream["grpcSettings"].(map[string]any) params["serviceName"] = grpc["serviceName"].(string) params["authority"], _ = grpc["authority"].(string) if grpc["multiMode"].(bool) { params["mode"] = "multi" } case "httpupgrade": - httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{}) + httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any) params["path"] = httpupgrade["path"].(string) if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := httpupgrade["headers"].(map[string]interface{}) + headers, _ := httpupgrade["headers"].(map[string]any) params["host"] = searchHost(headers) } case "xhttp": - xhttp, _ := stream["xhttpSettings"].(map[string]interface{}) + xhttp, _ := stream["xhttpSettings"].(map[string]any) params["path"] = xhttp["path"].(string) if host, ok := xhttp["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := xhttp["headers"].(map[string]interface{}) + headers, _ := xhttp["headers"].(map[string]any) params["host"] = searchHost(headers) } params["mode"] = xhttp["mode"].(string) @@ -386,8 +386,8 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { security, _ := stream["security"].(string) if security == "tls" { params["security"] = "tls" - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) + tlsSetting, _ := stream["tlsSettings"].(map[string]any) + alpns, _ := tlsSetting["alpn"].([]any) var alpn []string for _, a := range alpns { alpn = append(alpn, a.(string)) @@ -418,18 +418,18 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { if security == "reality" { params["security"] = "reality" - realitySetting, _ := stream["realitySettings"].(map[string]interface{}) + realitySetting, _ := stream["realitySettings"].(map[string]any) realitySettings, _ := searchKey(realitySetting, "settings") if realitySetting != nil { if sniValue, ok := searchKey(realitySetting, "serverNames"); ok { - sNames, _ := sniValue.([]interface{}) + sNames, _ := sniValue.([]any) params["sni"] = sNames[random.Num(len(sNames))].(string) } if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok { params["pbk"], _ = pbkValue.(string) } if sidValue, ok := searchKey(realitySetting, "shortIds"); ok { - shortIds, _ := sidValue.([]interface{}) + shortIds, _ := sidValue.([]any) params["sid"] = shortIds[random.Num(len(shortIds))].(string) } if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok { @@ -449,12 +449,12 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { params["security"] = "none" } - externalProxies, _ := stream["externalProxy"].([]interface{}) + externalProxies, _ := stream["externalProxy"].([]any) if len(externalProxies) > 0 { links := "" for index, externalProxy := range externalProxies { - ep, _ := externalProxy.(map[string]interface{}) + ep, _ := externalProxy.(map[string]any) newSecurity, _ := ep["forceTls"].(string) dest, _ := ep["dest"].(string) port := int(ep["port"].(float64)) @@ -507,7 +507,7 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string if inbound.Protocol != model.Trojan { return "" } - var stream map[string]interface{} + var stream map[string]any json.Unmarshal([]byte(inbound.StreamSettings), &stream) clients, _ := s.inboundService.GetClients(inbound) clientIndex := -1 @@ -525,54 +525,54 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string switch streamNetwork { case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) + tcp, _ := stream["tcpSettings"].(map[string]any) + header, _ := tcp["header"].(map[string]any) typeStr, _ := header["type"].(string) if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) + request := header["request"].(map[string]any) + requestPath, _ := request["path"].([]any) params["path"] = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) + headers, _ := request["headers"].(map[string]any) params["host"] = searchHost(headers) params["headerType"] = "http" } case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) + kcp, _ := stream["kcpSettings"].(map[string]any) + header, _ := kcp["header"].(map[string]any) params["headerType"] = header["type"].(string) params["seed"] = kcp["seed"].(string) case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) + ws, _ := stream["wsSettings"].(map[string]any) params["path"] = ws["path"].(string) if host, ok := ws["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := ws["headers"].(map[string]interface{}) + headers, _ := ws["headers"].(map[string]any) params["host"] = searchHost(headers) } case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) + grpc, _ := stream["grpcSettings"].(map[string]any) params["serviceName"] = grpc["serviceName"].(string) params["authority"], _ = grpc["authority"].(string) if grpc["multiMode"].(bool) { params["mode"] = "multi" } case "httpupgrade": - httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{}) + httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any) params["path"] = httpupgrade["path"].(string) if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := httpupgrade["headers"].(map[string]interface{}) + headers, _ := httpupgrade["headers"].(map[string]any) params["host"] = searchHost(headers) } case "xhttp": - xhttp, _ := stream["xhttpSettings"].(map[string]interface{}) + xhttp, _ := stream["xhttpSettings"].(map[string]any) params["path"] = xhttp["path"].(string) if host, ok := xhttp["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := xhttp["headers"].(map[string]interface{}) + headers, _ := xhttp["headers"].(map[string]any) params["host"] = searchHost(headers) } params["mode"] = xhttp["mode"].(string) @@ -580,8 +580,8 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string security, _ := stream["security"].(string) if security == "tls" { params["security"] = "tls" - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) + tlsSetting, _ := stream["tlsSettings"].(map[string]any) + alpns, _ := tlsSetting["alpn"].([]any) var alpn []string for _, a := range alpns { alpn = append(alpn, a.(string)) @@ -608,18 +608,18 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string if security == "reality" { params["security"] = "reality" - realitySetting, _ := stream["realitySettings"].(map[string]interface{}) + realitySetting, _ := stream["realitySettings"].(map[string]any) realitySettings, _ := searchKey(realitySetting, "settings") if realitySetting != nil { if sniValue, ok := searchKey(realitySetting, "serverNames"); ok { - sNames, _ := sniValue.([]interface{}) + sNames, _ := sniValue.([]any) params["sni"] = sNames[random.Num(len(sNames))].(string) } if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok { params["pbk"], _ = pbkValue.(string) } if sidValue, ok := searchKey(realitySetting, "shortIds"); ok { - shortIds, _ := sidValue.([]interface{}) + shortIds, _ := sidValue.([]any) params["sid"] = shortIds[random.Num(len(shortIds))].(string) } if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok { @@ -639,12 +639,12 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string params["security"] = "none" } - externalProxies, _ := stream["externalProxy"].([]interface{}) + externalProxies, _ := stream["externalProxy"].([]any) if len(externalProxies) > 0 { links := "" for index, externalProxy := range externalProxies { - ep, _ := externalProxy.(map[string]interface{}) + ep, _ := externalProxy.(map[string]any) newSecurity, _ := ep["forceTls"].(string) dest, _ := ep["dest"].(string) port := int(ep["port"].(float64)) @@ -698,11 +698,11 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st if inbound.Protocol != model.Shadowsocks { return "" } - var stream map[string]interface{} + var stream map[string]any json.Unmarshal([]byte(inbound.StreamSettings), &stream) clients, _ := s.inboundService.GetClients(inbound) - var settings map[string]interface{} + var settings map[string]any json.Unmarshal([]byte(inbound.Settings), &settings) inboundPassword := settings["password"].(string) method := settings["method"].(string) @@ -719,54 +719,54 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st switch streamNetwork { case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) + tcp, _ := stream["tcpSettings"].(map[string]any) + header, _ := tcp["header"].(map[string]any) typeStr, _ := header["type"].(string) if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) + request := header["request"].(map[string]any) + requestPath, _ := request["path"].([]any) params["path"] = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) + headers, _ := request["headers"].(map[string]any) params["host"] = searchHost(headers) params["headerType"] = "http" } case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) + kcp, _ := stream["kcpSettings"].(map[string]any) + header, _ := kcp["header"].(map[string]any) params["headerType"] = header["type"].(string) params["seed"] = kcp["seed"].(string) case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) + ws, _ := stream["wsSettings"].(map[string]any) params["path"] = ws["path"].(string) if host, ok := ws["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := ws["headers"].(map[string]interface{}) + headers, _ := ws["headers"].(map[string]any) params["host"] = searchHost(headers) } case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) + grpc, _ := stream["grpcSettings"].(map[string]any) params["serviceName"] = grpc["serviceName"].(string) params["authority"], _ = grpc["authority"].(string) if grpc["multiMode"].(bool) { params["mode"] = "multi" } case "httpupgrade": - httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{}) + httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any) params["path"] = httpupgrade["path"].(string) if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := httpupgrade["headers"].(map[string]interface{}) + headers, _ := httpupgrade["headers"].(map[string]any) params["host"] = searchHost(headers) } case "xhttp": - xhttp, _ := stream["xhttpSettings"].(map[string]interface{}) + xhttp, _ := stream["xhttpSettings"].(map[string]any) params["path"] = xhttp["path"].(string) if host, ok := xhttp["host"].(string); ok && len(host) > 0 { params["host"] = host } else { - headers, _ := xhttp["headers"].(map[string]interface{}) + headers, _ := xhttp["headers"].(map[string]any) params["host"] = searchHost(headers) } params["mode"] = xhttp["mode"].(string) @@ -775,8 +775,8 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st security, _ := stream["security"].(string) if security == "tls" { params["security"] = "tls" - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) + tlsSetting, _ := stream["tlsSettings"].(map[string]any) + alpns, _ := tlsSetting["alpn"].([]any) var alpn []string for _, a := range alpns { alpn = append(alpn, a.(string)) @@ -806,12 +806,12 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st encPart = fmt.Sprintf("%s:%s:%s", method, inboundPassword, clients[clientIndex].Password) } - externalProxies, _ := stream["externalProxy"].([]interface{}) + externalProxies, _ := stream["externalProxy"].([]any) if len(externalProxies) > 0 { links := "" for index, externalProxy := range externalProxies { - ep, _ := externalProxy.(map[string]interface{}) + ep, _ := externalProxy.(map[string]any) newSecurity, _ := ep["forceTls"].(string) dest, _ := ep["dest"].(string) port := int(ep["port"].(float64)) @@ -944,9 +944,9 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin return strings.Join(remark, separationChar) } -func searchKey(data interface{}, key string) (interface{}, bool) { +func searchKey(data any, key string) (any, bool) { switch val := data.(type) { - case map[string]interface{}: + case map[string]any: for k, v := range val { if k == key { return v, true @@ -955,7 +955,7 @@ func searchKey(data interface{}, key string) (interface{}, bool) { return result, true } } - case []interface{}: + case []any: for _, v := range val { if result, ok := searchKey(v, key); ok { return result, true @@ -965,19 +965,19 @@ func searchKey(data interface{}, key string) (interface{}, bool) { return nil, false } -func searchHost(headers interface{}) string { - data, _ := headers.(map[string]interface{}) +func searchHost(headers any) string { + data, _ := headers.(map[string]any) for k, v := range data { if strings.EqualFold(k, "host") { switch v.(type) { - case []interface{}: - hosts, _ := v.([]interface{}) + case []any: + hosts, _ := v.([]any) if len(hosts) > 0 { return hosts[0].(string) } else { return "" } - case interface{}: + case any: return v.(string) } } diff --git a/util/common/err.go b/util/common/err.go index 494e5c82..618bf8f3 100644 --- a/util/common/err.go +++ b/util/common/err.go @@ -7,17 +7,17 @@ import ( "x-ui/logger" ) -func NewErrorf(format string, a ...interface{}) error { +func NewErrorf(format string, a ...any) error { msg := fmt.Sprintf(format, a...) return errors.New(msg) } -func NewError(a ...interface{}) error { +func NewError(a ...any) error { msg := fmt.Sprintln(a...) return errors.New(msg) } -func Recover(msg string) interface{} { +func Recover(msg string) any { panicErr := recover() if panicErr != nil { if msg != "" { diff --git a/web/controller/util.go b/web/controller/util.go
index 440de276..40c7a8e9 100644 --- a/web/controller/util.go +++ b/web/controller/uti |
