Merge host_call.h with host_api.h

Author: elliottt

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

@@ -20,7 +20,6 @@
 #include "builtins/backend.h"
 #include "builtins/request-response.h"
 #include "host_interface/fastly.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 #include "js/Conversions.h"
 

runtime/js-compute-runtime/builtins/cache-override.cpp

@@ -10,7 +10,6 @@
 #include "cache-override.h"
 #include "host_interface/fastly.h"
 #include "host_interface/host_api.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

runtime/js-compute-runtime/builtins/cache-simple.cpp

@@ -4,7 +4,6 @@
 #include "builtins/shared/url.h"
 #include "host_interface/fastly.h"
 #include "host_interface/host_api.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 #include "js/ArrayBuffer.h"
 #include "js/Result.h"

runtime/js-compute-runtime/builtins/client-info.cpp

@@ -1,7 +1,6 @@
 #include "builtins/client-info.h"
 #include "core/geo_ip.h"
 #include "host_interface/host_api.h"
-#include "host_interface/host_call.h"
 #include "openssl/evp.h"
 
 #include "js/JSON.h"

runtime/js-compute-runtime/builtins/compression-stream.cpp

@@ -11,7 +11,6 @@
 #include "builtins/compression-stream.h"
 #include "builtins/transform-stream-default-controller.h"
 #include "builtins/transform-stream.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

runtime/js-compute-runtime/builtins/decompression-stream.cpp

@@ -11,7 +11,6 @@
 #include "builtins/decompression-stream.h"
 #include "builtins/transform-stream-default-controller.h"
 #include "builtins/transform-stream.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

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

@@ -15,7 +15,6 @@
 #include "builtins/request-response.h"
 #include "builtins/shared/url.h"
 #include "core/geo_ip.h"
-#include "host_interface/host_call.h"
 
 namespace builtins {
 

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

@@ -19,7 +19,6 @@
 #include "builtins/native-stream-source.h"
 #include "builtins/shared/url.h"
 #include "host_interface/host_api.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

runtime/js-compute-runtime/builtins/worker-location.cpp

@@ -1,7 +1,6 @@
 #include "builtins/worker-location.h"
 #include "builtin.h"
 #include "builtins/shared/url.h"
-#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 /**

runtime/js-compute-runtime/host_interface/host_api.h

@@ -1,6 +1,7 @@
 #ifndef JS_COMPUTE_RUNTIME_HOST_API_H
 #define JS_COMPUTE_RUNTIME_HOST_API_H
 
+#include <cstdint>
 #include <memory>
 #include <optional>
 #include <span>
@@ -10,16 +11,30 @@
 #include <vector>
 
 #include "core/allocator.h"
-#include "host_interface/host_call.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Winvalid-offsetof"
+#include "jsapi.h"
 #include "js/Utility.h"
 #pragma clang diagnostic pop
 
 /// A type to signal that a result produces no value.
 struct Void final {};
 
+/// The type of erros returned from the host.
+using FastlyError = uint8_t;
+
+bool error_is_generic(FastlyError e);
+bool error_is_invalid_argument(FastlyError e);
+bool error_is_optional_none(FastlyError e);
+bool error_is_bad_handle(FastlyError e);
+
+/// Generate an error in the JSContext.
+void handle_fastly_error(JSContext *cx, FastlyError err, int line, const char *func);
+
+/// Wrap up a call to handle_fastly_error with the current line and function.
+#define HANDLE_ERROR(cx, err) handle_fastly_error(cx, err, __LINE__, __func__)
+
 template <typename T> class Result final {
   /// A private wrapper to distinguish `fastly_compute_at_edge_fastly_error_t` in the private
   /// variant.