Refactoring

Author: yukibtc

.gitignore

@@ -1,2 +1,3 @@
 /target
-Cargo.lock
+Cargo.lock
+.DS_Store

Cargo.toml

@@ -1,9 +1,29 @@
-[workspace]
-members = [
-    "crates/reverseproxy",
-    "crates/reverseproxy-config",
-    "crates/reverseproxy-logger",
-    "crates/reverseproxy-tcp",
-    "crates/reverseproxy-tor",
-    "crates/reverseproxy-util",
-]
+[package]
+name = "reverseproxy"
+version = "0.1.0"
+edition = "2021"
+description = "TCP Reverse Proxy written in Rust"
+authors = ["Yuki Kishimoto <yukikishimoto@proton.me>"]
+homepage = "https://github.com/yukibtc/reverseproxy"
+repository = "https://github.com/yukibtc/reverseproxy.git"
+license = "MIT"
+readme = "README.md"
+
+[features]
+default = []
+tor = ["libtor"]
+
+[dependencies]
+anyhow = "1.0.58"
+clap = { version = "3.2.6", features = ["derive"] }
+env_logger = "0.9.0"
+futures = "0.3.21"
+libtor = { version = "47.8.0+0.4.7.x", features=["vendored-openssl"], optional = true }
+log = "0.4.14"
+rand = "0.8.5"
+tokio = { version = "1.19.2", features = ["full"] }
+tokio-socks = "0.5.1"
+
+[profile.release]
+lto = true
+codegen-units = 1

Makefile

@@ -40,4 +40,4 @@ clean:
 	$(Q)cargo clean
 
 loc:
-	$(Q)echo "--- Counting lines of .rs files (LOC):" && find crates/ -type f -name "*.rs" -exec cat {} \; | wc -l
+	$(Q)echo "--- Counting lines of .rs files (LOC):" && find src/ -type f -name "*.rs" -exec cat {} \; | wc -l

README.md

@@ -1,6 +1,14 @@
 # TCP Reverse Proxy written in Rust
 
-## Install 
+## Getting started 
+
+### Install from [crates.io](https://crates.io/crates/reverseproxy)
+
+```
+cargo install reverseproxy
+```
+
+### Install from source
 
 * [Build from source](doc/build.md) 
 
@@ -10,24 +18,28 @@ Does NOT support TLS yet!
 
 * Forward from local address to Tor hidden service (.onion) using socks5 proxy
 
-```
-reverseproxy 127.0.0.1:8080 torhiddenservice.onion:80 --socks5-proxy 127.0.0.1:9050
-```
-
-* Forward from local address to Tor hidden service (.onion) using embedded Tor client (feature in alpha stage)
-
-```
-reverseproxy 127.0.0.1:8080 torhiddenservice.onion:80 --use-tor
-```
+    ```
+    reverseproxy 127.0.0.1:8080 torhiddenservice.onion:80 --socks5-proxy 127.0.0.1:9050
+    ```
 
 * Forward from local address to local network address
 
-```
-reverseproxy 127.0.0.1:8080 othercomputer.local:80 
-```
+    ```
+    reverseproxy 127.0.0.1:8080 othercomputer.local:80 
+    ```
 
 To get more info use `reverseproxy --help`
 
+### Experimental
+
+* Forward from local address to Tor hidden service (.onion) using embedded Tor client
+
+    To enable this feature, build the binary using `cargo build --release --features tor` or `cargo install --features tor`
+
+    ```
+    reverseproxy 127.0.0.1:8080 torhiddenservice.onion:80 --use-tor
+    ```
+
 ## License
 
 This project is distributed under the MIT software license - see the [LICENSE](LICENSE) file for details