refactor!: make UserData more generic

.github/workflows/kernel.yml

@@ -21,9 +21,6 @@ jobs:
           target: wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v2
 
-      - name: install wasm-tools
-        uses: bytecodealliance/actions/wasm-tools/setup@v1
-
       - name: Install deps
         run: |
           sudo apt install wabt --yes

README.md

@@ -51,7 +51,6 @@ started:
 | Java SDK    | <img alt="Java SDK" src="https://extism.org/img/sdk-languages/java-android.svg" width="50px"/> | https://github.com/extism/java-sdk                                      | [Sonatype](https://central.sonatype.com/artifact/org.extism.sdk/extism) |
 | .NET SDK    | <img alt=".NET SDK" src="https://extism.org/img/sdk-languages/dotnet.svg" width="50px"/>       | https://github.com/extism/dotnet-sdk <br/>(supports C# & F#!)           | [Nuget](https://www.nuget.org/packages/Extism.Sdk)                      |
 | OCaml SDK   | <img alt="OCaml SDK" src="https://extism.org/img/sdk-languages/ocaml.svg" width="50px"/>       | https://github.com/extism/ocaml-sdk                                     | [opam](https://opam.ocaml.org/packages/extism/)                         |
-| Perl SDK    | <img alt="Perl SDK" src="https://extism.org/img/sdk-languages/perl.svg" width="50px"/>         | https://github.com/extism/perl-sdk                                      | N/A                                                                     |
 | PHP SDK     | <img alt="PHP SDK" src="https://extism.org/img/sdk-languages/php.svg" width="50px"/>           | https://github.com/extism/php-sdk                                       | [Packagist](https://packagist.org/packages/extism/extism)               |
 | Python SDK  | <img alt="Python SDK" src="https://extism.org/img/sdk-languages/python.svg" width="50px"/>     | https://github.com/extism/python-sdk                                    | [PyPi](https://pypi.org/project/extism/)                                |
 | Ruby SDK    | <img alt="Ruby SDK" src="https://extism.org/img/sdk-languages/ruby.svg" width="50px"/>         | https://github.com/extism/ruby-sdk                                      | [RubyGems](https://rubygems.org/gems/extism)                            |

kernel/build.sh

@@ -17,9 +17,6 @@ done
 
 cargo build --package extism-runtime-kernel --bin extism-runtime --release --target wasm32-unknown-unknown $CARGO_FLAGS
 cp target/wasm32-unknown-unknown/release/extism-runtime.wasm .
+wasm-strip extism-runtime.wasm
+mv extism-runtime.wasm ../runtime/src/extism-runtime.wasm
 
-wasm-tools parse extism-context.wat -o extism-context.wasm
-wasm-merge --enable-reference-types ./extism-runtime.wasm runtime extism-context.wasm context -o ../runtime/src/extism-runtime.wasm
-rm extism-context.wasm
-rm extism-runtime.wasm
-wasm-strip ../runtime/src/extism-runtime.wasm

kernel/extism-context.wat

@@ -1,3 +0,0 @@
-(module
-  (global (export "extism_context") (mut externref) (ref.null extern))
-)

runtime/README.md

@@ -12,7 +12,7 @@ To use the `extism` crate, you can add it to your Cargo file:
 
 ```toml
 [dependencies]
-extism = "1.2.0"
+extism = "1.0.0"
 ```
 
 ## Environment variables
@@ -201,7 +201,7 @@ fn main() {
 }
 ```
 
-> *Note*: In order to write host functions you should get familiar with the methods on the [CurrentPlugin](https://docs.rs/extism/latest/extism/struct.CurrentPlugin.html) and [UserData](https://docs.rs/extism/latest/extism/enum.UserData.html) types.
+> *Note*: In order to write host functions you should get familiar with the methods on the [Extism::CurrentPlugin](https://docs.rs/extism/latest/extism/struct.CurrentPlugin.html) and [Extism::CurrentPlugin](https://docs.rs/extism/latest/extism/struct.UserData.html) types.
 
 Now we can invoke the event:
 

runtime/build.rs

@@ -7,7 +7,7 @@ fn main() {
 #define EXTISM_SUCCESS 0
 
 /** An alias for I64 to signify an Extism pointer */
-#define EXTISM_PTR ExtismValType_I64
+#define PTR I64
 ";
     if let Ok(x) = cbindgen::Builder::new()
         .with_crate(".")

runtime/examples/linking.rs

@@ -2,8 +2,6 @@ use extism::*;
 
 fn main() {
     let manifest = Manifest::new([
-        // upper.wat provides an export called `host_reflect` that takes a string
-        // and returns the same string uppercased
         Wasm::File {
             // See https://github.com/extism/plugins/blob/main/upper.wat
             path: "../wasm/upper.wasm".into(),
@@ -12,9 +10,6 @@ fn main() {
                 hash: None,
             },
         },
-        // reflect expects host_reflect to be imported: https://github.com/extism/plugins/blob/e5578bbbdd87f9936a0a8d36df629768b2eff6bb/reflect/src/lib.rs#L5
-        // Extism will link the export from upper.wat to the import of reflect.rs at runtime so it
-        // can call it
         Wasm::File {
             // See https://github.com/extism/plugins/tree/main/reflect
             path: "../wasm/reflect.wasm".into(),

runtime/examples/readme.rs

@@ -1,7 +1,7 @@
 use extism::*;
 
 // pretend this is redis or something :)
-type KVStore = std::collections::BTreeMap<String, Vec<u8>>;
+type KVStore = std::sync::Arc<std::sync::Mutex<std::collections::BTreeMap<String, Vec<u8>>>>;
 
 // When a first argument separated with a semicolon is provided to `host_fn` it is used as the
 // variable name and type for the `UserData` parameter

runtime/extism.h

@@ -10,7 +10,7 @@
 #define EXTISM_SUCCESS 0
 
 /** An alias for I64 to signify an Extism pointer */
-#define EXTISM_PTR ExtismValType_I64
+#define PTR I64
 
 
 /**
@@ -20,31 +20,31 @@ typedef enum {
   /**
    * Signed 32 bit integer.
    */
-  ExtismValType_I32,
+  I32,
   /**
    * Signed 64 bit integer.
    */
-  ExtismValType_I64,
+  I64,
   /**
    * Floating point 32 bit integer.
    */
-  ExtismValType_F32,
+  F32,
   /**
    * Floating point 64 bit integer.
    */
-  ExtismValType_F64,
+  F64,
   /**
    * A 128 bit number.
    */
-  ExtismValType_V128,
+  V128,
   /**
    * A reference to a Wasm function.
    */
-  ExtismValType_FuncRef,
+  FuncRef,
   /**
    * A reference to opaque data in the Wasm instance.
    */
-  ExtismValType_ExternRef,
+  ExternRef,
 } ExtismValType;
 
 /**
@@ -113,12 +113,6 @@ extern "C" {
  */
 const uint8_t *extism_plugin_id(ExtismPlugin *plugin);
 
-/**
- * Get the current plugin's associated host context data. Returns null if call was made without
- * host context.
- */
-void *extism_current_plugin_host_context(ExtismCurrentPlugin *plugin);
-
 /**
  * Returns a pointer to the memory of the currently running plugin
  * NOTE: this should only be called from host functions.
@@ -237,20 +231,6 @@ int32_t extism_plugin_call(ExtismPlugin *plugin,
                            const uint8_t *data,
                            ExtismSize data_len);
 
-/**
- * Call a function with host context.
- *
- * `func_name`: is the function to call
- * `data`: is the input data
- * `data_len`: is the length of `data`
- * `host_context`: a pointer to context data that will be available in host functions
- */
-int32_t extism_plugin_call_with_host_context(ExtismPlugin *plugin,
-                                             const char *func_name,
-                                             const uint8_t *data,
-                                             ExtismSize data_len,
-                                             void *host_context);
-
 /**
  * Get the error associated with a `Plugin`
  */

runtime/src/current_plugin.rs

@@ -15,7 +15,6 @@ pub struct CurrentPlugin {
     pub(crate) available_pages: Option<u32>,
     pub(crate) memory_limiter: Option<MemoryLimiter>,
     pub(crate) id: uuid::Uuid,
-    pub(crate) start_time: std::time::Instant,
 }
 
 unsafe impl Send for CurrentPlugin {}
@@ -63,11 +62,6 @@ impl wasmtime::ResourceLimiter for MemoryLimiter {
 }
 
 impl CurrentPlugin {
-    /// Gets `Plugin`'s ID
-    pub fn id(&self) -> uuid::Uuid {
-        self.id
-    }
-
     /// Get a `MemoryHandle` from a memory offset
     pub fn memory_handle(&mut self, offs: u64) -> Option<MemoryHandle> {
         if offs == 0 {
@@ -187,23 +181,6 @@ impl CurrentPlugin {
         anyhow::bail!("{} unable to locate extism memory", self.id)
     }
 
-    pub fn host_context<T: Clone + 'static>(&mut self) -> Result<T, Error> {
-        let (linker, mut store) = self.linker_and_store();
-        let Some(Extern::Global(xs)) = linker.get(&mut store, EXTISM_ENV_MODULE, "extism_context")
-        else {
-            anyhow::bail!("unable to locate an extism kernel global: extism_context",)
-        };
-
-        let Val::ExternRef(Some(xs)) = xs.get(store) else {
-            anyhow::bail!("expected extism_context to be an externref value",)
-        };
-
-        match xs.data().downcast_ref::<T>().cloned() {
-            Some(xs) => Ok(xs.clone()),
-            None => anyhow::bail!("could not downcast extism_context",),
-        }
-    }
-
     pub fn memory_alloc(&mut self, n: u64) -> Result<MemoryHandle, Error> {
         if n == 0 {
             return Ok(MemoryHandle {
@@ -319,13 +296,7 @@ impl CurrentPlugin {
 
             if let Some(a) = &manifest.allowed_paths {
                 for (k, v) in a.iter() {
-                    let d = wasmtime_wasi::Dir::open_ambient_dir(k, auth).map_err(|err| {
-                        Error::msg(format!(
-                            "Unable to preopen directory \"{}\": {}",
-                            k.display(),
-                            err.kind()
-                        ))
-                    })?;
+                    let d = wasmtime_wasi::Dir::open_ambient_dir(k, auth)?;
                     ctx.preopened_dir(d, v)?;
                 }
             }
@@ -360,7 +331,6 @@ impl CurrentPlugin {
             available_pages,
             memory_limiter,
             id,
-            start_time: std::time::Instant::now(),
         })
     }
 
@@ -471,18 +441,6 @@ impl CurrentPlugin {
         let length = self.memory_length(offs).unwrap_or_default();
         (offs, length)
     }
-
-    /// Returns the remaining time before a plugin will timeout, or
-    /// `None` if no timeout is configured in the manifest
-    pub fn time_remaining(&self) -> Option<std::time::Duration> {
-        if let Some(x) = &self.manifest.timeout_ms {
-            let elapsed = &self.start_time.elapsed().as_millis();
-            let ms_left = x.saturating_sub(*elapsed as u64);
-            return Some(std::time::Duration::from_millis(ms_left));
-        }
-
-        None
-    }
 }
 
 impl Internal for CurrentPlugin {
@@ -494,6 +452,14 @@ impl Internal for CurrentPlugin {
         unsafe { &mut *self.store }
     }
 
+    fn linker(&self) -> &Linker<CurrentPlugin> {
+        unsafe { &*self.linker }
+    }
+
+    fn linker_mut(&mut self) -> &mut Linker<CurrentPlugin> {
+        unsafe { &mut *self.linker }
+    }
+
     fn linker_and_store(&mut self) -> (&mut Linker<CurrentPlugin>, &mut Store<CurrentPlugin>) {
         unsafe { (&mut *self.linker, &mut *self.store) }
     }

runtime/src/function.rs

@@ -4,7 +4,6 @@ use wasmtime::Caller;
 use crate::{error, trace, CurrentPlugin, Error};
 
 /// An enumeration of all possible value types in WebAssembly.
-/// cbindgen:prefix-with-name
 #[derive(Debug, Clone, Hash, Eq, PartialEq)]
 #[repr(C)]
 pub enum ValType {
@@ -72,9 +71,7 @@ pub struct CPtr {
 /// UserDataHandle is an untyped version of `UserData` that is stored inside `Function` to keep a live reference.
 #[derive(Clone)]
 pub(crate) enum UserDataHandle {
-    #[allow(dead_code)]
     C(Arc<CPtr>),
-    #[allow(dead_code)]
     Rust(Arc<std::sync::Mutex<dyn std::any::Any>>),
 }
 
@@ -84,18 +81,18 @@ pub(crate) enum UserDataHandle {
 /// using `UserData::get`. The `C` data is stored as a pointer and cleanup function and isn't usable from Rust. The cleanup function
 /// will be called when the inner `CPtr` is dropped.
 #[derive(Debug)]
-pub enum UserData<T: Sized> {
+pub enum UserData<T: Sync + Clone + Sized> {
     C(Arc<CPtr>),
-    Rust(Arc<std::sync::Mutex<T>>),
+    Rust(T),
 }
 
-impl<T: Default> Default for UserData<T> {
+impl<T: Default + Sync + Clone> Default for UserData<T> {
     fn default() -> Self {
         UserData::new(T::default())
     }
 }
 
-impl<T> Clone for UserData<T> {
+impl<T: Sync + Clone> Clone for UserData<T> {
     fn clone(&self) -> Self {
         match self {
             UserData::C(ptr) => UserData::C(ptr.clone()),
@@ -104,7 +101,7 @@ impl<T> Clone for UserData<T> {
     }
 }
 
-impl<T> UserData<T> {
+impl<T: Sync + Clone> UserData<T> {
     /// Create a new `UserData` from an existing pointer and free function, this is used
     /// by the C API to wrap C pointers into user data
     pub(crate) fn new_pointer(
@@ -129,12 +126,11 @@ impl<T> UserData<T> {
     ///
     /// This will wrap the provided value in a reference-counted mutex
     pub fn new(x: T) -> Self {
-        let data = Arc::new(std::sync::Mutex::new(x));
-        UserData::Rust(data)
+        UserData::Rust(x)
     }
 
     /// Get a copy of the inner value
-    pub fn get(&self) -> Result<Arc<std::sync::Mutex<T>>, Error> {
+    pub fn get(&self) -> Result<T, Error> {
         match self {
             UserData::C { .. } => anyhow::bail!("C UserData should not be used from Rust"),
             UserData::Rust(data) => Ok(data.clone()),
@@ -153,8 +149,8 @@ impl Drop for CPtr {
     }
 }
 
-unsafe impl<T> Send for UserData<T> {}
-unsafe impl<T> Sync for UserData<T> {}
+unsafe impl<T: Sync + Clone> Send for UserData<T> {}
+unsafe impl<T: Sync + Clone> Sync for UserData<T> {}
 unsafe impl Send for CPtr {}
 unsafe impl Sync for CPtr {}
 
@@ -183,7 +179,7 @@ pub struct Function {
 
 impl Function {
     /// Create a new host function
-    pub fn new<T: 'static, F>(
+    pub fn new<T: 'static + Sync + Clone, F>(
         name: impl Into<String>,
         args: impl IntoIterator<Item = ValType>,
         returns: impl IntoIterator<Item = ValType>,
@@ -214,7 +210,9 @@ impl Function {
             namespace: None,
             _user_data: match &user_data {
                 UserData::C(ptr) => UserDataHandle::C(ptr.clone()),
-                UserData::Rust(x) => UserDataHandle::Rust(x.clone()),
+                UserData::Rust(x) => {
+                    UserDataHandle::Rust(std::sync::Arc::new(std::sync::Mutex::new(x.clone())))
+                }
             },
         }
     }

runtime/src/internal.rs

@@ -12,6 +12,10 @@ pub(crate) trait Internal {
 
     fn store_mut(&mut self) -> &mut Store<CurrentPlugin>;
 
+    fn linker(&self) -> &Linker<CurrentPlugin>;
+
+    fn linker_mut(&mut self) -> &mut Linker<CurrentPlugin>;
+
     fn linker_and_store(&mut self) -> (&mut Linker<CurrentPlugin>, &mut Store<CurrentPlugin>);
 
     fn current_plugin(&self) -> &CurrentPlugin {

runtime/src/manifest.rs

@@ -47,13 +47,9 @@ fn to_module(engine: &Engine, wasm: &extism_manifest::Wasm) -> Result<(String, M
             let name = meta.name.as_deref().unwrap_or(MAIN_KEY).to_string();
 
             // Load file
-            let buf = std::fs::read(path).map_err(|err| {
-                Error::msg(format!(
-                    "Unable to load Wasm file \"{}\": {}",
-                    path.display(),
-                    err.kind()
-                ))
-            })?;
+            let mut buf = Vec::new();
+            let mut file = std::fs::File::open(path)?;
+            file.read_to_end(&mut buf)?;
 
             check_hash(&meta.hash, &buf)?;
             Ok((name, Module::new(engine, buf)?))

runtime/src/pdk.rs

@@ -217,11 +217,6 @@ pub(crate) fn http_request(
             r = r.set(k, v);
         }
 
-        // Set HTTP timeout to respect the manifest timeout
-        if let Some(remaining) = data.time_remaining() {
-            r = r.timeout(remaining);
-        }
-
         let res = if body_offset > 0 {
             let handle = match data.memory_handle(body_offset) {
                 Some(h) => h,
@@ -241,12 +236,6 @@ pub(crate) fn http_request(
                 Some(res.into_reader())
             }
             Err(e) => {
-                // Catch timeout and return
-                if let Some(d) = data.time_remaining() {
-                    if e.kind() == ureq::ErrorKind::Io && d.as_nanos() == 0 {
-                        anyhow::bail!("timeout");
-                    }
-                }
                 let msg = e.to_string();
                 if let Some(res) = e.into_response() {
                     data.http_status = res.status();

runtime/src/plugin.rs

@@ -1,5 +1,4 @@
 use std::{
-    any::Any,
     collections::{BTreeMap, BTreeSet},
     path::PathBuf,
 };
@@ -101,6 +100,14 @@ impl Internal for Plugin {
         &mut self.store
     }
 
+    fn linker(&self) -> &Linker<CurrentPlugin> {
+        &self.linker
+    }
+
+    fn linker_mut(&mut self) -> &mut Linker<CurrentPlugin> {
+        &mut self.linker
+    }
+
     fn linker_and_store(&mut self) -> (&mut Linker<CurrentPlugin>, &mut Store<CurrentPlugin>) {
         (&mut self.linker, &mut self.store)
     }
@@ -186,12 +193,6 @@ fn add_module<T: 'static>(
     }
 
     for import in module.imports() {
-        let module = import.module();
-
-        if module == EXTISM_ENV_MODULE && !matches!(import.ty(), ExternType::Func(_)) {
-            anyhow::bail!("linked modules cannot access non-function exports of extism kernel");
-        }
-
         if !linked.contains(import.module()) {
             if let Some(m) = modules.get(import.module()) {
                 add_module(
@@ -461,12 +462,7 @@ impl Plugin {
     }
 
     // Store input in memory and re-initialize `Internal` pointer
-    pub(crate) fn set_input(
-        &mut self,
-        input: *const u8,
-        mut len: usize,
-        host_context: Option<ExternRef>,
-    ) -> Result<(), Error> {
+    pub(crate) fn set_input(&mut self, input: *const u8, mut len: usize) -> Result<(), Error> {
         self.output = Output::default();
         self.clear_error()?;
         let id = self.id.to_string();
@@ -500,13 +496,6 @@ impl Plugin {
             )?;
         }
 
-        if let Some(Extern::Global(ctxt)) =
-            self.linker
-                .get(&mut self.store, EXTISM_ENV_MODULE, "extism_context")
-        {
-            ctxt.set(&mut self.store, Val::ExternRef(host_context))?;
-        }
-
         Ok(())
     }
 
@@ -684,7 +673,6 @@ impl Plugin {
         lock: &mut std::sync::MutexGuard<Option<Instance>>,
         name: impl AsRef<str>,
         input: impl AsRef<[u8]>,
-        host_context: Option<ExternRef>,
     ) -> Result<i32, (Error, i32)> {
         let name = name.as_ref();
         let input = input.as_ref();
@@ -698,7 +686,7 @@ impl Plugin {
 
         self.instantiate(lock).map_err(|e| (e, -1))?;
 
-        self.set_input(input.as_ptr(), input.len(), host_context)
+        self.set_input(input.as_ptr(), input.len())
             .map_err(|x| (x, -1))?;
 
         let func = match self.get_func(lock, name) {
@@ -729,7 +717,6 @@ impl Plugin {
             .expect("Timer should start");
         self.store.epoch_deadline_trap();
         self.store.set_epoch_deadline(1);
-        self.current_plugin_mut().start_time = std::time::Instant::now();
 
         // Call the function
         let mut results = vec![wasmtime::Val::null(); n_results];
@@ -886,26 +873,7 @@ impl Plugin {
         let lock = self.instance.clone();
         let mut lock = lock.lock().unwrap();
         let data = input.to_bytes()?;
-        self.raw_call(&mut lock, name, data, None)
-            .map_err(|e| e.0)
-            .and_then(move |_| self.output())
-    }
-
-    pub fn call_with_host_context<'a, 'b, T, U, C>(
-        &'b mut self,
-        name: impl AsRef<str>,
-        input: T,
-        host_context: C,
-    ) -> Result<U, Error>
-    where
-        T: ToBytes<'a>,
-        U: FromBytes<'b>,
-        C: Any + Send + Sync + 'static,
-    {
-        let lock = self.instance.clone();
-        let mut lock = lock.lock().unwrap();
-        let data = input.to_bytes()?;
-        self.raw_call(&mut lock, name, data, Some(ExternRef::new(host_context)))
+        self.raw_call(&mut lock, name, data)
             .map_err(|e| e.0)
             .and_then(move |_| self.output())
     }
@@ -924,7 +892,7 @@ impl Plugin {
         let lock = self.instance.clone();
         let mut lock = lock.lock().unwrap();
         let data = input.to_bytes().map_err(|e| (e, -1))?;
-        self.raw_call(&mut lock, name, data, None)
+        self.raw_call(&mut lock, name, data)
             .and_then(move |_| self.output().map_err(|e| (e, -1)))
     }
 

runtime/src/plugin_builder.rs

@@ -60,7 +60,7 @@ impl<'a> PluginBuilder<'a> {
     }
 
     /// Add a single host function
-    pub fn with_function<T: 'static, F>(
+    pub fn with_function<T: Sync + Clone + 'static, F>(
         mut self,
         name: impl Into<String>,
         args: impl IntoIterator<Item = ValType>,
@@ -80,7 +80,7 @@ impl<'a> PluginBuilder<'a> {
     }
 
     /// Add a single host function in a specific namespace
-    pub fn with_function_in_namespace<T: 'static, F>(
+    pub fn with_function_in_namespace<T: Sync + Clone + 'static, F>(
         mut self,
         namespace: impl Into<String>,
         name: impl Into<String>,

runtime/src/sdk.rs

@@ -84,24 +84,6 @@ pub unsafe extern "C" fn extism_plugin_id(plugin: *mut Plugin) -> *const u8 {
     plugin.id.as_bytes().as_ptr()
 }
 
-/// Get the current plugin's associated host context data. Returns null if call was made without
-/// host context.
-#[no_mangle]
-pub unsafe extern "C" fn extism_current_plugin_host_context(
-    plugin: *mut CurrentPlugin,
-) -> *mut std::ffi::c_void {
-    if plugin.is_null() {
-        return std::ptr::null_mut();
-    }
-
-    let plugin = &mut *plugin;
-    if let Ok(CVoidContainer(ptr)) = plugin.host_context::<CVoidContainer>() {
-        ptr
-    } else {
-        std::ptr::null_mut()
-    }
-}
-
 /// Returns a pointer to the memory of the currently running plugin
 /// NOTE: this should only be called from host functions.
 #[no_mangle]
@@ -482,31 +464,6 @@ pub unsafe extern "C" fn extism_plugin_call(
     func_name: *const c_char,
     data: *const u8,
     data_len: Size,
-) -> i32 {
-    extism_plugin_call_with_host_context(plugin, func_name, data, data_len, std::ptr::null_mut())
-}
-
-#[derive(Clone)]
-#[repr(transparent)]
-struct CVoidContainer(*mut std::ffi::c_void);
-
-// "You break it, you buy it."
-unsafe impl Send for CVoidContainer {}
-unsafe impl Sync for CVoidContainer {}
-
-/// Call a function with host context.
-///
-/// `func_name`: is the function to call
-/// `data`: is the input data
-/// `data_len`: is the length of `data`
-/// `host_context`: a pointer to context data that will be available in host functions
-#[no_mangle]
-pub unsafe extern "C" fn extism_plugin_call_with_host_context(
-    plugin: *mut Plugin,
-    func_name: *const c_char,
-    data: *const u8,
-    data_len: Size,
-    host_context: *mut std::ffi::c_void,
 ) -> i32 {
     if plugin.is_null() {
         return -1;
@@ -528,12 +485,7 @@ pub unsafe extern "C" fn extism_plugin_call_with_host_context(
         name
     );
     let input = std::slice::from_raw_parts(data, data_len as usize);
-    let res = plugin.raw_call(
-        &mut lock,
-        name,
-        input,
-        Some(ExternRef::new(CVoidContainer(host_context))),
-    );
+    let res = plugin.raw_call(&mut lock, name, input);
 
     match res {
         Err((e, rc)) => plugin.return_error(&mut lock, e, rc),
@@ -719,7 +671,7 @@ unsafe fn set_log_buffer(filter: &str) -> Result<(), Error> {
 /// Calls the provided callback function for each buffered log line.
 /// This is only needed when `extism_log_custom` is used.
 pub unsafe extern "C" fn extism_log_drain(handler: ExtismLogDrainFunctionType) {
-    if let Some(buf) = LOG_BUFFER.as_mut() {
+    if let Some(buf) = &mut LOG_BUFFER {
         if let Ok(mut buf) = buf.buffer.lock() {
             for (line, len) in buf.drain(..) {
                 handler(line.as_ptr(), len as u64);

runtime/src/tests/runtime.rs

@@ -240,34 +240,6 @@ fn test_timeout() {
     assert!(err == "timeout");
 }
 
-#[test]
-fn test_http_timeout() {
-    let f = Function::new(
-        "hello_world",
-        [PTR],
-        [PTR],
-        UserData::default(),
-        hello_world,
-    );
-
-    let manifest = Manifest::new([extism_manifest::Wasm::data(WASM_HTTP)])
-        .with_timeout(std::time::Duration::from_millis(1))
-        .with_allowed_host("www.extism.org");
-    let mut plugin = Plugin::new(manifest, [f], true).unwrap();
-
-    let start = std::time::Instant::now();
-    let output: Result<&[u8], Error> =
-        plugin.call("http_request", r#"{"url": "https://www.extism.org"}"#);
-    let end = std::time::Instant::now();
-    let time = end - start;
-    let err = output.unwrap_err().root_cause().to_string();
-    println!(
-        "Timed out plugin ran for {:?}, with error: {:?}",
-        time, &err
-    );
-    assert!(err == "timeout");
-}
-
 typed_plugin!(pub TestTypedPluginGenerics {
     count_vowels<T: FromBytes<'a>>(&str) -> T
 });
@@ -335,42 +307,6 @@ fn test_toml_manifest() {
     assert_eq!(count.get("count").unwrap().as_i64().unwrap(), 1);
 }
 
-#[test]
-fn test_call_with_host_context() {
-    #[derive(Clone)]
-    struct Foo {
-        message: String,
-    }
-
-    let f = Function::new(
-        "host_reflect",
-        [PTR],
-        [PTR],
-        UserData::default(),
-        |current_plugin, _val, ret, _user_data: UserData<()>| {
-            let foo = current_plugin.host_context::<Foo>()?;
-            let hnd = current_plugin.memory_new(foo.message)?;
-            ret[0] = current_plugin.memory_to_val(hnd);
-            Ok(())
-        },
-    );
-
-    let mut plugin = Plugin::new(WASM_REFLECT, [f], true).unwrap();
-
-    let message = "hello world";
-    let output: String = plugin
-        .call_with_host_context(
-            "reflect",
-            "anything, really",
-            Foo {
-                message: message.to_string(),
-            },
-        )
-        .unwrap();
-
-    assert_eq!(output, message);
-}
-
 #[test]
 fn test_fuzz_reflect_plugin() {
     // assert!(set_log_file("stdout", Some(log::Level::Trace)));
@@ -517,7 +453,7 @@ fn hello_world_user_data(
     _plugin: &mut CurrentPlugin,
     inputs: &[Val],
     outputs: &mut [Val],
-    user_data: UserData<std::fs::File>,
+    user_data: UserData<std::sync::Arc<std::sync::Mutex<std::fs::File>>>,
 ) -> Result<(), Error> {
     let data = user_data.get()?;
     let mut data = data.lock().unwrap();
@@ -534,7 +470,8 @@ fn test_userdata() {
         if path.exists() {
             std::fs::remove_file(&path).unwrap();
         }
-        let file = std::fs::File::create(&path).unwrap();
+        let file =
+            std::sync::Arc::new(std::sync::Mutex::new(std::fs::File::create(&path).unwrap()));
         let f = Function::new(
             "hello_world",
             [PTR],