Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

Commit

Permalink
fix: remove .json() shortcut from ky requests as it was causing pro…
Browse files Browse the repository at this point in the history
…blems with large requests
  • Loading branch information
vaaski committed Feb 17, 2021
1 parent 81e28fc commit 54e23d0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/playlist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ const byID = async (id: number, client_id: ClientIDv2) => {
const url = urlify(`playlists/${id}`, APIv2)
const searchParams = { client_id }

const data = await ky(url, { searchParams }).json()
return data as Playlistv2
const data = await ky(url, { searchParams })
return (await data.json()) as Playlistv2
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/resolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ resolve.browser = async (url: string, client_id: string): Promise<APIv1Resolve>
if (!client_id) throw new Error("APIv1 client_id has to be provided")

const searchParams = { url, client_id }
const data = await ky(`${APIv1}/resolve`, { searchParams }).json()
const data = await ky(`${APIv1}/resolve`, { searchParams })

return data as APIv1Resolve
return (await data.json()) as APIv1Resolve
}

export default resolve
10 changes: 6 additions & 4 deletions src/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const getByID = async (id: number, client_id: ClientIDv2) => {
const url = urlify(`users/${id}`, APIv2)
const searchParams = { client_id }

const data = await ky(url, { searchParams }).json()
return data as Userv2
const data = await ky(url, { searchParams })
return (await data.json()) as Userv2
}

/**
Expand Down Expand Up @@ -82,7 +82,8 @@ user.likes = async (identifier: URLorID, { limit = 50, client_id }: PaginatedOpt
const url = urlify(`users/${identifier}/likes`, APIv2)
const searchParams = { client_id, limit }

const data = (await ky(url, { searchParams }).json()) as UserLikesv2
const req = await ky(url, { searchParams })
const data = (await req.json()) as UserLikesv2

const ret: PaginatedResponse<UserLikesv2Element[]> = data
/* istanbul ignore next */
Expand Down Expand Up @@ -110,7 +111,8 @@ user.tracks = async (

const searchParams = { client_id, limit }
const url = urlify(`users/${identifier}/tracks`, APIv2)
const data = (await ky(url, { searchParams }).json()) as UserTracksv2
const req = await ky(url, { searchParams })
const data = (await req.json()) as UserTracksv2

const ret: PaginatedResponse<TrackElement[]> = data
/* istanbul ignore next */
Expand Down
3 changes: 2 additions & 1 deletion src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export const paginateNext = <K>(url: string, params: Record<string, string | num
const _params = Object.fromEntries(_url.searchParams.entries())
const searchParams = { ..._params, ...params }

const data = (await ky.get(url, { searchParams }).json()) as Record<string, any>
const req = await ky.get(url, { searchParams })
const data = (await req.json()) as Record<string, any>

const ret: PaginatedResponse<K> = {
collection: data.collection,
Expand Down

0 comments on commit 54e23d0

Please sign in to comment.