chore(core-web): update wasm-bindgen

stremio-core-web/Cargo.toml

@@ -12,7 +12,7 @@ default = ["std", "wasm"]
 
 std = []
 # enable wasm bindings exports, enabled by default (stremio-core-web crate after all)
-wasm = ["env", "dep:wasm-bindgen", "dep:wasm-bindgen-futures", "dep:gloo-utils", "dep:tracing-wasm", "dep:console_error_panic_hook", "dep:js-sys", "dep:web-sys", "getrandom?/js"]
+wasm = ["env", "dep:wasm-bindgen", "dep:wasm-bindgen-futures", "dep:serde-wasm-bindgen", "dep:tracing-wasm", "dep:console_error_panic_hook", "dep:js-sys", "dep:web-sys", "getrandom?/js"]
 # Enable's the wasm Env. impl
 # (this means that `wasm` feature is a superset of this one)
 env = ["dep:http", "dep:regex", "dep:hex", "dep:getrandom", "dep:serde_path_to_error"]
@@ -43,9 +43,9 @@ itertools = "0.14.*"
 boolinator = "2.4.*"
 
 # WASM
-wasm-bindgen = { version = "=0.2.78", features = ["serde-serialize"], optional = true }
-wasm-bindgen-futures = { version = "0.4", optional = true }
-gloo-utils = { version = "0.2", features = ["serde"], optional = true }
+wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"], optional = true }
+wasm-bindgen-futures = { version = "0.4.50", optional = true }
+serde-wasm-bindgen = { version = "0.6.5", optional = true }
 
 once_cell = "1"
 

stremio-core-web/src/env.rs

@@ -2,7 +2,6 @@ use std::{collections::HashMap, sync::RwLock};
 
 use chrono::{offset::TimeZone, DateTime, Utc};
 use futures::{future, Future, FutureExt, TryFutureExt};
-use gloo_utils::format::JsValueSerdeExt;
 use http::{Method, Request};
 use once_cell::sync::Lazy;
 use regex::Regex;
@@ -36,9 +35,9 @@ const INSTALLATION_ID_STORAGE_KEY: &str = "installation_id";
 
 #[wasm_bindgen]
 extern "C" {
-    #[wasm_bindgen(js_namespace = ["self"], js_name = app_version)]
+    #[wasm_bindgen(thread_local_v2, js_namespace = ["self"], js_name = app_version)]
     static APP_VERSION: String;
-    #[wasm_bindgen(js_namespace = ["self"], js_name = shell_version)]
+    #[wasm_bindgen(thread_local_v2, js_namespace = ["self"], js_name = shell_version)]
     static SHELL_VERSION: Option<String>;
     #[wasm_bindgen(catch, js_namespace = ["self"])]
     async fn get_location_hash() -> Result<JsValue, JsValue>;
@@ -275,7 +274,7 @@ impl Env for WebEnv {
                 let value = String::from_utf8_lossy(value.as_bytes()).into_owned();
                 headers.entry(key).or_insert_with(Vec::new).push(value);
             }
-            <JsValue as JsValueSerdeExt>::from_serde(&headers)
+            serde_wasm_bindgen::to_value(&headers)
                 .expect("WebEnv::fetch: JsValue from Headers failed to be built")
         };
         let body = match serde_json::to_string(&body) {
@@ -284,11 +283,14 @@ impl Env for WebEnv {
             }
             _ => None,
         };
-        let mut request_options = web_sys::RequestInit::new();
-        request_options
-            .method(method)
-            .headers(&headers)
-            .body(body.as_ref());
+
+        let request_options = web_sys::RequestInit::new();
+        request_options.set_method(method);
+        request_options.set_headers(&headers);
+
+        if let Some(body) = body {
+            request_options.set_body(&body);
+        }
 
         let request = web_sys::Request::new_with_str_and_init(&url, &request_options)
             .expect("request builder failed");
@@ -430,13 +432,14 @@ impl Env for WebEnv {
     ) -> serde_json::Value {
         serde_json::to_value(AnalyticsContext {
             app_type: "stremio-web".to_owned(),
-            app_version: APP_VERSION.to_owned(),
+            app_version: APP_VERSION.with(|version| version.to_string()),
             server_version: streaming_server
                 .settings
                 .as_ref()
                 .ready()
                 .map(|settings| settings.server_version.to_owned()),
-            shell_version: SHELL_VERSION.to_owned(),
+            shell_version: SHELL_VERSION
+                .with(|version| version.as_ref().map(|version| version.to_string())),
             system_language: global()
                 .navigator()
                 .language()

stremio-core-web/src/model/model.rs

@@ -1,11 +1,7 @@
-use gloo_utils::format::JsValueSerdeExt;
-use wasm_bindgen::JsValue;
+use {serde::Serialize, wasm_bindgen::JsValue};
 
 use super::*;
 
-#[cfg(debug_assertions)]
-use serde::Serialize;
-
 use stremio_core::{
     models::{
         addon_details::AddonDetails,
@@ -33,7 +29,7 @@ use stremio_core::{
 };
 
 use super::SerializeModel;
-use crate::env::WebEnv;
+use crate::{env::WebEnv, SERIALIZER};
 
 #[derive(Model, Clone)]
 #[cfg_attr(debug_assertions, derive(Serialize))]
@@ -125,9 +121,31 @@ impl WebModel {
         )
     }
     pub fn get_state(&self, field: &WebModelField) -> JsValue {
+        // return match field {
+        //     WebModelField::Ctx => serialize_ctx(&self.ctx),
+        //     WebModelField::AuthLink => JsValue::NULL,
+        //     WebModelField::DataExport => JsValue::NULL,
+        //     WebModelField::ContinueWatchingPreview => JsValue::NULL,
+        //     WebModelField::Board => JsValue::NULL,
+        //     WebModelField::Discover => JsValue::NULL,
+        //     WebModelField::Library => JsValue::NULL,
+        //     WebModelField::ContinueWatching => JsValue::NULL,
+        //     WebModelField::Calendar => JsValue::NULL,
+        //     WebModelField::Search => JsValue::NULL,
+        //     WebModelField::LocalSearch => JsValue::NULL,
+        //     WebModelField::MetaDetails => JsValue::NULL,
+        //     WebModelField::RemoteAddons => JsValue::NULL,
+        //     WebModelField::InstalledAddons => JsValue::NULL,
+        //     WebModelField::AddonDetails => JsValue::NULL,
+        //     WebModelField::StreamingServer => JsValue::NULL,
+        //     WebModelField::Player => JsValue::NULL,
+        // };
+
         match field {
             WebModelField::Ctx => serialize_ctx(&self.ctx),
-            WebModelField::AuthLink => <JsValue as JsValueSerdeExt>::from_serde(&self.auth_link)
+            WebModelField::AuthLink => self
+                .auth_link
+                .serialize(&SERIALIZER)
                 .expect("JsValue from AuthLink"),
             WebModelField::DataExport => serialize_data_export(&self.data_export),
             WebModelField::ContinueWatchingPreview => serialize_continue_watching_preview(
@@ -180,10 +198,10 @@ impl WebModel {
             ),
             WebModelField::RemoteAddons => serialize_remote_addons(&self.remote_addons, &self.ctx),
             WebModelField::InstalledAddons => serialize_installed_addons(&self.installed_addons),
-            WebModelField::AddonDetails => {
-                <JsValue as JsValueSerdeExt>::from_serde(&self.addon_details)
-                    .expect("JsValue from AddonDetails")
-            }
+            WebModelField::AddonDetails => self
+                .addon_details
+                .serialize(&SERIALIZER)
+                .expect("JsValue from AddonDetails"),
             WebModelField::StreamingServer => serialize_streaming_server(&self.streaming_server),
             WebModelField::Player => {
                 serialize_player::<WebEnv>(&self.player, &self.ctx, &self.streaming_server)

stremio-core-web/src/model/serialize_calendar.rs

@@ -1,4 +1,3 @@
-use gloo_utils::format::JsValueSerdeExt;
 use itertools::Itertools;
 use serde::Serialize;
 use stremio_core::{
@@ -60,7 +59,7 @@ mod model {
 
 #[cfg(feature = "wasm")]
 pub fn serialize_calendar(calendar: &stremio_core::models::calendar::Calendar) -> JsValue {
-    <JsValue as JsValueSerdeExt>::from_serde(&model::Calendar {
+    model::Calendar {
         selected: &calendar.selected,
         selectable: model::Selectable {
             prev: model::SelectableDate {
@@ -96,6 +95,7 @@ pub fn serialize_calendar(calendar: &stremio_core::models::calendar::Calendar) -
                     .collect_vec(),
             })
             .collect_vec(),
-    })
+    }
+    .serialize(&crate::SERIALIZER)
     .expect("JsValue from model::Calendar")
 }