(chore): patch the uniffi library instead of downgrading

Author: markharding

.gitlab/images/rust/Dockerfile

@@ -11,9 +11,7 @@ RUN apt-get update && apt-get install -y \
 
 # Rust deps
 RUN rustup set profile default && rustup component add clippy rustfmt
-RUN cargo install just cargo-ndk \
-    && cargo install wasm-bindgen-cli --version 0.2.113 \
-    && rm -rf /usr/local/cargo/registry
+RUN cargo install just wasm-bindgen-cli cargo-ndk && rm -rf /usr/local/cargo/registry
 
 # Android NDK
 RUN curl -L -o /tmp/ndk.zip "https://dl.google.com/android/repository/android-ndk-r27c-linux.zip" \

packages/rs-core-uniffi-web/ubrn-wasm-patch.toml

@@ -1,7 +1,5 @@
 # Merged into the auto-generated rust_modules/wasm/Cargo.toml by ubrn.
 # Disables rs-core's default `native-transport` feature so the wasm crate
 # only pulls in the wasm32-compatible `tonic-web-wasm-client` transport.
-# Pin wasm-bindgen
 [dependencies]
-polycentric-core = { default-features = false }
-wasm-bindgen = "=0.2.113"
+polycentric-core = { default-features = false }

patches/uniffi-bindgen-react-native@0.31.0-2.patch

@@ -0,0 +1,62 @@
+diff --git a/crates/ubrn_bindgen/src/bindings/gen_rust/mod.rs b/crates/ubrn_bindgen/src/bindings/gen_rust/mod.rs
+index f21884f978b3457cc67d1ba7122816dbf8b796b2..f0913aea2df850dcacf4ac6ff81c45e3d0404f41 100644
+--- a/crates/ubrn_bindgen/src/bindings/gen_rust/mod.rs
++++ b/crates/ubrn_bindgen/src/bindings/gen_rust/mod.rs
+@@ -95,8 +95,16 @@ impl FlavorParams<'_> {
+     }
+ }
+ 
+-fn callback_fn_ident() -> Ident {
+-    ident("JsCallbackFn")
++// wasm-bindgen >=0.2.114 collapses #[wasm_bindgen]-exposed structs that
++// share an identical Rust ident into one JS class breaking foreign-future callbacks.
++// Suffix the ident with the containing module's name so each is a distinct Rust type.
++// See https://github.com/wasm-bindgen/wasm-bindgen/pull/4977
++fn callback_fn_ident(module: &Ident) -> Ident {
++    use heck::ToUpperCamelCase;
++    ident(&format!(
++        "JsCallbackFn{}",
++        module.to_string().to_upper_camel_case()
++    ))
+ }
+ 
+ fn wasm_flavor() -> FlavorParams<'static> {
+@@ -305,7 +313,7 @@ impl<'a> ComponentTemplate<'a> {
+ 
+         let module_ident = cb.module_ident();
+         let js_class = cb.js_module_ident();
+-        let callback_fn_ident = callback_fn_ident();
++        let callback_fn_ident = callback_fn_ident(&module_ident);
+ 
+         quote! {
+             mod #module_ident {
+@@ -348,7 +356,8 @@ impl<'a> ComponentTemplate<'a> {
+ 
+     fn ffi_callback(&mut self, cb: &FfiCallbackFunction2) -> TokenStream {
+         let uniffi_ident = self.uniffi_ident();
+-        let callback_fn_ident = callback_fn_ident();
++        let cb_module_ident = cb.module_ident();
++        let callback_fn_ident = callback_fn_ident(&cb_module_ident);
+ 
+         let js_method_decl = self.js_callback_method_decl(&callback_fn_ident, cb.callback());
+ 
+@@ -512,8 +521,9 @@ impl<'a> ComponentTemplate<'a> {
+                 let field_ident = ident(field_name);
+                 let js_field_ident = camel_case_ident(field_name);
+                 if st.is_callback_method(field_name) {
+-                    let callback_fn_ident = callback_fn_ident();
+                     let alias_ident = st.method_alias_ident(field_name);
++                    let mod_ident = st.method_mod_ident(field_name);
++                    let callback_fn_ident = callback_fn_ident(&mod_ident);
+                     quote! {
+                         #[wasm_bindgen(method, getter, js_name = #js_field_ident)]
+                         fn #field_ident(this: &VTableJs) -> #alias_ident::#callback_fn_ident;
+@@ -737,7 +747,7 @@ impl<'a> ComponentTemplate<'a> {
+             }
+             FfiType::Callback(cb) => {
+                 let mod_ident = snake_case_ident(cb);
+-                let callback_fn_ident = callback_fn_ident();
++                let callback_fn_ident = callback_fn_ident(&mod_ident);
+                 quote! { #mod_ident::#callback_fn_ident }
+             }
+             FfiType::Reference(_) | FfiType::MutReference(_) => {

pnpm-lock.yaml

@@ -5,7 +5,10 @@ packages:
   - tools/*
 
 catalog:
-  typescript: ^5.9.3
   '@noble/hashes': ^1.8.0
+  typescript: ^5.9.3
 
 linkWorkspacePackages: true
+
+patchedDependencies:
+  uniffi-bindgen-react-native@0.31.0-2: patches/uniffi-bindgen-react-native@0.31.0-2.patch