Add websocket support for server functions

any_error/src/lib.rs

@@ -9,7 +9,7 @@ use std::{
     error,
     fmt::{self, Display},
     future::Future,
-    mem, ops,
+    ops,
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
@@ -103,9 +103,7 @@ pub fn get_error_hook() -> Option<Arc<dyn ErrorHook>> {
 
 /// Sets the current thread-local error hook, which will be invoked when [`throw`] is called.
 pub fn set_error_hook(hook: Arc<dyn ErrorHook>) -> ResetErrorHookOnDrop {
-    ResetErrorHookOnDrop(
-        ERROR_HOOK.with_borrow_mut(|this| mem::replace(this, Some(hook))),
-    )
+    ResetErrorHookOnDrop(ERROR_HOOK.with_borrow_mut(|this| this.replace(hook)))
 }
 
 /// Invokes the error hook set by [`set_error_hook`] with the given error.

leptos/src/form.rs

@@ -7,7 +7,7 @@ use server_fn::{
     codec::PostUrl,
     error::{IntoAppError, ServerFnErrorErr},
     request::ClientReq,
-    ServerFn,
+    Http, ServerFn,
 };
 use tachys::{
     either::Either,
@@ -75,7 +75,7 @@ use web_sys::{
 /// ```
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
-pub fn ActionForm<ServFn>(
+pub fn ActionForm<ServFn, OutputProtocol>(
     /// The action from which to build the form.
     action: ServerAction<ServFn>,
     /// A [`NodeRef`] in which the `<form>` element should be stored.
@@ -86,7 +86,7 @@ pub fn ActionForm<ServFn>(
 ) -> impl IntoView
 where
     ServFn: DeserializeOwned
-        + ServerFn<InputEncoding = PostUrl>
+        + ServerFn<Protocol = Http<PostUrl, OutputProtocol>>
         + Clone
         + Send
         + Sync
@@ -151,7 +151,7 @@ where
 /// [`form`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form)
 /// progressively enhanced to use client-side routing.
 #[component]
-pub fn MultiActionForm<ServFn>(
+pub fn MultiActionForm<ServFn, OutputProtocol>(
     /// The action from which to build the form.
     action: ServerMultiAction<ServFn>,
     /// A [`NodeRef`] in which the `<form>` element should be stored.
@@ -165,7 +165,7 @@ where
         + Sync
         + Clone
         + DeserializeOwned
-        + ServerFn<InputEncoding = PostUrl>
+        + ServerFn<Protocol = Http<PostUrl, OutputProtocol>>
         + 'static,
     ServFn::Output: Send + Sync + 'static,
     <<ServFn::Client as Client<ServFn::Error>>::Request as ClientReq<