Update all, now a reasonably usable software.
This commit is contained in:
William Floyd
parent
95c057a9a0
commit
3fd4176664
GPG key ID:
B3EEEDD81893CAF9
15 changed files with 889 additions and 841 deletions
|
|
@ -1,11 +1,8 @@
|
|||
/bin/
|
||||
.env
|
||||
.gitignore
|
||||
*docker-compose.yaml
|
||||
/.git/
|
||||
*.env
|
||||
config.json
|
||||
config.yaml
|
||||
*docker-compose.yaml
|
||||
Dockerfile
|
||||
*.tmpl
|
||||
/data/
|
||||
/gluetun/
|
||||
/dockerdata/
|
||||
qbittorrent-multiplexer
|
||||
3
.env
Normal file
3
.env
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
VPN_SERVICE_NAME="vpn"
|
||||
TZ="America/Chicago"
|
||||
MULTIPLEXER_PORT=9956
|
||||
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -1,9 +1,3 @@
|
|||
/.env
|
||||
/qbittorrent-docker-multiplexer
|
||||
/config.json
|
||||
/config.yaml
|
||||
/data
|
||||
/*-docker-compose.yaml
|
||||
/dockerdata/
|
||||
/gluetun/
|
||||
/localdata/
|
||||
/qbittorrent-multiplexer
|
||||
|
|
@ -8,13 +8,13 @@ COPY . ./
|
|||
RUN \
|
||||
CGO_ENABLED=0 \
|
||||
GOOS=linux \
|
||||
go build -a -installsuffix cgo -o qbittorrent-docker-multiplexer .
|
||||
go build -a -installsuffix cgo -o qbittorrent-multiplexer .
|
||||
|
||||
FROM alpine:latest
|
||||
|
||||
WORKDIR /root
|
||||
|
||||
# Copy the binary from the builder stage
|
||||
COPY --from=builder /src/qbittorrent-docker-multiplexer .
|
||||
COPY --from=builder /src/qbittorrent-multiplexer .
|
||||
|
||||
ENTRYPOINT ["/root/qbittorrent-docker-multiplexer"]
|
||||
ENTRYPOINT ["/root/qbittorrent-multiplexer"]
|
||||
|
|
|
|||
59
config.go
59
config.go
|
|
@ -1,8 +1,13 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/W-Floyd/qbittorrent-docker-multiplexer/multiplexer"
|
||||
"github.com/W-Floyd/qbittorrent-docker-multiplexer/qbittorrent"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"sync"
|
||||
|
||||
"github.com/W-Floyd/qbittorrent-multiplexer/multiplexer"
|
||||
"github.com/W-Floyd/qbittorrent-multiplexer/qbittorrent"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
|
|
@ -11,8 +16,54 @@ type Config struct {
|
|||
}
|
||||
|
||||
func (c Config) Validate() (errs []error) {
|
||||
errs = append(errs, c.Multiplexer.Validate()...)
|
||||
errs = append(errs, c.QBittorrent.Validate()...)
|
||||
|
||||
g := sync.WaitGroup{}
|
||||
|
||||
errsChan := make(chan error)
|
||||
|
||||
g.Add(2)
|
||||
go func() {
|
||||
defer g.Done()
|
||||
for _, err := range c.Multiplexer.Validate() {
|
||||
errsChan <- err
|
||||
}
|
||||
}()
|
||||
go func() {
|
||||
defer g.Done()
|
||||
for _, err := range c.QBittorrent.Validate() {
|
||||
errsChan <- err
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
g.Wait()
|
||||
close(errsChan)
|
||||
}()
|
||||
|
||||
for err := range errsChan {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
|
||||
return errs
|
||||
}
|
||||
|
||||
func (c Config) Prime() (errs []error) {
|
||||
|
||||
r := &http.Request{
|
||||
URL: &url.URL{
|
||||
Path: "/api/v2/torrents/info",
|
||||
},
|
||||
}
|
||||
|
||||
resps := c.ParallelResponses(r, RequestOptions{
|
||||
Callback: &RequestCallbackTorrentInfoAdd,
|
||||
})
|
||||
|
||||
for _, resp := range resps {
|
||||
errs = append(errs, resp.errs...)
|
||||
}
|
||||
|
||||
log.Println("Torrent list primed")
|
||||
|
||||
return errs
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
name: ${COMPOSE_PROJECT_NAME}
|
||||
include:
|
||||
- vpn-docker-compose.yaml
|
||||
- qbittorrent-docker-compose.yaml
|
||||
# services:
|
||||
# qbittorrent-docker-multiplexer:
|
||||
# container_name: qbittorrent-docker-multiplexer
|
||||
# build: .
|
||||
# network_mode: "container:${VPN_SERVICE_NAME}"
|
||||
# environment:
|
||||
# COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME}
|
||||
# QBITTORRENT_SECRETSEED: ${QBITTORRENT_SECRETSEED}
|
||||
# MULTIPLEXER_SECRET: ${MULTIPLEXER_SECRET}
|
||||
# MULTIPLEXER_PORT: ${MULTIPLEXER_PORT}
|
||||
# volumes:
|
||||
# # This allows spawning qBittorrent containers on demand
|
||||
# - /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
# # Template files
|
||||
# - ./qbittorrent.conf.tmpl:/config/qbittorrent.conf.tmpl
|
||||
# - ./docker-compose.yaml.tmpl:/config/docker-compose.yaml.tmpl
|
||||
# # State files (so we re-spawn containers as needed)
|
||||
# - ./data/:/data/
|
||||
# develop:
|
||||
# watch:
|
||||
# - action: rebuild
|
||||
# path: ./
|
||||
services:
|
||||
qbittorrent-multiplexer:
|
||||
container_name: qbittorrent-multiplexer
|
||||
network_mode: "container:${VPN_SERVICE_NAME}"
|
||||
environment:
|
||||
COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME}
|
||||
MULTIPLEXER_PORT: ${MULTIPLEXER_PORT}
|
||||
volumes:
|
||||
- ./config.yaml:/config/config.yaml
|
||||
build: .
|
||||
develop:
|
||||
watch:
|
||||
- action: rebuild
|
||||
path: ./
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
QBITTORRENT_SECRETSEED="shifty-sincerity-customize-subtract-suspense-unrushed-lullaby-protegee"
|
||||
MULTIPLEXER_SECRET="ironic-coastal-pastrami-chivalry-hydroxide-murkiness-equinox-dollop"
|
||||
7
go.mod
7
go.mod
|
|
@ -1,19 +1,16 @@
|
|||
module github.com/W-Floyd/qbittorrent-docker-multiplexer
|
||||
module github.com/W-Floyd/qbittorrent-multiplexer
|
||||
|
||||
go 1.23.4
|
||||
|
||||
require (
|
||||
github.com/Jeffail/gabs/v2 v2.7.0
|
||||
github.com/gorilla/mux v1.8.1
|
||||
github.com/leosunmo/zapchi v0.2.0
|
||||
github.com/motemen/go-loghttp v0.0.0-20231107055348-29ae44b293f4
|
||||
github.com/motemen/go-nuts v0.0.0-20220604134737-2658d0104f31
|
||||
github.com/omeid/uconfig v0.7.0
|
||||
go.uber.org/zap v1.27.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/go-chi/chi/v5 v5.2.1 // indirect
|
||||
github.com/google/go-cmp v0.6.0 // indirect
|
||||
github.com/kr/pretty v0.3.1 // indirect
|
||||
github.com/rogpeppe/go-internal v1.13.1 // indirect
|
||||
|
|
|
|||
386
go.sum
386
go.sum
|
|
@ -1,118 +1,12 @@
|
|||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
|
||||
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
|
||||
cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
|
||||
cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
|
||||
cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
|
||||
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
|
||||
cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
|
||||
cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
|
||||
cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
|
||||
cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
|
||||
cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
|
||||
cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
|
||||
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
|
||||
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
|
||||
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
|
||||
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
|
||||
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
|
||||
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
|
||||
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
|
||||
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
|
||||
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
|
||||
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
|
||||
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
|
||||
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
|
||||
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
|
||||
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
|
||||
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
|
||||
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
|
||||
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
|
||||
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
|
||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/Jeffail/gabs/v2 v2.7.0 h1:Y2edYaTcE8ZpRsR2AtmPu5xQdFDIthFG0jYhu5PY8kg=
|
||||
github.com/Jeffail/gabs/v2 v2.7.0/go.mod h1:dp5ocw1FvBBQYssgHsG7I1WYsiLRtkUaB1FEtSwvNUw=
|
||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
|
||||
github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
|
||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
|
||||
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
||||
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
||||
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
||||
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
|
||||
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
|
||||
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
|
||||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
||||
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
||||
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
||||
github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
||||
github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
||||
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
||||
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
||||
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
|
||||
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
|
|
@ -120,302 +14,26 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
|||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/leosunmo/zapchi v0.2.0 h1:BSX9FIcPbgVBgMgVBAfN0CrLWv012tjFcqSTfDDUYyY=
|
||||
github.com/leosunmo/zapchi v0.2.0/go.mod h1:SWyRMhaEvYcIG1Y/6rJ3nGW7Vlz71HnNtCQlRxm5ZcA=
|
||||
github.com/motemen/go-loghttp v0.0.0-20231107055348-29ae44b293f4 h1:WLWwzjax2/L5NAQul9bdk1EAP0+YGnAzJBJ/LzL8Dgs=
|
||||
github.com/motemen/go-loghttp v0.0.0-20231107055348-29ae44b293f4/go.mod h1:ykaRC7b5xKciHTUFZ60bbsOojQAkCmmehBNbBWeIz1Y=
|
||||
github.com/motemen/go-nuts v0.0.0-20220604134737-2658d0104f31 h1:lQ+0Zt2gm+w5+9iaBWKdJXC/gMrWjHhNbw9ts/9rSZ4=
|
||||
github.com/motemen/go-nuts v0.0.0-20220604134737-2658d0104f31/go.mod h1:vkBO+XDNzovo+YLBpUod2SFvuWLObXlERnfj99RP3rU=
|
||||
github.com/omeid/uconfig v0.7.0 h1:aoNKjAANazU0LbV5EqvzUlqVW8n4ML7W0qe2UUhwtYQ=
|
||||
github.com/omeid/uconfig v0.7.0/go.mod h1:aZqGvjN8OcabCs19rqF1CnILm9+jWohUNF/MABA29JM=
|
||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
|
||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
|
||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
|
||||
go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
|
||||
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
|
||||
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
|
||||
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
|
||||
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
||||
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
||||
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
||||
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
|
||||
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
|
||||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
|
||||
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
|
||||
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
||||
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
||||
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
|
||||
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
|
||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
||||
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
|
||||
golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
|
||||
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
||||
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
||||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
||||
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
||||
google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
|
||||
google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
|
||||
google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
|
||||
google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
||||
google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
||||
google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
||||
google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
||||
google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
||||
google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
|
||||
google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
|
||||
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
|
||||
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
|
||||
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
|
||||
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
|
||||
google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
|
||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||
google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
|
||||
google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
|
||||
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
|
||||
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
|
||||
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
|
||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
|
||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
||||
|
|
|
|||
864
handlers.go
864
handlers.go
|
|
@ -1,27 +1,191 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/W-Floyd/qbittorrent-docker-multiplexer/qbittorrent"
|
||||
"github.com/Jeffail/gabs/v2"
|
||||
"github.com/W-Floyd/qbittorrent-multiplexer/qbittorrent"
|
||||
)
|
||||
|
||||
type MergeOptions struct {
|
||||
CollisionFn *func(dest, source interface{}) interface{}
|
||||
EntryTransformer *func(c *Config, entry *gabs.Container) *gabs.Container
|
||||
OutputTransformer *func(c *Config, cont *gabs.Container) *gabs.Container
|
||||
RootIsArray bool
|
||||
ArraySortFn *func(a, b *gabs.Container) int
|
||||
}
|
||||
|
||||
type RequestOptions struct {
|
||||
Filter *func(c *Config, r *http.Request) bool // Returns true if request should be made
|
||||
Callback *func(c *Config, resp *http.Response) error // Is called on each response
|
||||
}
|
||||
|
||||
var (
|
||||
Statistics = map[*qbittorrent.Instance]struct {
|
||||
AlltimeDl *float64
|
||||
AlltimeUl *float64
|
||||
}{}
|
||||
|
||||
CollisionReplace = func(dest, source interface{}) interface{} {
|
||||
destArr, destIsArray := dest.([]interface{})
|
||||
sourceArr, sourceIsArray := source.([]interface{})
|
||||
if destIsArray {
|
||||
if sourceIsArray {
|
||||
return append(destArr, sourceArr...)
|
||||
}
|
||||
return append(destArr, source)
|
||||
}
|
||||
if sourceIsArray {
|
||||
return append(append([]interface{}{}, dest), sourceArr...)
|
||||
}
|
||||
return source
|
||||
}
|
||||
OutputTransformerTorrents = func(c *Config, cont *gabs.Container) *gabs.Container {
|
||||
for _, child := range cont.Data().([]*gabs.Container) {
|
||||
for _, key := range c.Multiplexer.Format.Info.RemoveFields {
|
||||
child.DeleteP(key)
|
||||
}
|
||||
}
|
||||
return cont
|
||||
}
|
||||
RequestCallbackTryAllCacheHash = func(c *Config, resp *http.Response) (err error) {
|
||||
if resp.Request.Form.Has("hash") {
|
||||
if resp.StatusCode == http.StatusOK {
|
||||
hash := qbittorrent.Hash(resp.Request.Form.Get("hash"))
|
||||
if hash == "" {
|
||||
return errors.New("empty hash when inspecting form")
|
||||
}
|
||||
instance := resp.Request.Context().Value(qbittorrent.ContextKeyInstance).(*qbittorrent.Instance)
|
||||
if instance == nil {
|
||||
return errors.New("empty instance when inspecting context")
|
||||
}
|
||||
qbittorrent.Locks.Torrents.Lock()
|
||||
defer qbittorrent.Locks.Torrents.Unlock()
|
||||
if torrentInstance, ok := qbittorrent.Torrents[hash]; ok {
|
||||
if instance != torrentInstance {
|
||||
log.Println("Updating hash to point to ", instance.URL.Host)
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
qbittorrent.Torrents[hash] = instance
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return errors.New("no hash field in form")
|
||||
}
|
||||
RequestFilterOnHash = func(c *Config, r *http.Request) bool {
|
||||
if r.Form.Has("hash") {
|
||||
hash := qbittorrent.Hash(r.Form.Get("hash"))
|
||||
if hash == "" {
|
||||
return true
|
||||
}
|
||||
qbittorrent.Locks.Torrents.Lock()
|
||||
defer qbittorrent.Locks.Torrents.Unlock()
|
||||
if instance, ok := qbittorrent.Torrents[hash]; ok {
|
||||
requestInstance := r.Context().Value(qbittorrent.ContextKeyInstance).(*qbittorrent.Instance)
|
||||
return instance == requestInstance
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
RequestCallbackTorrentInfoAdd = func(c *Config, resp *http.Response) error {
|
||||
|
||||
bodyBytes, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
resp.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
|
||||
|
||||
cont, err := gabs.ParseJSON(bodyBytes)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, child := range cont.Children() {
|
||||
hash := qbittorrent.Hash(strings.ReplaceAll(child.Search("hash").String(), "\"", ""))
|
||||
instance := resp.Request.Context().Value(qbittorrent.ContextKeyInstance).(*qbittorrent.Instance)
|
||||
if hash == "" {
|
||||
return errors.New("no hash found for child")
|
||||
}
|
||||
if instance == nil {
|
||||
return errors.New("no instance found from context")
|
||||
}
|
||||
qbittorrent.Locks.Torrents.Lock()
|
||||
qbittorrent.Torrents[hash] = instance
|
||||
qbittorrent.Locks.Torrents.Unlock()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
)
|
||||
|
||||
func (c *Config) HandleAll(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// if r.URL.Path == "/api/v2/torrents/info" {
|
||||
// c.HandlerFetchMergeArray(w, r)
|
||||
// } else if slices.Contains([]string{
|
||||
// "/api/v2/sync/maindata",
|
||||
// "/api/v2/torrents/categories",
|
||||
// }, r.URL.Path) {
|
||||
// c.HandlerFetchMerge(w, r)
|
||||
// } else if r.Form.Has("hash") || r.Form.Has("hashes") {
|
||||
// c.HandlerHashFinder(w, r)
|
||||
// } else {
|
||||
if false {
|
||||
r.ParseForm()
|
||||
|
||||
if r.URL.Path == "/debug/leastbusy" {
|
||||
body := strings.NewReader(qbittorrent.LeastBusy().URL.Host)
|
||||
c.MakeResponse(nil, &http.Response{Body: io.NopCloser(body)}, w)
|
||||
} else if r.URL.Path == "/debug/torrents/perinstance" {
|
||||
body := []string{}
|
||||
|
||||
counts := map[*qbittorrent.Instance]int{}
|
||||
for _, instance := range qbittorrent.Instances {
|
||||
counts[instance] = 0
|
||||
}
|
||||
|
||||
for _, instance := range qbittorrent.Torrents {
|
||||
counts[instance] += 1
|
||||
}
|
||||
|
||||
for instance, count := range counts {
|
||||
body = append(body, instance.URL.String()+" - "+strconv.Itoa(count))
|
||||
}
|
||||
|
||||
c.MakeResponse(nil, &http.Response{Body: io.NopCloser(strings.NewReader(strings.Join(body, "\n")))}, w)
|
||||
} else if strings.HasPrefix(r.URL.Path, "/api/v2/sync/maindata") {
|
||||
log.Println("HandlerTorrentsInfo")
|
||||
resp, err := c.HandlerTorrentsMaindata(r)
|
||||
c.MakeResponse(err, resp, w)
|
||||
} else if strings.HasPrefix(r.URL.Path, "/api/v2/torrents/info") {
|
||||
log.Println("HandlerMergeJSON - OutputTransformer")
|
||||
resp, err := c.HandlerMergeJSON(r,
|
||||
RequestOptions{
|
||||
Callback: &RequestCallbackTorrentInfoAdd,
|
||||
},
|
||||
MergeOptions{
|
||||
RootIsArray: true,
|
||||
ArraySortFn: SortRootGabsArrayByKey(c, "added_on"),
|
||||
OutputTransformer: &OutputTransformerTorrents,
|
||||
},
|
||||
)
|
||||
c.MakeResponse(err, resp, w)
|
||||
} else if strings.HasPrefix(r.URL.Path, "/api/v2/torrents/add") {
|
||||
log.Println("HandlerLeastBusy")
|
||||
c.HandlerLeastBusy(w, r, RequestOptions{})
|
||||
} else if r.Form.Has("hash") {
|
||||
log.Println("HandlerTryAll")
|
||||
c.HandlerTryAll(w, r, RequestOptions{
|
||||
Callback: &RequestCallbackTryAllCacheHash,
|
||||
Filter: &RequestFilterOnHash,
|
||||
})
|
||||
} else {
|
||||
log.Println("HandlerPassthrough")
|
||||
if strings.HasPrefix(r.URL.Path, "/api/v2") {
|
||||
log.Println("Passing through API call using Round Robin - consider making an exception for this case if appropriate")
|
||||
log.Println(r.URL.String())
|
||||
}
|
||||
c.HandlerPassthrough(w, r)
|
||||
}
|
||||
|
||||
|
|
@ -29,331 +193,403 @@ func (c *Config) HandleAll(w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
func (c *Config) HandlerPassthrough(w http.ResponseWriter, r *http.Request) {
|
||||
i := qbittorrent.NextRoundRobin()
|
||||
resp, err := i.GetResponse(r)
|
||||
err := i.Login()
|
||||
if err != nil {
|
||||
c.MakeResponse(err, nil, w)
|
||||
return
|
||||
}
|
||||
newReq := i.PrepareRequest(r)
|
||||
resp, err := i.Client.Do(newReq)
|
||||
c.MakeResponse(err, resp, w)
|
||||
}
|
||||
|
||||
// func (c *Config) MakeRequest(r *http.Request, i *uint) (*http.Response, error) {
|
||||
func (c *Config) HandlerLeastBusy(w http.ResponseWriter, r *http.Request, requestOptions RequestOptions) {
|
||||
i := qbittorrent.LeastBusy()
|
||||
err := i.Login()
|
||||
if err != nil {
|
||||
c.MakeResponse(err, nil, w)
|
||||
return
|
||||
}
|
||||
newReq := i.PrepareRequest(r)
|
||||
resp, err := i.Client.Do(newReq)
|
||||
c.MakeResponse(err, resp, w)
|
||||
}
|
||||
|
||||
// body, err := io.ReadAll(r.Body)
|
||||
// r.Body = io.NopCloser(bytes.NewBuffer(body))
|
||||
func (c *Config) HandlerTryAll(w http.ResponseWriter, r *http.Request, requestOptions RequestOptions) {
|
||||
|
||||
// proxy, err := qbittorrent.GetProxy(&c.QBittorrent, i)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
resps := c.ParallelResponses(r, RequestOptions{
|
||||
Filter: requestOptions.Filter,
|
||||
})
|
||||
|
||||
// req, err := http.NewRequest(
|
||||
// r.Method,
|
||||
// qbittorrent.URL(&c.QBittorrent, i, r.URL).String(),
|
||||
// bytes.NewBuffer(body),
|
||||
// )
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
successCount := 0
|
||||
var resp *http.Response
|
||||
var err error
|
||||
|
||||
// req.Header = r.Header.Clone()
|
||||
for _, r := range resps {
|
||||
if len(r.errs) == 0 && r.response.StatusCode == http.StatusOK {
|
||||
successCount += 1
|
||||
resp = r.response
|
||||
}
|
||||
}
|
||||
|
||||
// err = PrepareRequest(req, c, i)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
if successCount == 0 {
|
||||
err = errors.New("no successful responses")
|
||||
} else if successCount > 1 {
|
||||
err = errors.New("more than 1 successful response")
|
||||
}
|
||||
if err != nil {
|
||||
c.MakeResponse(err, nil, w)
|
||||
}
|
||||
|
||||
// oldDirector := proxy.Director
|
||||
err = (*requestOptions.Callback)(c, resp)
|
||||
c.MakeResponse(err, resp, w)
|
||||
|
||||
// proxy.Director = func(r *http.Request) {
|
||||
// rewriteRequestURL(req, qbittorrent.URL(&c.QBittorrent, i, r.URL))
|
||||
// r.Header.Del("Referer")
|
||||
// }
|
||||
}
|
||||
|
||||
// // if strings.HasPrefix(r.URL.RequestURI(), "/api/v2/torrents/add") {
|
||||
// // log.Println(req)
|
||||
// // }
|
||||
func (c *Config) ParallelResponses(r *http.Request, requestOptions RequestOptions) (resps []struct {
|
||||
response *http.Response
|
||||
instance *qbittorrent.Instance
|
||||
errs []error
|
||||
}) {
|
||||
var g sync.WaitGroup
|
||||
for _, i := range qbittorrent.Instances {
|
||||
g.Add(1)
|
||||
go func() {
|
||||
defer g.Done()
|
||||
errs := []error{}
|
||||
newReq := r.Clone(r.Context())
|
||||
err := i.Login()
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
var resp *http.Response
|
||||
newReq = i.PrepareRequest(newReq)
|
||||
if requestOptions.Filter != nil && !(*requestOptions.Filter)(c, newReq) {
|
||||
return
|
||||
} else {
|
||||
resp, err = i.Client.Do(newReq)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
resps = append(resps, struct {
|
||||
response *http.Response
|
||||
instance *qbittorrent.Instance
|
||||
errs []error
|
||||
}{
|
||||
response: resp,
|
||||
instance: i,
|
||||
errs: errs,
|
||||
})
|
||||
}()
|
||||
}
|
||||
g.Wait()
|
||||
|
||||
// resp, err := proxy.Transport.RoundTrip(req)
|
||||
// proxy.Director = oldDirector
|
||||
if requestOptions.Callback != nil {
|
||||
for _, resp := range resps {
|
||||
err := (*requestOptions.Callback)(c, resp.response)
|
||||
if err != nil {
|
||||
resp.errs = append(resp.errs, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// return resp, err
|
||||
return
|
||||
}
|
||||
|
||||
// }
|
||||
func (c *Config) HandlerTorrentsMaindata(r *http.Request) (*http.Response, error) {
|
||||
|
||||
g := sync.WaitGroup{}
|
||||
|
||||
var resp *http.Response
|
||||
var err error
|
||||
|
||||
infoChan := make(chan *gabs.Container)
|
||||
|
||||
callback := func(c *Config, resp *http.Response) error {
|
||||
|
||||
instance := resp.Request.Context().Value(qbittorrent.ContextKeyInstance).(*qbittorrent.Instance)
|
||||
if instance == nil {
|
||||
return errors.New("empty instance")
|
||||
}
|
||||
|
||||
bodyBytes, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
resp.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
|
||||
|
||||
container, err := gabs.ParseJSON(bodyBytes)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, ok := Statistics[instance]; !ok {
|
||||
dl := 0.0
|
||||
ul := 0.0
|
||||
v := struct {
|
||||
AlltimeDl *float64
|
||||
AlltimeUl *float64
|
||||
}{&dl, &ul}
|
||||
Statistics[instance] = v
|
||||
}
|
||||
|
||||
pairs := []struct {
|
||||
value *float64
|
||||
from string
|
||||
}{
|
||||
{value: Statistics[instance].AlltimeDl, from: "alltime_dl"},
|
||||
{value: Statistics[instance].AlltimeUl, from: "alltime_ul"},
|
||||
}
|
||||
|
||||
for _, pair := range pairs {
|
||||
path := "server_state." + pair.from
|
||||
if container.ExistsP(path) {
|
||||
if pair.value == nil {
|
||||
v := float64(0)
|
||||
pair.value = &v
|
||||
}
|
||||
*pair.value = container.Path(path).Data().(float64)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
g.Add(1)
|
||||
go func() {
|
||||
defer g.Done()
|
||||
resp, err = c.HandlerMergeJSON(r,
|
||||
RequestOptions{
|
||||
Callback: &callback,
|
||||
},
|
||||
MergeOptions{
|
||||
CollisionFn: &CollisionReplace,
|
||||
},
|
||||
)
|
||||
}()
|
||||
|
||||
for _, i := range qbittorrent.Instances {
|
||||
g.Add(1)
|
||||
go func() {
|
||||
defer g.Done()
|
||||
req := &http.Request{
|
||||
Method: http.MethodGet,
|
||||
URL: &url.URL{
|
||||
Path: "/api/v2/transfer/info",
|
||||
},
|
||||
}
|
||||
|
||||
newReq := i.PrepareRequest(req)
|
||||
resp, err := i.Client.Do(newReq)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
body, err := gabs.ParseJSONBuffer(resp.Body)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
infoChan <- body
|
||||
|
||||
}()
|
||||
}
|
||||
|
||||
go func() {
|
||||
g.Wait()
|
||||
close(infoChan)
|
||||
}()
|
||||
|
||||
summedInfo := struct {
|
||||
DhtNodes float64
|
||||
DlInfoData float64
|
||||
DlInfoSpeed float64
|
||||
DlRateLimit float64
|
||||
UpInfoData float64
|
||||
UpInfoSpeed float64
|
||||
UpRateLimit float64
|
||||
}{}
|
||||
|
||||
pairs := []struct {
|
||||
value *float64
|
||||
from string
|
||||
to []string
|
||||
}{
|
||||
{value: &summedInfo.DhtNodes, from: "dht_nodes"},
|
||||
{value: &summedInfo.DhtNodes, from: "dht_nodes"},
|
||||
{value: &summedInfo.DlInfoData, from: "dl_info_data"},
|
||||
{value: &summedInfo.DlInfoSpeed, from: "dl_info_speed"},
|
||||
{value: &summedInfo.DlRateLimit, from: "dl_rate_limit"},
|
||||
{value: &summedInfo.UpInfoData, from: "up_info_data"},
|
||||
{value: &summedInfo.UpInfoSpeed, from: "up_info_speed"},
|
||||
{value: &summedInfo.UpRateLimit, from: "up_rate_limit"},
|
||||
}
|
||||
|
||||
for infoCon := range infoChan {
|
||||
for _, pair := range pairs {
|
||||
*pair.value += infoCon.Path(pair.from).Data().(float64)
|
||||
}
|
||||
}
|
||||
|
||||
g.Wait()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
bodyCon, err := gabs.ParseJSONBuffer(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, pair := range pairs {
|
||||
if len(pair.to) == 0 {
|
||||
pair.to = []string{pair.from}
|
||||
}
|
||||
for _, to := range pair.to {
|
||||
if _, err = bodyCon.SetP(*pair.value, "server_state."+to); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stats := struct {
|
||||
AlltimeDl float64
|
||||
AlltimeUl float64
|
||||
}{}
|
||||
|
||||
for _, instance := range qbittorrent.Instances {
|
||||
if Statistics[instance].AlltimeDl != nil {
|
||||
stats.AlltimeDl += *Statistics[instance].AlltimeDl
|
||||
}
|
||||
if Statistics[instance].AlltimeUl != nil {
|
||||
stats.AlltimeUl += *Statistics[instance].AlltimeUl
|
||||
}
|
||||
}
|
||||
|
||||
if _, err = bodyCon.SetP(stats.AlltimeDl, "server_state.alltime_dl"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err = bodyCon.SetP(stats.AlltimeUl, "server_state.alltime_ul"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newBody := bodyCon.Bytes()
|
||||
|
||||
resp.Body = io.NopCloser(bytes.NewBuffer(newBody))
|
||||
resp.ContentLength = int64(len(newBody))
|
||||
resp.Request = r
|
||||
|
||||
return resp, nil
|
||||
|
||||
}
|
||||
|
||||
// func (c *Config) Handler
|
||||
|
||||
func (c *Config) HandlerMergeJSON(r *http.Request, requestOptions RequestOptions, mergeOptions MergeOptions) (*http.Response, error) {
|
||||
|
||||
if mergeOptions.CollisionFn != nil && mergeOptions.RootIsArray {
|
||||
return nil, errors.New("cannot use RootIsArray and CollisionFn at the same time")
|
||||
}
|
||||
|
||||
if mergeOptions.ArraySortFn != nil && !mergeOptions.RootIsArray {
|
||||
return nil, errors.New("cannot use ArraySortFn when RootIsArray is not true")
|
||||
}
|
||||
|
||||
resps := c.ParallelResponses(r, requestOptions)
|
||||
|
||||
var err error
|
||||
|
||||
for _, resp := range resps {
|
||||
if len(resp.errs) != 0 {
|
||||
err = errors.Join(append(resp.errs, err)...)
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
outputCont := &gabs.Container{}
|
||||
outputContArray := []*gabs.Container{}
|
||||
|
||||
for _, resp := range resps {
|
||||
|
||||
cont, err := gabs.ParseJSONBuffer(resp.response.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if mergeOptions.EntryTransformer != nil {
|
||||
newCont := (*mergeOptions.EntryTransformer)(c, cont)
|
||||
cont = newCont
|
||||
}
|
||||
|
||||
if mergeOptions.RootIsArray {
|
||||
outputContArray = append(outputContArray, cont.Children()...)
|
||||
} else {
|
||||
if mergeOptions.CollisionFn != nil {
|
||||
outputCont.MergeFn(cont, *mergeOptions.CollisionFn)
|
||||
} else {
|
||||
outputCont.Merge(cont)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if mergeOptions.RootIsArray {
|
||||
|
||||
if mergeOptions.ArraySortFn != nil {
|
||||
slices.SortStableFunc(outputContArray, *mergeOptions.ArraySortFn)
|
||||
}
|
||||
|
||||
outputCont = gabs.Wrap(outputContArray)
|
||||
}
|
||||
|
||||
if mergeOptions.OutputTransformer != nil {
|
||||
newOutput := (*mergeOptions.OutputTransformer)(c, outputCont)
|
||||
outputCont = newOutput
|
||||
}
|
||||
|
||||
output := &http.Response{}
|
||||
if c.Multiplexer.Format.PrettyPrint {
|
||||
output.Body = io.NopCloser(bytes.NewBufferString(outputCont.StringIndent("", " ")))
|
||||
} else {
|
||||
output.Body = io.NopCloser(bytes.NewBufferString(outputCont.String()))
|
||||
}
|
||||
|
||||
output.Header = resps[0].response.Header.Clone()
|
||||
output.Header.Del("Content-Length")
|
||||
|
||||
return output, nil
|
||||
|
||||
}
|
||||
|
||||
func (c Config) MakeResponse(err error, resp *http.Response, w http.ResponseWriter) {
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
} else {
|
||||
for header := range resp.Header {
|
||||
w.Header().Add(header, resp.Header.Get(header))
|
||||
}
|
||||
|
||||
// if resp.Request != nil && resp.Request.Header != nil && strings.Contains(resp.Request.Header.Get("Accept-Encoding"), "gzip") {
|
||||
// w.Header().Add("Content-Encoding", "gzip")
|
||||
// newWriter := gzip.NewWriter(w)
|
||||
// io.Copy(newWriter, resp.Body)
|
||||
// } else {
|
||||
// io.Copy(w, resp.Body)
|
||||
// }
|
||||
|
||||
io.Copy(w, resp.Body)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// func (c *Config) HandlerHashFinder(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// body, err := io.ReadAll(r.Body)
|
||||
// r.Body = io.NopCloser(bytes.NewBuffer(body))
|
||||
// if helperError(err, w) {
|
||||
// return
|
||||
// }
|
||||
|
||||
// hashes := []string{}
|
||||
|
||||
// key := "hash"
|
||||
|
||||
// if r.Form.Has("hash") {
|
||||
// hashes = append(hashes, r.Form.Get("hash"))
|
||||
// }
|
||||
|
||||
// if r.Form.Has("hashes") {
|
||||
// key = "hashes"
|
||||
// hashes = append(hashes, strings.Split(r.Form.Get("hashes"), "|")...)
|
||||
// }
|
||||
|
||||
// state.AppState.Locks.Torrents.Lock()
|
||||
// defer state.AppState.Locks.Torrents.Unlock()
|
||||
|
||||
// resps := []*http.Response{}
|
||||
|
||||
// for _, hash := range hashes {
|
||||
|
||||
// form, err := url.ParseQuery(r.URL.RawQuery)
|
||||
// if helperError(err, w) {
|
||||
// return
|
||||
// }
|
||||
|
||||
// form.Del("hash")
|
||||
// form.Del("hashes")
|
||||
// form.Set(key, hash)
|
||||
|
||||
// r.URL.RawQuery = form.Encode()
|
||||
|
||||
// instance, ok := state.AppState.Torrents[hash]
|
||||
|
||||
// if ok {
|
||||
|
||||
// resp, err := c.MakeRequest(r, &instance)
|
||||
// if err != nil || resp.StatusCode != http.StatusOK {
|
||||
// ok = false
|
||||
// } else {
|
||||
// resps = append(resps, resp)
|
||||
// }
|
||||
|
||||
// r.Form.Del("")
|
||||
|
||||
// } else if !ok {
|
||||
|
||||
// log.Println("hash not known, looking up: " + hash)
|
||||
// for i := uint(0); i < state.AppState.NumberOfClients; i++ {
|
||||
|
||||
// resp, err := c.MakeRequest(r, &i)
|
||||
// if helperError(err, w) {
|
||||
// return
|
||||
// } else if resp.StatusCode == http.StatusOK {
|
||||
// resps = append(resps, resp)
|
||||
// state.AppState.Torrents[hash] = i
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// if len(resps) == 1 {
|
||||
// c.MakeResponse(resps[0], w)
|
||||
// } else if len(resps) > 0 {
|
||||
|
||||
// baseResp := resps[0]
|
||||
|
||||
// baseBody := ""
|
||||
|
||||
// for _, resp := range resps {
|
||||
|
||||
// body, err := io.ReadAll(resp.Body)
|
||||
// if helperError(err, w) {
|
||||
// return
|
||||
// }
|
||||
|
||||
// baseBody += string(body)
|
||||
|
||||
// }
|
||||
|
||||
// baseResp.Body = io.NopCloser(bytes.NewBuffer([]byte(baseBody)))
|
||||
|
||||
// c.MakeResponse(baseResp, w)
|
||||
|
||||
// } else {
|
||||
// http.Error(w, "no responses", http.StatusInternalServerError)
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// func (c *Config) Parallel(r *http.Request) (output []*struct {
|
||||
// response *gabs.Container
|
||||
// instance uint
|
||||
// }, err error) {
|
||||
|
||||
// g, ctx := errgroup.WithContext(context.Background())
|
||||
// responses := make(chan struct {
|
||||
// response *http.Response
|
||||
// instance uint
|
||||
// })
|
||||
|
||||
// body, err := io.ReadAll(r.Body)
|
||||
// if err != nil {
|
||||
// return
|
||||
// }
|
||||
|
||||
// for i := uint(0); i < state.AppState.NumberOfClients; i++ {
|
||||
// g.Go(func() (err error) {
|
||||
|
||||
// req, err := http.NewRequest(
|
||||
// r.Method,
|
||||
// qbittorrent.URL(&c.QBittorrent, &i, r.URL).String(),
|
||||
// bytes.NewBuffer(body),
|
||||
// )
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// resp, err := c.MakeRequest(req, &i)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// } else if resp.StatusCode != http.StatusOK {
|
||||
// body, _ := io.ReadAll(resp.Body)
|
||||
// return errors.New("Error" + string(body))
|
||||
// }
|
||||
|
||||
// select {
|
||||
// case responses <- struct {
|
||||
// response *http.Response
|
||||
// instance uint
|
||||
// }{
|
||||
// response: resp,
|
||||
// instance: i,
|
||||
// }:
|
||||
// return nil
|
||||
// case <-ctx.Done():
|
||||
// return ctx.Err()
|
||||
// }
|
||||
|
||||
// })
|
||||
// }
|
||||
|
||||
// go func() {
|
||||
// g.Wait()
|
||||
// close(responses)
|
||||
// }()
|
||||
|
||||
// for resp := range responses {
|
||||
// cont, err := gabs.ParseJSONBuffer(resp.response.Body)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
|
||||
// output = append(output, &struct {
|
||||
// response *gabs.Container
|
||||
// instance uint
|
||||
// }{
|
||||
// response: cont,
|
||||
// instance: resp.instance,
|
||||
// })
|
||||
|
||||
// }
|
||||
|
||||
// err = g.Wait()
|
||||
// if err != nil {
|
||||
// return
|
||||
// }
|
||||
|
||||
// return output, nil
|
||||
|
||||
// }
|
||||
|
||||
// func (c *Config) HandlerFetchMergeArray(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// if r.URL.Path == "/api/v2/torrents/info" {
|
||||
// state.AppState.Locks.Torrents.Lock()
|
||||
// defer state.AppState.Locks.Torrents.Unlock()
|
||||
// state.AppState.Torrents = map[string]uint{}
|
||||
// }
|
||||
|
||||
// resps, err := c.Parallel(r)
|
||||
// if helperError(err, w) {
|
||||
// return
|
||||
// }
|
||||
|
||||
// output := []*gabs.Container{}
|
||||
// for _, resp := range resps {
|
||||
// for _, child := range resp.response.Children() {
|
||||
// output = append(output, child)
|
||||
|
||||
// if r.URL.Path == "/api/v2/torrents/info" {
|
||||
// hash := child.Path("hash").Data().(string)
|
||||
// state.AppState.Torrents[hash] = resp.instance
|
||||
// log.Println("Stored hash", hash)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// if r.URL.Path == "/api/v2/torrents/info" {
|
||||
// slices.SortStableFunc(output, func(a *gabs.Container, b *gabs.Container) int {
|
||||
// return strings.Compare(a.Path("added_on").String(), b.Path("added_on").String())
|
||||
// })
|
||||
// }
|
||||
|
||||
// w.Write(gabs.Wrap(output).BytesIndent("", " "))
|
||||
|
||||
// }
|
||||
|
||||
// func (c *Config) HandlerFetchMerge(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// resps, err := c.Parallel(r)
|
||||
// if helperError(err, w) {
|
||||
// return
|
||||
// }
|
||||
|
||||
// output := &gabs.Container{}
|
||||
// for _, resp := range resps {
|
||||
// output.MergeFn(resp.response, func(dest, source interface{}) interface{} {
|
||||
// destArr, destIsArray := dest.([]interface{})
|
||||
// sourceArr, sourceIsArray := source.([]interface{})
|
||||
// if destIsArray {
|
||||
// if sourceIsArray {
|
||||
// return append(destArr, sourceArr...)
|
||||
// }
|
||||
// return append(destArr, source)
|
||||
// }
|
||||
// if sourceIsArray {
|
||||
// return append(append([]interface{}{}, dest), sourceArr...)
|
||||
// }
|
||||
// return source
|
||||
// })
|
||||
// }
|
||||
|
||||
// w.Write(gabs.Wrap(output).BytesIndent("", " "))
|
||||
|
||||
// }
|
||||
|
||||
// // Prepepares and rewrites headers required to auth with qBittorrent
|
||||
// func PrepareRequest(r *http.Request, c *Config, i *uint) (err error) {
|
||||
// if r == nil {
|
||||
// return errors.New("empty request given")
|
||||
// }
|
||||
// if c == nil {
|
||||
// return errors.New("empty config given")
|
||||
// }
|
||||
// if i == nil {
|
||||
// return errors.New("empty instance given")
|
||||
// }
|
||||
|
||||
// url := qbittorrent.URL(&c.QBittorrent, i, r.URL)
|
||||
|
||||
// r.Host = url.String()
|
||||
// r.Header.Del("Referer")
|
||||
// r.Header.Del("Origin")
|
||||
// r.Header.Del("Accept-Encoding")
|
||||
// r.Header.Set("Cookie", state.AppState.Cookies[*i].Raw)
|
||||
|
||||
// return
|
||||
// }
|
||||
func SortRootGabsArrayByKey(c *Config, key string) (f *func(a, b *gabs.Container) int) {
|
||||
retval := func(a, b *gabs.Container) int {
|
||||
return strings.Compare(a.Path(key).String(), b.Path(key).String())
|
||||
}
|
||||
return &retval
|
||||
}
|
||||
|
|
|
|||
82
main.go
82
main.go
|
|
@ -12,10 +12,9 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/leosunmo/zapchi"
|
||||
"go.uber.org/zap"
|
||||
|
||||
_ "github.com/motemen/go-loghttp/global"
|
||||
// _ "github.com/motemen/go-loghttp/global"
|
||||
"github.com/omeid/uconfig"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
|
@ -24,46 +23,44 @@ func init() {
|
|||
log.SetFlags(log.LstdFlags | log.Lshortfile)
|
||||
|
||||
// loghttp.DefaultLogRequest = func(req *http.Request) {
|
||||
// if false ||
|
||||
// strings.HasPrefix(req.URL.RequestURI(), "/api/v2/torrents/delete") ||
|
||||
// strings.HasPrefix(req.URL.RequestURI(), "/api/v2/torrents/add") {
|
||||
// log.Printf("--> %s %s", req.Method, req.URL)
|
||||
// for name, values := range req.Header {
|
||||
// // Loop over all values for the name.
|
||||
// for _, value := range values {
|
||||
// log.Println(name, value)
|
||||
// }
|
||||
// }
|
||||
// fmt.Println("")
|
||||
// for k, v := range req.Form {
|
||||
// log.Println(k, v)
|
||||
// }
|
||||
// fmt.Println("")
|
||||
// }
|
||||
// }
|
||||
|
||||
// loghttp.DefaultLogResponse = func(resp *http.Response) {
|
||||
// loc := resp.Request.URL
|
||||
// if loc != nil {
|
||||
// if !strings.HasPrefix(req.URL.RequestURI(), "/api/v2/sync/maindata") {
|
||||
// if false ||
|
||||
// strings.HasPrefix(loc.RequestURI(), "/api/v2/torrents/delete") ||
|
||||
// strings.HasPrefix(loc.RequestURI(), "/api/v2/torrents/add") {
|
||||
// ctx := resp.Request.Context()
|
||||
// if start, ok := ctx.Value(loghttp.ContextKeyRequestStart).(time.Time); ok {
|
||||
// log.Printf("<-- %d %s (%s)", resp.StatusCode, resp.Request.URL, roundtime.Duration(time.Now().Sub(start), 2))
|
||||
// } else {
|
||||
// log.Printf("<-- %d %s", resp.StatusCode, resp.Request.URL)
|
||||
// }
|
||||
// for name, values := range resp.Header {
|
||||
// strings.HasPrefix(req.URL.RequestURI(), "/api/v2/torrents/delete") ||
|
||||
// strings.HasPrefix(req.URL.RequestURI(), "/api/v2/torrents/add") {
|
||||
// log.Printf("--> %s %s", req.Method, req.URL)
|
||||
// for name, values := range req.Header {
|
||||
// // Loop over all values for the name.
|
||||
// for _, value := range values {
|
||||
// log.Println(name, value)
|
||||
// }
|
||||
// }
|
||||
// fmt.Println("")
|
||||
// for k, v := range req.Form {
|
||||
// log.Println(k, v)
|
||||
// }
|
||||
// fmt.Println("")
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// loghttp.DefaultLogResponse = func(resp *http.Response) {
|
||||
// if !strings.HasPrefix(resp.Request.URL.RequestURI(), "/api/v2/sync/maindata") {
|
||||
// ctx := resp.Request.Context()
|
||||
// if start, ok := ctx.Value(loghttp.ContextKeyRequestStart).(time.Time); ok {
|
||||
// log.Printf("<-- %d %s (%s)", resp.StatusCode, resp.Request.URL, roundtime.Duration(time.Now().Sub(start), 2))
|
||||
// } else {
|
||||
// log.Printf("<-- %d %s", resp.StatusCode, resp.Request.URL)
|
||||
// }
|
||||
// for name, values := range resp.Header {
|
||||
// // Loop over all values for the name.
|
||||
// for _, value := range values {
|
||||
// log.Println(name, value)
|
||||
// }
|
||||
// }
|
||||
// fmt.Println("")
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
func main() {
|
||||
|
|
@ -95,6 +92,14 @@ func main() {
|
|||
os.Exit(1)
|
||||
}
|
||||
|
||||
// Router
|
||||
|
||||
r := mux.NewRouter()
|
||||
|
||||
r.PathPrefix("/").HandlerFunc(conf.HandleAll)
|
||||
|
||||
// r.Use(zapchi.Logger(logger, "router"))
|
||||
|
||||
errs := conf.Validate()
|
||||
if errs != nil {
|
||||
fmt.Println("Errors in config:")
|
||||
|
|
@ -104,13 +109,10 @@ func main() {
|
|||
os.Exit(1)
|
||||
}
|
||||
|
||||
// Router
|
||||
|
||||
r := mux.NewRouter()
|
||||
|
||||
r.PathPrefix("/").HandlerFunc(conf.HandleAll)
|
||||
|
||||
r.Use(zapchi.Logger(logger, "router"))
|
||||
errs = conf.Prime()
|
||||
if errs != nil {
|
||||
log.Println(errs)
|
||||
}
|
||||
|
||||
srv := &http.Server{
|
||||
Addr: conf.Multiplexer.Address + ":" + strconv.FormatUint(uint64(conf.Multiplexer.Port), 10),
|
||||
|
|
@ -120,8 +122,6 @@ func main() {
|
|||
Handler: r,
|
||||
}
|
||||
|
||||
fmt.Println(conf.Multiplexer.ShutdownTimeout)
|
||||
|
||||
go func() {
|
||||
if err := srv.ListenAndServe(); err != nil {
|
||||
log.Println(err)
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@ import (
|
|||
)
|
||||
|
||||
type Config struct {
|
||||
Secret string `default:"" usage:"Multiplexer app secret"`
|
||||
Address string `default:"0.0.0.0" usage:"Multiplexer listening address"`
|
||||
Port uint `default:"9955" usage:"Multiplexer port"`
|
||||
Minify struct {
|
||||
Info struct {
|
||||
Trackers bool `default:"false" usage:"Whether to remove tracker information for client performance"`
|
||||
Format struct {
|
||||
PrettyPrint bool `usage:"Whether to pretty print outputs (useful for debugging)"`
|
||||
Info struct {
|
||||
RemoveFields []string `default:"" usage:"Fields to remove from responses (for client performance)"`
|
||||
}
|
||||
}
|
||||
ShutdownTimeout time.Duration `default:"15s"`
|
||||
|
|
@ -20,10 +20,6 @@ type Config struct {
|
|||
|
||||
func (c Config) Validate() (errs []error) {
|
||||
|
||||
if c.Secret == "" {
|
||||
errs = append(errs, errors.New("(Multiplexer) Empty Secret key"))
|
||||
}
|
||||
|
||||
if c.Address == "" {
|
||||
errs = append(errs, errors.New("(Multiplexer) Empty Listening Address key"))
|
||||
}
|
||||
|
|
|
|||
29
qbittorrent-docker-compose.yaml
Normal file
29
qbittorrent-docker-compose.yaml
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
services:
|
||||
qbittorrent1:
|
||||
image: lscr.io/linuxserver/qbittorrent:latest
|
||||
container_name: qbittorrent1
|
||||
network_mode: "service:${VPN_SERVICE_NAME}"
|
||||
environment:
|
||||
- PUID=1000
|
||||
- PGID=1000
|
||||
- TZ=${TZ}
|
||||
- WEBUI_PORT=11000
|
||||
- TORRENTING_PORT=6881
|
||||
volumes:
|
||||
- ./dockerdata/qbittorrent1/config:/config
|
||||
- ./dockerdata/qbittorrent1/downloads:/downloads
|
||||
restart: unless-stopped
|
||||
qbittorrent2:
|
||||
image: lscr.io/linuxserver/qbittorrent:latest
|
||||
container_name: qbittorrent2
|
||||
network_mode: "service:${VPN_SERVICE_NAME}"
|
||||
environment:
|
||||
- PUID=1000
|
||||
- PGID=1000
|
||||
- TZ=${TZ}
|
||||
- WEBUI_PORT=11001
|
||||
- TORRENTING_PORT=6882
|
||||
volumes:
|
||||
- ./dockerdata/qbittorrent2/config:/config
|
||||
- ./dockerdata/qbittorrent2/downloads:/downloads
|
||||
restart: unless-stopped
|
||||
|
|
@ -1,43 +1,54 @@
|
|||
package qbittorrent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/http/cookiejar"
|
||||
"net/url"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
URL string `usage:"URL of qBittorrent instance (http://hostname:port)"`
|
||||
Authenticate bool `default:"true" usage:"Whether to authenticate"`
|
||||
Username string `usage:"Username for auth"`
|
||||
Password string `usage:"Password for auth"`
|
||||
URL string `usage:"URL of qBittorrent instance (http://hostname:port)"`
|
||||
Authenticate bool `usage:"Whether to authenticate"`
|
||||
Username string `usage:"Username for auth - implies Authenticate=true"`
|
||||
Password string `usage:"Password for auth - implies Authenticate=true"`
|
||||
Name string `usage:"Name of instance, used as a shorter alternative for user"`
|
||||
CookieTimeout time.Duration `usage:"Cookie refresh interval"`
|
||||
}
|
||||
|
||||
type Instance struct {
|
||||
URL *url.URL
|
||||
Client *http.Client
|
||||
Auth struct {
|
||||
Enabled *bool
|
||||
Lock sync.Mutex
|
||||
Enabled *bool
|
||||
Cookie struct {
|
||||
Timeout time.Duration
|
||||
Expires time.Time
|
||||
Mutex sync.Mutex
|
||||
}
|
||||
Credentials struct {
|
||||
Username *string
|
||||
Password *string
|
||||
}
|
||||
}
|
||||
Name string
|
||||
}
|
||||
|
||||
type Configs []*Config
|
||||
type Hash string
|
||||
type ContextKey *string
|
||||
|
||||
var (
|
||||
Instances []*Instance
|
||||
Torrents map[Hash]*Instance
|
||||
Torrents map[Hash]*Instance = map[Hash]*Instance{}
|
||||
RoundRobinCounter int
|
||||
|
||||
Locks struct {
|
||||
|
|
@ -45,14 +56,55 @@ var (
|
|||
Torrents sync.Mutex
|
||||
RoundRobinCounter sync.Mutex
|
||||
}
|
||||
ContextKeyInstance = NewContextKey("instance")
|
||||
)
|
||||
|
||||
func NewContextKey(key string) ContextKey {
|
||||
return ContextKey(&key)
|
||||
}
|
||||
|
||||
func (c Configs) Validate() (errs []error) {
|
||||
|
||||
g := sync.WaitGroup{}
|
||||
d := sync.WaitGroup{}
|
||||
|
||||
errsChan := make(chan error)
|
||||
instancesChan := make(chan *Instance)
|
||||
|
||||
for _, config := range c {
|
||||
instance, instanceErrors := config.New()
|
||||
errs = append(errs, instanceErrors...)
|
||||
Instances = append(Instances, instance)
|
||||
g.Add(1)
|
||||
go func() {
|
||||
defer g.Done()
|
||||
instance, instanceErrors := config.New()
|
||||
for _, err := range instanceErrors {
|
||||
errsChan <- err
|
||||
}
|
||||
instancesChan <- instance
|
||||
}()
|
||||
}
|
||||
|
||||
d.Add(3)
|
||||
go func() {
|
||||
defer d.Done()
|
||||
g.Wait()
|
||||
close(errsChan)
|
||||
close(instancesChan)
|
||||
}()
|
||||
go func() {
|
||||
defer d.Done()
|
||||
for instance := range instancesChan {
|
||||
Instances = append(Instances, instance)
|
||||
}
|
||||
}()
|
||||
go func() {
|
||||
defer d.Done()
|
||||
for err := range errsChan {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}()
|
||||
|
||||
d.Wait()
|
||||
|
||||
log.Println("Config validated")
|
||||
return
|
||||
}
|
||||
|
|
@ -71,8 +123,11 @@ func (c *Config) New() (i *Instance, errs []error) {
|
|||
|
||||
i.Auth.Enabled = &c.Authenticate
|
||||
|
||||
var jar *cookiejar.Jar
|
||||
|
||||
// Authentication
|
||||
if *i.Auth.Enabled {
|
||||
if *i.Auth.Enabled || c.Username != "" || c.Password != "" {
|
||||
*i.Auth.Enabled = true
|
||||
// Credentials
|
||||
if c.Username == "" {
|
||||
errs = append(errs, errors.New("empty username"))
|
||||
|
|
@ -84,13 +139,27 @@ func (c *Config) New() (i *Instance, errs []error) {
|
|||
} else {
|
||||
i.Auth.Credentials.Password = &c.Password
|
||||
}
|
||||
|
||||
jar, err = cookiejar.New(nil)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
|
||||
if c.CookieTimeout == 0 {
|
||||
i.Auth.Cookie.Timeout = time.Minute * 15
|
||||
} else {
|
||||
i.Auth.Cookie.Timeout = c.CookieTimeout
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if len(errs) == 0 {
|
||||
i.Client = &http.Client{
|
||||
Transport: http.DefaultTransport,
|
||||
Jar: &cookiejar.Jar{},
|
||||
Transport: http.DefaultTransport,
|
||||
Jar: jar,
|
||||
CheckRedirect: http.DefaultClient.CheckRedirect,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Authentication
|
||||
|
|
@ -101,54 +170,93 @@ func (c *Config) New() (i *Instance, errs []error) {
|
|||
}
|
||||
}
|
||||
|
||||
i.Name = c.Name
|
||||
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
func (i *Instance) Login() error {
|
||||
|
||||
needToUpdate := false
|
||||
|
||||
for _, cookie := range i.Client.Jar.Cookies(&url.URL{Path: "/api/v2/"}) {
|
||||
if !cookie.Expires.After(time.Now()) {
|
||||
needToUpdate = true
|
||||
break
|
||||
}
|
||||
if !(*i.Auth.Enabled) {
|
||||
return nil
|
||||
}
|
||||
|
||||
if !needToUpdate {
|
||||
i.Auth.Cookie.Mutex.Lock()
|
||||
defer i.Auth.Cookie.Mutex.Unlock()
|
||||
|
||||
if i.Auth.Cookie.Expires.After(time.Now()) {
|
||||
return nil
|
||||
}
|
||||
|
||||
form := url.Values{}
|
||||
form.Add("username", *i.Auth.Credentials.Username)
|
||||
form.Add("password", *i.Auth.Credentials.Password)
|
||||
form.Add("username", *(i.Auth.Credentials.Username))
|
||||
form.Add("password", *(i.Auth.Credentials.Password))
|
||||
|
||||
req := i.MakeRequest("/api/v2/auth/login")
|
||||
req.URL.RawQuery = form.Encode()
|
||||
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
resp, err := i.GetResponse(req)
|
||||
req, err := i.MakeRequest(http.MethodPost, "/api/v2/auth/login", strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return err
|
||||
} else if resp.StatusCode != http.StatusOK {
|
||||
body, _ := io.ReadAll(resp.Body)
|
||||
return errors.New("status code " + strconv.Itoa(resp.StatusCode) + ", body:\n" + string(body))
|
||||
}
|
||||
req.Header = http.Header{}
|
||||
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
newReq := i.PrepareRequest(req)
|
||||
|
||||
resp, err := i.Client.Do(newReq)
|
||||
|
||||
if err != nil || resp.StatusCode != http.StatusOK {
|
||||
log.Println("Authentication failed (" + i.URL.Host + ")")
|
||||
body := []byte("NONE")
|
||||
status := "NONE"
|
||||
if resp != nil {
|
||||
body, _ = io.ReadAll(resp.Body)
|
||||
status = strconv.Itoa(resp.StatusCode)
|
||||
}
|
||||
|
||||
suffix := ""
|
||||
if err != nil {
|
||||
suffix = "\nError: " + err.Error()
|
||||
}
|
||||
|
||||
return errors.New("Status Code:" + status + "\nBody:\n" + string(body) + suffix)
|
||||
}
|
||||
|
||||
i.Auth.Cookie.Expires = time.Now().Add(i.Auth.Cookie.Timeout)
|
||||
|
||||
log.Println("Authenticated (" + i.URL.Host + ")")
|
||||
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
func (i *Instance) MakeRequest(method string, pathElements ...string) *http.Request {
|
||||
return &http.Request{
|
||||
Method: method,
|
||||
URL: i.URL.JoinPath(pathElements...),
|
||||
}
|
||||
func (i *Instance) MakeRequest(method, url string, body io.Reader) (*http.Request, error) {
|
||||
req, err := http.NewRequest(method, url, body)
|
||||
req.URL.Host = i.URL.Host
|
||||
return req, err
|
||||
}
|
||||
|
||||
func (i *Instance) GetResponse(r *http.Request) (resp *http.Response, err error) {
|
||||
return i.Client.Transport.RoundTrip(r)
|
||||
func (i *Instance) PrepareRequest(r *http.Request) (newReq *http.Request) {
|
||||
|
||||
ctx := r.Context()
|
||||
|
||||
newReq = r.Clone(context.WithValue(ctx, ContextKeyInstance, i))
|
||||
|
||||
newReq.RequestURI = ""
|
||||
newReq.URL.Scheme = i.URL.Scheme
|
||||
newReq.URL.Host = i.URL.Host
|
||||
newReq.Host = i.URL.Host
|
||||
|
||||
if newReq.Header == nil {
|
||||
newReq.Header = http.Header{}
|
||||
}
|
||||
|
||||
newReq.Header.Set("Referer", i.URL.JoinPath("/").String())
|
||||
newReq.Header.Del("Origin")
|
||||
newReq.Header.Del("Cookie")
|
||||
newReq.Header.Del("Accept-Encoding")
|
||||
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
func LeastBusy() *Instance {
|
||||
|
|
@ -161,26 +269,39 @@ func LeastBusy() *Instance {
|
|||
|
||||
counts := map[*Instance]uint{}
|
||||
|
||||
for _, instance := range Instances {
|
||||
counts[instance] = 0
|
||||
}
|
||||
|
||||
for _, instance := range Torrents {
|
||||
counts[instance] += 1
|
||||
}
|
||||
|
||||
var minimum *uint
|
||||
var minimumInstance *Instance
|
||||
|
||||
for i, c := range counts {
|
||||
for _, c := range counts {
|
||||
if minimum == nil {
|
||||
minimum = &c
|
||||
minimumInstance = i
|
||||
} else {
|
||||
if c < *minimum {
|
||||
minimum = &c
|
||||
minimumInstance = i
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return minimumInstance
|
||||
minimumInstances := []*Instance{}
|
||||
|
||||
for instance, count := range counts {
|
||||
if count == *minimum {
|
||||
minimumInstances = append(minimumInstances, instance)
|
||||
}
|
||||
}
|
||||
|
||||
slices.SortStableFunc(minimumInstances, func(a, b *Instance) int {
|
||||
return strings.Compare(a.URL.Host, b.URL.Host)
|
||||
})
|
||||
|
||||
return minimumInstances[0]
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
17
vpn-docker-compose.yaml
Normal file
17
vpn-docker-compose.yaml
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
services:
|
||||
vpn:
|
||||
image: qmcgaw/gluetun:latest
|
||||
container_name: vpn
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
devices:
|
||||
- /dev/net/tun:/dev/net/tun
|
||||
ports:
|
||||
- ${MULTIPLEXER_PORT}:${MULTIPLEXER_PORT}
|
||||
- 11000:11000
|
||||
- 11001:11001
|
||||
volumes:
|
||||
- ./gluetun:/gluetun
|
||||
environment:
|
||||
- VPN_SERVICE_PROVIDER=windscribe
|
||||
- VPN_TYPE=wireguard
|
||||
Loading…
Add table
Reference in a new issue