mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2024-12-12 16:50:28 +01:00
a483bd9e38
* 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{}
324 lines
7.5 KiB
Go
324 lines
7.5 KiB
Go
// GoToSocial
|
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package delivery
|
|
|
|
import (
|
|
"context"
|
|
"slices"
|
|
"time"
|
|
|
|
"codeberg.org/gruf/go-runners"
|
|
"codeberg.org/gruf/go-structr"
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
|
|
"github.com/superseriousbusiness/gotosocial/internal/httpclient"
|
|
"github.com/superseriousbusiness/gotosocial/internal/log"
|
|
"github.com/superseriousbusiness/gotosocial/internal/queue"
|
|
)
|
|
|
|
// Delivery wraps an httpclient.Request{}
|
|
// to add ActivityPub ID IRI fields of the
|
|
// outgoing activity, so that deliveries may
|
|
// be indexed (and so, dropped from queue)
|
|
// by any of these possible ID IRIs.
|
|
type Delivery struct {
|
|
|
|
// ActorID contains the ActivityPub
|
|
// actor ID IRI (if any) of the activity
|
|
// being sent out by this request.
|
|
ActorID string
|
|
|
|
// ObjectID contains the ActivityPub
|
|
// object ID IRI (if any) of the activity
|
|
// being sent out by this request.
|
|
ObjectID string
|
|
|
|
// TargetID contains the ActivityPub
|
|
// target ID IRI (if any) of the activity
|
|
// being sent out by this request.
|
|
TargetID string
|
|
|
|
// Request is the prepared (+ wrapped)
|
|
// httpclient.Client{} request that
|
|
// constitutes this ActivtyPub delivery.
|
|
Request httpclient.Request
|
|
|
|
// internal fields.
|
|
next time.Time
|
|
}
|
|
|
|
func (dlv *Delivery) backoff() time.Duration {
|
|
if dlv.next.IsZero() {
|
|
return 0
|
|
}
|
|
return time.Until(dlv.next)
|
|
}
|
|
|
|
// WorkerPool wraps multiple Worker{}s in
|
|
// a singular struct for easy multi start/stop.
|
|
type WorkerPool struct {
|
|
|
|
// Client defines httpclient.Client{}
|
|
// passed to each of delivery pool Worker{}s.
|
|
Client *httpclient.Client
|
|
|
|
// Queue is the embedded queue.StructQueue{}
|
|
// passed to each of delivery pool Worker{}s.
|
|
Queue queue.StructQueue[*Delivery]
|
|
|
|
// internal fields.
|
|
workers []*Worker
|
|
}
|
|
|
|
// Init will initialize the Worker{} pool
|
|
// with given http client, request queue to pull
|
|
// from and number of delivery workers to spawn.
|
|
func (p *WorkerPool) Init(client *httpclient.Client) {
|
|
p.Client = client
|
|
p.Queue.Init(structr.QueueConfig[*Delivery]{
|
|
Indices: []structr.IndexConfig{
|
|
{Fields: "ActorID", Multiple: true},
|
|
{Fields: "ObjectID", Multiple: true},
|
|
{Fields: "TargetID", Multiple: true},
|
|
},
|
|
})
|
|
}
|
|
|
|
// Start will attempt to start 'n' Worker{}s.
|
|
func (p *WorkerPool) Start(n int) (ok bool) {
|
|
if ok = (len(p.workers) == 0); ok {
|
|
p.workers = make([]*Worker, n)
|
|
for i := range p.workers {
|
|
p.workers[i] = new(Worker)
|
|
p.workers[i].Client = p.Client
|
|
p.workers[i].Queue = &p.Queue
|
|
ok = p.workers[i].Start() && ok
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
// Stop will attempt to stop contained Worker{}s.
|
|
func (p *WorkerPool) Stop() (ok bool) {
|
|
if ok = (len(p.workers) > 0); ok {
|
|
for i := range p.workers {
|
|
ok = p.workers[i].Stop() && ok
|
|
p.workers[i] = nil
|
|
}
|
|
p.workers = p.workers[:0]
|
|
}
|
|
return
|
|
}
|
|
|
|
// Worker wraps an httpclient.Client{} to feed
|
|
// from queue.StructQueue{} for ActivityPub reqs
|
|
// to deliver. It does so while prioritizing new
|
|
// queued requests over backlogged retries.
|
|
type Worker struct {
|
|
|
|
// Client is the httpclient.Client{} that
|
|
// delivery worker will use for requests.
|
|
Client *httpclient.Client
|
|
|
|
// Queue is the Delivery{} message queue
|
|
// that delivery worker will feed from.
|
|
Queue *queue.StructQueue[*Delivery]
|
|
|
|
// internal fields.
|
|
backlog []*Delivery
|
|
service runners.Service
|
|
}
|
|
|
|
// Start will attempt to start the Worker{}.
|
|
func (w *Worker) Start() bool {
|
|
return w.service.GoRun(w.run)
|
|
}
|
|
|
|
// Stop will attempt to stop the Worker{}.
|
|
func (w *Worker) Stop() bool {
|
|
return w.service.Stop()
|
|
}
|
|
|
|
// run wraps process to restart on any panic.
|
|
func (w *Worker) run(ctx context.Context) {
|
|
if w.Client == nil || w.Queue == nil {
|
|
panic("not yet initialized")
|
|
}
|
|
log.Infof(ctx, "%p: started delivery worker", w)
|
|
defer log.Infof(ctx, "%p: stopped delivery worker", w)
|
|
for returned := false; !returned; {
|
|
func() {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
log.Errorf(ctx, "recovered panic: %v", r)
|
|
}
|
|
}()
|
|
w.process(ctx)
|
|
returned = true
|
|
}()
|
|
}
|
|
}
|
|
|
|
// process is the main delivery worker processing routine.
|
|
func (w *Worker) process(ctx context.Context) {
|
|
if w.Client == nil || w.Queue == nil {
|
|
// we perform this check here just
|
|
// to ensure the compiler knows these
|
|
// variables aren't nil in the loop,
|
|
// even if already checked by caller.
|
|
panic("not yet initialized")
|
|
}
|
|
|
|
loop:
|
|
for {
|
|
// Get next delivery.
|
|
dlv, ok := w.next(ctx)
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
// Check whether backoff required.
|
|
const min = 100 * time.Millisecond
|
|
if d := dlv.backoff(); d > min {
|
|
|
|
// Start backoff sleep timer.
|
|
backoff := time.NewTimer(d)
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
// Main ctx
|
|
// cancelled.
|
|
backoff.Stop()
|
|
return
|
|
|
|
case <-w.Queue.Wait():
|
|
// A new message was
|
|
// queued, re-add this
|
|
// to backlog + retry.
|
|
w.pushBacklog(dlv)
|
|
backoff.Stop()
|
|
continue loop
|
|
|
|
case <-backoff.C:
|
|
// success!
|
|
}
|
|
}
|
|
|
|
// Attempt delivery of AP request.
|
|
rsp, retry, err := w.Client.DoOnce(
|
|
&dlv.Request,
|
|
)
|
|
|
|
if err == nil {
|
|
// Ensure body closed.
|
|
_ = rsp.Body.Close()
|
|
continue loop
|
|
}
|
|
|
|
if !retry {
|
|
// Drop deliveries when no
|
|
// retry requested, or they
|
|
// reached max (either).
|
|
continue loop
|
|
}
|
|
|
|
// Determine next delivery attempt.
|
|
backoff := dlv.Request.BackOff()
|
|
dlv.next = time.Now().Add(backoff)
|
|
|
|
// Push to backlog.
|
|
w.pushBacklog(dlv)
|
|
}
|
|
}
|
|
|
|
// next gets the next available delivery, blocking until available if necessary.
|
|
func (w *Worker) next(ctx context.Context) (*Delivery, bool) {
|
|
loop:
|
|
for {
|
|
// Try pop next queued.
|
|
dlv, ok := w.Queue.Pop()
|
|
|
|
if !ok {
|
|
// Check the backlog.
|
|
if len(w.backlog) > 0 {
|
|
|
|
// Sort by 'next' time.
|
|
sortDeliveries(w.backlog)
|
|
|
|
// Pop next delivery.
|
|
dlv := w.popBacklog()
|
|
|
|
return dlv, true
|
|
}
|
|
|
|
select {
|
|
// Backlog is empty, we MUST
|
|
// block until next enqueued.
|
|
case <-w.Queue.Wait():
|
|
continue loop
|
|
|
|
// Worker was stopped.
|
|
case <-ctx.Done():
|
|
return nil, false
|
|
}
|
|
}
|
|
|
|
// Replace request context for worker state canceling.
|
|
ctx := gtscontext.WithValues(ctx, dlv.Request.Context())
|
|
dlv.Request.Request = dlv.Request.Request.WithContext(ctx)
|
|
|
|
return dlv, true
|
|
}
|
|
}
|
|
|
|
// popBacklog pops next available from the backlog.
|
|
func (w *Worker) popBacklog() *Delivery {
|
|
if len(w.backlog) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// Pop from backlog.
|
|
dlv := w.backlog[0]
|
|
|
|
// Shift backlog down by one.
|
|
copy(w.backlog, w.backlog[1:])
|
|
w.backlog = w.backlog[:len(w.backlog)-1]
|
|
|
|
return dlv
|
|
}
|
|
|
|
// pushBacklog pushes the given delivery to backlog.
|
|
func (w *Worker) pushBacklog(dlv *Delivery) {
|
|
w.backlog = append(w.backlog, dlv)
|
|
}
|
|
|
|
// sortDeliveries sorts deliveries according
|
|
// to when is the first requiring re-attempt.
|
|
func sortDeliveries(d []*Delivery) {
|
|
slices.SortFunc(d, func(a, b *Delivery) int {
|
|
const k = +1
|
|
switch {
|
|
case a.next.Before(b.next):
|
|
return +k
|
|
case b.next.Before(a.next):
|
|
return -k
|
|
default:
|
|
return 0
|
|
}
|
|
})
|
|
}
|