Added support for specifying Websocket Protocols #222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ranile
reviewed
Jun 16, 2022
crates/net/src/websocket/futures.rs
Outdated
| Self::setup(web_sys::WebSocket::new_with_str_sequence( | ||
| url, | ||
| &JsValue::from_serde(protocols).map_err(|err| { | ||
| js_sys::Error::new(&format!("Failed to convert protocols to JSON: {}", err)) |
There was a problem hiding this comment.
We aren't converting these to JSON, are we? This error message seems misleading.
There was a problem hiding this comment.
Looking at JsValue::from_serde, it seems that we serialize to a JSON string and then parse as a JS value. I suppose the error message is too literal. Would it be better if changed the error message to "Failed to convert protocols to Javascript value: {}" ?
#[cfg(feature = "serde-serialize")]
pub fn from_serde<T>(t: &T) -> serde_json::Result<JsValue>
where
T: serde::ser::Serialize + ?Sized,
{
let s = serde_json::to_string(t)?;
unsafe { Ok(JsValue::_new(__wbindgen_json_parse(s.as_ptr(), s.len()))) }
}
|
Thanks a lot for the PR 🎉 |
ranile
pushed a commit
that referenced
this pull request
Jul 1, 2022
The websocket feature requires `Serde` and `wasm-bindgen/serde-serialize` since #222
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, WebSockets can only be created without specifying the protocol. I've added support for either specifying a single protocol using
WebSocket::open_with_protocolor a list of protocols withWebSocket::open_with_protocols