refactor: remove the component adapter implementation (#864)

Author: JakeChampion

.github/workflows/main.yml

@@ -140,7 +140,6 @@ jobs:
         if-no-files-found: error
         path: |
           js-compute-runtime.wasm
-          js-compute-runtime-component.wasm
 
   ensure_cargo_installs:
     name: Ensure that all required "cargo install" commands are run, or we have a cache hit

.gitignore

@@ -21,7 +21,6 @@ tests/wpt-harness/wpt-test-runner.js
 wpt-runtime.wasm
 docs-app/bin/main.wasm
 docs-app/pkg/*.tar.gz
-runtime/js-compute-runtime/fastly-world/fastly_world_component_type.o
 
 *.a
 yarn-error.log

runtime/fastly/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.27)
 
 include("../StarlingMonkey/cmake/add_as_subproject.cmake")
 
-add_builtin(fastly::runtime SRC handler.cpp common/ip_octets_to_js_string.cpp host-api/component/fastly_world_adapter.cpp)
+add_builtin(fastly::runtime SRC handler.cpp common/ip_octets_to_js_string.cpp)
 add_builtin(fastly::cache_simple SRC builtins/cache-simple.cpp DEPENDENCIES OpenSSL)
 add_builtin(fastly::fastly SRC builtins/fastly.cpp)
 add_builtin(fastly::backend SRC builtins/backend.cpp)

runtime/fastly/builtins/backend.cpp

@@ -815,8 +815,9 @@ JS::Result<mozilla::Ok> Backend::register_dynamic_backend(JSContext *cx, JS::Han
 
     auto client_cert_key_slot = JS::GetReservedSlot(backend, Backend::Slots::ClientCertKey);
 
-    backend_config.client_cert = host_api::ClientCert{
-        .cert = std::move(client_cert_chars), .key = (FastlyHandle)client_cert_key_slot.toInt32()};
+    backend_config.client_cert =
+        host_api::ClientCert{.cert = std::move(client_cert_chars),
+                             .key = (host_api::CertKey)client_cert_key_slot.toInt32()};
   }
 
   auto res = host_api::HttpReq::register_dynamic_backend(name_str, target_str, backend_config);

runtime/fastly/builtins/fetch-event.cpp

@@ -454,7 +454,9 @@ void dispatch_fetch_event(HandleObject event, double *total_compute) {
   dispatch_fetch_event(event);
   double diff = duration_cast<microseconds>(system_clock::now() - pre_handler).count();
   *total_compute += diff;
-  printf("Request handler took %fms\n", diff / 1000);
+  if (ENGINE->debug_logging_enabled()) {
+    printf("Request handler took %fms\n", diff / 1000);
+  }
 }
 
 JSObject *FetchEvent::prepare_downstream_request(JSContext *cx) {

runtime/fastly/builtins/fetch/fetch.cpp

@@ -22,7 +22,8 @@ class FetchTask final : public api::AsyncTask {
   Heap<JSObject *> promise_;
 
 public:
-  explicit FetchTask(FastlyHandle handle, JS::HandleObject request, JS::HandleObject promise)
+  explicit FetchTask(host_api::HttpPendingReq::Handle handle, JS::HandleObject request,
+                     JS::HandleObject promise)
       : request_(request), promise_(promise) {
     if (static_cast<int32_t>(handle) < 0)
       abort();

runtime/fastly/builtins/fetch/request-response.cpp

@@ -75,7 +75,7 @@ bool error_stream_controller_with_pending_exception(JSContext *cx, JS::HandleObj
 
 constexpr size_t HANDLE_READ_CHUNK_SIZE = 8192;
 
-bool process_body_read(JSContext *cx, FastlyHandle handle, JS::HandleObject context,
+bool process_body_read(JSContext *cx, host_api::HttpBody::Handle handle, JS::HandleObject context,
                        JS::HandleObject promise) {
   MOZ_ASSERT(context);
   JS::RootedObject streamSource(cx, context);
@@ -196,7 +196,8 @@ ReadResult read_from_handle_all(JSContext *cx, host_api::HttpBody body) {
 
 } // namespace
 
-bool RequestOrResponse::process_pending_request(JSContext *cx, FastlyHandle handle,
+bool RequestOrResponse::process_pending_request(JSContext *cx,
+                                                host_api::HttpPendingReq::Handle handle,
                                                 JS::HandleObject context,
                                                 JS::HandleObject promise) {
   MOZ_ASSERT(Request::is_instance(context));
@@ -409,8 +410,9 @@ bool RequestOrResponse::extract_body(JSContext *cx, JS::HandleObject self,
         length = str.len;
       }
 
-      if (!text)
+      if (!text) {
         return false;
+      }
       buf = text.get();
       content_type = "text/plain;charset=UTF-8";
     }
@@ -3072,8 +3074,9 @@ bool Response::constructor(JSContext *cx, unsigned argc, JS::Value *vp) {
   JS::RootedObject headers(cx);
   JS::RootedObject headersInstance(
       cx, JS_NewObjectWithGivenProto(cx, &Headers::class_, Headers::proto_obj));
-  if (!headersInstance)
+  if (!headersInstance) {
     return false;
+  }
 
   headers = Headers::create(cx, headersInstance, Headers::Mode::ProxyToResponse, response,
                             headers_val, false);

runtime/fastly/builtins/fetch/request-response.h

@@ -35,8 +35,8 @@ class RequestOrResponse final {
   static void set_manual_framing_headers(JSContext *cx, JSObject *obj, JS::HandleValue url);
   static bool body_unusable(JSContext *cx, JS::HandleObject body);
   static bool extract_body(JSContext *cx, JS::HandleObject self, JS::HandleValue body_val);
-  static bool process_pending_request(JSContext *cx, FastlyHandle handle, JS::HandleObject context,
-                                      JS::HandleObject promise);
+  static bool process_pending_request(JSContext *cx, host_api::HttpPendingReq::Handle handle,
+                                      JS::HandleObject context, JS::HandleObject promise);
 
   /**
    * Returns the RequestOrResponse's Headers if it has been reified, nullptr if

runtime/fastly/builtins/kv-store.cpp

@@ -185,7 +185,8 @@ bool parse_and_validate_key(JSContext *cx, const char *key, size_t len) {
 
 } // namespace
 
-bool KVStore::process_pending_kv_store_delete(JSContext *cx, FastlyHandle handle,
+bool KVStore::process_pending_kv_store_delete(JSContext *cx,
+                                              host_api::ObjectStorePendingDelete::Handle handle,
                                               JS::HandleObject context, JS::HandleObject promise) {
   host_api::ObjectStorePendingDelete pending_delete(handle);
 
@@ -239,7 +240,8 @@ bool KVStore::delete_(JSContext *cx, unsigned argc, JS::Value *vp) {
   return true;
 }
 
-bool KVStore::process_pending_kv_store_lookup(JSContext *cx, FastlyHandle handle,
+bool KVStore::process_pending_kv_store_lookup(JSContext *cx,
+                                              host_api::ObjectStorePendingLookup::Handle handle,
                                               JS::HandleObject context, JS::HandleObject promise) {
   host_api::ObjectStorePendingLookup pending_lookup(handle);
 

runtime/fastly/builtins/kv-store.h

@@ -48,9 +48,11 @@ class KVStore final : public builtins::BuiltinImpl<KVStore> {
   static const unsigned ctor_length = 1;
 
   static bool constructor(JSContext *cx, unsigned argc, JS::Value *vp);
-  static bool process_pending_kv_store_lookup(JSContext *cx, FastlyHandle handle,
+  static bool process_pending_kv_store_lookup(JSContext *cx,
+                                              host_api::ObjectStorePendingLookup::Handle handle,
                                               JS::HandleObject context, JS::HandleObject promise);
-  static bool process_pending_kv_store_delete(JSContext *cx, FastlyHandle handle,
+  static bool process_pending_kv_store_delete(JSContext *cx,
+                                              host_api::ObjectStorePendingDelete::Handle handle,
                                               JS::HandleObject context, JS::HandleObject promise);
 };