Allow Response to be used as a base class to extend from within application javascript

Author: Jake Champion

c-dependencies/js-compute-runtime/js-compute-builtins.cpp

@@ -4851,8 +4851,110 @@ JSString *status_message(JSObject *obj) {
   return JS::GetReservedSlot(obj, Slots::StatusMessage).toString();
 }
 
-JSObject *create(JSContext *cx, ResponseHandle response_handle, BodyHandle body_handle,
-                 bool is_upstream);
+const unsigned ctor_length = 1;
+
+bool check_receiver(JSContext *cx, HandleValue receiver, const char *method_name);
+
+bool ok_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  uint16_t status = Response::status(self);
+  args.rval().setBoolean(status >= 200 && status < 300);
+  return true;
+}
+
+bool status_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  args.rval().setInt32(status(self));
+  return true;
+}
+
+bool statusText_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  args.rval().setString(status_message(self));
+  return true;
+}
+
+bool url_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  args.rval().set(RequestOrResponse::url(self));
+  return true;
+}
+
+// TODO: store version client-side.
+bool version_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  uint32_t version = 0;
+  if (!HANDLE_RESULT(cx, xqd_resp_version_get(response_handle(self), &version)))
+    return false;
+
+  args.rval().setInt32(version);
+  return true;
+}
+
+JSString *type_default_atom;
+JSString *type_error_atom;
+
+bool type_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  args.rval().setString(status(self) == 0 ? type_error_atom : type_default_atom);
+  return true;
+}
+
+bool headers_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+
+  JSObject *headers = RequestOrResponse::headers<Headers::Mode::ProxyToResponse>(cx, self);
+  if (!headers)
+    return false;
+
+  args.rval().setObject(*headers);
+  return true;
+}
+
+template <BodyReadResult result_type> bool bodyAll(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+  return RequestOrResponse::bodyAll<result_type>(cx, args, self);
+}
+
+bool body_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+  return RequestOrResponse::body_get(cx, args, self, true);
+}
+
+bool bodyUsed_get(JSContext *cx, unsigned argc, Value *vp) {
+  METHOD_HEADER(0)
+  args.rval().setBoolean(RequestOrResponse::body_used(self));
+  return true;
+}
+
+const JSFunctionSpec methods[] = {
+    JS_FN("arrayBuffer", bodyAll<BodyReadResult::ArrayBuffer>, 0, JSPROP_ENUMERATE),
+    JS_FN("json", bodyAll<BodyReadResult::JSON>, 0, JSPROP_ENUMERATE),
+    JS_FN("text", bodyAll<BodyReadResult::Text>, 0, JSPROP_ENUMERATE), JS_FS_END};
+
+const JSPropertySpec properties[] = {JS_PSG("type", type_get, JSPROP_ENUMERATE),
+                                     JS_PSG("url", url_get, JSPROP_ENUMERATE),
+                                     JS_PSG("status", status_get, JSPROP_ENUMERATE),
+                                     JS_PSG("ok", ok_get, JSPROP_ENUMERATE),
+                                     JS_PSG("statusText", statusText_get, 0),
+                                     JS_PSG("version", version_get, JSPROP_ENUMERATE),
+                                     JS_PSG("headers", headers_get, JSPROP_ENUMERATE),
+                                     JS_PSG("body", body_get, JSPROP_ENUMERATE),
+                                     JS_PSG("bodyUsed", bodyUsed_get, JSPROP_ENUMERATE),
+                                     JS_PS_END};
+
+bool constructor(JSContext *cx, unsigned argc, Value *vp);
+
+CLASS_BOILERPLATE_CUSTOM_INIT(Response)
+
+JSObject *create(JSContext *cx, HandleObject response, ResponseHandle response_handle,
+                 BodyHandle body_handle, bool is_upstream);
 
 /**
  * The `Response` constructor https://fetch.spec.whatwg.org/#dom-response
@@ -4923,7 +5025,8 @@ bool constructor(JSContext *cx, unsigned argc, Value *vp) {
     return false;
   }
 
-  RootedObject response(cx, create(cx, response_handle, body_handle, false));
+  RootedObject responseInstance(cx, JS_NewObjectForConstructor(cx, &class_, args));
+  RootedObject response(cx, create(cx, responseInstance, response_handle, body_handle, false));
   if (!response) {
     return false;
   }
@@ -4988,106 +5091,6 @@ bool constructor(JSContext *cx, unsigned argc, Value *vp) {
   return true;
 }
 
-const unsigned ctor_length = 1;
-
-bool check_receiver(JSContext *cx, HandleValue receiver, const char *method_name);
-
-bool ok_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  uint16_t status = Response::status(self);
-  args.rval().setBoolean(status >= 200 && status < 300);
-  return true;
-}
-
-bool status_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  args.rval().setInt32(status(self));
-  return true;
-}
-
-bool statusText_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  args.rval().setString(status_message(self));
-  return true;
-}
-
-bool url_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  args.rval().set(RequestOrResponse::url(self));
-  return true;
-}
-
-// TODO: store version client-side.
-bool version_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  uint32_t version = 0;
-  if (!HANDLE_RESULT(cx, xqd_resp_version_get(response_handle(self), &version)))
-    return false;
-
-  args.rval().setInt32(version);
-  return true;
-}
-
-JSString *type_default_atom;
-JSString *type_error_atom;
-
-bool type_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  args.rval().setString(status(self) == 0 ? type_error_atom : type_default_atom);
-  return true;
-}
-
-bool headers_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-
-  JSObject *headers = RequestOrResponse::headers<Headers::Mode::ProxyToResponse>(cx, self);
-  if (!headers)
-    return false;
-
-  args.rval().setObject(*headers);
-  return true;
-}
-
-template <BodyReadResult result_type> bool bodyAll(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-  return RequestOrResponse::bodyAll<result_type>(cx, args, self);
-}
-
-bool body_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-  return RequestOrResponse::body_get(cx, args, self, true);
-}
-
-bool bodyUsed_get(JSContext *cx, unsigned argc, Value *vp) {
-  METHOD_HEADER(0)
-  args.rval().setBoolean(RequestOrResponse::body_used(self));
-  return true;
-}
-
-const JSFunctionSpec methods[] = {
-    JS_FN("arrayBuffer", bodyAll<BodyReadResult::ArrayBuffer>, 0, JSPROP_ENUMERATE),
-    JS_FN("json", bodyAll<BodyReadResult::JSON>, 0, JSPROP_ENUMERATE),
-    JS_FN("text", bodyAll<BodyReadResult::Text>, 0, JSPROP_ENUMERATE), JS_FS_END};
-
-const JSPropertySpec properties[] = {JS_PSG("type", type_get, JSPROP_ENUMERATE),
-                                     JS_PSG("url", url_get, JSPROP_ENUMERATE),
-                                     JS_PSG("status", status_get, JSPROP_ENUMERATE),
-                                     JS_PSG("ok", ok_get, JSPROP_ENUMERATE),
-                                     JS_PSG("statusText", statusText_get, 0),
-                                     JS_PSG("version", version_get, JSPROP_ENUMERATE),
-                                     JS_PSG("headers", headers_get, JSPROP_ENUMERATE),
-                                     JS_PSG("body", body_get, JSPROP_ENUMERATE),
-                                     JS_PSG("bodyUsed", bodyUsed_get, JSPROP_ENUMERATE),
-                                     JS_PS_END};
-
-CLASS_BOILERPLATE_CUSTOM_INIT(Response)
-
 bool init_class(JSContext *cx, HandleObject global) {
   if (!init_class_impl(cx, global)) {
     return false;
@@ -5099,12 +5102,8 @@ bool init_class(JSContext *cx, HandleObject global) {
          (type_error_atom = JS_AtomizeAndPinString(cx, "error"));
 }
 
-JSObject *create(JSContext *cx, ResponseHandle response_handle, BodyHandle body_handle,
-                 bool is_upstream) {
-  RootedObject response(cx, JS_NewObjectWithGivenProto(cx, &class_, proto_obj));
-  if (!response)
-    return nullptr;
-
+JSObject *create(JSContext *cx, HandleObject response, ResponseHandle response_handle,
+                 BodyHandle body_handle, bool is_upstream) {
   JS::SetReservedSlot(response, Slots::Response, JS::Int32Value(response_handle.handle));
   JS::SetReservedSlot(response, Slots::Headers, JS::NullValue());
   JS::SetReservedSlot(response, Slots::Body, JS::Int32Value(body_handle.handle));
@@ -7633,7 +7632,12 @@ bool process_pending_requests(JSContext *cx) {
     return JS::RejectPromise(cx, response_promise, exn);
   }
 
-  RootedObject response(cx, Response::create(cx, response_handle, body, true));
+  RootedObject response_instance(
+      cx, JS_NewObjectWithGivenProto(cx, &Response::class_, Response::proto_obj));
+  if (!response_instance)
+    return false;
+
+  RootedObject response(cx, Response::create(cx, response_instance, response_handle, body, true));
   if (!response)
     return false;
 

integration-tests/js-compute/fixtures/extend-from-builtins/extend-from-builtins.ts

@@ -4,7 +4,7 @@ const builtins = [
     TransformStream,
     CompressionStream,
     // Request,
-    // Response,
+    Response,
     Dictionary,
     // Headers,
     CacheOverride,