chore: replace more places with json compatible serializer

elpiel · elpiel · commit 82c8c28d2c8c · 2025-02-21T16:35:10.000+02:00
Signed-off-by: Lachezar Lechev &lt;lachezar@ambire.com&gt;
diff --git a/stremio-core-web/src/model/serialize_calendar.rs b/stremio-core-web/src/model/serialize_calendar.rs
@@ -1,6 +1,5 @@
 use itertools::Itertools;
 use serde::Serialize;
-use serde_wasm_bindgen::Serializer;
 use stremio_core::{
     deep_links::{CalendarDeepLinks, CalendarItemDeepLinks},
     models::calendar::{FullDate, MonthInfo, Selected, YearMonthDate},
@@ -97,6 +96,6 @@ pub fn serialize_calendar(calendar: &stremio_core::models::calendar::Calendar) -
             })
             .collect_vec(),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::Calendar")
 }
diff --git a/stremio-core-web/src/model/serialize_catalogs_with_extra.rs b/stremio-core-web/src/model/serialize_catalogs_with_extra.rs
@@ -2,7 +2,7 @@ use itertools::Itertools;
 use serde::Serialize;
 
 #[cfg(feature = "wasm")]
-use {serde_wasm_bindgen::Serializer, wasm_bindgen::JsValue};
+use wasm_bindgen::JsValue;
 
 use crate::model::deep_links_ext::DeepLinksExt;
 
@@ -146,6 +146,6 @@ impl<'a> TryFrom<&CatalogsWithExtra<'a>> for JsValue {
     type Error = serde_wasm_bindgen::Error;
 
     fn try_from(catalogs: &CatalogsWithExtra<'a>) -> Result<Self, Self::Error> {
-        catalogs.serialize(&Serializer::json_compatible())
+        catalogs.serialize(&crate::SERIALIZER)
     }
 }
diff --git a/stremio-core-web/src/model/serialize_continue_watching_preview.rs b/stremio-core-web/src/model/serialize_continue_watching_preview.rs
@@ -1,7 +1,6 @@
 #[cfg(feature = "wasm")]
 use {
     serde::Serialize,
-    serde_wasm_bindgen::Serializer,
     stremio_core::types::{profile::Settings, streams::StreamsBucket},
     url::Url,
     wasm_bindgen::JsValue,
@@ -22,7 +21,7 @@ pub fn serialize_continue_watching_preview(
         streaming_server_url,
         settings,
     ))
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::ContinueWatchingPreview")
 }
 
diff --git a/stremio-core-web/src/model/serialize_ctx.rs b/stremio-core-web/src/model/serialize_ctx.rs
@@ -1,13 +1,13 @@
 use serde::Serialize;
 #[cfg(feature = "wasm")]
-use {serde_wasm_bindgen::Serializer, wasm_bindgen::JsValue};
+use wasm_bindgen::JsValue;
 
 pub use model::*;
 
 #[cfg(feature = "wasm")]
 pub fn serialize_ctx(ctx: &stremio_core::models::ctx::Ctx) -> JsValue {
     model::Ctx::from(ctx)
-        .serialize(&Serializer::json_compatible())
+        .serialize(&crate::SERIALIZER)
         .expect("JsValue from Ctx")
 }
 
diff --git a/stremio-core-web/src/model/serialize_data_export.rs b/stremio-core-web/src/model/serialize_data_export.rs
@@ -1,5 +1,5 @@
 #[cfg(feature = "wasm")]
-use {serde::Serialize, serde_wasm_bindgen::Serializer, wasm_bindgen::JsValue};
+use {serde::Serialize, wasm_bindgen::JsValue};
 
 pub use model::*;
 
@@ -25,6 +25,6 @@ pub fn serialize_data_export(
             .as_ref()
             .map(|(_auth_key, loadable)| loadable),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::DataExport")
 }
diff --git a/stremio-core-web/src/model/serialize_discover.rs b/stremio-core-web/src/model/serialize_discover.rs
@@ -4,7 +4,6 @@ use {
     boolinator::Boolinator,
     itertools::Itertools,
     serde::Serialize,
-    serde_wasm_bindgen::Serializer,
     stremio_core::deep_links::{DiscoverDeepLinks, MetaItemDeepLinks, StreamDeepLinks},
     wasm_bindgen::JsValue,
 };
@@ -237,6 +236,6 @@ pub fn serialize_discover(
             }
         }),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from Discover model::CatalogWithFilters")
 }
diff --git a/stremio-core-web/src/model/serialize_installed_addons.rs b/stremio-core-web/src/model/serialize_installed_addons.rs
@@ -1,6 +1,6 @@
 #[cfg(feature = "wasm")]
 use {
-    crate::model::deep_links_ext::DeepLinksExt, serde::Serialize, serde_wasm_bindgen::Serializer,
+    crate::model::deep_links_ext::DeepLinksExt, serde::Serialize,
     stremio_core::deep_links::AddonsDeepLinks, wasm_bindgen::JsValue,
 };
 
@@ -97,6 +97,6 @@ pub fn serialize_installed_addons(
             })
             .collect(),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::InstalledAddonsWithFilters")
 }
diff --git a/stremio-core-web/src/model/serialize_library.rs b/stremio-core-web/src/model/serialize_library.rs
@@ -1,7 +1,6 @@
 use crate::model::deep_links_ext::DeepLinksExt;
 use serde::Serialize;
-#[cfg(feature = "wasm")]
-use serde_wasm_bindgen::Serializer;
+
 use stremio_core::deep_links::{LibraryDeepLinks, LibraryItemDeepLinks};
 use stremio_core::models::ctx::Ctx;
 use stremio_core::models::library_with_filters::{LibraryWithFilters, Selected, Sort};
@@ -136,6 +135,6 @@ pub fn serialize_library<F>(
             })
             .collect(),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::LibraryWithFilters")
 }
diff --git a/stremio-core-web/src/model/serialize_local_search.rs b/stremio-core-web/src/model/serialize_local_search.rs
@@ -1,7 +1,6 @@
 use itertools::Itertools;
 use serde::Serialize;
-#[cfg(feature = "wasm")]
-use serde_wasm_bindgen::Serializer;
+
 #[cfg(feature = "wasm")]
 use wasm_bindgen::JsValue;
 
@@ -41,6 +40,6 @@ pub fn serialize_local_search(local_search: &LocalSearch) -> JsValue {
             .unique_by(|i| i.query)
             .collect(),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::LocalSearch")
 }
diff --git a/stremio-core-web/src/model/serialize_meta_details.rs b/stremio-core-web/src/model/serialize_meta_details.rs
@@ -7,7 +7,7 @@ use itertools::Itertools;
 use serde::Serialize;
 use url::Url;
 #[cfg(feature = "wasm")]
-use {serde_wasm_bindgen::Serializer, stremio_core::runtime::Env, wasm_bindgen::JsValue};
+use {stremio_core::runtime::Env, wasm_bindgen::JsValue};
 
 use stremio_core::{
     constants::META_RESOURCE_NAME,
@@ -395,6 +395,6 @@ pub fn serialize_meta_details<E: Env + 'static>(
                     .unwrap_or_else(|| meta_item.preview.name.to_owned())
             }),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::MetaDetails")
 }
diff --git a/stremio-core-web/src/model/serialize_player.rs b/stremio-core-web/src/model/serialize_player.rs
@@ -1,7 +1,6 @@
 use semver::Version;
 use serde::Serialize;
-#[cfg(feature = "wasm")]
-use serde_wasm_bindgen::Serializer;
+
 use url::Url;
 #[cfg(feature = "wasm")]
 use wasm_bindgen::JsValue;
@@ -362,6 +361,6 @@ pub fn serialize_player<E: stremio_core::runtime::Env + 'static>(
                 },
             }),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::Player")
 }
diff --git a/stremio-core-web/src/model/serialize_remote_addons.rs b/stremio-core-web/src/model/serialize_remote_addons.rs
@@ -1,8 +1,7 @@
 use crate::model::deep_links_ext::DeepLinksExt;
 #[cfg(feature = "wasm")]
 use serde::Serialize;
-#[cfg(feature = "wasm")]
-use serde_wasm_bindgen::Serializer;
+
 use stremio_core::deep_links::AddonsDeepLinks;
 use stremio_core::models::catalog_with_filters::{CatalogWithFilters, Selected};
 use stremio_core::models::common::Loadable;
@@ -110,6 +109,6 @@ pub fn serialize_remote_addons(
                 },
             }),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::CatalogWithFilters")
 }
diff --git a/stremio-core-web/src/model/serialize_streaming_server.rs b/stremio-core-web/src/model/serialize_streaming_server.rs
@@ -1,7 +1,6 @@
 #[cfg(feature = "wasm")]
 use serde::Serialize;
-#[cfg(feature = "wasm")]
-use serde_wasm_bindgen::Serializer;
+
 use stremio_core::deep_links::MetaItemDeepLinks;
 use stremio_core::models::common::Loadable;
 use stremio_core::models::streaming_server::{PlaybackDevice, Selected};
@@ -61,6 +60,6 @@ pub fn serialize_streaming_server(
             }),
         statistics: streaming_server.statistics.as_ref(),
     }
-    .serialize(&Serializer::json_compatible())
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::StreamingServer")
 }
diff --git a/stremio-core-web/src/stremio_core_web.rs b/stremio-core-web/src/stremio_core_web.rs
@@ -3,6 +3,7 @@ use std::sync::RwLock;
 use enclose::enclose;
 use futures::{future, try_join, FutureExt, StreamExt};
 use once_cell::sync::Lazy;
+use serde::Serialize;
 use tracing::{info, Level};
 use tracing_wasm::WASMLayerConfigBuilder;
 use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
@@ -28,6 +29,9 @@ use crate::{
     model::{WebModel, WebModelField},
 };
 
+pub(crate) const SERIALIZER: serde_wasm_bindgen::Serializer =
+    serde_wasm_bindgen::Serializer::json_compatible();
+
 #[allow(clippy::type_complexity)]
 static RUNTIME: Lazy<RwLock<Option<Loadable<Runtime<WebEnv, WebModel>, EnvError>>>> =
     Lazy::new(Default::default);
@@ -137,7 +141,7 @@ pub async fn initialize_runtime(emit_to_ui: js_sys::Function) -> Result<(), JsVa
                             ));
                         };
                         emit_to_ui
-                            .call1(&JsValue::NULL, &serde_wasm_bindgen::to_value(&event).expect("Event handler: JsValue from Event"))
+                            .call1(&JsValue::NULL, &event.serialize(&SERIALIZER).expect("Event handler: JsValue from Event"))
                             .expect("emit event failed");
                         future::ready(())
                     }));
@@ -148,13 +152,15 @@ pub async fn initialize_runtime(emit_to_ui: js_sys::Function) -> Result<(), JsVa
                 Err(error) => {
                     *RUNTIME.write().expect("runtime write failed") =
                         Some(Loadable::Err(error.to_owned()));
-                    Err(serde_wasm_bindgen::to_value(&error).expect("Storage: JsValue from Event"))
+                    Err(error
+                        .serialize(&SERIALIZER)
+                        .expect("Storage: JsValue from Event"))
                 }
             }
         }
         Err(error) => {
             *RUNTIME.write().expect("runtime write failed") = Some(Loadable::Err(error.to_owned()));
-            Err(serde_wasm_bindgen::to_value(&error).expect("JsValue from Event"))
+            Err(error.serialize(&SERIALIZER).expect("JsValue from Event"))
         }
     }
 }
@@ -167,13 +173,14 @@ pub fn get_debug_state() -> JsValue {
         .as_ref()
         .expect("runtime is not ready")
         .as_ref()
-        .expect("runtime is not ready");
+        .expect("runtime is not re  ady");
     let model = runtime.model().expect("model read failed");
-    serde_wasm_bindgen::to_value(&*model).expect("JsValue from WebModel")
+    model.serialize(&SERIALIZER).expect("JsValue from WebModel")
 }
 
 #[wasm_bindgen]
 pub fn get_state(field: JsValue) -> JsValue {
+    // JsValue::NULL
     let field = serde_wasm_bindgen::from_value(field).expect("get state failed");
     let runtime = RUNTIME.read().expect("runtime read failed");
     let runtime = runtime
@@ -234,7 +241,7 @@ pub fn analytics(event: JsValue, location_hash: JsValue) {
 pub fn decode_stream(stream: JsValue) -> JsValue {
     let stream = stream.as_string().map(Stream::decode);
     match stream {
-        Some(Ok(stream)) => serde_wasm_bindgen::to_value(&stream).expect("JsValue from Stream"),
+        Some(Ok(stream)) => stream.serialize(&SERIALIZER).expect("JsValue from Stream"),
         _ => JsValue::NULL,
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`use itertools::Itertools;`
`2`	`2`	`use serde::Serialize;`
`3`		`-use serde_wasm_bindgen::Serializer;`
`4`	`3`	`use stremio_core::{`
`5`	`4`	`deep_links::{CalendarDeepLinks, CalendarItemDeepLinks},`
`6`	`5`	`models::calendar::{FullDate, MonthInfo, Selected, YearMonthDate},`
`@@ -97,6 +96,6 @@ pub fn serialize_calendar(calendar: &stremio_core::models::calendar::Calendar) -`
`97`	`96`	`})`
`98`	`97`	`.collect_vec(),`
`99`	`98`	`}`
`100`		`- .serialize(&Serializer::json_compatible())`
	`99`	`+ .serialize(&crate::SERIALIZER)`
`101`	`100`	`.expect("JsValue from model::Calendar")`
`102`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use itertools::Itertools;`
`2`	`2`	`use serde::Serialize;`
`3`	`3`
`4`	`4`	`#[cfg(feature = "wasm")]`
`5`		`-use {serde_wasm_bindgen::Serializer, wasm_bindgen::JsValue};`
	`5`	`+use wasm_bindgen::JsValue;`
`6`	`6`
`7`	`7`	`use crate::model::deep_links_ext::DeepLinksExt;`
`8`	`8`
`@@ -146,6 +146,6 @@ impl<'a> TryFrom<&CatalogsWithExtra<'a>> for JsValue {`
`146`	`146`	`type Error = serde_wasm_bindgen::Error;`
`147`	`147`
`148`	`148`	`fn try_from(catalogs: &CatalogsWithExtra<'a>) -> Result<Self, Self::Error> {`
`149`		`- catalogs.serialize(&Serializer::json_compatible())`
	`149`	`+ catalogs.serialize(&crate::SERIALIZER)`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#[cfg(feature = "wasm")]`
`2`		`-use {serde::Serialize, serde_wasm_bindgen::Serializer, wasm_bindgen::JsValue};`
	`2`	`+use {serde::Serialize, wasm_bindgen::JsValue};`
`3`	`3`
`4`	`4`	`pub use model::*;`
`5`	`5`
`@@ -25,6 +25,6 @@ pub fn serialize_data_export(`
`25`	`25`	`.as_ref()`
`26`	`26`	`.map(\|(_auth_key, loadable)\| loadable),`
`27`	`27`	`}`
`28`		`- .serialize(&Serializer::json_compatible())`
	`28`	`+ .serialize(&crate::SERIALIZER)`
`29`	`29`	`.expect("JsValue from model::DataExport")`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ use {`
`4`	`4`	`boolinator::Boolinator,`
`5`	`5`	`itertools::Itertools,`
`6`	`6`	`serde::Serialize,`
`7`		`- serde_wasm_bindgen::Serializer,`
`8`	`7`	`stremio_core::deep_links::{DiscoverDeepLinks, MetaItemDeepLinks, StreamDeepLinks},`
`9`	`8`	`wasm_bindgen::JsValue,`
`10`	`9`	`};`
`@@ -237,6 +236,6 @@ pub fn serialize_discover(`
`237`	`236`	`}`
`238`	`237`	`}),`
`239`	`238`	`}`
`240`		`- .serialize(&Serializer::json_compatible())`
	`239`	`+ .serialize(&crate::SERIALIZER)`
`241`	`240`	`.expect("JsValue from Discover model::CatalogWithFilters")`
`242`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#[cfg(feature = "wasm")]`
`2`	`2`	`use {`
`3`		`- crate::model::deep_links_ext::DeepLinksExt, serde::Serialize, serde_wasm_bindgen::Serializer,`
	`3`	`+ crate::model::deep_links_ext::DeepLinksExt, serde::Serialize,`
`4`	`4`	`stremio_core::deep_links::AddonsDeepLinks, wasm_bindgen::JsValue,`
`5`	`5`	`};`
`6`	`6`
`@@ -97,6 +97,6 @@ pub fn serialize_installed_addons(`
`97`	`97`	`})`
`98`	`98`	`.collect(),`
`99`	`99`	`}`
`100`		`- .serialize(&Serializer::json_compatible())`
	`100`	`+ .serialize(&crate::SERIALIZER)`
`101`	`101`	`.expect("JsValue from model::InstalledAddonsWithFilters")`
`102`	`102`	`}`