feat(stremio-core-web): use Storage wasm-bindgen binding

Signed-off-by: Lachezar Lechev <[email protected]>

Author: elpiel

stremio-core-web/Cargo.toml

@@ -59,6 +59,8 @@ web-sys = { version = "0.3", features = [
     "Request",
     "RequestInit",
     "Response",
+    "Storage",
+    "Window",
     "console",
 ], optional = true }
 # for env. impl

stremio-core-web/src/env.rs

@@ -41,12 +41,12 @@ extern "C" {
     static SHELL_VERSION: Option<String>;
     #[wasm_bindgen(catch, js_namespace = ["self"])]
     async fn get_location_hash() -> Result<JsValue, JsValue>;
-    #[wasm_bindgen(catch, js_namespace = ["self"])]
-    async fn local_storage_get_item(key: String) -> Result<JsValue, JsValue>;
-    #[wasm_bindgen(catch, js_namespace = ["self"])]
-    async fn local_storage_set_item(key: String, value: String) -> Result<(), JsValue>;
-    #[wasm_bindgen(catch, js_namespace = ["self"])]
-    async fn local_storage_remove_item(key: String) -> Result<(), JsValue>;
+    // #[wasm_bindgen(catch, js_namespace = ["self"])]
+    // async fn local_storage_get_item(key: String) -> Result<JsValue, JsValue>;
+    // #[wasm_bindgen(catch, js_namespace = ["self"])]
+    // async fn local_storage_set_item(key: String, value: String) -> Result<(), JsValue>;
+    // #[wasm_bindgen(catch, js_namespace = ["self"])]
+    // async fn local_storage_remove_item(key: String) -> Result<(), JsValue>;
 }
 
 static INSTALLATION_ID: Lazy<RwLock<Option<String>>> = Lazy::new(Default::default);
@@ -351,51 +351,76 @@ impl Env for WebEnv {
     where
         for<'de> T: Deserialize<'de> + 'static,
     {
-        local_storage_get_item(key.to_owned())
-            .map_err(|error| {
-                EnvError::StorageReadError(
-                    error
-                        .dyn_into::<js_sys::Error>()
-                        .map(|error| String::from(error.message()))
-                        .unwrap_or_else(|_| UNKNOWN_ERROR.to_owned()),
-                )
-            })
-            .and_then(|value| async move {
-                value
-                    .as_string()
-                    .map(|value| serde_json::from_str(&value))
-                    .transpose()
-                    .map_err(EnvError::from)
-            })
-            .boxed_local()
+        future::ready(
+            web_sys::window()
+                .unwrap()
+                .local_storage()
+                .unwrap()
+                .unwrap()
+                .get_item(key)
+                // local_storage_get_item(key.to_owned())
+                .map_err(|error| {
+                    EnvError::StorageReadError(
+                        error
+                            .dyn_into::<js_sys::Error>()
+                            .map(|error| String::from(error.message()))
+                            .unwrap_or_else(|_| UNKNOWN_ERROR.to_owned()),
+                    )
+                })
+                .and_then(|value| {
+                    value
+                        // .as_string()
+                        .map(|value| serde_json::from_str(&value))
+                        .transpose()
+                        .map_err(EnvError::from)
+                }),
+        )
+        .boxed_local()
     }
 
     fn set_storage<T: Serialize>(key: &str, value: Option<&T>) -> TryEnvFuture<()> {
         let key = key.to_owned();
         match value {
             Some(value) => future::ready(serde_json::to_string(value))
                 .map_err(EnvError::from)
-                .and_then(|value| {
-                    local_storage_set_item(key, value).map_err(|error| {
+                .and_then(move |value| {
+                    future::ready(
+                        web_sys::window()
+                            .unwrap()
+                            .local_storage()
+                            .unwrap()
+                            .unwrap()
+                            .set_item(&key, &value)
+                            // local_storage_set_item(key, value)
+                            .map_err(|error| {
+                                EnvError::StorageWriteError(
+                                    error
+                                        .dyn_into::<js_sys::Error>()
+                                        .map(|error| String::from(error.message()))
+                                        .unwrap_or_else(|_| UNKNOWN_ERROR.to_owned()),
+                                )
+                            }),
+                    )
+                })
+                .boxed_local(),
+            None => future::ready(
+                web_sys::window()
+                    .unwrap()
+                    .local_storage()
+                    .unwrap()
+                    .unwrap()
+                    .delete(&key)
+                    // local_storage_remove_item(key)
+                    .map_err(|error| {
                         EnvError::StorageWriteError(
                             error
                                 .dyn_into::<js_sys::Error>()
                                 .map(|error| String::from(error.message()))
                                 .unwrap_or_else(|_| UNKNOWN_ERROR.to_owned()),
                         )
-                    })
-                })
-                .boxed_local(),
-            None => local_storage_remove_item(key)
-                .map_err(|error| {
-                    EnvError::StorageWriteError(
-                        error
-                            .dyn_into::<js_sys::Error>()
-                            .map(|error| String::from(error.message()))
-                            .unwrap_or_else(|_| UNKNOWN_ERROR.to_owned()),
-                    )
-                })
-                .boxed_local(),
+                    }),
+            )
+            .boxed_local(),
         }
     }
 

stremio-core-web/src/worker.js

@@ -11,9 +11,9 @@ self.init = async ({ appVersion, shellVersion }) => {
     self.app_version = appVersion;
     self.shell_version = shellVersion;
     self.get_location_hash = async () => bridge.call(['location', 'hash'], []);
-    self.local_storage_get_item = async (key) => bridge.call(['localStorage', 'getItem'], [key]);
-    self.local_storage_set_item = async (key, value) => bridge.call(['localStorage', 'setItem'], [key, value]);
-    self.local_storage_remove_item = async (key) => bridge.call(['localStorage', 'removeItem'], [key]);
+    // self.local_storage_get_item = async (key) => bridge.call(['localStorage', 'getItem'], [key]);
+    // self.local_storage_set_item = async (key, value) => bridge.call(['localStorage', 'setItem'], [key, value]);
+    // self.local_storage_remove_item = async (key) => bridge.call(['localStorage', 'removeItem'], [key]);
     const { default: initialize_api, initialize_runtime, get_state, get_debug_state, dispatch, analytics, decode_stream } = require('./stremio_core_web.js');
     self.getState = get_state;
     self.getDebugState = get_debug_state;