Check provider online status just before it is used

Author: wille

internal/endpoint.go

@@ -26,21 +26,6 @@ type Endpoint struct {
 	AddXForwardedHeaders bool `yaml:"add_xfwd_headers,omitempty"`
 }
 
-// GetActiveProviders returns a list of providers that are currently considered online
-func (p *Endpoint) GetActiveProviders() []*Provider {
-	var active []*Provider
-
-	for _, e := range p.Providers {
-		if !e.online {
-			continue
-		}
-
-		active = append(active, e)
-	}
-
-	return active
-}
-
 func (e *Endpoint) HTTPHealthcheck(provider *Provider) error {
 	// TODO move to healthcheck loop
 	if provider.IsRateLimited() {

internal/http.go

@@ -26,9 +26,11 @@ var defaultClient = &http.Client{
 }
 
 func ProxyHTTP(ctx context.Context, endpoint *Endpoint, req *rpc.BatchRequest, timing *servertiming.Header) (*rpc.BatchResponse, *Provider, error) {
-	providers := endpoint.GetActiveProviders()
+	for _, provider := range endpoint.Providers {
+		if !provider.online {
+			continue
+		}
 
-	for _, provider := range providers {
 		m := timing.NewMetric(provider.Name).Start()
 		res, err := SendHTTPRPCRequest(ctx, provider, req)
 		m.Stop()

internal/provider_test.go

@@ -43,8 +43,9 @@ func TestInvalidChainID(t *testing.T) {
 	assert.Contains(t, err.Error(), "chainId mismatch")
 
 	// Verify no active endpoints are returned
-	active := provider.GetActiveProviders()
-	assert.Empty(t, active)
+	for _, p := range provider.Providers {
+		assert.False(t, p.online)
+	}
 }
 
 // TestRateLimitWithRetryAfter tests connecting to a provider that returns a 429 rate limit with retry-after header
@@ -85,8 +86,9 @@ func TestRateLimitWithRetryAfter(t *testing.T) {
 	assert.True(t, provider.Providers[0].retryAt.Before(time.Now().Add(30*time.Second)))
 
 	// Verify endpoint is not returned as active during rate limiting
-	active := provider.GetActiveProviders()
-	assert.Empty(t, active)
+	for _, p := range provider.Providers {
+		assert.False(t, p.online)
+	}
 }
 
 // TestSlowProvider tests connecting to a provider that is slow to respond

internal/ws.go

@@ -272,14 +272,18 @@ func (proxy *WebSocketProxy) pumpClient(client *Client) {
 }
 
 // DialAnyProvider dials any provider and returns a WebSocketProxy
-func (proxy *WebSocketProxy) DialAnyProvider(provider *Endpoint, timing *servertiming.Header) (*Provider, error) {
-	for _, endpoint := range provider.GetActiveProviders() {
-		if endpoint.Ws == "" {
+func (proxy *WebSocketProxy) DialAnyProvider(e *Endpoint, timing *servertiming.Header) (*Provider, error) {
+	for _, p := range e.Providers {
+		if p.Ws == "" {
 			continue
 		}
 
-		m := timing.NewMetric(endpoint.Name).Start()
-		err := proxy.DialProvider(provider, endpoint)
+		if !p.online {
+			continue
+		}
+
+		m := timing.NewMetric(p.Name).Start()
+		err := proxy.DialProvider(e, p)
 		m.Stop()
 
 		// In case the request was closed before the provider connection was established
@@ -294,13 +298,13 @@ func (proxy *WebSocketProxy) DialAnyProvider(provider *Endpoint, timing *servert
 		}
 
 		if err != nil {
-			endpoint.SetStatus(false, err)
+			p.SetStatus(false, err)
 			continue
 		}
 
-		endpoint.SetStatus(true, nil)
+		p.SetStatus(true, nil)
 
-		return endpoint, nil
+		return p, nil
 	}
 
 	return nil, ErrNoProvidersAvailable