diff options
| -rw-r--r-- | cli/js/40_testing.js | 5 | ||||
| -rw-r--r-- | ext/websocket/01_websocket.js | 8 | ||||
| -rw-r--r-- | ext/websocket/02_websocketstream.js | 14 | ||||
| -rw-r--r-- | ext/websocket/lib.rs | 31 |
4 files changed, 25 insertions, 33 deletions
diff --git a/cli/js/40_testing.js b/cli/js/40_testing.js index a0dcaf499..146448356 100644 --- a/cli/js/40_testing.js +++ b/cli/js/40_testing.js @@ -128,7 +128,10 @@ const OP_DETAILS = { "op_ws_close": ["close a WebSocket", "awaiting until the `close` event is emitted on a `WebSocket`, or the `WebSocketStream#closed` promise resolves"], "op_ws_create": ["create a WebSocket", "awaiting until the `open` event is emitted on a `WebSocket`, or the result of a `WebSocketStream#connection` promise"], "op_ws_next_event": ["receive the next message on a WebSocket", "closing a `WebSocket` or `WebSocketStream`"], - "op_ws_send": ["send a message on a WebSocket", "closing a `WebSocket` or `WebSocketStream`"], + "op_ws_send_text": ["send a message on a WebSocket", "closing a `WebSocket` or `WebSocketStream`"], + "op_ws_send_binary": ["send a message on a WebSocket", "closing a `WebSocket` or `WebSocketStream`"], + "op_ws_send_ping": ["send a message on a WebSocket", "closing a `WebSocket` or `WebSocketStream`"], + "op_ws_send_pong": ["send a message on a WebSocket", "closing a `WebSocket` or `WebSocketStream`"], }; // Wrap test function in additional assertion that makes sure diff --git a/ext/websocket/01_websocket.js b/ext/websocket/01_websocket.js index 60378b675..1b7a45ce0 100644 --- a/ext/websocket/01_websocket.js +++ b/ext/websocket/01_websocket.js @@ -534,13 +534,7 @@ class WebSocket extends EventTarget { clearTimeout(this[_idleTimeoutTimeout]); this[_idleTimeoutTimeout] = setTimeout(async () => { if (this[_readyState] === OPEN) { - await core.opAsync( - "op_ws_send", - this[_rid], - { - kind: "ping", - }, - ); + await core.opAsync("op_ws_send_ping", this[_rid]); this[_idleTimeoutTimeout] = setTimeout(async () => { if (this[_readyState] === OPEN) { this[_readyState] = CLOSING; diff --git a/ext/websocket/02_websocketstream.js b/ext/websocket/02_websocketstream.js index 0d01e62ee..f545d7a99 100644 --- a/ext/websocket/02_websocketstream.js +++ b/ext/websocket/02_websocketstream.js @@ -207,17 +207,11 @@ class WebSocketStream { const writable = new WritableStream({ write: async (chunk) => { if (typeof chunk === "string") { - await core.opAsync("op_ws_send", this[_rid], { - kind: "text", - value: chunk, - }); + await core.opAsync2("op_ws_send_text", this[_rid], chunk); } else if ( ObjectPrototypeIsPrototypeOf(Uint8ArrayPrototype, chunk) ) { - await core.opAsync("op_ws_send", this[_rid], { - kind: "binary", - value: chunk, - }, chunk); + await core.opAsync2("op_ws_send_binary", this[_rid], chunk); } else { throw new TypeError( "A chunk may only be either a string or an Uint8Array", @@ -265,9 +259,7 @@ class WebSocketStream { } case 3: { /* ping */ - await core.opAsync("op_ws_send", this[_rid], { - kind: "pong", - }); + await core.opAsync("op_ws_send_pong", this[_rid]); await pull(controller); break; } diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index 07cddc85b..74898a471 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -406,27 +406,29 @@ pub async fn op_ws_send_text( } #[op] -pub async fn op_ws_send( +pub async fn op_ws_send_ping( state: Rc<RefCell<OpState>>, rid: ResourceId, - value: SendValue, ) -> Result<(), AnyError> { - let msg = match value { - SendValue::Text(text) => { - Frame::new(true, OpCode::Text, None, text.into_bytes()) - } - SendValue::Binary(buf) => { - Frame::new(true, OpCode::Binary, None, buf.to_vec()) - } - SendValue::Pong => Frame::new(true, OpCode::Pong, None, vec![]), - SendValue::Ping => Frame::new(true, OpCode::Ping, None, vec![]), - }; + let resource = state + .borrow_mut() + .resource_table + .get::<ServerWebSocket>(rid)?; + resource + .write_frame(Frame::new(true, OpCode::Ping, None, vec![])) + .await +} +#[op] +pub async fn op_ws_send_pong( + state: Rc<RefCell<OpState>>, + rid: ResourceId, +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table .get::<ServerWebSocket>(rid)?; - resource.write_frame(msg).await + resource.write_frame(Frame::pong(vec![])).await } #[op(deferred)] @@ -521,11 +523,12 @@ deno_core::extension!(deno_websocket, ops = [ op_ws_check_permission_and_cancel_handle<P>, op_ws_create<P>, - op_ws_send, op_ws_close, op_ws_next_event, op_ws_send_binary, op_ws_send_text, + op_ws_send_ping, + op_ws_send_pong, op_ws_server_create, ], esm = [ "01_websocket.js", "02_websocketstream.js" ], |