laurent/sorare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: laurent:master
Branches Tags
laurent:master
laurent:v0.1.11
laurent:v0.1.10
laurent:v0.1.9
laurent:v0.1.8
laurent:v0.1.7
laurent:v0.1.6
laurent:v0.1.5
laurent:v0.1.4
laurent:v0.1.3
laurent:v0.1.2
laurent:v0.1.1
laurent:v0.1.0
..
compare: laurent:v0.1.9
Branches Tags
laurent:master
laurent:v0.1.11
laurent:v0.1.10
laurent:v0.1.9
laurent:v0.1.8
laurent:v0.1.7
laurent:v0.1.6
laurent:v0.1.5
laurent:v0.1.4
laurent:v0.1.3
laurent:v0.1.2
laurent:v0.1.1
laurent:v0.1.0

No commits in common. "master" and "v0.1.9" have entirely different histories.
master ... v0.1.9

11 changed files with 91 additions and 245 deletions
Show Stats Expand all files Collapse all files

4
api.go
View File

@ -97,10 +97,6 @@ func (s *Sorare) Debug() *Sorare {
return s
}
func (s *Sorare) SetApiKey(apiKey string) {
s.Client.SetApiKey(apiKey)
}
func (s *Sorare) SetJWTToken(token graphql.JwtToken, audience string) {
s.Client.SetJWTToken(token, audience)
}

55
cmd/console/main.go
View File

@ -31,48 +31,39 @@ func main() {
ctx := context.Background()
p, err := api.Football.Player.Get(ctx, graphql.SlugParams{Slug: "joshua-kimmich"})
si, err := api.ShopItems.Get(ctx, sorare.ShopItemsParams{
Types: []sorare.ShopItemType{sorare.ShopItemTypeLevelUp},
UnlockedOnly: true,
})
if err != nil {
panic(err)
}
log.Printf("%+v", p)
for _, item := range si {
log.Printf(
"%s %d %d %s %s",
item.TypeName,
item.ShopItemInterface.MyBalance,
item.ShopItemInterface.Price,
item.LevelUpShopItem.Rarity,
time.Until(item.ShopItemInterface.MyLimitResetAt).String(),
)
}
// si, err := api.ShopItems.Get(ctx, sorare.ShopItemsParams{
// Types: []sorare.ShopItemType{sorare.ShopItemTypeLevelUp},
// UnlockedOnly: true,
// })
// if err != nil {
// panic(err)
// }
// for _, item := range si {
// log.Printf(
// "%s %d %d %s %s",
// item.TypeName,
// item.ShopItemInterface.MyBalance,
// item.ShopItemInterface.Price,
// item.LevelUpShopItem.Rarity,
// time.Until(item.ShopItemInterface.MyLimitResetAt).String(),
// )
// }
// cu, err := api.Users.CurrentUser.Get(ctx, graphql.EmptyParams{})
// if err != nil {
// panic(err)
// }
// log.Printf("%d", cu.CoinBalance)
// cards, err := api.Users.FootballCards("gigiz22").Get(ctx, football.CardsParams{
cu, err := api.Users.CurrentUser.Get(ctx, graphql.EmptyParams{})
if err != nil {
panic(err)
}
log.Printf("%d", cu.CoinBalance)
// cu, err := api.Users.FootballCards("gigiz22").Get(ctx, football.CardsParams{
// Rarities: []types.Rarity{types.RarityLimited},
// })
// if err != nil {
// panic(err)
// }
// sort.Slice(cards, func(i, j int) bool {
// return cards[i].XpNeededForNextGrade-cards[i].Xp > cards[j].XpNeededForNextGrade-cards[j].Xp
// sort.Slice(cu, func(i, j int) bool {
// return cu[i].XpNeededForNextGrade-cu[i].Xp > cu[j].XpNeededForNextGrade-cu[j].Xp
// })
// for _, card := range cards {
// if !card.InSeasonEligible {
// continue
// }
// for _, card := range cu {
// log.Printf(
// "%60s %2d %6d %6d %6d (%d/%d)",
// card.Token.Name,

8
football/football.go
View File

@ -26,8 +26,7 @@ type Football struct {
Players *graphql.Query[[]Player, graphql.SlugsParams]
Season *graphql.Query[Season, SeasonParams]
So5 *So5
Rivals *Rivals
So5 *So5
}
func NewFootball(c *graphql.Client) *Football {
@ -110,14 +109,13 @@ func NewFootball(c *graphql.Client) *Football {
c,
"players",
[]string{"football"},
).WithMaxPageSize(100),
),
Season: graphql.NewQuery[Season, SeasonParams](
c,
"season",
[]string{"football"},
),
So5: NewSo5(c),
Rivals: NewRivals(c),
So5: NewSo5(c),
}
}

17
football/rivals.go
View File

@ -1,17 +0,0 @@
package football
import "git.lehouerou.net/laurent/sorare/graphql"
type Rivals struct {
c *graphql.Client
PastGames *graphql.PaginatedQuery[RivalsGame, graphql.EmptyParams]
}
func NewRivals(c *graphql.Client) *Rivals {
return &Rivals{
c: c,
PastGames: graphql.NewPaginatedQuery[RivalsGame, graphql.EmptyParams](c, "pastGamesPaginated", []string{"football", "rivals"}).WithOverrideComplexity(107),
}
}

32
football/rivals_game.go
View File

@ -1,32 +0,0 @@
package football
import (
"git.lehouerou.net/laurent/sorare/graphql"
"git.lehouerou.net/laurent/sorare/types"
)
type RivalsDraftableObject struct {
Id graphql.Id `graphql:"id"`
CapValue float64 `graphql:"capValue"`
Player struct {
Slug string `graphql:"slug"`
ActiveClub struct {
Slug string `graphql:"slug"`
}
ActiveNationalTeam struct {
Slug string `graphql:"slug"`
}
} `graphql:"player"`
Position types.Position `graphql:"position"`
}
type RivalsGame struct {
Id graphql.Id `graphql:"id"`
Slug string `graphql:"slug"`
Cap int `graphql:"cap"`
DraftablePlayers []RivalsDraftableObject `graphql:"draftablePlayers"`
FormationKnown bool `graphql:"formationKnown"`
Game struct {
Id graphql.Id `graphql:"id"`
} `graphql:"game"`
}

10
football/so5.go
View File

@ -22,28 +22,28 @@ func NewSo5(c *graphql.Client) *So5 {
So5Fixture: graphql.NewQuery[So5Fixture, So5FixtureParams](
c,
"so5Fixture",
[]string{"so5"},
[]string{"football", "so5"},
),
So5Fixtures: graphql.NewPaginatedQuery[So5Fixture, So5FixturesParams](
c,
"so5Fixtures",
[]string{"so5"},
[]string{"football", "so5"},
),
So5Score: graphql.NewQuery[So5Score, graphql.IdParams](
c,
"so5Score",
[]string{"so5"},
[]string{"football", "so5"},
),
So5Leaderboard: graphql.NewQuery[So5Leaderboard, graphql.SlugParams](
c,
"so5Leaderboard",
[]string{"so5"},
[]string{"football", "so5"},
),
UpcomingLeaderboards: graphql.NewQuery[[]So5Leaderboard, UpcomingLeaderboardsParams](
c,
"upcomingLeaderboards",
[]string{"so5"},
[]string{"football", "so5"},
),
}
}

12
graphql/authentication.go
View File

@ -57,10 +57,10 @@ type JwtToken struct {
type SignIn struct {
CurrentUser struct {
Slug string
Slug string
JwtToken JwtToken `graphql:"jwtToken(aud: $aud)"`
} `graphql:"currentUser"`
OtpSessionChallenge string
JwtToken JwtToken `graphql:"jwtToken(aud: $aud)"`
Errors []struct {
Message string
} `graphql:"errors"`
@ -116,12 +116,12 @@ func (c *Client) getNewToken(
}
if len(res.Errors) == 0 {
if res.JwtToken.Token == "" {
if res.CurrentUser.JwtToken.Token == "" {
return JwtToken{}, errors.New(
"no errors & no jwt token returned on email/password mutation",
)
}
return res.JwtToken, nil
return res.CurrentUser.JwtToken, nil
}
if res.Errors[0].Message == "invalid" {
@ -146,10 +146,10 @@ func (c *Client) getNewToken(
}
if len(resOtp.Errors) == 0 {
if resOtp.JwtToken.Token == "" {
if resOtp.CurrentUser.JwtToken.Token == "" {
return JwtToken{}, errors.New("no errors & no jwt token returned on otp mutation")
}
return resOtp.JwtToken, nil
return resOtp.CurrentUser.JwtToken, nil
}
return JwtToken{}, errors.Errorf("validating otp: %s", resOtp.Errors[0].Message)
}

106
graphql/client.go
View File

@ -3,7 +3,6 @@ package graphql
import (
"context"
"net/http"
"reflect"
"sync"
"time"
@ -23,11 +22,9 @@ type Client struct {
httpClient *http.Client
gql *graphql.Client
rl *rate.Limiter
apirl *rate.Limiter
lock *sync.Mutex
authenticated bool
token JwtToken
apiKey string
}
func NewClient(httpclient *http.Client, baseUrl string) *Client {
@ -35,7 +32,6 @@ func NewClient(httpclient *http.Client, baseUrl string) *Client {
httpClient: httpclient,
gql: graphql.NewClient(baseUrl, httpclient),
rl: rate.NewLimiter(rate.Every(rateLimitPeriod), rateLimitBurst),
apirl: rate.NewLimiter(rate.Every(rateLimitPeriod/10), rateLimitBurst*10),
lock: &sync.Mutex{},
authenticated: false,
}
@ -54,18 +50,12 @@ func (c *Client) SetJWTToken(token JwtToken, audience string) {
c.authenticated = true
}
func (c *Client) SetApiKey(apiKey string) {
c.gql = c.gql.WithRequestModifier(func(request *http.Request) {
request.Header.Set("APIKEY", apiKey)
})
c.apiKey = apiKey
}
func (c *Client) MaxQueryComplexity() int {
if c.apiKey != "" || c.authenticated {
func (c *Client) MaxComplexity() int {
if c.authenticated {
return MaxAuthenticatedQueryComplexity
} else {
return MaxAnonymousQueryComplexity
}
return MaxAnonymousQueryComplexity
}
func (c *Client) ConstructRawQuery(
@ -81,16 +71,9 @@ func (c *Client) Query(
variables interface{},
options ...graphql.Option,
) error {
if c.apiKey != "" {
err := c.apirl.Wait(ctx)
if err != nil {
return errors.Wrap(err, "waiting for rate limit")
}
} else {
err := c.rl.Wait(ctx)
if err != nil {
return errors.Wrap(err, "waiting for rate limit")
}
err := c.rl.Wait(ctx)
if err != nil {
return errors.Wrap(err, "waiting for rate limit")
}
c.lock.Lock()
defer c.lock.Unlock()
@ -103,16 +86,9 @@ func (c *Client) QueryRaw(
variables interface{},
options ...graphql.Option,
) ([]byte, error) {
if c.apiKey != "" {
err := c.apirl.Wait(ctx)
if err != nil {
return nil, errors.Wrap(err, "waiting for rate limit")
}
} else {
err := c.rl.Wait(ctx)
if err != nil {
return nil, errors.Wrap(err, "waiting for rate limit")
}
err := c.rl.Wait(ctx)
if err != nil {
return nil, errors.Wrap(err, "waiting for rate limit")
}
c.lock.Lock()
defer c.lock.Unlock()
@ -125,67 +101,11 @@ func (c *Client) Mutate(
variables interface{},
options ...graphql.Option,
) error {
if c.apiKey != "" {
err := c.apirl.Wait(ctx)
if err != nil {
return errors.Wrap(err, "waiting for rate limit")
}
} else {
err := c.rl.Wait(ctx)
if err != nil {
return errors.Wrap(err, "waiting for rate limit")
}
err := c.rl.Wait(ctx)
if err != nil {
return errors.Wrap(err, "waiting for rate limit")
}
c.lock.Lock()
defer c.lock.Unlock()
return c.gql.Mutate(ctx, q, variables, options...)
}
func GetTypeComplexity(t reflect.Type) int {
var checkStruct func(t reflect.Type, complexity *int)
checkStruct = func(t reflect.Type, complexity *int) {
if t.Kind() != reflect.Struct {
return
}
for i := 0; i < t.NumField(); i++ {
field := t.Field(i)
tag := field.Tag.Get("graphql")
if field.Type.Kind() == reflect.Struct {
*complexity++
if len(tag) > 6 && tag[:6] == "... on" {
*complexity--
}
checkStruct(field.Type, complexity)
continue
}
if field.Type.Kind() == reflect.Slice {
if isSimpleType(field.Type.Elem()) {
*complexity++
} else {
*complexity++
tmpcomplexity := 0
checkStruct(field.Type.Elem(), &tmpcomplexity)
*complexity += tmpcomplexity * 10
}
continue
}
if tag != "" && tag != "__typename" {
*complexity++
}
}
}
complexity := 0
checkStruct(t, &complexity)
return complexity
}
func isSimpleType(t reflect.Type) bool {
switch t.Kind() {
case reflect.Bool, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr,
reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.String:
return true
default:
return false
}
}

61
graphql/paginated_query.go
View File

@ -12,8 +12,6 @@ type PaginatedQuery[ResultType any, Params any] struct {
additionalPayloadParams map[string]interface{}
additionalQueryParams map[string]interface{}
overrideComplexity int
}
func NewPaginatedQuery[ResultType any, Params any](
@ -27,7 +25,6 @@ func NewPaginatedQuery[ResultType any, Params any](
containerLayers: containerLayers,
additionalPayloadParams: make(map[string]interface{}),
additionalQueryParams: make(map[string]interface{}),
overrideComplexity: 0,
}
}
@ -47,11 +44,6 @@ func (pq *PaginatedQuery[ResultType, Params]) WithQueryParam(
return pq
}
func (pq *PaginatedQuery[ResultType, Params]) WithOverrideComplexity(complexity int) *PaginatedQuery[ResultType, Params] {
pq.overrideComplexity = complexity
return pq
}
type PaginatedQueryGetOptions struct {
Limit int
}
@ -76,26 +68,17 @@ func (pq *PaginatedQuery[ResultType, Params]) Get(
var res []ResultType
after := ""
var noop ResultType
complexity := pq.overrideComplexity
if complexity == 0 {
complexity = GetTypeComplexity(reflect.TypeOf(noop))
}
maxPageSize := (pq.c.MaxQueryComplexity() - 7 - len(pq.containerLayers)) / complexity
pageSize := (pq.c.MaxComplexity() - 9) / (GetComplexity(reflect.TypeOf(noop)) + 1)
for {
pageSize := maxPageSize
if opts.Limit > 0 {
remaining := opts.Limit - len(res)
if remaining < pageSize {
pageSize = remaining
}
}
page, pi, err := pq.getPage(ctx, params, after, pageSize)
if err != nil {
return nil, err
}
res = append(res, page...)
if opts.Limit > 0 && len(res) >= opts.Limit {
return res[:opts.Limit], nil
for _, item := range page {
res = append(res, item)
if opts.Limit > 0 && len(res) >= opts.Limit {
return res, nil
}
}
if !pi.HasNextPage {
break
@ -139,3 +122,35 @@ func (pq *PaginatedQuery[ResultType, Params]) getPage(
}
return res.Nodes, res.PageInfo, nil
}
func GetComplexity(t reflect.Type) int {
var checkStruct func(t reflect.Type, complexity *int)
checkStruct = func(t reflect.Type, complexity *int) {
if t.Kind() != reflect.Struct {
return
}
for i := 0; i < t.NumField(); i++ {
field := t.Field(i)
if field.Type.Kind() == reflect.Struct {
*complexity++
tag := field.Tag.Get("graphql")
if len(tag) > 6 && tag[:6] == "... on" {
*complexity--
}
checkStruct(field.Type, complexity)
continue
}
if field.Type.Kind() == reflect.Slice {
*complexity++
tmpcomplexity := 0
checkStruct(field.Type.Elem(), &tmpcomplexity)
*complexity += tmpcomplexity * 10
continue
}
*complexity++
}
}
complexity := 0
checkStruct(t, &complexity)
return complexity
}

25
graphql/query.go
View File

@ -3,7 +3,6 @@ package graphql
import (
"context"
"fmt"
"reflect"
"strings"
"github.com/pkg/errors"
@ -16,8 +15,6 @@ type Query[ReturnType any, Params any] struct {
additionalPayloadParams map[string]interface{}
additionalQueryParams map[string]interface{}
maxPageSize int
}
func NewQuery[ReturnType any, Params any](
@ -32,7 +29,6 @@ func NewQuery[ReturnType any, Params any](
additionalPayloadParams: make(map[string]interface{}),
additionalQueryParams: make(map[string]interface{}),
maxPageSize: 0,
}
}
@ -52,27 +48,6 @@ func (r *Query[ReturnType, Params]) WithQueryParam(
return r
}
func (r *Query[ReturnType, Params]) WithMaxPageSize(maxPageSize int) *Query[ReturnType, Params] {
r.maxPageSize = maxPageSize
return r
}
func (r *Query[ReturnType, Params]) GetPageSize() int {
t := reflect.TypeOf((*ReturnType)(nil)).Elem()
if t.Kind() == reflect.Slice {
t = t.Elem()
}
complexity := GetTypeComplexity(t)
maxComplexity := r.c.MaxQueryComplexity()
layers := len(r.containerLayers)
computedPageSize := (maxComplexity - layers - 1) / complexity
if r.maxPageSize > 0 && r.maxPageSize < computedPageSize {
return r.maxPageSize
}
return computedPageSize
}
func (r *Query[ReturnType, Params]) Get(ctx context.Context, params Params) (ReturnType, error) {
paramsMap := convertParamsToMap(params)

6
user.go
View File

@ -12,8 +12,8 @@ import (
)
type baseUser struct {
Active bool `graphql:"active"`
FootballCardCounts struct {
Active bool `graphql:"active"`
CardCounts struct {
Common int `graphql:"common"`
CustomSeries int `graphql:"customSeries"`
Limited int `graphql:"limited"`
@ -21,7 +21,7 @@ type baseUser struct {
SuperRare int `graphql:"superRare"`
Unique int `graphql:"unique"`
Total int `graphql:"total"`
} `graphql:"footballCardCounts"`
} `graphql:"cardCounts"`
CreatedAt time.Time `graphql:"createdAt"`
EthVaultId int `graphql:"ethVaultId"`
EthereumAddress string `graphql:"ethereumAddress"`