Skip to content

Commit c3dcb25

Browse files
author
Matt Carroll
committed
Remove unnecessary clearTimeout
1 parent aaa1caa commit c3dcb25

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

packages/datafile-manager/src/nodeRequest.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ function createHeadersFromNodeIncomingMessage(
6161
return headers
6262
}
6363

64-
function getResponseFromRequest(request: http.ClientRequest): [Promise<Response>, NodeJS.Timeout] {
65-
let timeout!: NodeJS.Timeout
64+
function getResponseFromRequest(request: http.ClientRequest): Promise<Response> {
6665
// TODO: When we drop support for Node 6, consider using util.promisify instead of
6766
// constructing own Promise
68-
const promise: Promise<Response> = new Promise((resolve, reject) => {
69-
timeout = setTimeout(() => {
67+
return new Promise((resolve, reject) => {
68+
const timeout = setTimeout(() => {
7069
request.abort()
7170
reject(new Error('Request timed out'))
7271
}, REQUEST_TIMEOUT_MS)
@@ -112,7 +111,6 @@ function getResponseFromRequest(request: http.ClientRequest): [Promise<Response>
112111
}
113112
})
114113
})
115-
return [promise, timeout]
116114
}
117115

118116
export function makeGetRequest(reqUrl: string, headers: Headers): AbortableRequest {
@@ -140,13 +138,12 @@ export function makeGetRequest(reqUrl: string, headers: Headers): AbortableReque
140138
}
141139

142140
const request = requester(requestOptions)
143-
const [responsePromise, timeout] = getResponseFromRequest(request)
141+
const responsePromise = getResponseFromRequest(request)
144142

145143
request.end()
146144

147145
return {
148146
abort() {
149-
clearTimeout(timeout)
150147
request.abort()
151148
},
152149
responsePromise,

0 commit comments

Comments
 (0)