From f85cd54cb4a1c54d835374d83dba4f8f7b89d2d1 Mon Sep 17 00:00:00 2001 From: crowlKats <13135287+crowlKats@users.noreply.github.com> Date: Tue, 5 Jan 2021 13:37:02 +0100 Subject: fix(runtime/websocket): respond to ping with pong (#8974) --- runtime/ops/websocket.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'runtime/ops/websocket.rs') diff --git a/runtime/ops/websocket.rs b/runtime/ops/websocket.rs index 812844f39..b220655ae 100644 --- a/runtime/ops/websocket.rs +++ b/runtime/ops/websocket.rs @@ -216,6 +216,7 @@ pub async fn op_ws_create( #[serde(rename_all = "camelCase")] struct SendArgs { rid: u32, + kind: String, text: Option, } @@ -226,9 +227,11 @@ pub async fn op_ws_send( ) -> Result { let args: SendArgs = serde_json::from_value(args)?; - let msg = match args.text { - Some(text) => Message::Text(text), - None => Message::Binary(bufs[0].to_vec()), + let msg = match args.kind.as_str() { + "text" => Message::Text(args.text.unwrap()), + "binary" => Message::Binary(bufs[0].to_vec()), + "pong" => Message::Pong(vec![]), + _ => unreachable!(), }; let rid = args.rid; -- cgit v1.2.3