tech/sendico
2
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed default to grpcs #623

Merged
tech merged 1 commits from tron-622 into main 2026-03-04 00:31:21 +00:00
Conversation 0 Commits 1 Files Changed 1 +20 -18
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/gateway/tron/internal/service/gateway/tronclient/client.go
View File

@@ -107,18 +107,21 @@ func newForceIPv4Dialer(host, port string) func(context.Context, string) (net.Co
func normalizeGRPCAddress(grpcURL string) (string, bool, error) { func normalizeGRPCAddress(grpcURL string) (string, bool, error) {
target := strings.TrimSpace(grpcURL) target := strings.TrimSpace(grpcURL)
useTLS := false
if target == "" { if target == "" {
return "", false, merrors.InvalidArgument("tronclient: grpc url is required") return "", false, merrors.InvalidArgument("tronclient: grpc url is required")
} }
if strings.Contains(target, "://") {
// Default to secure gRPC when no scheme is provided.
if !strings.Contains(target, "://") {
target = "grpcs://" + target
}
u, err := url.Parse(target) u, err := url.Parse(target)
if err != nil { if err != nil {
return "", false, merrors.InvalidArgument("tronclient: invalid grpc url") return "", false, merrors.InvalidArgument("tronclient: invalid grpc url")
} }
if u.Scheme == "https" || u.Scheme == "grpcs" {
useTLS = true useTLS := u.Scheme == "https" || u.Scheme == "grpcs"
}
host := strings.TrimSpace(u.Host) host := strings.TrimSpace(u.Host)
if host == "" { if host == "" {
return "", false, merrors.InvalidArgument("tronclient: grpc url missing host") return "", false, merrors.InvalidArgument("tronclient: grpc url missing host")
@@ -126,9 +129,8 @@ func normalizeGRPCAddress(grpcURL string) (string, bool, error) {
if useTLS && u.Port() == "" { if useTLS && u.Port() == "" {
host = host + ":443" host = host + ":443"
} }
return host, useTLS, nil return host, useTLS, nil
}
return target, useTLS, nil
} }
func grpcTokenUnaryInterceptor(token string) grpc.UnaryClientInterceptor { func grpcTokenUnaryInterceptor(token string) grpc.UnaryClientInterceptor {