Use HttpReq, HttpResp, and HttpBody in more places

Author: elliottt

runtime/js-compute-runtime/builtins/fastly.cpp

@@ -144,15 +144,14 @@ bool Fastly::createFanoutHandoff(JSContext *cx, unsigned argc, JS::Value *vp) {
     return false;
   }
 
-  fastly_response_handle_t response_handle = INVALID_HANDLE;
-  fastly_error_t err;
-  if (!fastly_http_resp_new(&response_handle, &err)) {
-    HANDLE_ERROR(cx, err);
+  auto response_handle = HttpResp::make();
+  if (auto *err = response_handle.to_err()) {
+    HANDLE_ERROR(cx, *err);
     return false;
   }
-  fastly_body_handle_t body_handle = INVALID_HANDLE;
-  if (!fastly_http_body_new(&body_handle, &err)) {
-    HANDLE_ERROR(cx, err);
+  auto body_handle = HttpBody::make();
+  if (auto *err = body_handle.to_err()) {
+    HANDLE_ERROR(cx, *err);
     return false;
   }
 
@@ -181,8 +180,9 @@ bool Fastly::createFanoutHandoff(JSContext *cx, unsigned argc, JS::Value *vp) {
   bool is_upstream = true;
   bool is_grip_upgrade = true;
   JS::RootedObject response(
-      cx, builtins::Response::create(cx, response_instance, response_handle, body_handle,
-                                     is_upstream, is_grip_upgrade, std::move(backend_chars)));
+      cx, builtins::Response::create(cx, response_instance, response_handle.unwrap(),
+                                     body_handle.unwrap(), is_upstream, is_grip_upgrade,
+                                     std::move(backend_chars)));
   if (!response) {
     return false;
   }

runtime/js-compute-runtime/builtins/fetch-event.cpp

@@ -74,12 +74,12 @@ JSObject *FetchEvent::prepare_downstream_request(JSContext *cx) {
       cx, JS_NewObjectWithGivenProto(cx, &Request::class_, Request::proto_obj));
   if (!requestInstance)
     return nullptr;
-  return Request::create(cx, requestInstance, INVALID_HANDLE, INVALID_HANDLE, true);
+  return Request::create(cx, requestInstance, HttpReq{}, HttpBody{}, true);
 }
 
 bool FetchEvent::init_downstream_request(JSContext *cx, JS::HandleObject request,
                                          fastly_request_t *req) {
-  MOZ_ASSERT(Request::request_handle(request) == INVALID_HANDLE);
+  MOZ_ASSERT(!Request::request_handle(request).is_valid());
 
   fastly_error_t err;
 
@@ -176,11 +176,11 @@ bool FetchEvent::request_get(JSContext *cx, unsigned argc, JS::Value *vp) {
 namespace {
 
 bool start_response(JSContext *cx, JS::HandleObject response_obj, bool streaming) {
-  fastly_response_handle_t response = Response::response_handle(response_obj);
-  fastly_body_handle_t body = RequestOrResponse::body_handle(response_obj);
+  auto response = Response::response_handle(response_obj);
+  auto body = RequestOrResponse::body_handle(response_obj);
 
   fastly_error_t err;
-  if (!fastly_http_resp_send_downstream(response, body, streaming, &err)) {
+  if (!fastly_http_resp_send_downstream(response.handle, body.handle, streaming, &err)) {
     HANDLE_ERROR(cx, err);
     return false;
   }

runtime/js-compute-runtime/builtins/object-store.cpp

@@ -276,10 +276,10 @@ bool ObjectStore::put(JSContext *cx, unsigned argc, JS::Value *vp) {
       JS::RootedObject stream_source(cx,
                                      builtins::NativeStreamSource::get_stream_source(cx, body_obj));
       JS::RootedObject source_owner(cx, builtins::NativeStreamSource::owner(stream_source));
-      fastly_body_handle_t body = RequestOrResponse::body_handle(source_owner);
+      auto body = RequestOrResponse::body_handle(source_owner);
 
       fastly_error_t err;
-      if (!fastly_object_store_insert(object_store_handle(self), &key_str, body, &err)) {
+      if (!fastly_object_store_insert(object_store_handle(self), &key_str, body.handle, &err)) {
         HANDLE_ERROR(cx, err);
         return ReturnPromiseRejectedWithPendingError(cx, args);
       }