hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-25 04:54:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove json_response in favor of Response::json, which now works in Rouille 2.x

Browse source
This commit is contained in:
Lucien Greathouse 2018-05-30 22:52:27 -07:00
parent 5eaa5b7950
commit 068aa513a0
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/src/web.rs
View file

@ -1,9 +1,9 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::{mpsc, RwLock, Arc}; use std::sync::{mpsc, RwLock, Arc};
use rouille; use rouille::{self, Response};
use web_util::{read_json, json_response}; use web_util::read_json;
use id::Id; use id::Id;
use rbx::RbxInstance; use rbx::RbxInstance;
use rbx_session::RbxSession; use rbx_session::RbxSession;
@ -63,7 +63,7 @@ pub fn start(config: WebConfig) {
partitions.insert(partition.name.clone(), partition.target.as_slice()); partitions.insert(partition.name.clone(), partition.target.as_slice());
} }
json_response(ServerInfoResponse { Response::json(&ServerInfoResponse {
server_version, server_version,
protocol_version: 2, protocol_version: 2,
server_id: &server_id, server_id: &server_id,
@ -80,7 +80,7 @@ pub fn start(config: WebConfig) {
let messages = config.message_session.messages.read().unwrap(); let messages = config.message_session.messages.read().unwrap();
if cursor > messages.len() as i32 { if cursor > messages.len() as i32 {
return json_response(SubscribeResponse { return Response::json(&SubscribeResponse {
server_id: &server_id, server_id: &server_id,
messages: &[], messages: &[],
message_cursor: messages.len() as i32 - 1, message_cursor: messages.len() as i32 - 1,
@ -91,7 +91,7 @@ pub fn start(config: WebConfig) {
let new_messages = &messages[(cursor + 1) as usize..]; let new_messages = &messages[(cursor + 1) as usize..];
let new_cursor = cursor + new_messages.len() as i32; let new_cursor = cursor + new_messages.len() as i32;
return json_response(SubscribeResponse { return Response::json(&SubscribeResponse {
server_id: &server_id, server_id: &server_id,
messages: new_messages, messages: new_messages,
message_cursor: new_cursor, message_cursor: new_cursor,
@ -105,7 +105,7 @@ pub fn start(config: WebConfig) {
match rx.recv() { match rx.recv() {
Ok(_) => (), Ok(_) => (),
Err(_) => return rouille::Response::text("error!").with_status_code(500), Err(_) => return Response::text("error!").with_status_code(500),
} }
config.message_session.unsubscribe(sender_id); config.message_session.unsubscribe(sender_id);
@ -115,11 +115,11 @@ pub fn start(config: WebConfig) {
let new_messages = &messages[(cursor + 1) as usize..]; let new_messages = &messages[(cursor + 1) as usize..];
let new_cursor = cursor + new_messages.len() as i32; let new_cursor = cursor + new_messages.len() as i32;
return json_response(SubscribeResponse { Response::json(&SubscribeResponse {
server_id: &server_id, server_id: &server_id,
messages: new_messages, messages: new_messages,
message_cursor: new_cursor, message_cursor: new_cursor,
}); })
} }
}, },
@ -131,7 +131,7 @@ pub fn start(config: WebConfig) {
messages.len() as i32 - 1 messages.len() as i32 - 1
}; };
json_response(ReadAllResponse { Response::json(&ReadAllResponse {
server_id: &server_id, server_id: &server_id,
message_cursor, message_cursor,
instances: &rbx_session.instances, instances: &rbx_session.instances,
@ -144,10 +144,10 @@ pub fn start(config: WebConfig) {
None => return rouille::Response::text("Malformed JSON").with_status_code(400), None => return rouille::Response::text("Malformed JSON").with_status_code(400),
}; };
rouille::Response::json(&body) Response::json(&body)
}, },
_ => rouille::Response::empty_404() _ => Response::empty_404()
) )
}); });
} }

5
server/src/web_util.rs
View file

@ -6,11 +6,6 @@ use serde_json;
static MAX_BODY_SIZE: usize = 100 * 1024 * 1024; // 100 MiB static MAX_BODY_SIZE: usize = 100 * 1024 * 1024; // 100 MiB
pub fn json_response<T: serde::Serialize>(value: T) -> rouille::Response {
let data = serde_json::to_string(&value).unwrap();
rouille::Response::from_data("application/json", data)
}
/// Pulls text that may be JSON out of a Rouille Request object. /// Pulls text that may be JSON out of a Rouille Request object.
/// ///
/// Doesn't do any actual parsing -- all this method does is verify the content /// Doesn't do any actual parsing -- all this method does is verify the content