fix: Ensure that ctx and env __init__ arguments are always wrapped#131
Open
hoodmane wants to merge 1 commit into
Open
fix: Ensure that ctx and env __init__ arguments are always wrapped#131hoodmane wants to merge 1 commit into
hoodmane wants to merge 1 commit into
Conversation
We fixed the double-wrapping problem in cloudflare#126 but added a new problem that ctx and env args in subclasses won't be wrapped at all. This switches to wrapping all __init__ functions but making DurableObjectContext and _EnvWrapper idempotent so that double wrapping them is not possible.
ryanking13
reviewed
Jun 19, 2026
| def __init_subclass__(cls, **_kwargs): | ||
| if _is_direct_binding_subclass(cls, DurableObject): | ||
| _wrap_subclass(cls) | ||
| _wrap_class(cls) |
Contributor
There was a problem hiding this comment.
Do we need both decorator + __init_subclass__?
Contributor
There was a problem hiding this comment.
Okay, this class wrapping thing is really making my head confused
| return cls | ||
|
|
||
|
|
||
| def _wrap_workflow_step(cls): |
Contributor
There was a problem hiding this comment.
I guess calling _wrap_workflow_step twice would still wrap run function twice
Contributor
Author
There was a problem hiding this comment.
Oh yeah these need to be adjusted too that is right.
| _wrap_subclass(cls) | ||
| _wrap_queue_handler(cls) | ||
| _wrap_class(cls) | ||
| _wrap_queue_handler(cls) |
Contributor
There was a problem hiding this comment.
Same for queue. the queue function would be wrapped twice I guess?
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 free
to 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.
We fixed the double-wrapping problem in #126 but added a new problem that ctx and env args in subclasses won't be wrapped at all. This switches to wrapping all init functions but making DurableObjectContext and _EnvWrapper idempotent so that double wrapping them is not possible.