Skip to content

[Refactor] Simplify control flow in abortSignalFromRequestBehaviour #8354

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

Draft
gonzaloriestra wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −7
Draft

[Refactor] Simplify control flow in abortSignalFromRequestBehaviour #8354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions packages/cli-kit/src/public/node/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,16 @@ interface FetchOptions {
* @returns An AbortSignal.
*/
export function abortSignalFromRequestBehaviour(behaviour: RequestBehaviour): AbortSignal {
let signal: AbortSignal
if (behaviour.useAbortSignal === true) {
signal = AbortSignal.timeout(behaviour.timeoutMs)
} else if (behaviour.useAbortSignal && typeof behaviour.useAbortSignal === 'function') {
signal = behaviour.useAbortSignal()
} else if (behaviour.useAbortSignal) {
signal = behaviour.useAbortSignal
return AbortSignal.timeout(behaviour.timeoutMs)
}
return signal
if (typeof behaviour.useAbortSignal === 'function') {
return behaviour.useAbortSignal()
}
if (behaviour.useAbortSignal) {
return behaviour.useAbortSignal
}
return undefined
}

async function innerFetch({url, behaviour, init, logRequest, useHttpsAgent}: FetchOptions): Promise<Response> {
Expand Down
Loading