move all old code (not yet deleted) to old dirs

time to start on iteration #5
plabayo · Dec 25, 2023 · 3ada5d6 · 3ada5d6
1 parent c30b8e1
commit 3ada5d6
Show file tree

Hide file tree

Showing 63 changed files with 67 additions and 1,724 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = [".", "rama-cli", "rama-rt", "rama-rt-macros"]
+members = [".", "rama-cli"]
 
 [workspace.package]
 version = "0.2.0"
@@ -36,17 +36,11 @@ hyper = { package = "rama-hyper", version = "0.1001000", features = ["http1", "h
 hyper-util = { package = "rama-hyper-util", version = "0.1002", features = ["server-auto"] }
 matchit = "0.7.3"
 pin-project-lite = "0.2.13"
-rama-rt = { version = "0.2", path = "./rama-rt" }
-rama-rt-macros = { version = "0.2", path = "./rama-rt-macros" }
 serde = { version = "1.0", features = ["derive"] }
 serde_urlencoded = "0.7"
-tower-async = { version = "0.2", features = [
-  "util",
-  "timeout",
-  "filter",
-  "limit",
-] }
-tower-async-http = { version = "0.2", features = ["full"] }
+tower = { version = "0.4.13", default-features = false, features = ["util"] }
+tower-layer = "0.3.2"
+tower-service = "0.3.2"
 tracing = "0.1"
 
 [dev-dependencies]

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@
 [ghs-badge]: https://img.shields.io/badge/sponsor-30363D?style=for-the-badge&logo=GitHub-Sponsors&logoColor=#EA4AAA
 [ghs-url]: https://github.com/sponsors/plabayo
 
-🦙 Rama is a modular proxy framework for the 🦀 Rust language to move and transform your network packets. You can use it to develop 🚦 reverse proxies, 🔓 TLS termination proxies, 🌐 HTTP(S) proxies, 🧦 SOCKS5 proxies and 🕵️‍♀️ distortion proxies.
+🦙 Rama is a modular proxy framework for the 🦀 Rust language to move and transform your network packets. You can use it to develop 🚦 reverse proxies, 🔓 TLS termination proxies, 🌐 HTTP(S) proxies, 🧦 SOCKS5 proxies and 🕵️‍♀️ distortion proxies. Rama is async-first using [Tokio](https://tokio.rs/) as its Async Runtime.
 
 Please refer to [the examples found in the `./examples` dir](./examples) to get inspired on how you can use it for your purposes. There is no [crates.io](https://crates.io) release of rama yet. If you already want to start using rama already your can do so by referring to it in your `Cargo.toml` as follows:
 
@@ -74,7 +74,7 @@ without any additional terms or conditions.
 
 Special thanks goes to all involved in developing, maintaining and supporting [the Rust programming language](https://www.rust-lang.org/), the [Tokio ecosystem](https://tokio.rs/) and [all other crates](./Cargo.toml) that we depend upon.
 
-Extra credits also go to [Axum](https://github.com/tokio-rs/axum), from which ideas and code were copied as its a project very much in line with the kind of software we want Rama to be, but for a different purpose. Our hats also go off to [Tower](https://github.com/tower-rs/tower), its inventors and all the people and creatures that help make it be every day.
+Extra credits also go to [Axum](https://github.com/tokio-rs/axum), from which ideas and code were copied as its a project very much in line with the kind of software we want Rama to be, but for a different purpose. Our hats also go off to [Tower](https://github.com/tower-rs/tower), its inventors and all the people and creatures that help make it be every day. The initial code for the SOCKS5 support was copied from EAimTY's codebases.
 
 ## 💖 | Sponsors
 
@@ -121,12 +121,3 @@ Note that the Tokio runtime and its ecosystems sparked initial experimental vers
 but that we since then, after plenty of non-published iterations, have broken free from that ecosystem,
 and are now supporting other ecosystems as well. In fact, by default we link not into any async runtime,
 and rely only on the `std` library for for any future/async primitives.
-
-### What Async Runtime is used?
-
-We try to write the Rama codebase in an async runtime agnostic manner. Everything that is
-runtime specific (e.g. low level primitives) lives within `rama-rt`. For now [multithreaded Tokio](https://tokio.rs/) is the only platform tested on and that is ready to use. In fact it is for now the only one implemented in the `rama-rt` crate.
-
-There are currently no plans to move away from [Tokio](https://tokio.rs/), we do however have plans to look into adding opt-in (feature-gated) supported for _io-uring_.
-
-Please [open an issue](https://github.com/plabayo/rama/issues) or come and talk to us by [joining our Discord][discord-url] in case you want to help in adding support for different async runtimes.
diff --git a/examples/tokio_tcp_echo_server.rs → old-examples/tokio_tcp_echo_server.rs b/examples/tokio_tcp_echo_server.rs → old-examples/tokio_tcp_echo_server.rs
diff --git a/examples/tokio_tcp_hello.rs → old-examples/tokio_tcp_hello.rs b/examples/tokio_tcp_hello.rs → old-examples/tokio_tcp_hello.rs
diff --git a/examples/tokio_tcp_http_hello.rs → old-examples/tokio_tcp_http_hello.rs b/examples/tokio_tcp_http_hello.rs → old-examples/tokio_tcp_http_hello.rs
diff --git a/examples/tokio_tls_https_hello.rs → old-examples/tokio_tls_https_hello.rs b/examples/tokio_tls_https_hello.rs → old-examples/tokio_tls_https_hello.rs
diff --git a/examples/tokio_tls_proxy.rs → old-examples/tokio_tls_proxy.rs b/examples/tokio_tls_proxy.rs → old-examples/tokio_tls_proxy.rs
diff --git a/src/http/header_value.rs → old-src/http/header_value.rs b/src/http/header_value.rs → old-src/http/header_value.rs
diff --git a/src/http/middleware/dns/error.rs → old-src/http/middleware/dns/error.rs b/src/http/middleware/dns/error.rs → old-src/http/middleware/dns/error.rs
diff --git a/src/http/middleware/dns/layer.rs → old-src/http/middleware/dns/layer.rs b/src/http/middleware/dns/layer.rs → old-src/http/middleware/dns/layer.rs
diff --git a/src/http/middleware/dns/mod.rs → old-src/http/middleware/dns/mod.rs b/src/http/middleware/dns/mod.rs → old-src/http/middleware/dns/mod.rs
diff --git a/src/http/middleware/dns/resolver.rs → old-src/http/middleware/dns/resolver.rs b/src/http/middleware/dns/resolver.rs → old-src/http/middleware/dns/resolver.rs
diff --git a/src/http/middleware/dns/service.rs → old-src/http/middleware/dns/service.rs b/src/http/middleware/dns/service.rs → old-src/http/middleware/dns/service.rs
diff --git a/src/http/middleware/header_config.rs → old-src/http/middleware/header_config.rs b/src/http/middleware/header_config.rs → old-src/http/middleware/header_config.rs
diff --git a/src/http/middleware/mod.rs → old-src/http/middleware/mod.rs b/src/http/middleware/mod.rs → old-src/http/middleware/mod.rs
diff --git a/src/http/mod.rs → old-src/http/mod.rs b/src/http/mod.rs → old-src/http/mod.rs
diff --git a/src/http/server/executor.rs → old-src/http/server/executor.rs b/src/http/server/executor.rs → old-src/http/server/executor.rs
diff --git a/src/http/server/hyper_body.rs → old-src/http/server/hyper_body.rs b/src/http/server/hyper_body.rs → old-src/http/server/hyper_body.rs
diff --git a/src/http/server/hyper_conn.rs → old-src/http/server/hyper_conn.rs b/src/http/server/hyper_conn.rs → old-src/http/server/hyper_conn.rs
diff --git a/src/http/server/io.rs → old-src/http/server/io.rs b/src/http/server/io.rs → old-src/http/server/io.rs
diff --git a/src/http/server/mod.rs → old-src/http/server/mod.rs b/src/http/server/mod.rs → old-src/http/server/mod.rs
diff --git a/src/http/server/service.rs → old-src/http/server/service.rs b/src/http/server/service.rs → old-src/http/server/service.rs
diff --git a/old-src/lib.rs b/old-src/lib.rs
@@ -0,0 +1,22 @@
+#![feature(return_type_notation)]
+#![allow(incomplete_features)]
+
+pub mod rt;
+
+pub mod service;
+pub mod state;
+
+pub mod stream;
+
+pub mod tcp;
+
+pub mod http;
+pub mod tls;
+
+#[allow(unreachable_pub)]
+mod sealed {
+    pub trait Sealed<T> {}
+}
+
+/// Alias for a type-erased error type.
+pub type BoxError = Box<dyn std::error::Error + Send + Sync>;
diff --git a/old-src/service/mod.rs b/old-src/service/mod.rs
diff --git a/src/service/spawn.rs → old-src/service/spawn.rs b/src/service/spawn.rs → old-src/service/spawn.rs
diff --git a/src/state.rs → old-src/state.rs b/src/state.rs → old-src/state.rs
diff --git a/src/stream/layer/mod.rs → old-src/stream/layer/mod.rs b/src/stream/layer/mod.rs → old-src/stream/layer/mod.rs
diff --git a/src/stream/layer/tracker/bytes.rs → old-src/stream/layer/tracker/bytes.rs b/src/stream/layer/tracker/bytes.rs → old-src/stream/layer/tracker/bytes.rs
diff --git a/src/stream/layer/tracker/mod.rs → old-src/stream/layer/tracker/mod.rs b/src/stream/layer/tracker/mod.rs → old-src/stream/layer/tracker/mod.rs
diff --git a/src/stream/mod.rs → old-src/stream/mod.rs b/src/stream/mod.rs → old-src/stream/mod.rs
diff --git a/src/stream/service/echo.rs → old-src/stream/service/echo.rs b/src/stream/service/echo.rs → old-src/stream/service/echo.rs
diff --git a/src/stream/service/forward.rs → old-src/stream/service/forward.rs b/src/stream/service/forward.rs → old-src/stream/service/forward.rs
diff --git a/src/stream/service/mod.rs → old-src/stream/service/mod.rs b/src/stream/service/mod.rs → old-src/stream/service/mod.rs
diff --git a/src/tcp/client/forward.rs → old-src/tcp/client/forward.rs b/src/tcp/client/forward.rs → old-src/tcp/client/forward.rs
diff --git a/src/tcp/client/mod.rs → old-src/tcp/client/mod.rs b/src/tcp/client/mod.rs → old-src/tcp/client/mod.rs
diff --git a/src/tcp/mod.rs → old-src/tcp/mod.rs b/src/tcp/mod.rs → old-src/tcp/mod.rs
diff --git a/src/tcp/server/listener.rs → old-src/tcp/server/listener.rs b/src/tcp/server/listener.rs → old-src/tcp/server/listener.rs
diff --git a/src/tcp/server/mod.rs → old-src/tcp/server/mod.rs b/src/tcp/server/mod.rs → old-src/tcp/server/mod.rs
diff --git a/src/tls/mod.rs → old-src/tls/mod.rs b/src/tls/mod.rs → old-src/tls/mod.rs
diff --git a/rama-rt/src/rt_tokio/tls/mod.rs → old-src/tls/server/mod.rs b/rama-rt/src/rt_tokio/tls/mod.rs → old-src/tls/server/mod.rs
diff --git a/src/tls/server/rustls.rs → old-src/tls/server/rustls.rs b/src/tls/server/rustls.rs → old-src/tls/server/rustls.rs
diff --git a/rama-cli/Cargo.toml b/rama-cli/Cargo.toml
@@ -16,6 +16,7 @@ clap = { version = "4.4", features = [ "derive" ] }
 crossterm = "0.27"
 rama = { version = "0.2", path = ".." }
 ratatui = "0.25"
+tokio = { version = "1.35", features = [ "rt-multi-thread", "macros" ] }
 
 [[bin]]
 name = "rama"

diff --git a/rama-cli/src/main.rs b/rama-cli/src/main.rs
@@ -22,7 +22,7 @@ enum Commands {
     Run,
 }
 
-#[rama::rt::main]
+#[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let args = Cli::parse();
 

diff --git a/rama-rt-macros/Cargo.toml b/rama-rt-macros/Cargo.toml
diff --git a/rama-rt-macros/README.md b/rama-rt-macros/README.md