Skip to content

fix: prevent parsing empty responses from throwing #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 2, 2022
Merged

fix: prevent parsing empty responses from throwing #105

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e21db1b
fix: prevent parsing empty responses from throwing
Dec 1, 2022
eb3ea1b
fix: guard empty JSON + check length of content
Dec 1, 2022
c04ebf2
fix: remove `try/catch`
Dec 1, 2022
b8eb706
fix: adjust error text
Dec 1, 2022
64932e2
fix: throw when invalid content
Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ export type ErrorResponse = {
message: string
}

const isErrorResponse = (data: unknown): data is ErrorResponse => {
const isObject = typeof data === 'object' && data !== null
return isObject && 'code' in data && 'message' in data
}

function replaceParam(str: string, key: string, value: string): string {
return str.replace(new RegExp(`\\{${key}\\}`, 'g'), value)
}
Expand Down Expand Up @@ -51,16 +56,18 @@ export async function fetchData<T>(url: string, body?: unknown): Promise<T> {
}

const resp = await fetch(url, options)
const json = await resp.json()
let json

if (!resp.ok) {
let errTxt = ''
try {
const err = json as ErrorResponse
errTxt = `${err.code}: ${err.message}`
} catch (e) {
errTxt = resp.statusText
try {
json = await resp.json()
} catch {
if (resp.headers && resp.headers.get('content-length') !== '0') {
throw new Error(`Invalid response content: ${resp.statusText}`)
}
}

if (!resp.ok) {
const errTxt = isErrorResponse(json) ? `${json.code}: ${json.message}` : resp.statusText
throw new Error(errTxt)
}

Expand Down