Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 14:53:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow sending binary messages

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2020-06-11 16:58:02 +02:00
parent 7db485aeb2
commit f855fbb604
2 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

54
components/script/dom/rtcdatachannel.rs
View file

@ -7,10 +7,12 @@ use crate::dom::bindings::codegen::Bindings::RTCDataChannelBinding::RTCDataChann
use crate::dom::bindings::codegen::Bindings::RTCDataChannelBinding::RTCDataChannelMethods;
use crate::dom::bindings::codegen::Bindings::RTCDataChannelBinding::RTCDataChannelState;
use crate::dom::bindings::codegen::Bindings::RTCErrorBinding::{RTCErrorDetailType, RTCErrorInit};
use crate::dom::bindings::error::{Error, Fallible};
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject};
use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::bindings::str::{DOMString, USVString};
use crate::dom::blob::Blob;
use crate::dom::event::{Event, EventBubbles, EventCancelable};
use crate::dom::eventtarget::EventTarget;
use crate::dom::globalscope::GlobalScope;
@ -22,6 +24,8 @@ use dom_struct::dom_struct;
use js::conversions::ToJSValConvertible;
use js::jsapi::JSAutoRealm;
use js::jsval::UndefinedValue;
use js::rust::CustomAutoRooterGuard;
use js::typedarray::{ArrayBuffer, ArrayBufferView};
use servo_media::webrtc::{
DataChannelId, DataChannelInit, DataChannelMessage, DataChannelState, WebRtcError,
};
@ -180,6 +184,29 @@ impl RTCDataChannel {
};
*self.ready_state.borrow_mut() = state.into();
}
fn send(&self, source: &SendSource) -> Fallible<()> {
if *self.ready_state.borrow() != RTCDataChannelState::Open {
return Err(Error::InvalidState);
}
let message = match source {
SendSource::String(string) => DataChannelMessage::Text(string.0.clone()),
SendSource::Blob(blob) => {
DataChannelMessage::Binary(blob.get_bytes().unwrap_or(vec![]))
},
SendSource::ArrayBuffer(array) => DataChannelMessage::Binary(array.to_vec()),
SendSource::ArrayBufferView(array) => DataChannelMessage::Binary(array.to_vec()),
};
let controller = self.peer_connection.get_webrtc_controller().borrow();
controller
.as_ref()
.unwrap()
.send_data_channel_message(&self.servo_media_id, message);
Ok(())
}
}
impl Drop for RTCDataChannel {
@ -189,6 +216,13 @@ impl Drop for RTCDataChannel {
}
}
enum SendSource<'a, 'b> {
String(&'a USVString),
Blob(&'a Blob),
ArrayBuffer(CustomAutoRooterGuard<'b, ArrayBuffer>),
ArrayBufferView(CustomAutoRooterGuard<'b, ArrayBufferView>),
}
impl RTCDataChannelMethods for RTCDataChannel {
// https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-onopen
event_handler!(open, GetOnopen, SetOnopen);
@ -265,22 +299,24 @@ impl RTCDataChannelMethods for RTCDataChannel {
// fn SetBinaryType(&self, value: DOMString) -> ();
// https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-send
fn Send(&self, data: USVString) {
let controller = self.peer_connection.get_webrtc_controller().borrow();
controller
.as_ref()
.unwrap()
.send_data_channel_message(&self.servo_media_id, DataChannelMessage::Text(data.0));
fn Send(&self, data: USVString) -> Fallible<()> {
self.send(&SendSource::String(&data))
}
// https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-send!overload-1
// fn Send_(&self, data: &Blob) -> () {}
fn Send_(&self, data: &Blob) -> Fallible<()> {
self.send(&SendSource::Blob(data))
}
// https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-send!overload-2
// fn Send__(&self, data: CustomAutoRooterGuard<ArrayBuffer>) -> () {}
fn Send__(&self, data: CustomAutoRooterGuard<ArrayBuffer>) -> Fallible<()> {
self.send(&SendSource::ArrayBuffer(data))
}
// https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-send!overload-3
// fn Send___(&self, data: CustomAutoRooterGuard<ArrayBufferView>) -> () {}
fn Send___(&self, data: CustomAutoRooterGuard<ArrayBufferView>) -> Fallible<()> {
self.send(&SendSource::ArrayBufferView(data))
}
}
impl From<&RTCDataChannelInit> for DataChannelInit {

8
components/script/dom/webidls/RTCDataChannel.webidl
View file

@ -24,10 +24,10 @@ interface RTCDataChannel : EventTarget {
void close();
attribute EventHandler onmessage;
//attribute DOMString binaryType;
void send(USVString data);
//void send(Blob data);
//void send(ArrayBuffer data);
//void send(ArrayBufferView data);
[Throws] void send(USVString data);
[Throws] void send(Blob data);
[Throws] void send(ArrayBuffer data);
[Throws] void send(ArrayBufferView data);
};
// https://www.w3.org/TR/webrtc/#dom-rtcdatachannelinit