Update to the latest WITs and adapter.

Changes:
 - Add more values to `content-encodings`.
 - Change `tls-version` to a `u16`.
 - Give `kv-error` an `extra` arm for extensibility.
 - Bump `fastly:compute` to version number 0.1.0.

Author: dgohman-fastly

src/component/compute/kv_store.rs

@@ -331,3 +331,9 @@ impl kv_store::HostExtraListOptions for ComponentCtx {
         Ok(())
     }
 }
+
+impl kv_store::HostExtraKvError for ComponentCtx {
+    fn drop(&mut self, _options: Resource<kv_store::ExtraKvError>) -> wasmtime::Result<()> {
+        Ok(())
+    }
+}

wasm_abi/adapter/src/fastly/core.rs

@@ -1328,6 +1328,16 @@ pub mod fastly_http_req {
         }
     }
 
+    fn encode_tls_version(val: u32) -> Result<http_types::TlsVersion, ()> {
+        match val {
+            0 => Ok(0x0301), // TLS 1.0
+            1 => Ok(0x0302), // TLS 1.1
+            2 => Ok(0x0303), // TLS 1.2
+            3 => Ok(0x0304), // TLS 1.3
+            _ => Err(()),
+        }
+    }
+
     #[export_name = "fastly_http_req#body_downstream_get"]
     pub fn body_downstream_get(
         req_handle_out: *mut RequestHandle,
@@ -2105,11 +2115,11 @@ pub mod fastly_http_req {
         let sni_hostname = make_str!(sni_hostname, sni_hostname_len);
         let client_cert = make_str!(client_certificate, client_certificate_len);
 
-        let tls_version_min = match unsafe { (*config).ssl_min_version }.try_into() {
+        let tls_version_min = match encode_tls_version(unsafe { (*config).ssl_min_version }) {
             Ok(tls_version_min) => tls_version_min,
             Err(_) => return FastlyStatus::INVALID_ARGUMENT,
         };
-        let tls_version_max = match unsafe { (*config).ssl_max_version }.try_into() {
+        let tls_version_max = match encode_tls_version(unsafe { (*config).ssl_max_version }) {
             Ok(tls_version_max) => tls_version_max,
             Err(_) => return FastlyStatus::INVALID_ARGUMENT,
         };
@@ -3443,7 +3453,7 @@ pub mod fastly_kv_store {
                 PayloadTooLarge => Self::PayloadTooLarge,
                 InternalError => Self::InternalError,
                 TooManyRequests => Self::TooManyRequests,
-                GenericError => Self::Uninitialized,
+                GenericError | Extra(_) => Self::Uninitialized,
             }
         }
     }
@@ -4010,28 +4020,13 @@ pub mod fastly_backend {
         }
     }
 
-    impl From<http_types::TlsVersion> for u32 {
-        fn from(val: http_types::TlsVersion) -> Self {
-            match val {
-                http_types::TlsVersion::Tls1 => 0,
-                http_types::TlsVersion::Tls11 => 1,
-                http_types::TlsVersion::Tls12 => 2,
-                http_types::TlsVersion::Tls13 => 3,
-            }
-        }
-    }
-
-    impl TryFrom<u32> for http_types::TlsVersion {
-        type Error = u32;
-
-        fn try_from(val: u32) -> Result<Self, Self::Error> {
-            match val {
-                0 => Ok(http_types::TlsVersion::Tls1),
-                1 => Ok(http_types::TlsVersion::Tls11),
-                2 => Ok(http_types::TlsVersion::Tls12),
-                3 => Ok(http_types::TlsVersion::Tls13),
-                _ => Err(val),
-            }
+    fn decode_tls_version(val: http_types::TlsVersion) -> Result<u32, ()> {
+        match val {
+            0x0301 => Ok(0), // TLS 1.0
+            0x0302 => Ok(1), // TLS 1.1
+            0x0303 => Ok(2), // TLS 1.2
+            0x0304 => Ok(3), // TLS 1.3
+            _ => Err(()),
         }
     }
 
@@ -4214,12 +4209,15 @@ pub mod fastly_backend {
     ) -> FastlyStatus {
         let backend = crate::make_str!(unsafe_main_ptr!(backend_ptr), backend_len);
         match adapter_backend::get_tls_min_version(backend) {
-            Ok(Some(res)) => {
-                unsafe {
-                    *main_ptr!(value) = u32::from(res);
+            Ok(Some(res)) => match decode_tls_version(res) {
+                Ok(decoded) => {
+                    unsafe {
+                        *main_ptr!(value) = decoded;
+                    }
+                    FastlyStatus::OK
                 }
-                FastlyStatus::OK
-            }
+                Err(()) => FastlyStatus::UNSUPPORTED,
+            },
             Ok(None) => FastlyStatus::NONE,
             Err(e) => e.into(),
         }
@@ -4233,12 +4231,15 @@ pub mod fastly_backend {
     ) -> FastlyStatus {
         let backend = crate::make_str!(unsafe_main_ptr!(backend_ptr), backend_len);
         match adapter_backend::get_tls_max_version(backend) {
-            Ok(Some(res)) => {
-                unsafe {
-                    *main_ptr!(value) = u32::from(res);
+            Ok(Some(res)) => match decode_tls_version(res) {
+                Ok(decoded) => {
+                    unsafe {
+                        *main_ptr!(value) = decoded;
+                    }
+                    FastlyStatus::OK
                 }
-                FastlyStatus::OK
-            }
+                Err(()) => FastlyStatus::UNSUPPORTED,
+            },
             Ok(None) => FastlyStatus::NONE,
             Err(e) => e.into(),
         }
@@ -4828,7 +4829,7 @@ mod fastly_image_optimizer {
 /// allocation to convert a `&[Resource]` to a `&[u32]`.
 fn select_wrapper(hs: &[u32]) -> u32 {
     unsafe {
-        #[link(wasm_import_module = "fastly:compute/async-io@0.0.0-prerelease.1")]
+        #[link(wasm_import_module = "fastly:compute/async-io@0.1.0")]
         extern "C" {
             #[link_name = "select"]
             fn wit_import(_: *const u32, _: usize) -> u32;
@@ -4847,7 +4848,7 @@ fn select_with_timeout_wrapper(hs: &[u32], timeout_ms: u32) -> Option<u32> {
         struct RetArea([::core::mem::MaybeUninit<u8>; 8]);
         let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 8]);
         let ptr1 = ret_area.0.as_mut_ptr().cast::<u8>();
-        #[link(wasm_import_module = "fastly:compute/async-io@0.0.0-prerelease.1")]
+        #[link(wasm_import_module = "fastly:compute/async-io@0.1.0")]
         extern "C" {
             #[link_name = "select-with-timeout"]
             fn wit_import(_: *const u32, _: usize, _: u32, _: *mut u8);

wasm_abi/adapter/src/fastly/error.rs

@@ -73,7 +73,9 @@ impl From<crate::bindings::fastly::compute::kv_store::KvError> for FastlyStatus
             KvError::BadRequest | KvError::PreconditionFailed | KvError::PayloadTooLarge => {
                 std::hint::black_box(FastlyStatus::INVALID_ARGUMENT)
             }
-            KvError::GenericError | KvError::InternalError => FastlyStatus::UNKNOWN_ERROR,
+            KvError::GenericError | KvError::InternalError | KvError::Extra(_) => {
+                FastlyStatus::UNKNOWN_ERROR
+            }
             KvError::TooManyRequests => FastlyStatus::LIMITEXCEEDED,
         }
     }

wasm_abi/adapter/src/fastly/http_cache.rs

@@ -150,6 +150,7 @@ mod http_cache {
                 STALE_WHILE_REVALIDATE_NS,
                 (*options).stale_while_revalidate_ns
             ),
+            stale_if_error_ns: None,
             surrogate_keys,
             length: when_enabled!(LENGTH, (*options).length),
             sensitive_data: mask.contains(HttpCacheWriteOptionsMask::SENSITIVE_DATA),

wasm_abi/data/viceroy-component-adapter.wasm

@@ -13,8 +13,8 @@ interface adapter-abi {
 /// `http-downstream` interface which do the same thing but take an explicit
 /// `request` handle.
 interface adapter-http-req {
-  use fastly:compute/types@0.0.0-prerelease.1.{error, ip-address};
-  use fastly:compute/http-req@0.0.0-prerelease.1.{
+  use fastly:compute/types@0.1.0.{error, ip-address};
+  use fastly:compute/http-req@0.1.0.{
     client-cert-verify-result, request, body, response-with-body, error-with-detail,
     pending-response
   };
@@ -119,7 +119,7 @@ interface adapter-http-req {
 
 /// Deprecated; these functions take `backend` as a string.
 interface adapter-backend {
-  use fastly:compute/backend@0.0.0-prerelease.1.{
+  use fastly:compute/backend@0.1.0.{
     backend-health, error, timeout-ms, tls-version, timeout-secs, probe-count,
     dynamic-backend-options,
   };
@@ -164,7 +164,7 @@ interface adapter-backend {
 
 /// Deprecated functions formerly of `fastly:compute/image-optimizer`.
 interface adapter-image-optimizer {
-  use fastly:compute/image-optimizer@0.0.0-prerelease.1.{
+  use fastly:compute/image-optimizer@0.1.0.{
     body, request, image-optimizer-transform-options, response-with-body, error
   };
 
@@ -178,8 +178,8 @@ interface adapter-image-optimizer {
 }
 
 interface adapter-http-downstream {
-  use fastly:compute/types@0.0.0-prerelease.1.{error};
-  use fastly:compute/http-req@0.0.0-prerelease.1.{request};
+  use fastly:compute/types@0.1.0.{error};
+  use fastly:compute/http-req@0.1.0.{request};
 
   /// Deprecated, because it doesn't return `none` on an empty certificate.
   downstream-tls-raw-client-certificate-deprecated: func(
@@ -190,9 +190,9 @@ interface adapter-http-downstream {
 
 /// Deprecated functions formerly of `fastly:compute/http-cache`.
 interface adapter-http-cache {
-  use fastly:compute/types@0.0.0-prerelease.1.{error};
-  use fastly:compute/http-req@0.0.0-prerelease.1.{request};
-  use fastly:compute/http-cache@0.0.0-prerelease.1.{entry};
+  use fastly:compute/types@0.1.0.{error};
+  use fastly:compute/http-req@0.1.0.{request};
+  use fastly:compute/http-cache@0.1.0.{entry};
 
   /// Deprecated; use `transaction-lookup` instead.
   lookup: func(
@@ -217,8 +217,8 @@ interface adapter-http-cache {
 
 /// Adapter Core Cache functions.
 interface adapter-cache {
-  use fastly:compute/types@0.0.0-prerelease.1.{error};
-  use fastly:compute/cache@0.0.0-prerelease.1.{
+  use fastly:compute/types@0.1.0.{error};
+  use fastly:compute/cache@0.1.0.{
     extra-lookup-options, extra-write-options, extra-replace-options
   };
 
@@ -243,7 +243,7 @@ interface adapter-cache {
 
 /// User-agent string parsing (deprecated).
 interface adapter-uap {
-  use fastly:compute/types@0.0.0-prerelease.1.{error};
+  use fastly:compute/types@0.1.0.{error};
 
   resource user-agent {
     family: func(max-len: u64) -> result<string, error>;
@@ -258,7 +258,7 @@ interface adapter-uap {
 
 /// Deprecated functions formerly of `fastly:compute/erl`.
 interface adapter-erl {
-  use fastly:compute/types@0.0.0-prerelease.1.{error};
+  use fastly:compute/types@0.1.0.{error};
 
   check-rate: func(
     rate-counter: string,
@@ -302,8 +302,8 @@ interface adapter-erl {
 
 /// Deprecated functions formerly of `fastly:compute/shielding`.
 interface adapter-shielding {
-  use fastly:compute/types@0.0.0-prerelease.1.{error};
-  use fastly:compute/shielding@0.0.0-prerelease.1.{shield-backend-options};
+  use fastly:compute/types@0.1.0.{error};
+  use fastly:compute/shielding@0.1.0.{shield-backend-options};
 
   /// Deprecated; this function returns the backend as a `string`.
   backend-for-shield: func(
@@ -331,7 +331,7 @@ world adapter-imports {
 /// The `fastly:compute/service` world plus the deprecated interfaces.
 world adapter-service {
   // Make this world a superset of the public `service` world.
-  include fastly:compute/service@0.0.0-prerelease.1;
+  include fastly:compute/service@0.1.0;
 
   // And, add all the deprecated interfaces.
   include adapter-imports;
@@ -341,6 +341,6 @@ world adapter-service {
 /// exports (`http-incoming.handle`), so that it can be used by library components
 /// that don't have their own `main` function.
 world adapter-service-imports {
-    include fastly:compute/service-imports@0.0.0-prerelease.1;
+    include fastly:compute/service-imports@0.1.0;
     include adapter-imports;
 }