From a483bd9e38333b153df1d4df95276cca38f99ff5 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:45:35 +0100 Subject: [performance] massively improved ActivityPub delivery worker efficiency (#2812) * add delivery worker type that pulls from queue to httpclient package * finish up some code commenting, bodge a vendored activity library change, integrate the deliverypool changes into transportcontroller * hook up queue deletion logic * support deleting queued http requests by target ID * don't index APRequest by hostname in the queue * use gorun * use the original context's values when wrapping msg type as delivery{} * actually log in the AP delivery worker ... * add uncommitted changes * use errors.AsV2() * use errorsv2.AsV2() * finish adding some code comments, add bad host handling to delivery workers * slightly tweak deliveryworkerpool API, use advanced sender multiplier * remove PopCtx() method, let others instead rely on Wait() * shuffle things around to move delivery stuff into transport/ subpkg * remove dead code * formatting * validate request before queueing for delivery * finish adding code comments, fix up backoff code * finish adding more code comments * clamp minimum no. senders to 1 * add start/stop logging to delivery worker, some slight changes * remove double logging * use worker ptrs * expose the embedded log fields in httpclient.Request{} * ensure request context values are preserved when updating ctx * add delivery worker tests * fix linter issues * ensure delivery worker gets inited in testrig * fix tests to delivering messages to check worker delivery queue * update error type to use ptr instead of value receiver * fix test calling Workers{}.Start() instead of testrig.StartWorkers() * update docs for advanced-sender-multiplier * update to the latest activity library version * add comment about not using httptest.Server{} --- internal/httpclient/validate.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'internal/httpclient/validate.go') diff --git a/internal/httpclient/validate.go b/internal/httpclient/validate.go index 881d3f699..5a6257288 100644 --- a/internal/httpclient/validate.go +++ b/internal/httpclient/validate.go @@ -38,7 +38,7 @@ func ValidateRequest(r *http.Request) error { return fmt.Errorf("%w: empty url host", ErrInvalidRequest) case r.URL.Scheme != "http" && r.URL.Scheme != "https": return fmt.Errorf("%w: unsupported protocol %q", ErrInvalidRequest, r.URL.Scheme) - case strings.IndexFunc(r.Method, func(r rune) bool { return !httpguts.IsTokenRune(r) }) != -1: + case strings.IndexFunc(r.Method, isNotTokenRune) != -1: return fmt.Errorf("%w: invalid method %q", ErrInvalidRequest, r.Method) } @@ -60,3 +60,8 @@ func ValidateRequest(r *http.Request) error { return nil } + +// isNotTokenRune wraps IsTokenRune to inverse result. +func isNotTokenRune(r rune) bool { + return !httpguts.IsTokenRune(r) +} -- cgit v1.2.3