mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-13 06:20:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

make it fully typed and errors more verbose

Browse source
This commit is contained in:
Toshit Chawda 2024-10-12 15:27:29 -07:00
parent e35717bf2c
commit 373d2f4a4d
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
5 changed files with 79 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/src/websocket.rs
View file

@ -24,7 +24,8 @@ use wasm_bindgen_futures::spawn_local;
use crate::{
tokioio::TokioIo,
utils::{entries_of_object, from_entries, ws_key},
EpoxyClient, EpoxyError, EpoxyHandlers, HttpBody,
EpoxyClient, EpoxyError, EpoxyHandlers, EpoxyWebSocketHeadersInput, EpoxyWebSocketInput,
HttpBody,
};
#[wasm_bindgen]
@ -40,9 +41,10 @@ impl EpoxyWebSocket {
handlers: EpoxyHandlers,
url: String,
protocols: Vec<String>,
headers: JsValue,
headers: EpoxyWebSocketHeadersInput,
user_agent: &str,
) -> Result<Self, EpoxyError> {
let headers = JsValue::from(headers);
let EpoxyHandlers {
onopen,
onclose,
@ -151,7 +153,7 @@ impl EpoxyWebSocket {
}
}
pub async fn send(&self, payload: JsValue) -> Result<(), EpoxyError> {
pub async fn send(&self, payload: EpoxyWebSocketInput) -> Result<(), EpoxyError> {
let ret = if let Some(str) = payload.as_string() {
self.tx
.lock()
@ -159,17 +161,20 @@ impl EpoxyWebSocket {
.write_frame(Frame::text(Payload::Owned(str.as_bytes().to_vec())))
.await
.map_err(EpoxyError::from)
} else if let Ok(binary) = payload.dyn_into::<ArrayBuffer>() {
} else if let Some(binary) = payload.dyn_ref::<ArrayBuffer>() {
self.tx
.lock()
.await
.write_frame(Frame::binary(Payload::Owned(
Uint8Array::new(&binary).to_vec(),
Uint8Array::new(binary).to_vec(),
)))
.await
.map_err(EpoxyError::from)
} else {
Err(EpoxyError::WsInvalidPayload)
Err(EpoxyError::WsInvalidPayload(format!(
"{:?}",
JsValue::from(payload)
)))
};
match ret {