Global, mono-binary to libraries and binaries
This separates the previous mono-binary setup into separate libraries and binaries. Specifically it split the old since api/ingestor binary into an Atproto, and DB library, as well as an api, and ingestor binary. Atproto Lib Was mostly untouched. The original URI implementation was changed to use FromStr, otherwise only imports were changed. DB Lib Is mostly unused, so there wasn't much that needed to be changed. Some new files were added so that future work on it can hit the ground running. Api Binary Is almost entirely the same. Imports were changed and the ingestor code of main was removed. Ingestor Binary Was almost entirely refactored. An interface to made injestors was added, and it was modularized. The only shared code is in Ingestor.start(), and collections.rs's macros, but that is mostly boilerplate.
This commit is contained in:
parent
45acaaa601
commit
eb28549a0f
31 changed files with 582 additions and 636 deletions
|
|
@ -1,61 +0,0 @@
|
|||
use crate::{
|
||||
atproto::Nsid,
|
||||
router::xrpc::{
|
||||
XrpcEndpoint,
|
||||
XrpcHandler,
|
||||
QueryInput,
|
||||
ProcedureInput,
|
||||
}
|
||||
};
|
||||
use axum::Router as AxumRouter;
|
||||
use core::net::SocketAddr;
|
||||
use std::net::{IpAddr, Ipv4Addr};
|
||||
use tokio::net::TcpListener;
|
||||
|
||||
pub struct Router {
|
||||
addr: SocketAddr,
|
||||
router: AxumRouter,
|
||||
}
|
||||
|
||||
// In case server ever needs to support more than just XRPC
|
||||
pub enum Endpoint {
|
||||
Xrpc(XrpcEndpoint),
|
||||
}
|
||||
impl Endpoint {
|
||||
pub fn new_xrpc_query<Q>(nsid: Nsid, query: Q) -> Self
|
||||
where
|
||||
Q: XrpcHandler<QueryInput> + Clone
|
||||
{
|
||||
Endpoint::Xrpc(XrpcEndpoint::new_query(nsid,query))
|
||||
}
|
||||
pub fn new_xrpc_procedure<P>(nsid: Nsid, procedure: P) -> Self
|
||||
where
|
||||
P: XrpcHandler<ProcedureInput> + Clone
|
||||
{
|
||||
Endpoint::Xrpc(XrpcEndpoint::new_procedure(nsid,procedure))
|
||||
}
|
||||
}
|
||||
|
||||
pub mod xrpc;
|
||||
|
||||
impl Router {
|
||||
pub fn new() -> Self {
|
||||
let mut router = AxumRouter::new();
|
||||
router = XrpcEndpoint::not_implemented().add_to_router(router);
|
||||
let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127,0,0,1)), 6702);
|
||||
Router { router, addr }
|
||||
}
|
||||
|
||||
pub fn add_endpoint(mut self, endpoint: Endpoint) -> Self {
|
||||
match endpoint {
|
||||
Endpoint::Xrpc(ep) => self.router = ep.add_to_router(self.router),
|
||||
};
|
||||
self
|
||||
}
|
||||
|
||||
pub async fn serve(self) {
|
||||
let listener = TcpListener::bind(self.addr).await.unwrap();
|
||||
|
||||
axum::serve(listener, self.router).await.unwrap();
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue