rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-22 05:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Imfs to ServeSession, threading through generic ImfsFetcher

Browse Source
This commit is contained in:
Lucien Greathouse
2019-09-13 12:52:15 -07:00
parent 651e63a0fb
commit 8481caa67c
5 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/web/api.rs
View File

@@ -9,6 +9,7 @@ use hyper::{header, service::Service, Body, Method, Request, Response, StatusCod
use rbx_dom_weak::RbxId;
use crate::{
imfs::new::ImfsFetcher,
serve_session::ServeSession,
web::{
interface::{
@@ -19,11 +20,11 @@ use crate::{
},
};
pub struct ApiService {
serve_session: Arc<ServeSession>,
pub struct ApiService<F> {
serve_session: Arc<ServeSession<F>>,
}
impl Service for ApiService {
impl<F: ImfsFetcher> Service for ApiService<F> {
type ReqBody = Body;
type ResBody = Body;
type Error = hyper::Error;
@@ -42,13 +43,13 @@ impl Service for ApiService {
}
}
impl ApiService {
pub fn new(serve_session: Arc<ServeSession>) -> ApiService {
impl<F: ImfsFetcher> ApiService<F> {
pub fn new(serve_session: Arc<ServeSession<F>>) -> Self {
ApiService { serve_session }
}
/// Get a summary of information about the server
fn handle_api_rojo(&self) -> <ApiService as Service>::Future {
fn handle_api_rojo(&self) -> <Self as Service>::Future {
let tree = self.serve_session.tree();
let root_instance_id = tree.get_root_id();
@@ -63,7 +64,7 @@ impl ApiService {
/// Retrieve any messages past the given cursor index, and if
/// there weren't any, subscribe to receive any new messages.
fn handle_api_subscribe(&self, request: Request<Body>) -> <ApiService as Service>::Future {
fn handle_api_subscribe(&self, request: Request<Body>) -> <Self as Service>::Future {
let argument = &request.uri().path()["/api/subscribe/".len()..];
let _input_cursor: u32 = match argument.parse() {
Ok(v) => v,
@@ -93,7 +94,7 @@ impl ApiService {
// })
}
fn handle_api_read(&self, request: Request<Body>) -> <ApiService as Service>::Future {
fn handle_api_read(&self, request: Request<Body>) -> <Self as Service>::Future {
let argument = &request.uri().path()["/api/read/".len()..];
let requested_ids: Option<Vec<RbxId>> = argument.split(',').map(RbxId::parse_str).collect();