mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 00:39:13 +00:00
refactor(http): implement shared transport and clients (#1288)
* fix(http): flip to a shared transport and clients * nice threads * that is terrible * fake uri for magnet * lazy locking * why bother with r's * flip magic params to struct * refactor(http-clients): use separate clients with shared transport * refactor(http-clients): add missing license header * refactor(http-clients): defer and fix errors --------- Co-authored-by: ze0s <ze0s@riseup.net>
This commit is contained in:
parent
2a4fb7750b
commit
3234f0d919
48 changed files with 537 additions and 391 deletions
|
@ -1,6 +1,8 @@
|
|||
// Copyright (c) 2021 - 2023, Ludvig Lundgren and the autobrr contributors.
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//go:build integration
|
||||
|
||||
package btn
|
||||
|
||||
import (
|
||||
|
@ -14,9 +16,8 @@ import (
|
|||
|
||||
"github.com/autobrr/autobrr/internal/domain"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestAPI(t *testing.T) {
|
||||
|
@ -67,7 +68,7 @@ func TestAPI(t *testing.T) {
|
|||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
c := NewClient(tt.fields.Url, tt.fields.APIKey)
|
||||
c := NewClient(tt.fields.APIKey, WithUrl(ts.URL))
|
||||
|
||||
got, err := c.TestAPI(context.Background())
|
||||
if tt.wantErr && assert.Error(t, err) {
|
||||
|
@ -166,8 +167,7 @@ func TestClient_GetTorrentByID(t *testing.T) {
|
|||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
|
||||
c := NewClient(tt.fields.Url, tt.fields.APIKey)
|
||||
c := NewClient(tt.fields.APIKey, WithUrl(ts.URL))
|
||||
|
||||
got, err := c.GetTorrentByID(context.Background(), tt.args.torrentID)
|
||||
if tt.wantErr && assert.Error(t, err) {
|
||||
|
|
|
@ -7,42 +7,61 @@ import (
|
|||
"context"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/autobrr/autobrr/internal/domain"
|
||||
"github.com/autobrr/autobrr/pkg/jsonrpc"
|
||||
"github.com/autobrr/autobrr/pkg/sharedhttp"
|
||||
|
||||
"golang.org/x/time/rate"
|
||||
)
|
||||
|
||||
const DefaultURL = "https://api.broadcasthe.net/"
|
||||
|
||||
type ApiClient interface {
|
||||
GetTorrentByID(ctx context.Context, torrentID string) (*domain.TorrentBasic, error)
|
||||
TestAPI(ctx context.Context) (bool, error)
|
||||
}
|
||||
|
||||
type OptFunc func(*Client)
|
||||
|
||||
func WithUrl(url string) OptFunc {
|
||||
return func(c *Client) {
|
||||
c.url = url
|
||||
}
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
rpcClient jsonrpc.Client
|
||||
Ratelimiter *rate.Limiter
|
||||
rateLimiter *rate.Limiter
|
||||
APIKey string
|
||||
url string
|
||||
|
||||
Log *log.Logger
|
||||
}
|
||||
|
||||
func NewClient(url string, apiKey string) ApiClient {
|
||||
if url == "" {
|
||||
url = "https://api.broadcasthe.net/"
|
||||
}
|
||||
|
||||
func NewClient(apiKey string, opts ...OptFunc) ApiClient {
|
||||
c := &Client{
|
||||
rpcClient: jsonrpc.NewClientWithOpts(url, &jsonrpc.ClientOpts{
|
||||
Headers: map[string]string{
|
||||
"User-Agent": "autobrr",
|
||||
},
|
||||
}),
|
||||
Ratelimiter: rate.NewLimiter(rate.Every(150*time.Hour), 1), // 150 rpcRequest every 1 hour
|
||||
url: DefaultURL,
|
||||
rateLimiter: rate.NewLimiter(rate.Every(150*time.Hour), 1), // 150 rpcRequest every 1 hour
|
||||
APIKey: apiKey,
|
||||
}
|
||||
|
||||
for _, opt := range opts {
|
||||
opt(c)
|
||||
}
|
||||
|
||||
c.rpcClient = jsonrpc.NewClientWithOpts(c.url, &jsonrpc.ClientOpts{
|
||||
Headers: map[string]string{
|
||||
"User-Agent": "autobrr",
|
||||
},
|
||||
HTTPClient: &http.Client{
|
||||
Timeout: time.Second * 60,
|
||||
Transport: sharedhttp.Transport,
|
||||
},
|
||||
})
|
||||
|
||||
if c.Log == nil {
|
||||
c.Log = log.New(io.Discard, "", log.LstdFlags)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue