Request timeout #308
Request timeout #308
Conversation
| await s.listen(s.port); | ||
| }); | ||
|
|
||
| test('timeout option', async t => { |
There was a problem hiding this comment.
The rest of the tests tend to take this form:
const err = await t.throws(got(`${s.url}/`, {
timeout: 1,
retries: 0
}));
t.is(err.code, 'ETIMEDOUT');I'd be in favor of testing this way because:
- it offloads worrying about if it throws to ava.
- consistent style is helpful in reducing complexity.
|
@floatdrop so should we just name the option gotTimeout? |
|
@djmadeira nah, |
|
@floatdrop @alextes addressed comments. |
index.js
Outdated
| @@ -152,6 +162,7 @@ function asPromise(opts) { | |||
| throw new got.HTTPError(statusCode, res.headers, opts); | |||
| } | |||
|
|
|||
| clearTimeout(timeout); | |||
index.js
Outdated
|
|
||
| return (requestPromise => timeout ? | ||
| pTimeout(requestPromise, timeout, new got.RequestError({message: 'Request timed out', code: 'ETIMEDOUT'}, opts)) : | ||
| requestPromise |
There was a problem hiding this comment.
This could be more readable. Can you move it (line 111 to 113) out into a separate variable?
readme.md
Outdated
|
|
||
| Option accepts `object` with separate `connect` and `socket` fields for connection and socket inactivity timeouts. | ||
| Option accepts `object` with separate `connect`, `socket`, and `request` fields for connection, socket, and entire request timeouts. |
There was a problem hiding this comment.
I know it's not from this change, but Option accepts object with separate => This also accepts an object with separate.
|
@sindresorhus @floatdrop addressed comments. |
?
|
Thank you for this contribution. I spent a few hour struggling to find out why I wasn't catching the timeout errors, so I resorted to reading the code. Lo and behold, a fix was merged on v7.0.0 so all I had to do was update my version of got. Thanks, man! =) |
It should have been a major release probably :( |
Fixes #257.
Changes timeout option so that if a number is supplied, that is the timeout for the entire request to be completed; if an object is supplied, the keys
connect,socket, andrequestset connection, socket, and entire request timeouts, respectively.Open questions: