rename conduit to conduwuit finally

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-14 21:58:01 -05:00
parent c6bf8f5ea1
commit 0317cc8cc5
No known key found for this signature in database
277 changed files with 559 additions and 551 deletions

View file

@ -1,5 +1,5 @@
[package]
name = "conduit_router"
name = "conduwuit_router"
categories.workspace = true
description.workspace = true
edition.workspace = true
@ -55,10 +55,10 @@ axum-server-dual-protocol.optional = true
axum-server.workspace = true
axum.workspace = true
bytes.workspace = true
conduit-admin.workspace = true
conduit-api.workspace = true
conduit-core.workspace = true
conduit-service.workspace = true
conduwuit-admin.workspace = true
conduwuit-api.workspace = true
conduwuit-core.workspace = true
conduwuit-service.workspace = true
const-str.workspace = true
futures.workspace = true
http.workspace = true

View file

@ -5,9 +5,9 @@ use axum::{
Router,
};
use axum_client_ip::SecureClientIpSource;
use conduit::{error, Result, Server};
use conduit_api::router::state::Guard;
use conduit_service::Services;
use conduwuit::{error, Result, Server};
use conduwuit_api::router::state::Guard;
use conduwuit_service::Services;
use http::{
header::{self, HeaderName},
HeaderValue, Method, StatusCode,
@ -155,7 +155,7 @@ fn body_limit_layer(server: &Server) -> DefaultBodyLimit { DefaultBodyLimit::max
fn catch_panic(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_util::Full<bytes::Bytes>> {
//TODO: XXX
/*
conduit_service::services()
conduwuit_service::services()
.server
.metrics
.requests_panic

View file

@ -4,17 +4,17 @@ mod router;
mod run;
mod serve;
extern crate conduit_core as conduit;
extern crate conduwuit_core as conduwuit;
use std::{panic::AssertUnwindSafe, pin::Pin, sync::Arc};
use conduit::{Error, Result, Server};
use conduit_service::Services;
use conduwuit::{Error, Result, Server};
use conduwuit_service::Services;
use futures::{Future, FutureExt, TryFutureExt};
conduit::mod_ctor! {}
conduit::mod_dtor! {}
conduit::rustc_flags_capture! {}
conduwuit::mod_ctor! {}
conduwuit::mod_dtor! {}
conduwuit::rustc_flags_capture! {}
#[unsafe(no_mangle)]
pub extern "Rust" fn start(server: &Arc<Server>) -> Pin<Box<dyn Future<Output = Result<Arc<Services>>> + Send>> {

View file

@ -4,8 +4,8 @@ use axum::{
extract::State,
response::{IntoResponse, Response},
};
use conduit::{debug, debug_error, debug_warn, defer, err, error, trace, Result};
use conduit_service::Services;
use conduwuit::{debug, debug_error, debug_warn, defer, err, error, trace, Result};
use conduwuit_service::Services;
use http::{Method, StatusCode, Uri};
#[tracing::instrument(

View file

@ -1,16 +1,16 @@
use std::sync::Arc;
use axum::{response::IntoResponse, routing::get, Router};
use conduit::Error;
use conduit_api::router::{state, state::Guard};
use conduit_service::Services;
use conduwuit::Error;
use conduwuit_api::router::{state, state::Guard};
use conduwuit_service::Services;
use http::{StatusCode, Uri};
use ruma::api::client::error::ErrorKind;
pub(crate) fn build(services: &Arc<Services>) -> (Router, Guard) {
let router = Router::<state::State>::new();
let (state, guard) = state::create(services.clone());
let router = conduit_api::router::build(router, &services.server)
let router = conduwuit_api::router::build(router, &services.server)
.route("/", get(it_works))
.fallback(not_found)
.with_state(state);

View file

@ -1,6 +1,6 @@
extern crate conduit_admin as admin;
extern crate conduit_core as conduit;
extern crate conduit_service as service;
extern crate conduwuit_admin as admin;
extern crate conduwuit_core as conduwuit;
extern crate conduwuit_service as service;
use std::{
sync::{atomic::Ordering, Arc},
@ -8,7 +8,7 @@ use std::{
};
use axum_server::Handle as ServerHandle;
use conduit::{debug, debug_error, debug_info, error, info, Error, Result, Server};
use conduwuit::{debug, debug_error, debug_info, error, info, Error, Result, Server};
use service::Services;
use tokio::{
sync::broadcast::{self, Sender},

View file

@ -6,8 +6,8 @@ mod unix;
use std::sync::Arc;
use axum_server::Handle as ServerHandle;
use conduit::Result;
use conduit_service::Services;
use conduwuit::Result;
use conduwuit_service::Services;
use tokio::sync::broadcast;
use super::layers;
@ -28,7 +28,7 @@ pub(super) async fn serve(
return tls::serve(server, app, handle, addrs).await;
#[cfg(not(feature = "direct_tls"))]
return conduit::Err!(Config(
return conduwuit::Err!(Config(
"tls",
"conduwuit was not built with direct TLS support (\"direct_tls\")"
));

View file

@ -5,7 +5,7 @@ use std::{
use axum::Router;
use axum_server::{bind, Handle as ServerHandle};
use conduit::{debug_info, info, Result, Server};
use conduwuit::{debug_info, info, Result, Server};
use tokio::task::JoinSet;
pub(super) async fn serve(

View file

@ -6,7 +6,7 @@ use axum_server_dual_protocol::{
axum_server::{bind_rustls, tls_rustls::RustlsConfig},
ServerExt,
};
use conduit::{err, Result, Server};
use conduwuit::{err, Result, Server};
use tokio::task::JoinSet;
use tracing::{debug, info, warn};

View file

@ -10,7 +10,7 @@ use axum::{
extract::{connect_info::IntoMakeServiceWithConnectInfo, Request},
Router,
};
use conduit::{debug, debug_error, info, result::UnwrapInfallible, trace, warn, Err, Result, Server};
use conduwuit::{debug, debug_error, info, result::UnwrapInfallible, trace, warn, Err, Result, Server};
use hyper::{body::Incoming, service::service_fn};
use hyper_util::{
rt::{TokioExecutor, TokioIo},