hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up session, add mutability to Session.tree

Browse source
This commit is contained in:
Lucien Greathouse 2018-08-19 21:58:47 -07:00
parent 1129c2e679
commit ba89a8bf6a
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/src/session.rs
View file

@ -1,5 +1,5 @@
use std::{ use std::{
sync::Arc, sync::{Arc, RwLock},
}; };
use ::{ use ::{
@ -10,8 +10,8 @@ use ::{
pub struct Session { pub struct Session {
project: Project, project: Project,
message_queue: Arc<MessageQueue>, pub message_queue: Arc<MessageQueue>,
tree: Arc<RbxTree>, pub tree: Arc<RwLock<RbxTree>>,
} }
impl Session { impl Session {
@ -19,19 +19,11 @@ impl Session {
Session { Session {
project, project,
message_queue: Arc::new(MessageQueue::new()), message_queue: Arc::new(MessageQueue::new()),
tree: Arc::new(RbxTree::new()), tree: Arc::new(RwLock::new(RbxTree::new())),
} }
} }
pub fn get_project(&self) -> &Project { pub fn get_project(&self) -> &Project {
&self.project &self.project
} }
pub fn get_message_queue(&self) -> &MessageQueue {
&self.message_queue
}
pub fn get_tree(&self) -> &RbxTree {
&self.tree
}
} }

24
server/src/web.rs
View file

@ -65,11 +65,13 @@ impl Server {
(GET) (/api/rojo) => { (GET) (/api/rojo) => {
// Get a summary of information about the server. // Get a summary of information about the server.
let tree = self.session.tree.read().unwrap();
Response::json(&ServerInfoResponse { Response::json(&ServerInfoResponse {
server_version: self.server_version, server_version: self.server_version,
protocol_version: 2, protocol_version: 2,
server_id: &self.server_id, server_id: &self.server_id,
root_instance_id: self.session.get_tree().root_instance_id, root_instance_id: tree.root_instance_id,
}) })
}, },
@ -77,9 +79,11 @@ impl Server {
// Retrieve any messages past the given cursor index, and if // Retrieve any messages past the given cursor index, and if
// there weren't any, subscribe to receive any new messages. // there weren't any, subscribe to receive any new messages.
let message_queue = Arc::clone(&self.session.message_queue);
// Did the client miss any messages since the last subscribe? // Did the client miss any messages since the last subscribe?
{ {
let (new_cursor, new_messages) = self.session.get_message_queue().get_messages_since(cursor); let (new_cursor, new_messages) = message_queue.get_messages_since(cursor);
if new_messages.len() > 0 { if new_messages.len() > 0 {
return Response::json(&SubscribeResponse { return Response::json(&SubscribeResponse {
@ -92,17 +96,17 @@ impl Server {
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
let sender_id = self.session.get_message_queue().subscribe(tx); let sender_id = message_queue.subscribe(tx);
match rx.recv() { match rx.recv() {
Ok(_) => (), Ok(_) => (),
Err(_) => return Response::text("error!").with_status_code(500), Err(_) => return Response::text("error!").with_status_code(500),
} }
self.session.get_message_queue().unsubscribe(sender_id); message_queue.unsubscribe(sender_id);
{ {
let (new_cursor, new_messages) = self.session.get_message_queue().get_messages_since(cursor); let (new_cursor, new_messages) = message_queue.get_messages_since(cursor);
return Response::json(&SubscribeResponse { return Response::json(&SubscribeResponse {
server_id: &self.server_id, server_id: &self.server_id,
@ -113,6 +117,8 @@ impl Server {
}, },
(GET) (/api/read/{ id_list: String }) => { (GET) (/api/read/{ id_list: String }) => {
let message_queue = Arc::clone(&self.session.message_queue);
let requested_ids: Result<Vec<Id>, _> = id_list let requested_ids: Result<Vec<Id>, _> = id_list
.split(",") .split(",")
.map(str::parse) .map(str::parse)
@ -123,18 +129,18 @@ impl Server {
Err(_) => return rouille::Response::text("Malformed ID list").with_status_code(400), Err(_) => return rouille::Response::text("Malformed ID list").with_status_code(400),
}; };
let rbx_tree = self.session.get_tree(); let tree = self.session.tree.read().unwrap();
let message_cursor = self.session.get_message_queue().get_message_cursor(); let message_cursor = message_queue.get_message_cursor();
let mut instances = HashMap::new(); let mut instances = HashMap::new();
for &requested_id in &requested_ids { for &requested_id in &requested_ids {
match rbx_tree.get_instance(requested_id) { match tree.get_instance(requested_id) {
Some(instance) => { Some(instance) => {
instances.insert(instance.get_id(), Cow::Borrowed(instance)); instances.insert(instance.get_id(), Cow::Borrowed(instance));
for descendant in rbx_tree.iter_descendants(requested_id) { for descendant in tree.iter_descendants(requested_id) {
instances.insert(descendant.get_id(), Cow::Borrowed(descendant)); instances.insert(descendant.get_id(), Cow::Borrowed(descendant));
} }
}, },