Uh oh!
There was an error while loading. Please reload this page.
feat(core,cloudflare): Add dispose to the client for proper cleanup - #19506
Merged
Conversation
JPeer264force-pushed
the
jp/dispose-client-only
branch
from
February 24, 2026 17:00
cec1807 to
3545d37CompareContributor
size-limit report 📦
|
Contributor
node-overhead report 🧳Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.
|
JPeer264
marked this pull request as ready for review
February 25, 2026 08:15
JPeer264force-pushed
the
jp/dispose-client-only
branch
from
February 25, 2026 08:17
3545d37 to
82bbe5cCompareThere was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.
| // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers | ||
| // will still be called and may need the client to capture errors. | ||
| if (res.status === 101) { | ||
| waitUntil?.(client?.flush(2000)); |
There was a problem hiding this comment.
Passing undefined to waitUntil for 101 responses
Low Severity
When res.status === 101, waitUntil?.(client?.flush(2000)) can pass undefined to waitUntil if client is undefined (which the init() return type permits as CloudflareClient | undefined). The Cloudflare waitUntil expects a Promise, so this could cause a runtime error. All other code paths use flushAndDispose(client), which is an async function that always returns a Promise regardless of whether client is defined. The previous code uniformly used the global flush(2000), which also always returns a Promise.
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
closes#19475
closes JS-1785
This is a way to dispose the client entirely. Every request in Cloudflare Workers create their own client. Once the request is done the client would stay in memory forever, unless we
disposeit after every request. We also have to wait until allwaitUntils are finished, otherwise we would loose these traces.The
dispose()method got added on purpose into the core client, as thegetCurrentClient()would return aClient. Thedispose()method actually only has functionality inside theServerRuntimeClient, as only the server would need this functionality.There is still a leak in one of the default integrations, but when running load tests against the reproduction repo and setting
defaultIntegrations: false, then no leak is happening.FWIW there will be a separate PR for adding a MemoryProfiler as seen in #19364, to prevent this memory leak in the future.