liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Add SocketKind and use it to separate XMLSocket and Socket

This commit is contained in:
sleepycatcoding 2023-08-01 23:46:06 +03:00 committed by Nathan Adams
parent 662c7f986d
commit cd92677b2a
2 changed files with 90 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/avm2/globals/flash/net/socket.rs
View File

@ -43,7 +43,7 @@ pub fn connect<'gc>(
sockets, navigator, ..
} = &mut activation.context;
sockets.connect(*navigator, socket, host.to_utf8_lossy().into_owned(), port);
sockets.connect_avm2(*navigator, socket, host.to_utf8_lossy().into_owned(), port);
Ok(Value::Undefined)
}

58
core/src/socket.rs
View File

@ -1,4 +1,5 @@
use crate::{
avm1::globals::xml_socket::XmlSocket,
avm2::{object::SocketObject, Activation, Avm2, EventObject, TObject},
backend::navigator::NavigatorBackend,
context::UpdateContext,
@ -14,15 +15,22 @@ use std::{
pub type SocketHandle = Index;
#[derive(Collect)]
#[collect(no_drop)]
enum SocketKind<'gc> {
Avm2(SocketObject<'gc>),
Avm1(XmlSocket<'gc>),
}
#[derive(Collect)]
#[collect(no_drop)]
struct Socket<'gc> {
target: SocketObject<'gc>,
target: SocketKind<'gc>,
sender: RefCell<AsyncSender<Vec<u8>>>,
}
impl<'gc> Socket<'gc> {
fn new(target: SocketObject<'gc>, sender: AsyncSender<Vec<u8>>) -> Self {
fn new(target: SocketKind<'gc>, sender: AsyncSender<Vec<u8>>) -> Self {
Self {
target,
sender: RefCell::new(sender),
@ -71,7 +79,7 @@ impl<'gc> Sockets<'gc> {
}
}
pub fn connect(
pub fn connect_avm2(
&mut self,
backend: &mut dyn NavigatorBackend,
target: SocketObject<'gc>,
@ -80,7 +88,7 @@ impl<'gc> Sockets<'gc> {
) {
let (sender, receiver) = unbounded();
let socket = Socket::new(target, sender);
let socket = Socket::new(SocketKind::Avm2(target), sender);
let handle = self.sockets.insert(socket);
// NOTE: This call will send SocketAction::Connect to sender with connection status.
@ -134,9 +142,19 @@ impl<'gc> Sockets<'gc> {
None => continue,
};
match target {
SocketKind::Avm2(target) => {
let connect_evt =
EventObject::bare_default_event(&mut activation.context, "connect");
Avm2::dispatch_event(&mut activation.context, connect_evt, target.into());
Avm2::dispatch_event(
&mut activation.context,
connect_evt,
target.into(),
);
}
// TODO: Implement this.
SocketKind::Avm1(_) => {}
}
}
SocketAction::Connect(
handle,
@ -148,6 +166,8 @@ impl<'gc> Sockets<'gc> {
None => continue,
};
match target {
SocketKind::Avm2(target) => {
let io_error_evt = activation
.avm2()
.classes()
@ -164,7 +184,15 @@ impl<'gc> Sockets<'gc> {
)
.expect("IOErrorEvent should be constructed");
Avm2::dispatch_event(&mut activation.context, io_error_evt, target.into());
Avm2::dispatch_event(
&mut activation.context,
io_error_evt,
target.into(),
);
}
// TODO: Not sure if avm1 xmlsocket has a way to notify a error. (Probably should just fire connect event with success as false).
SocketKind::Avm1(_) => {}
}
}
SocketAction::Data(handle, data) => {
let target = match activation.context.sockets.sockets.get(handle) {
@ -173,6 +201,8 @@ impl<'gc> Sockets<'gc> {
None => continue,
};
match target {
SocketKind::Avm2(target) => {
let bytes_loaded = data.len();
target.read_buffer().extend(data);
@ -193,7 +223,15 @@ impl<'gc> Sockets<'gc> {
)
.expect("ProgressEvent should be constructed");
Avm2::dispatch_event(&mut activation.context, progress_evt, target.into());
Avm2::dispatch_event(
&mut activation.context,
progress_evt,
target.into(),
);
}
// TODO: Implement this.
SocketKind::Avm1(_) => {}
}
}
SocketAction::Close(handle) => {
let target = match activation.context.sockets.sockets.get(handle) {
@ -202,10 +240,16 @@ impl<'gc> Sockets<'gc> {
None => continue,
};
match target {
SocketKind::Avm2(target) => {
let close_evt =
EventObject::bare_default_event(&mut activation.context, "close");
Avm2::dispatch_event(&mut activation.context, close_evt, target.into());
}
// TODO: Implement this.
SocketKind::Avm1(_) => {}
}
}
}
}
}