Skip to content

rainbow: improve proxy errors, and use atclient #1359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bnewbold wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

rainbow: improve proxy errors, and use atclient #1359

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7676728
rainbow: better basic relay requestCrawl proxy error msg
bnewbold Mar 14, 2026
20036de
rainbow: switch to atclient; and pass back relay errors verbatim
bnewbold Mar 14, 2026
09c3aef
rainbow: log requestCrawl proxy failures
bnewbold Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions splitter/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/url"

comatproto "github.com/bluesky-social/indigo/api/atproto"
"github.com/bluesky-social/indigo/xrpc"
"github.com/bluesky-social/indigo/atproto/atclient"

"github.com/labstack/echo/v4"
)
Expand Down Expand Up @@ -42,26 +42,30 @@ func (s *Splitter) HandleComAtprotoSyncRequestCrawl(c echo.Context) error {
ctx := c.Request().Context()
var body comatproto.SyncRequestCrawl_Input
if err := c.Bind(&body); err != nil {
return c.JSON(http.StatusBadRequest, xrpc.XRPCError{ErrStr: "BadRequest", Message: fmt.Sprintf("invalid body: %s", err)})
return c.JSON(http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("invalid body: %s", err)})
}
if body.Hostname == "" {
return c.JSON(http.StatusBadRequest, xrpc.XRPCError{ErrStr: "BadRequest", Message: "must include a hostname"})
return c.JSON(http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "must include a hostname"})
}

// first forward to the upstream
xrpcc := xrpc.Client{
Client: s.upstreamClient,
Host: s.conf.UpstreamHostHTTP(),
UserAgent: &s.conf.UserAgent,
client := &atclient.APIClient{
Client: s.upstreamClient,
Host: s.conf.UpstreamHostHTTP(),
Headers: map[string][]string{
"User-Agent": []string{s.conf.UserAgent},
},
}

err := comatproto.SyncRequestCrawl(ctx, &xrpcc, &body)
err := comatproto.SyncRequestCrawl(ctx, client, &body)
if err != nil {
httpError, ok := err.(*xrpc.Error)
s.logger.Warn("failed to proxy requestCrawl", "targetHost", body.Hostname, "err", err)
apiError, ok := err.(*atclient.APIError)
if ok {
return c.JSON(httpError.StatusCode, xrpc.XRPCError{ErrStr: "UpstreamError", Message: fmt.Sprintf("%s", httpError.Wrapped)})
// pass through the upstream error
return c.JSON(apiError.StatusCode, atclient.ErrorBody{Name: apiError.Message, Message: apiError.Message})
}
return c.JSON(http.StatusInternalServerError, xrpc.XRPCError{ErrStr: "ProxyRequestFailed", Message: fmt.Sprintf("failed forwarding request: %s", err)})
return c.JSON(http.StatusBadGateway, atclient.ErrorBody{Name: "ProxyRequestFailed", Message: "could not connect to relay instance"})
}

// if that was successful, then forward on to the other upstreams (in goroutines)
Expand All @@ -71,11 +75,14 @@ func (s *Splitter) HandleComAtprotoSyncRequestCrawl(c echo.Context) error {
go func() {
// new context to outlive original HTTP request
ctx := context.Background()
xrpcc := xrpc.Client{
client := &atclient.APIClient{
Client: s.peerClient,
Host: crawler,
Headers: map[string][]string{
"User-Agent": []string{s.conf.UserAgent},
},
}
if err := comatproto.SyncRequestCrawl(ctx, &xrpcc, &body); err != nil {
if err := comatproto.SyncRequestCrawl(ctx, client, &body); err != nil {
s.logger.Warn("failed to forward requestCrawl", "crawler", crawler, "targetHost", body.Hostname, "err", err)
} else {
s.logger.Info("successfully forwarded requestCrawl", "crawler", crawler, "targetHost", body.Hostname)
Expand Down Expand Up @@ -115,7 +122,7 @@ func (s *Splitter) ProxyRequest(c echo.Context, hostname, scheme string) error {
upstreamReq, err := http.NewRequest(req.Method, u.String(), req.Body)
if err != nil {
s.logger.Warn("proxy request failed", "err", err)
return c.JSON(http.StatusBadRequest, xrpc.XRPCError{ErrStr: "BadRequest", Message: "failed to proxy to upstream relay"})
return c.JSON(http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "failed to proxy to upstream relay"})
}

// copy subset of request headers
Expand All @@ -128,7 +135,7 @@ func (s *Splitter) ProxyRequest(c echo.Context, hostname, scheme string) error {

upstreamResp, err := s.upstreamClient.Do(upstreamReq)
if err != nil {
return c.JSON(http.StatusBadRequest, xrpc.XRPCError{ErrStr: "BadRequest", Message: "failed to proxy to upstream relay"})
return c.JSON(http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "failed to proxy to upstream relay"})
}
defer upstreamResp.Body.Close()

Expand Down
Loading