idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 00:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(download-clients): porla implement rules (#711)

Browse source 
* feat(downloadclients): Porla implement rules

* feat(downloadclients): Porla add basic auth support

* feat(porla): use new token for auth

* feat(porla): update check can download rules
This commit is contained in:
ze0s 2023-02-24 19:17:02 +01:00 • committed by GitHub
parent 209e23de4f
commit d100703784
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 248 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

46
pkg/jsonrpc/jsonrpc.go
View file

@ -2,6 +2,7 @@ package jsonrpc
import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
@ -13,6 +14,7 @@ import (
type Client interface {
Call(method string, params ...interface{}) (*RPCResponse, error)
CallCtx(ctx context.Context, method string, params ...interface{}) (*RPCResponse, error)
}
type RPCRequest struct {
@ -61,11 +63,23 @@ type rpcClient struct {
endpoint string
httpClient *http.Client
headers map[string]string
// HTTP Basic auth username
basicUser string
// HTTP Basic auth password
basicPass string
}
type ClientOpts struct {
HTTPClient *http.Client
Headers map[string]string
// HTTP Basic auth username
BasicUser string
// HTTP Basic auth password
BasicPass string
}
type RPCResponses []*RPCResponse
@ -95,6 +109,9 @@ func NewClientWithOpts(endpoint string, opts *ClientOpts) Client {
}
}
c.basicUser = opts.BasicUser
c.basicPass = opts.BasicPass
return c
}
@ -106,22 +123,38 @@ func (c *rpcClient) Call(method string, params ...interface{}) (*RPCResponse, er
Params: Params(params...),
}
return c.doCall(request)
return c.doCall(context.TODO(), request)
}
func (c *rpcClient) newRequest(req interface{}) (*http.Request, error) {
func (c *rpcClient) CallCtx(ctx context.Context, method string, params ...interface{}) (*RPCResponse, error) {
request := RPCRequest{
ID: 1,
JsonRPC: "2.0",
Method: method,
Params: Params(params...),
}
return c.doCall(ctx, request)
}
func (c *rpcClient) newRequest(ctx context.Context, req interface{}) (*http.Request, error) {
body, err := json.Marshal(req)
if err != nil {
return nil, errors.Wrap(err, "could not marshal request")
}
request, err := http.NewRequest("POST", c.endpoint, bytes.NewReader(body))
request, err := http.NewRequestWithContext(ctx, "POST", c.endpoint, bytes.NewReader(body))
if err != nil {
return nil, errors.Wrap(err, "error creating request")
}
request.Header.Set("Content-Type", "application/json")
request.Header.Set("Accept", "application/json")
// set basic auth
if c.basicUser != "" && c.basicPass != "" {
request.SetBasicAuth(c.basicUser, c.basicPass)
}
for k, v := range c.headers {
request.Header.Set(k, v)
}
@ -129,9 +162,9 @@ func (c *rpcClient) newRequest(req interface{}) (*http.Request, error) {
return request, nil
}
func (c *rpcClient) doCall(request RPCRequest) (*RPCResponse, error) {
func (c *rpcClient) doCall(ctx context.Context, request RPCRequest) (*RPCResponse, error) {
httpRequest, err := c.newRequest(request)
httpRequest, err := c.newRequest(ctx, request)
if err != nil {
return nil, errors.Wrap(err, "could not create rpc http request")
}
@ -225,8 +258,7 @@ func (r *RPCResponse) GetObject(toType interface{}) error {
return errors.Wrap(err, "could not marshal object")
}
err = json.Unmarshal(js, toType)
if err != nil {
if err = json.Unmarshal(js, toType); err != nil {
return errors.Wrap(err, "could not unmarshal object")
}