Catch when nodejs request is aborted #141
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
M4RC3L05
commented
Feb 6, 2024
src/listener.ts
Outdated
| @@ -143,6 +143,13 @@ export const getRequestListener = ( | |||
| // so generate a pseudo Request object with only the minimum required information. | |||
| const req = newRequest(incoming) | |||
|
|
|||
| // Detect if request was aborted. | |||
| incoming.socket.on('close', () => { | |||
| if (incoming.aborted) { | |||
There was a problem hiding this comment.
From the nodejs docs it appears that the aborted property is deprecated, and as a replacement, we should check the destroyed (https://nodejs.org/dist/latest-v20.x/docs/api/http.html#messageaborted).
For some reason if i use it, it makes most of the tests fail, do not know if this is something related with supertest...
There was a problem hiding this comment.
Resolved, had to listen to the close event on the response and check the incoming.destroyed
| @@ -89,3 +89,42 @@ describe('Error handling - async fetchCallback', () => { | |||
| expect(res.text).toBe('error handler did not return a response') | |||
| }) | |||
| }) | |||
|
|
|||
| describe('Abort request', () => { | |||
There was a problem hiding this comment.
Is there any more tests that i should include?
M4RC3L05
force-pushed
the
enhancement/nodejs-request-abort
branch
2 times, most recently
from
16ef93d
to
2a75974
Compare
|
I'm preparing an improvement plan now, so wait a minute. |
|
Hi @M4RC3L05 I hope to achieve the following two points as well.
As an example, I would like to have something like the following PR, can you incorporate it into your PR? |
|
Hi, sure, I can work on making does changes |
M4RC3L05
force-pushed
the
enhancement/nodejs-request-abort
branch
from
2a75974
to
c9fa9ef
Compare
M4RC3L05
commented
Feb 8, 2024
| @@ -40,6 +40,34 @@ describe('Request', () => { | |||
| expect(req).toBeInstanceOf(global.Request) | |||
| expect(req.url).toBe('http://localhost/foo.txt') | |||
| }) | |||
|
|
|||
| it('should generate only one `AbortController` per `Request` object created', async () => { | |||
There was a problem hiding this comment.
Just a sanity check to make sure we do not create a new AbortController every time we access it, or any other property since it calls getRequestCache.
|
@M4RC3L05 Thank you. Looks good! |
When we receive a request, we start listening to the close event on the response. When fired, we check if the request was aborted using `incoming.destroyed`, if it was, we dispatch an abort event to the existing request abort signal. Without this, whe the client abortes the request, the signal on the request was not being called with the abort event. Signed-off-by: m4rc3l05 <15786310+M4RC3L05@users.noreply.github.com>
M4RC3L05
force-pushed
the
enhancement/nodejs-request-abort
branch
from
c9fa9ef
to
55e0250
Compare
|
Done |
|
@M4RC3L05 Thanks!! |
nicolewhite
referenced
this pull request
in autoblocksai/cli
Mar 20, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@hono/node-server](https://togithub.com/honojs/node-server) | [`1.7.0` -> `1.8.2`](https://renovatebot.com/diffs/npm/@hono%2fnode-server/1.7.0/1.8.2) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>honojs/node-server (@​hono/node-server)</summary> ### [`v1.8.2`](https://togithub.com/honojs/node-server/releases/tag/v1.8.2) [Compare Source](https://togithub.com/honojs/node-server/compare/v1.8.1...v1.8.2) #### What's Changed - fix: duplex only has a getter by [@​wenerme](https://togithub.com/wenerme) in [https://github.com/honojs/node-server/pull/149](https://togithub.com/honojs/node-server/pull/149) #### New Contributors - [@​wenerme](https://togithub.com/wenerme) made their first contribution in [https://github.com/honojs/node-server/pull/149](https://togithub.com/honojs/node-server/pull/149) **Full Changelog**: honojs/node-server@v1.8.1...v1.8.2 ### [`v1.8.1`](https://togithub.com/honojs/node-server/releases/tag/v1.8.1) [Compare Source](https://togithub.com/honojs/node-server/compare/v1.8.0...v1.8.1) This release includes a `feat` change, but it's minor, so release this as a patch-release. #### What's Changed - feat: support keepalive property for Request object by [@​usualoma](https://togithub.com/usualoma) in [https://github.com/honojs/node-server/pull/148](https://togithub.com/honojs/node-server/pull/148) **Full Changelog**: honojs/node-server@v1.8.0...v1.8.1 ### [`v1.8.0`](https://togithub.com/honojs/node-server/releases/tag/v1.8.0) [Compare Source](https://togithub.com/honojs/node-server/compare/v1.7.0...v1.8.0) #### What's Changed - feat: bump hono to v3.12.8, add customer err tests for compress middl… by [@​ariskemper](https://togithub.com/ariskemper) in [https://github.com/honojs/node-server/pull/130](https://togithub.com/honojs/node-server/pull/130) - refactor(test): replace features to be removed in v4 by [@​ryuapp](https://togithub.com/ryuapp) in [https://github.com/honojs/node-server/pull/136](https://togithub.com/honojs/node-server/pull/136) - Catch when nodejs request is aborted by [@​M4RC3L05](https://togithub.com/M4RC3L05) in [https://github.com/honojs/node-server/pull/141](https://togithub.com/honojs/node-server/pull/141) - chore: bump hono to v4 by [@​yusukebe](https://togithub.com/yusukebe) in [https://github.com/honojs/node-server/pull/143](https://togithub.com/honojs/node-server/pull/143) - feat: use internal body if available for returning the response in its original form as much as possible by [@​usualoma](https://togithub.com/usualoma) in [https://github.com/honojs/node-server/pull/145](https://togithub.com/honojs/node-server/pull/145) #### New Contributors - [@​ariskemper](https://togithub.com/ariskemper) made their first contribution in [https://github.com/honojs/node-server/pull/130](https://togithub.com/honojs/node-server/pull/130) - [@​ryuapp](https://togithub.com/ryuapp) made their first contribution in [https://github.com/honojs/node-server/pull/136](https://togithub.com/honojs/node-server/pull/136) - [@​M4RC3L05](https://togithub.com/M4RC3L05) made their first contribution in [https://github.com/honojs/node-server/pull/141](https://togithub.com/honojs/node-server/pull/141) **Full Changelog**: honojs/node-server@v1.7.0...v1.8.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" in timezone America/Chicago, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/autoblocksai/cli). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNDUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjI0NS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we receive a request, we start listening to the close event. When fired, we check if the request was aborted using
incoming.aborted, if it was, we dispatch an abort event to the existing request abort signal.Without this, when the client aborts the request, the signal on the request was not being called with the abort event.
Closes: #107