readyz handler

Author: metachris

proxy/receiver_api.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"html/template"
 	"log/slog"
+	"net/http"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -81,12 +82,34 @@ func (prx *ReceiverProxy) UserJSONRPCHandler(maxRequestBodySizeBytes int64) (*rp
 			MaxRequestBodySizeBytes:          maxRequestBodySizeBytes,
 			VerifyRequestSignatureFromHeader: true,
 			GetResponseContent:               landingPageHTML,
+			ReadyHandler:                     prx.readyHandler,
 		},
 	)
 
 	return handler, err
 }
 
+// readyHandler is caalling /readyz on rbuilder
+func (prx *ReceiverProxy) readyHandler(w http.ResponseWriter, r *http.Request) error {
+	resp, err := http.Get(prx.localBuilderEndpoint + "/readyz")
+	if err != nil {
+		prx.Log.Warn("Failed to check builder readiness", slog.Any("error", err))
+		http.Error(w, "not ready", http.StatusServiceUnavailable)
+		return nil
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		http.Error(w, "not ready", http.StatusServiceUnavailable)
+		return nil
+	}
+
+	// If the builder is ready, return 200 OK
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte("ready"))
+	return nil
+}
+
 func (prx *ReceiverProxy) ValidateSigner(ctx context.Context, req *ParsedRequest, systemEndpoint bool) error {
 	req.signer = rpcserver.GetSigner(ctx)
 	if !systemEndpoint {

proxy/receiver_proxy.go

@@ -43,7 +43,8 @@ type ReceiverProxy struct {
 	PublicCertPEM   []byte
 	Certificate     tls.Certificate
 
-	localBuilder rpcclient.RPCClient
+	localBuilder         rpcclient.RPCClient
+	localBuilderEndpoint string
 
 	UserHandler   http.Handler
 	SystemHandler http.Handler
@@ -131,6 +132,7 @@ func NewReceiverProxy(config ReceiverProxyConfig) (*ReceiverProxy, error) {
 		PublicCertPEM:               cert,
 		Certificate:                 certificate,
 		localBuilder:                localBuilder,
+		localBuilderEndpoint:        config.LocalBuilderEndpoint,
 		requestUniqueKeysRLU:        expirable.NewLRU[uuid.UUID, struct{}](requestsRLUSize, nil, requestsRLUTTL),
 		replacementNonceRLU:         expirable.NewLRU[replacementNonceKey, int](replacementNonceSize, nil, replacementNonceTTL),
 		userAPIRateLimiter:          userAPIRateLimiter,

proxy/receiver_proxy_test.go

@@ -670,3 +670,20 @@ func TestValidateLocalBundles(t *testing.T) {
 
 	proxiesFlushQueue()
 }
+
+func TestJSONRPCServerReadyzOK(t *testing.T) {
+	tempDir := t.TempDir()
+	certPath := path.Join(tempDir, "cert")
+	keyPath := path.Join(tempDir, "key")
+	proxy, err := StartTestOrderflowProxy("1", certPath, keyPath)
+	require.NoError(t, err)
+
+	req := httptest.NewRequest(http.MethodGet, "/readyz", nil)
+
+	rr := httptest.NewRecorder()
+	proxy.localServer.Handler.ServeHTTP(rr, req)
+	respBody, err := io.ReadAll(rr.Body)
+	require.NoError(t, err)
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Contains(t, string(respBody), "ready")
+}