Allow classes to extend from Request #116
Merged
Conversation
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
JakeChampion
force-pushed
the
jake/extend-builtins
branch
from
7991b17 to
af07fff
Compare
JakeChampion
force-pushed
the
jake/extend-builtins
branch
from
af07fff to
6bdd91a
Compare
JakeChampion
commented
Jun 20, 2022
JakeChampion
commented
Jun 20, 2022
| bool constructor(JSContext *cx, unsigned argc, Value *vp) { | ||
| REQUEST_HANDLER_ONLY("The Request builtin"); | ||
| CTOR_HEADER("Request", 1); | ||
| RootedObject requestInstance(cx, JS_NewObjectForConstructor(cx, &class_, args)); |
Contributor
Author
There was a problem hiding this comment.
I've had to move the constructor to below the use of the class macro because the constructor implementation now needs access to &class_ which is defined within the class macro
JakeChampion
commented
Jun 20, 2022
Comment on lines
4208
to
4215
| JSObject *create(JSContext *cx, RequestHandle request_handle, BodyHandle body_handle, | ||
| bool is_downstream) { | ||
| RootedObject request(cx, JS_NewObjectWithGivenProto(cx, &class_, proto_obj)); | ||
| if (!request) | ||
| RootedObject requestInstance(cx, JS_NewObjectWithGivenProto(cx, &class_, proto_obj)); | ||
| if (!requestInstance) | ||
| return nullptr; | ||
|
|
||
| JS::SetReservedSlot(request, Slots::Request, JS::Int32Value(request_handle.handle)); | ||
| JS::SetReservedSlot(request, Slots::Headers, JS::NullValue()); | ||
| JS::SetReservedSlot(request, Slots::Body, JS::Int32Value(body_handle.handle)); | ||
| JS::SetReservedSlot(request, Slots::BodyStream, JS::NullValue()); | ||
| JS::SetReservedSlot(request, Slots::HasBody, JS::FalseValue()); | ||
| JS::SetReservedSlot(request, Slots::BodyUsed, JS::FalseValue()); | ||
| JS::SetReservedSlot(request, Slots::Method, JS::StringValue(GET_atom)); | ||
| JS::SetReservedSlot(request, Slots::CacheOverride, JS::NullValue()); | ||
| JS::SetReservedSlot(request, Slots::IsDownstream, JS::BooleanValue(is_downstream)); | ||
| return Request::create(cx, requestInstance, request_handle, body_handle, is_downstream); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This method exists for use within the prepare_downstream_request function, which should always use the runtime's Request implementation and not one which could be supplied by the applications' JS
elliottt
approved these changes
Jun 21, 2022
Contributor
elliottt
left a comment
elliottt
left a comment
There was a problem hiding this comment.
This looks great! I had one question about the new create overload introduced, but feel free to reply and merge if it's benign.
…s instead of JS_NewObjectWithGivenProto as JS_NewObjectForConstructor will use the callee to determine parentage and [[Prototype]], which allows applications to extend from Request
JakeChampion
force-pushed
the
jake/extend-builtins
branch
from
ffb443e to
f61ebe2
Compare
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.
This is part of the solution for #113 - that issue shows that all our built-in classes are not extendable within applications' JavaScript.
This pull-request changes our Request to use
JS_NewObjectForConstructorwhen the construction has come from the applications' JavaScript, which assigns the correct prototype to the instance being constructed (taking into accountextendsin JavaScript)I've also added a test which confirms that the correct prototype has been assigned when extending from
Request