upgrade: flutter_rust_bridge@ 2.0.0-dev.27.

2025-06-30 06:42:54 +08:00 · 2024-03-10 20:28:24 +08:00
parent 00e5f7545b
commit 430455c2da
14 changed files with 129 additions and 1223 deletions
--- a/rust/src/frb_generated.io.rs
+++ b/rust/src/frb_generated.io.rs
@ -1,10 +1,9 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.25.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27.

 // Section: imports

 use super::*;
-use crate::api::http_api::*;
 use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
 use flutter_rust_bridge::for_generated::transform_result_dco;
 use flutter_rust_bridge::{Handler, IntoIntoDart};
@ -12,17 +11,3 @@ use flutter_rust_bridge::{Handler, IntoIntoDart};
 // Section: boilerplate

 flutter_rust_bridge::frb_generated_boilerplate_io!();
-
-#[no_mangle]
-pub extern "C" fn frbgen_starcitizen_doctor_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
-    ptr: *const std::ffi::c_void,
-) {
-    MoiArc::<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest :: Version>>::increment_strong_count(ptr as _);
-}
-
-#[no_mangle]
-pub extern "C" fn frbgen_starcitizen_doctor_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
-    ptr: *const std::ffi::c_void,
-) {
-    MoiArc::<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest :: Version>>::decrement_strong_count(ptr as _);
-}
--- a/rust/src/frb_generated.rs
+++ b/rust/src/frb_generated.rs
@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.25.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27.

 #![allow(
    non_camel_case_types,
@ -19,7 +19,6 @@

 // Section: imports

-use crate::api::http_api::*;
 use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
 use flutter_rust_bridge::for_generated::transform_result_dco;
 use flutter_rust_bridge::{Handler, IntoIntoDart};
@ -31,7 +30,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
    default_rust_opaque = RustOpaqueMoi,
    default_rust_auto_opaque = RustAutoOpaqueMoi,
 );
-const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.25";
+const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.27";

 // Section: executor

@ -198,12 +197,6 @@ fn wire_start_process_impl(
    )
 }

-// Section: related_funcs
-
-flutter_rust_bridge::frb_generated_moi_arc_impl_value!(
-    flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest::Version>
-);
-
 // Section: dart2rust

 impl SseDecode for flutter_rust_bridge::for_generated::anyhow::Error {
@ -213,16 +206,6 @@ impl SseDecode for flutter_rust_bridge::for_generated::anyhow::Error {
    }
 }

-impl SseDecode for reqwest::Version {
-    // Codec=Sse (Serialization based), see doc to use other codecs
-    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
-        let mut inner = <RustOpaqueMoi<
-            flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest::Version>,
-        >>::sse_decode(deserializer);
-        return inner.rust_auto_opaque_decode_owned();
-    }
-}
-
 impl SseDecode for std::collections::HashMap<String, String> {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@ -231,16 +214,6 @@ impl SseDecode for std::collections::HashMap<String, String> {
    }
 }

-impl SseDecode
-    for RustOpaqueMoi<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest::Version>>
-{
-    // Codec=Sse (Serialization based), see doc to use other codecs
-    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
-        let mut inner = <usize>::sse_decode(deserializer);
-        return decode_rust_opaque_moi(inner);
-    }
-}
-
 impl SseDecode for String {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@ -292,6 +265,21 @@ impl SseDecode for Vec<(String, String)> {
    }
 }

+impl SseDecode for crate::http_package::MyHttpVersion {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <i32>::sse_decode(deserializer);
+        return match inner {
+            0 => crate::http_package::MyHttpVersion::HTTP_09,
+            1 => crate::http_package::MyHttpVersion::HTTP_10,
+            2 => crate::http_package::MyHttpVersion::HTTP_11,
+            3 => crate::http_package::MyHttpVersion::HTTP_2,
+            4 => crate::http_package::MyHttpVersion::HTTP_3,
+            _ => unreachable!("Invalid variant for MyHttpVersion: {}", inner),
+        };
+    }
+}
+
 impl SseDecode for crate::api::http_api::MyMethod {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@ -362,7 +350,7 @@ impl SseDecode for crate::http_package::RustHttpResponse {
        let mut var_headers = <std::collections::HashMap<String, String>>::sse_decode(deserializer);
        let mut var_url = <String>::sse_decode(deserializer);
        let mut var_contentLength = <Option<u64>>::sse_decode(deserializer);
-        let mut var_version = <reqwest::Version>::sse_decode(deserializer);
+        let mut var_version = <crate::http_package::MyHttpVersion>::sse_decode(deserializer);
        let mut var_remoteAddr = <String>::sse_decode(deserializer);
        let mut var_data = <Option<Vec<u8>>>::sse_decode(deserializer);
        return crate::http_package::RustHttpResponse {
@ -403,13 +391,6 @@ impl SseDecode for () {
    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {}
 }

-impl SseDecode for usize {
-    // Codec=Sse (Serialization based), see doc to use other codecs
-    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
-        deserializer.cursor.read_u64::<NativeEndian>().unwrap() as _
-    }
-}
-
 impl SseDecode for bool {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@ -448,34 +429,27 @@ fn pde_ffi_dispatcher_sync_impl(

 // Section: rust2dart

-pub struct Local_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
-    reqwest::Version,
-);
 // Codec=Dco (DartCObject based), see doc to use other codecs
-impl flutter_rust_bridge::IntoDart
-    for Local_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion
-{
+impl flutter_rust_bridge::IntoDart for crate::http_package::MyHttpVersion {
    fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
-        flutter_rust_bridge::for_generated::rust_auto_opaque_encode::<_, MoiArc<_>>(self.0)
-            .into_dart()
+        match self {
+            Self::HTTP_09 => 0.into_dart(),
+            Self::HTTP_10 => 1.into_dart(),
+            Self::HTTP_11 => 2.into_dart(),
+            Self::HTTP_2 => 3.into_dart(),
+            Self::HTTP_3 => 4.into_dart(),
+        }
    }
 }
 impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive
-    for Local_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion
+    for crate::http_package::MyHttpVersion
 {
 }
-impl
-    flutter_rust_bridge::IntoIntoDart<
-        Local_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion,
-    > for reqwest::Version
+impl flutter_rust_bridge::IntoIntoDart<crate::http_package::MyHttpVersion>
+    for crate::http_package::MyHttpVersion
 {
-    fn into_into_dart(
-        self,
-    ) -> Local_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion
-    {
-        Local_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
-            self,
-        )
+    fn into_into_dart(self) -> crate::http_package::MyHttpVersion {
+        self
    }
 }
 // Codec=Dco (DartCObject based), see doc to use other codecs
@ -539,13 +513,6 @@ impl SseEncode for flutter_rust_bridge::for_generated::anyhow::Error {
    }
 }

-impl SseEncode for reqwest::Version {
-    // Codec=Sse (Serialization based), see doc to use other codecs
-    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
-        <RustOpaqueMoi<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest :: Version>>>::sse_encode(flutter_rust_bridge::for_generated::rust_auto_opaque_encode::<_, MoiArc<_>>(self), serializer);
-    }
-}
-
 impl SseEncode for std::collections::HashMap<String, String> {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@ -553,17 +520,6 @@ impl SseEncode for std::collections::HashMap<String, String> {
    }
 }

-impl SseEncode
-    for RustOpaqueMoi<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest::Version>>
-{
-    // Codec=Sse (Serialization based), see doc to use other codecs
-    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
-        let (ptr, size) = self.sse_encode_raw();
-        <usize>::sse_encode(ptr, serializer);
-        <i32>::sse_encode(size, serializer);
-    }
-}
-
 impl SseEncode for String {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@ -608,6 +564,25 @@ impl SseEncode for Vec<(String, String)> {
    }
 }

+impl SseEncode for crate::http_package::MyHttpVersion {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(
+            match self {
+                crate::http_package::MyHttpVersion::HTTP_09 => 0,
+                crate::http_package::MyHttpVersion::HTTP_10 => 1,
+                crate::http_package::MyHttpVersion::HTTP_11 => 2,
+                crate::http_package::MyHttpVersion::HTTP_2 => 3,
+                crate::http_package::MyHttpVersion::HTTP_3 => 4,
+                _ => {
+                    unimplemented!("");
+                }
+            },
+            serializer,
+        );
+    }
+}
+
 impl SseEncode for crate::api::http_api::MyMethod {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@ -676,7 +651,7 @@ impl SseEncode for crate::http_package::RustHttpResponse {
        <std::collections::HashMap<String, String>>::sse_encode(self.headers, serializer);
        <String>::sse_encode(self.url, serializer);
        <Option<u64>>::sse_encode(self.content_length, serializer);
-        <reqwest::Version>::sse_encode(self.version, serializer);
+        <crate::http_package::MyHttpVersion>::sse_encode(self.version, serializer);
        <String>::sse_encode(self.remote_addr, serializer);
        <Option<Vec<u8>>>::sse_encode(self.data, serializer);
    }
@ -708,16 +683,6 @@ impl SseEncode for () {
    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {}
 }

-impl SseEncode for usize {
-    // Codec=Sse (Serialization based), see doc to use other codecs
-    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
-        serializer
-            .cursor
-            .write_u64::<NativeEndian>(self as _)
-            .unwrap();
-    }
-}
-
 impl SseEncode for bool {
    // Codec=Sse (Serialization based), see doc to use other codecs
    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
--- a/rust/src/frb_generated.web.rs
+++ b/rust/src/frb_generated.web.rs
@ -1,10 +1,9 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.25.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27.

 // Section: imports

 use super::*;
-use crate::api::http_api::*;
 use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
 use flutter_rust_bridge::for_generated::transform_result_dco;
 use flutter_rust_bridge::for_generated::wasm_bindgen;
@ -14,17 +13,3 @@ use flutter_rust_bridge::{Handler, IntoIntoDart};
 // Section: boilerplate

 flutter_rust_bridge::frb_generated_boilerplate_web!();
-
-#[wasm_bindgen]
-pub fn rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
-    ptr: *const std::ffi::c_void,
-) {
-    MoiArc::<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest :: Version>>::increment_strong_count(ptr as _);
-}
-
-#[wasm_bindgen]
-pub fn rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
-    ptr: *const std::ffi::c_void,
-) {
-    MoiArc::<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest :: Version>>::decrement_strong_count(ptr as _);
-}
--- a/rust/src/http_package/mod.rs
+++ b/rust/src/http_package/mod.rs
@ -8,17 +8,30 @@ use std::sync::{Arc, RwLock};
 use std::time::Duration;
 use flutter_rust_bridge::for_generated::lazy_static;

-#[derive(Debug)]
+#[allow(non_camel_case_types)]
+pub enum MyHttpVersion { HTTP_09, HTTP_10, HTTP_11, HTTP_2, HTTP_3 }
+
 pub struct RustHttpResponse {
    pub status_code: u16,
    pub headers: HashMap<String, String>,
    pub url: String,
    pub content_length: Option<u64>,
-    pub version: reqwest::Version,
+    pub version: MyHttpVersion,
    pub remote_addr: String,
    pub data: Option<Vec<u8>>,
 }

+fn _hyper_version_to_my_version(v: reqwest::Version) -> MyHttpVersion {
+    match v {
+        reqwest::Version::HTTP_09 => { MyHttpVersion::HTTP_09 }
+        reqwest::Version::HTTP_10 => { MyHttpVersion::HTTP_10 }
+        reqwest::Version::HTTP_11 => { MyHttpVersion::HTTP_11 }
+        reqwest::Version::HTTP_2 => { MyHttpVersion::HTTP_2 }
+        reqwest::Version::HTTP_3 => { MyHttpVersion::HTTP_3 }
+        _ => { panic!("Unsupported HTTP version") }
+    }
+}
+
 lazy_static! {
    static ref DEFAULT_HEADER: RwLock<HeaderMap> = RwLock::from(HeaderMap::new());
    static ref DNS_CLIENT : Arc<dns::MyHickoryDnsResolver> = Arc::from(dns::MyHickoryDnsResolver::default());
@ -73,6 +86,8 @@ pub async fn fetch(
        data = Some(bytes.unwrap().to_vec());
    }

+    let version = _hyper_version_to_my_version(version);
+
    let resp = RustHttpResponse {
        status_code,
        headers: resp_headers,