Update go.mod

.gitignore

@@ -0,0 +1 @@
+api_test.go

airingschedule.go

@@ -1,8 +1,10 @@
 package anilist
 
-func (api *Api) GetAiringSchedule(vars AiringScheduleQuery, onError func(error)) <-chan *AiringSchedule {
+import "context"
+
+func (api *Api) GetAiringSchedule(ctx context.Context, vars AiringScheduleQuery, onError func(error)) *Cursor[AiringSchedule] {
 	resp := responseObj[*page[AiringSchedule]]{}
-	return requestPaged(api, getAiringScheduleQuery, vars.toMap(), &resp, onError)
+	return requestPaged(api, ctx, getAiringScheduleQuery, vars.toMap(), &resp, onError)
 }
 
 const (

api.go

@@ -2,6 +2,7 @@ package anilist
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"net/http"
 )
@@ -48,6 +49,10 @@ func request[T any](api *Api, query string, vars map[string]interface{}, respObj
 	}
 	defer resp.Body.Close()
 
+	if resp.StatusCode != 200 {
+		return handleError(resp)
+	}
+
 	//data, _ := ioutil.ReadAll(resp.Body)
 	//fmt.Println(string(data))
 
@@ -60,15 +65,19 @@ func request[T any](api *Api, query string, vars map[string]interface{}, respObj
 	return nil
 }
 
-func requestPaged[R any](api *Api, query string, vars map[string]interface{}, respObj *responseObj[*page[R]], onError func(error)) <-chan *R {
+func requestPaged[R any](api *Api, ctx context.Context, query string, vars map[string]interface{}, respObj *responseObj[*page[R]], onError func(error)) *Cursor[R] {
 	resp := responseObj[struct {
 		Page *page[R] `json:"Page"`
 	}]{}
 
+	var cancelFunc context.CancelFunc
+	ctx, cancelFunc = context.WithCancel(ctx)
+
 	out := make(chan *R, 50)
 
 	go func() {
 		defer close(out)
+		defer cancelFunc()
 
 		vars["page"] = 0
 
@@ -85,9 +94,17 @@ func requestPaged[R any](api *Api, query string, vars map[string]interface{}, re
 				return
 			}
 
+			if resp.Data.Page == nil {
+				return
+			}
+
 			for _, value := range resp.Data.Page.Data() {
 				value := value
-				out <- &value
+				select {
+				case out <- &value:
+				case <-ctx.Done():
+					return
+				}
 			}
 
 			if resp.Data.Page.PageInfo.CurrentPage == resp.Data.Page.PageInfo.LastPage {
@@ -96,5 +113,9 @@ func requestPaged[R any](api *Api, query string, vars map[string]interface{}, re
 		}
 	}()
 
-	return out
+	return &Cursor[R]{
+		Chan:       out,
+		ctx:        ctx,
+		cancelFunc: cancelFunc,
+	}
 }

api_error.go

@@ -0,0 +1,32 @@
+package anilist
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+)
+
+type apiError struct {
+	Message string `json:"message"`
+	Status  int    `json:"status"`
+}
+
+type apiErrResp struct {
+	Errors []apiError `json:"errors"`
+}
+
+func handleError(resp *http.Response) error {
+	respObj := &apiErrResp{}
+
+	dec := json.NewDecoder(resp.Body)
+	err := dec.Decode(respObj)
+	if err != nil {
+		return err
+	}
+
+	if len(respObj.Errors) == 0 {
+		return errors.New("unknown API error")
+	}
+
+	return errors.New(respObj.Errors[0].Message)
+}

cursor.go

@@ -0,0 +1,35 @@
+package anilist
+
+import "context"
+
+type Cursor[T any] struct {
+	ctx        context.Context
+	cancelFunc context.CancelFunc
+	Chan       <-chan *T
+}
+
+func (c *Cursor[T]) First() *T {
+	defer c.cancelFunc()
+	return <-c.Chan
+}
+
+func (c *Cursor[T]) Close() {
+	c.cancelFunc()
+}
+
+func (c *Cursor[T]) Next() (*T, bool) {
+	if c.ctx.Err() == nil {
+		value, ok := <-c.Chan
+		return value, ok
+	}
+
+	return nil, false
+}
+
+func (c *Cursor[T]) Slice() []T {
+	s := make([]T, 0)
+	for value, ok := c.Next(); ok; value, ok = c.Next() {
+		s = append(s, *value)
+	}
+	return s
+}

go.mod

@@ -1,3 +1,3 @@
-module git.tordarus.net/Tordarus/anilist
+module git.tordarus.net/tordarus/anilist
 
 go 1.18

media.go

@@ -1,8 +1,10 @@
 package anilist
 
-func (api *Api) GetMedia(vars MediaQuery, onError func(error)) <-chan *Media {
+import "context"
+
+func (api *Api) GetMedia(ctx context.Context, vars MediaQuery, onError func(error)) *Cursor[Media] {
 	resp := responseObj[*page[Media]]{}
-	return requestPaged(api, getMediaQuery, vars.toMap(), &resp, onError)
+	return requestPaged(api, ctx, getMediaQuery, vars.toMap(), &resp, onError)
 }
 
 const (

medialist.go

@@ -1,8 +1,10 @@
 package anilist
 
-func (api *Api) GetMediaList(vars MediaListQuery, onError func(error)) <-chan *MediaList {
+import "context"
+
+func (api *Api) GetMediaList(ctx context.Context, vars MediaListQuery, onError func(error)) *Cursor[MediaList] {
 	resp := responseObj[*page[MediaList]]{}
-	return requestPaged(api, getMediaListQuery, vars.toMap(), &resp, onError)
+	return requestPaged(api, ctx, getMediaListQuery, vars.toMap(), &resp, onError)
 }
 
 const (

sub_selections.go

@@ -7,7 +7,6 @@ const (
 		airingAt
 		timeUntilAiring
 		episode
-		media ` + subSelectionMedia + `
 	}`
 
 	subSelectionMediaList = `{
@@ -93,7 +92,7 @@ const (
 			isAdult
 			userId
 		}
-		nextAiringEpisode
+		nextAiringEpisode ` + subSelectionAiringSchedule + `
 	}`
 
 	subSelectionFuzzyDate = `{

types.go

@@ -9,8 +9,10 @@ type User struct {
 	Name string `json:"name,omitempty"`
 }
 
+type MediaID int
+
 type Media struct {
-	ID                int             `json:"id"`
+	ID                MediaID         `json:"id"`
 	Title             MediaTitle      `json:"title"`
 	Type              MediaType       `json:"type"`
 	Format            MediaFormat     `json:"format"`
@@ -113,10 +115,12 @@ const (
 	MediaSourcePictureBook       MediaSource = "PICTURE_BOOK"
 )
 
+type MediaTrailerID string
+
 type MediaTrailer struct {
-	ID        string `json:"id"`
-	Site      string `json:"site"`
-	Thumbnail string `json:"thumbnail"`
+	ID        MediaTrailerID `json:"id"`
+	Site      string         `json:"site"`
+	Thumbnail string         `json:"thumbnail"`
 }
 
 type MediaCoverImage struct {
@@ -126,8 +130,10 @@ type MediaCoverImage struct {
 	Color      string `json:"color"`
 }
 
+type MediaTagID int
+
 type MediaTag struct {
-	ID             int    `json:"id"`
+	MediaTagID     int    `json:"id"`
 	Name           string `json:"name"`
 	Description    string `json:"description"`
 	Category       string `json:"category"`
@@ -173,10 +179,12 @@ func (d Seconds) Duration() time.Duration {
 	return time.Duration(d) * time.Second
 }
 
+type MediaListID int
+
 type MediaList struct {
-	ID                    int             `json:"id"`
+	ID                    MediaListID     `json:"id"`
 	UserID                int             `json:"userId"`
-	MediaID               int             `json:"mediaId"`
+	MediaID               MediaID         `json:"mediaId"`
 	Status                MediaListStatus `json:"status"`
 	Score                 float64         `json:"score"`
 	Progress              int             `json:"progress"`
@@ -197,19 +205,20 @@ type MediaList struct {
 type MediaListStatus string
 
 const (
-	MediaListStatusCurrent   MediaSource = "CURRENT"
-	MediaListStatusPlanning  MediaSource = "PLANNING"
-	MediaListStatusCompleted MediaSource = "COMPLETED"
-	MediaListStatusDropped   MediaSource = "DROPPED"
-	MediaListStatusPaused    MediaSource = "PAUSED"
-	MediaListStatusRepeating MediaSource = "REPEATING"
+	MediaListStatusCurrent   MediaListStatus = "CURRENT"
+	MediaListStatusPlanning  MediaListStatus = "PLANNING"
+	MediaListStatusCompleted MediaListStatus = "COMPLETED"
+	MediaListStatusDropped   MediaListStatus = "DROPPED"
+	MediaListStatusPaused    MediaListStatus = "PAUSED"
+	MediaListStatusRepeating MediaListStatus = "REPEATING"
 )
 
+type AiringScheduleID int
+
 type AiringSchedule struct {
-	ID              int      `json:"id"`
-	MediaID         int      `json:"mediaId"`
-	AiringAt        UnixTime `json:"airingAt"`
-	TimeUntilAiring Seconds  `json:"timeUntilAiring"`
-	Episode         int      `json:"episode"`
-	Media           *Media   `json:"media"`
+	ID              AiringScheduleID `json:"id"`
+	MediaID         MediaID          `json:"mediaId"`
+	AiringAt        UnixTime         `json:"airingAt"`
+	TimeUntilAiring Seconds          `json:"timeUntilAiring"`
+	Episode         int              `json:"episode"`
 }

user.go

@@ -1,5 +1,7 @@
 package anilist
 
+import "context"
+
 func (api *Api) GetUserByName(name string) (*User, error) {
 	query := `query ($name: String) {
 		User (name: $name) ` + subSelectionUser + `
@@ -42,10 +44,10 @@ func (api *Api) GetUserByID(id int) (*User, error) {
 	return resp.Data.User, nil
 }
 
-func (api *Api) SearchUsers(search string, onError func(error)) <-chan *User {
+func (api *Api) SearchUsers(ctx context.Context, search string, onError func(error)) *Cursor[User] {
 	vars := map[string]interface{}{"search": search}
 	resp := responseObj[*page[User]]{}
-	return requestPaged(api, searchUsersQuery, vars, &resp, onError)
+	return requestPaged(api, ctx, searchUsersQuery, vars, &resp, onError)
 }
 
 const (

utils.go

@@ -18,7 +18,7 @@ func addValue2InterfaceMap[K, T comparable](m map[K]interface{}, key K, value T)
 }
 
 func addSlice2InterfaceMap[K, T comparable](m map[K]interface{}, key K, value []T) {
-	if value != nil && len(value) > 0 {
+	if len(value) > 0 {
 		m[key] = value
 	}
 }