-
Notifications
You must be signed in to change notification settings - Fork 539
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.
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
fix: prioritise error events over timeouts #1551
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good spot!
@mcollina please check again |
tests are not working for windows
not sure what this is about |
this change also seems to fix the example from the original issue
|
my new test is failing on windows :( |
@mcollina seems like on windows we'll need 2 setImmediates I still don't know why but I noticed we have different implementation for windows in net.js. is it fine if we add another setImmediate? |
Detect if we are on windows and add another immediate in that case. I would also recommend moving that logic in a function because it's a bit hard to read. |
@mcollina please check again |
Error events in the implementation of 'net.connect' are defered to the next tick: https://github.com/nodejs/node/blob/main/lib/net.js#L1144 This will result in the TO callback always being executed before the error events callback in the callback queue. This fix makes sure that error event callbacks are executed before the TO socket destroy logic. fixes #1484
It would be a good idea to cancel the setImmedates when the response/error is fired.. let me do that first and then I'll ping you for revewing |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1551 +/- ##
==========================================
+ Coverage 94.91% 94.93% +0.01%
==========================================
Files 50 50
Lines 4702 4715 +13
==========================================
+ Hits 4463 4476 +13
Misses 239 239 ☔ View full report in Codecov by Sentry. |
@mcollina please check again |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Bumps undici from 5.8.0 to 5.9.1. Release notes Sourced from undici's releases. v5.9.1 What's Changed fix: don't timeout while waiting for client to send request (#1604) Fix array headers by @mateonunez in nodejs/undici#1598 fix(fetch): implement fully read body algorithm by @KhafraDev in nodejs/undici#1597 fix: add support for integrity option to Fetch by @jelmervdl in nodejs/undici#1596 fix(File): respect typed array byteOffset and byteLength by @mrbbot in nodejs/undici#1601 New Contributors @mateonunez made their first contribution in nodejs/undici#1598 @jelmervdl made their first contribution in nodejs/undici#1596 @mrbbot made their first contribution in nodejs/undici#1601 Full Changelog: nodejs/[email protected] v5.8.2⚠️ Security Release⚠️ CRLF Injection in Nodejs ‘undici’ via Content-Type GHSA-f772-66g8-q5h3 CVE-2022-35948 undici.request vulnerable to SSRF using absolute URL on pathname GHSA-8qr4-xgw6-wmr3 CVE-2022-35949 What's Changed docs: mock different endpoints in a single file by @ritvik130 in nodejs/undici#1589 feat(webidl): better error message for ByteString converter by @KhafraDev in nodejs/undici#1591 New Contributors @ritvik130 made their first contribution in nodejs/undici#1589 Full Changelog: nodejs/[email protected] v5.8.1 What's Changed Do not decode the body while we are following a redirect by @mcollina in nodejs/undici#1554 docs: Fix spelling/grammar in "Mocking Request" by @meyfa in nodejs/undici#1555 fix(MockInterceptor): callback options.headers w/ fetch by @KhafraDev in nodejs/undici#1559 fix(fetch): ByteString checks & conversion in Headers by @KhafraDev in nodejs/undici#1560 test: update client certificates with ones that expires in 100 years by @jodevsa in nodejs/undici#1566 fix: x-www-form-urlencoded parser keep the BOM by @cola119 in nodejs/undici#1563 fix: prioritise error events over timeouts by @jodevsa in nodejs/undici#1551 fix: add isErrorLike by @KhafraDev in nodejs/undici#1570 fix(types): add missing pool stats by @SkeLLLa in nodejs/undici#1573 fix: fetch a long base64 url will crash and nothing happens (close: #1574) by @ahaoboy in nodejs/undici#1575 fix: follow signal.reason in Request by @LiviaMedeiros in nodejs/undici#1580 docs: Fix DiagnosticsChannel sidebar link by @trentm in nodejs/undici#1582 fix: make mock headers case-insensitive by @cola119 in nodejs/undici#1585 New Contributors @meyfa made their first contribution in nodejs/undici#1555 @cola119 made their first contribution in nodejs/undici#1563 @SkeLLLa made their first contribution in nodejs/undici#1573 ... (truncated) Commits 5890e16 5.9.1 ecae314 fix: don't timeout while waiting for client to send request (#1604) fa9fd90 fix(File): respect typed array byteOffset and byteLength (#1601) ae6f554 fix: add support for integrity option to Fetch (#1596) deed628 fix(fetch): implement fully read body algorithm (#1597) 0d1419c Fix array headers (#1598) 52d1ce5 Bumped v5.8.2 66165d6 Merge pull request from GHSA-f772-66g8-q5h3 124f7eb Merge pull request from GHSA-8qr4-xgw6-wmr3 aef314c feat(webidl): better error message for ByteString converter (#1591) Additional commits viewable in compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase. Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: @dependabot rebase will rebase this PR @dependabot recreate will recreate this PR, overwriting any edits that have been made to it @dependabot merge will merge this PR after your CI passes on it @dependabot squash and merge will squash and merge this PR after your CI passes on it @dependabot cancel merge will cancel a previously requested merge and block automerging @dependabot reopen will reopen this PR if it is closed @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the Security Alerts page. Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix: prioritise error events over timeouts
Error events in the implementation of
net.connect
are defered to the next tick: https://github.com/nodejs/node/blob/main/lib/net.js#L1144This will result in the TO callback always being executed before the error events callback in the callback queue.
This fix makes sure that error event callbacks are executed before the TO socket destroy logic.
fixes #1484