diff --git a/agent/internal/publichttp/disconnect_test.go b/agent/internal/publichttp/disconnect_test.go new file mode 100644 index 000000000..0414de63d --- /dev/null +++ b/agent/internal/publichttp/disconnect_test.go @@ -0,0 +1,35 @@ +package publichttp + +import ( + "context" + "net/http" + "net/http/httptest" + "testing" + + "github.com/muxable/rtchat/agent/internal/webhook" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" +) + +// The app's WebView aborts /embed when the preview closes or switches +// channel. The provider lookup then fails at once on the canceled request; +// a caller that left is not a server failure. +func TestEmbedAbortedByClientIsNotAnError(t *testing.T) { + core, logs := observer.New(zap.InfoLevel) + defer zap.ReplaceGlobals(zap.New(core))() + s, _, mux := fixture() + s.HTTP = &http.Client{Transport: transport(func(r *http.Request) (*http.Response, error) { + if err := r.Context().Err(); err != nil { + return nil, err + } + return response(200, `{"data":[{"id":"1","login":"streamer"}]}`), nil + })} + ctx, hangUp := context.WithCancel(context.Background()) + hangUp() + request := httptest.NewRequestWithContext(ctx, http.MethodGet, "/embed?provider=twitch&channelId=1", nil) + webhook.LoggingMiddleware(mux).ServeHTTP(httptest.NewRecorder(), request) + entries := logs.FilterMessage("http request").All() + if len(entries) != 1 || entries[0].Level != zap.InfoLevel || entries[0].ContextMap()["status"] != int64(499) { + t.Fatalf("aborted embed logged as %v", entries) + } +} diff --git a/agent/internal/webhook/server.go b/agent/internal/webhook/server.go index 2f3af7f86..1337c414d 100644 --- a/agent/internal/webhook/server.go +++ b/agent/internal/webhook/server.go @@ -1,6 +1,8 @@ package webhook import ( + "context" + "errors" "net/http" "sync" "sync/atomic" @@ -73,6 +75,11 @@ func LoggingMiddleware(next http.Handler) http.Handler { start := time.Now() writer := &statusWriter{ResponseWriter: w, status: http.StatusOK} next.ServeHTTP(writer, r) + // A caller that hung up cancels every downstream call, so whatever the + // handler wrote describes the hang-up, not the server. + if errors.Is(r.Context().Err(), context.Canceled) { + writer.status = 499 + } level := zap.InfoLevel if writer.status >= 500 { level = zap.ErrorLevel