Merge pull request #138 from nttcom/LSP/WASM

Enable rust-analyzer for cfg
nttcom · Dec 12, 2024 · df9b692 · df9b692
2 parents d69adb6 + 2234dca
commit df9b692
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 22 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,9 +7,9 @@
     "editor.defaultFormatter": "rust-lang.rust-analyzer",
     "editor.inlayHints.enabled": "on"
   },
-  "rust-analyzer.cargo.cfgs": {
-    "web_sys_unstable_apis": ""
-  },
   "rust-analyzer.checkOnSave": true,
-  "rust-analyzer.check.command": "clippy"
+  "rust-analyzer.check.command": "clippy",
+  "rust-analyzer.cargo.extraEnv": {
+    "RUSTFLAGS": "--cfg web_sys_unstable_apis"
+  }
 }
diff --git a/README.md b/README.md
@@ -2,6 +2,9 @@
 
 Both server and browser client are written in Rust.
 
+> [!NOTE]
+> draft-ietf-moq-transport-06 prototype is [here](https://github.com/nttcom/moq-wasm/tree/draft-06)
+
 ## Implementation
 
 Supported version: draft-ietf-moq-transport-06
@@ -38,6 +41,7 @@ Supported version: draft-ietf-moq-transport-06
   - [ ] Priorities
   - [ ] Object Cache
 
+
 ## Modules
 
 ### moqt-core

diff --git a/moqt-client-sample/Cargo.toml b/moqt-client-sample/Cargo.toml
@@ -37,4 +37,4 @@ features = [
 ]
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(web_sys_unstable_apis)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(web_sys_unstable_apis)'] }
diff --git a/moqt-client-sample/config.toml b/moqt-client-sample/config.toml
diff --git a/moqt-client-sample/src/lib.rs b/moqt-client-sample/src/lib.rs
@@ -671,22 +671,9 @@ impl MOQTClient {
     }
 
     #[wasm_bindgen(js_name = sendUnsubscribeMessage)]
-    pub async fn send_unsubscribe_message(
-        &self,
-        track_namespace: js_sys::Array,
-        track_name: String,
-    ) -> Result<JsValue, JsValue> {
+    pub async fn send_unsubscribe_message(&self, subscribe_id: u64) -> Result<JsValue, JsValue> {
         if let Some(writer) = &*self.control_stream_writer.borrow() {
-            let length = track_namespace.length();
-            let mut track_namespace_vec: Vec<String> = Vec::with_capacity(length as usize);
-            for i in 0..length {
-                let js_element = track_namespace.get(i);
-                let string_element = js_element
-                    .as_string()
-                    .ok_or_else(|| JsValue::from_str("Array contains a non-string element"))?;
-                track_namespace_vec.push(string_element);
-            }
-            let unsubscribe_message = Unsubscribe::new(track_namespace_vec, track_name);
+            let unsubscribe_message = Unsubscribe::new(subscribe_id);
             let mut unsubscribe_message_buf = BytesMut::new();
             unsubscribe_message.packetize(&mut unsubscribe_message_buf);