webclient: rename sdk client
Kim committed
Nov 18, 2025 at 11:09 UTC
7b2b39e7f94ceb869ffb1f5c64000655f8eb8ad9
1 file changed
+9
-9
cmd/webclient/main_js.go
+9
-9
@@ -28,7 +28,7 @@ import (
28
)
29
30
var (
31
- rdClient *sdk.RDClient
31
+ client *sdk.Client
32
33
// SDK connection manager for Service Worker messaging
34
sdkConnections = make(map[string]io.ReadWriteCloser)
@@ -94,7 +94,7 @@ var rdDialer = func(ctx context.Context, network, address string) (net.Conn, err
94
}
95
address = unicodeAddr
96
97
- lease, err := rdClient.LookupName(address)
97
+ lease, err := client.LookupName(address)
98
if err == nil && lease != nil {
99
log.Debug().Str("name", address).Str("id", lease.Identity.Id).Msg("[Dialer] Found lease")
100
address = lease.Identity.Id
@@ -104,7 +104,7 @@ var rdDialer = func(ctx context.Context, network, address string) (net.Conn, err
104
105
log.Debug().Str("original_addr", originalAddr).Str("final_addr", address).Msg("[Dialer] Attempting dial")
106
cred := sdk.NewCredential()
107
- conn, err := rdClient.Dial(cred, address, "http/1.1")
107
+ conn, err := client.Dial(cred, address, "http/1.1")
108
if err != nil {
109
log.Error().Err(err).Str("address", address).Msg("[Dialer] Dial failed")
110
return nil, err
@@ -112,7 +112,7 @@ var rdDialer = func(ctx context.Context, network, address string) (net.Conn, err
112
return conn, nil
113
}
114
115
-var client = &http.Client{
115
+var httpClient = &http.Client{
116
Timeout: time.Second * 30,
117
Transport: &http.Transport{
118
MaxIdleConns: 1000,
@@ -400,7 +400,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
400
r.URL.Host = decodedHost
401
r.URL.Scheme = "http"
402
403
- resp, err := client.Do(r)
403
+ resp, err := httpClient.Do(r)
404
if err != nil {
405
log.Error().Err(err).Msgf("Failed to proxy request to %s", r.URL.String())
406
http.Error(w, fmt.Sprintf("Failed to proxy request to %s, err: %v", r.URL.String(), err), http.StatusBadGateway)
@@ -642,7 +642,7 @@ func handleSDKConnect(data js.Value) {
642
log.Debug().Str("original", leaseName).Str("normalized", normalizedLeaseName).Msg("[SDK Connect] Normalized lease name")
643
644
// Lookup lease by name to get lease ID
645
- lease, err := rdClient.LookupName(normalizedLeaseName)
645
+ lease, err := client.LookupName(normalizedLeaseName)
646
if err != nil {
647
log.Error().Err(err).Str("leaseName", leaseName).Msg("[SDK Connect] Lease lookup failed")
648
js.Global().Call("__sdk_post_message", map[string]interface{}{
@@ -658,7 +658,7 @@ func handleSDKConnect(data js.Value) {
658
659
// Create E2EE connection using SDK with lease ID
660
cred := sdk.NewCredential()
661
- conn, err := rdClient.Dial(cred, leaseID, "http/1.1")
661
+ conn, err := client.Dial(cred, leaseID, "http/1.1")
662
if err != nil {
663
log.Error().Err(err).Str("leaseID", leaseID).Msg("[SDK Connect] Failed")
664
@@ -849,14 +849,14 @@ func main() {
849
850
log.Info().Strs("servers", bootstrapServerList).Msg("Initializing RDClient with bootstrap servers from global variable")
851
852
- rdClient, err = sdk.NewClient(
852
+ client, err = sdk.NewClient(
853
sdk.WithBootstrapServers(bootstrapServerList),
854
sdk.WithDialer(WebSocketDialerJS()),
855
)
856
if err != nil {
857
panic(err)
858
}
859
- defer rdClient.Close()
859
+ defer client.Close()
860
861
// Initialize WebSocket manager
862
wsManager := NewWebSocketManager()