Skip to content

refactor: don't use #[arraybuffer] op2 attribute #31189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: don't use #[arraybuffer] op2 attribute #31189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ext/websocket/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,17 @@ pub fn ws_create_server_stream(
state.resource_table.add(ServerWebSocket::new(ws))
}

fn send_binary(state: &mut OpState, rid: ResourceId, data: &[u8]) {
enum SendBinaryData<'a> {
Vec(Vec<u8>),
Slice(&'a [u8]),
}

fn send_binary(state: &mut OpState, rid: ResourceId, data: SendBinaryData) {
let resource = state.resource_table.get::<ServerWebSocket>(rid).unwrap();
let data = data.to_vec();
let data = match data {
SendBinaryData::Vec(v) => v,
SendBinaryData::Slice(v) => v.to_vec(),
};
let len = data.len();
resource.buffered.set(resource.buffered.get() + len);
let lock = resource.reserve_lock();
Expand All @@ -615,16 +623,16 @@ pub fn op_ws_send_binary(
#[smi] rid: ResourceId,
#[anybuffer] data: &[u8],
) {
send_binary(state, rid, data)
send_binary(state, rid, SendBinaryData::Slice(data))
}

#[op2(fast)]
pub fn op_ws_send_binary_ab(
state: &mut OpState,
#[smi] rid: ResourceId,
#[arraybuffer] data: &[u8],
#[buffer(copy)] data: Vec<u8>,
) {
send_binary(state, rid, data)
send_binary(state, rid, SendBinaryData::Vec(data))
}

#[op2(fast)]
Expand Down
Loading