Move server components into own directory

sebpuetz · Apr 14, 2024 · 193209e · 193209e
1 parent 014184f
commit 193209e
Show file tree

Hide file tree

Showing 87 changed files with 11 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-  "./channels/*",
-  "./gateway",
-  "./ws-proto",
-  "./udp-proto",
-  "./voice/*",
+  "./server/channels/*",
+  "./server/gateway",
+  "./server/ws-proto",
+  "./server/udp-proto",
+  "./server/voice/*",
 ]
 
 exclude = [

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -31,11 +31,11 @@ tokio-tungstenite = { version = "0.20.1", features = [
 tracing = { version = "0.1.39", features = ["log"] }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 tungstenite = { version = "0.20.1", features = ["rustls"] }
-udp-proto = { version = "0.1.0", path = "../udp-proto" }
+udp-proto = { version = "0.1.0", path = "../server/udp-proto" }
 uuid = { version = "1.4.1", features = ["v4", "serde"] }
-voices-voice-crypto = { path = "../voice/crypto" }
-voice-proto = { path = "../voice/proto", features = ["client"] }
-voices-ws-proto = { path = "../ws-proto", features = ["client"] }
+voices-voice-crypto = { path = "../server/voice/crypto" }
+voice-proto = { path = "../server/voice/proto", features = ["client"] }
+voices-ws-proto = { path = "../server/ws-proto", features = ["client"] }
 rubato = { version = "0.14.1", features = ["log"] }
 tracing-log = "0.1.3"
 nnnoiseless = "0.5.1"
diff --git a/channels/core/.env → server/channels/core/.env b/channels/core/.env → server/channels/core/.env
diff --git a/channels/core/Cargo.toml → server/channels/core/Cargo.toml b/channels/core/Cargo.toml → server/channels/core/Cargo.toml
diff --git a/channels/core/diesel.toml → server/channels/core/diesel.toml b/channels/core/diesel.toml → server/channels/core/diesel.toml
diff --git a/channels/core/init.sql → server/channels/core/init.sql b/channels/core/init.sql → server/channels/core/init.sql
diff --git a/channels/core/init_db.sh → server/channels/core/init_db.sh b/channels/core/init_db.sh → server/channels/core/init_db.sh
diff --git a/...00000000000_diesel_initial_setup/down.sql → ...00000000000_diesel_initial_setup/down.sql b/...00000000000_diesel_initial_setup/down.sql → ...00000000000_diesel_initial_setup/down.sql
diff --git a/...0000000000000_diesel_initial_setup/up.sql → ...0000000000000_diesel_initial_setup/up.sql b/...0000000000000_diesel_initial_setup/up.sql → ...0000000000000_diesel_initial_setup/up.sql
diff --git a/...igrations/2022-08-30-214404_init/down.sql → ...igrations/2022-08-30-214404_init/down.sql b/...igrations/2022-08-30-214404_init/down.sql → ...igrations/2022-08-30-214404_init/down.sql
diff --git a/.../migrations/2022-08-30-214404_init/up.sql → .../migrations/2022-08-30-214404_init/up.sql b/.../migrations/2022-08-30-214404_init/up.sql → .../migrations/2022-08-30-214404_init/up.sql
diff --git a/channels/core/src/db.rs → server/channels/core/src/db.rs b/channels/core/src/db.rs → server/channels/core/src/db.rs
diff --git a/channels/core/src/db_models/channel.rs → ...er/channels/core/src/db_models/channel.rs b/channels/core/src/db_models/channel.rs → ...er/channels/core/src/db_models/channel.rs
diff --git a/channels/core/src/db_models/mod.rs → server/channels/core/src/db_models/mod.rs b/channels/core/src/db_models/mod.rs → server/channels/core/src/db_models/mod.rs
diff --git a/channels/core/src/db_models/server.rs → server/channels/core/src/db_models/server.rs b/channels/core/src/db_models/server.rs → server/channels/core/src/db_models/server.rs
diff --git a/channels/core/src/db_models/voice_server.rs → ...annels/core/src/db_models/voice_server.rs b/channels/core/src/db_models/voice_server.rs → ...annels/core/src/db_models/voice_server.rs
diff --git a/channels/core/src/error.rs → server/channels/core/src/error.rs b/channels/core/src/error.rs → server/channels/core/src/error.rs
diff --git a/channels/core/src/lib.rs → server/channels/core/src/lib.rs b/channels/core/src/lib.rs → server/channels/core/src/lib.rs
diff --git a/channels/core/src/models.rs → server/channels/core/src/models.rs b/channels/core/src/models.rs → server/channels/core/src/models.rs
diff --git a/channels/core/src/schema.rs → server/channels/core/src/schema.rs b/channels/core/src/schema.rs → server/channels/core/src/schema.rs
diff --git a/channels/core/src/test.rs → server/channels/core/src/test.rs b/channels/core/src/test.rs → server/channels/core/src/test.rs
diff --git a/channels/core/src/test_helper.rs → server/channels/core/src/test_helper.rs b/channels/core/src/test_helper.rs → server/channels/core/src/test_helper.rs
diff --git a/channels/grpc/Cargo.toml → server/channels/grpc/Cargo.toml b/channels/grpc/Cargo.toml → server/channels/grpc/Cargo.toml
diff --git a/channels/grpc/Dockerfile → server/channels/grpc/Dockerfile b/channels/grpc/Dockerfile → server/channels/grpc/Dockerfile
diff --git a/channels/grpc/build.rs → server/channels/grpc/build.rs b/channels/grpc/build.rs → server/channels/grpc/build.rs
diff --git a/channels/grpc/channels.v1.proto → server/channels/grpc/channels.v1.proto b/channels/grpc/channels.v1.proto → server/channels/grpc/channels.v1.proto
diff --git a/channels/grpc/src/lib.rs → server/channels/grpc/src/lib.rs b/channels/grpc/src/lib.rs → server/channels/grpc/src/lib.rs
diff --git a/channels/grpc/src/main.rs → server/channels/grpc/src/main.rs b/channels/grpc/src/main.rs → server/channels/grpc/src/main.rs
diff --git a/channels/grpc/src/server.rs → server/channels/grpc/src/server.rs b/channels/grpc/src/server.rs → server/channels/grpc/src/server.rs
diff --git a/channels/grpc/src/service.rs → server/channels/grpc/src/service.rs b/channels/grpc/src/service.rs → server/channels/grpc/src/service.rs
diff --git a/channels/grpc/src/voice_channels.v1.rs → ...er/channels/grpc/src/voice_channels.v1.rs b/channels/grpc/src/voice_channels.v1.rs → ...er/channels/grpc/src/voice_channels.v1.rs
diff --git a/channels/models/Cargo.toml → server/channels/models/Cargo.toml b/channels/models/Cargo.toml → server/channels/models/Cargo.toml
diff --git a/channels/models/src/lib.rs → server/channels/models/src/lib.rs b/channels/models/src/lib.rs → server/channels/models/src/lib.rs
diff --git a/gateway/Cargo.toml → server/gateway/Cargo.toml b/gateway/Cargo.toml → server/gateway/Cargo.toml
diff --git a/gateway/Dockerfile → server/gateway/Dockerfile b/gateway/Dockerfile → server/gateway/Dockerfile
diff --git a/gateway/build.rs → server/gateway/build.rs b/gateway/build.rs → server/gateway/build.rs
diff --git a/gateway/cli.py → server/gateway/cli.py b/gateway/cli.py → server/gateway/cli.py
diff --git a/gateway/src/channel_registry/distributed.rs → ...teway/src/channel_registry/distributed.rs b/gateway/src/channel_registry/distributed.rs → ...teway/src/channel_registry/distributed.rs
diff --git a/gateway/src/channel_registry/integrated.rs → ...ateway/src/channel_registry/integrated.rs b/gateway/src/channel_registry/integrated.rs → ...ateway/src/channel_registry/integrated.rs
diff --git a/gateway/src/channel_registry/mod.rs → server/gateway/src/channel_registry/mod.rs b/gateway/src/channel_registry/mod.rs → server/gateway/src/channel_registry/mod.rs
diff --git a/...src/channel_registry/voice_channels.v1.rs → ...src/channel_registry/voice_channels.v1.rs b/...src/channel_registry/voice_channels.v1.rs → ...src/channel_registry/voice_channels.v1.rs
diff --git a/gateway/src/lib.rs → server/gateway/src/lib.rs b/gateway/src/lib.rs → server/gateway/src/lib.rs
diff --git a/gateway/src/main.rs → server/gateway/src/main.rs b/gateway/src/main.rs → server/gateway/src/main.rs
diff --git a/gateway/src/rest_api.rs → server/gateway/src/rest_api.rs b/gateway/src/rest_api.rs → server/gateway/src/rest_api.rs
diff --git a/gateway/src/server/channels/mod.rs → server/gateway/src/server/channels/mod.rs b/gateway/src/server/channels/mod.rs → server/gateway/src/server/channels/mod.rs
diff --git a/.../src/server/channels/state/distributed.rs → .../src/server/channels/state/distributed.rs b/.../src/server/channels/state/distributed.rs → .../src/server/channels/state/distributed.rs
diff --git a/gateway/src/server/channels/state/local.rs → ...ateway/src/server/channels/state/local.rs b/gateway/src/server/channels/state/local.rs → ...ateway/src/server/channels/state/local.rs
diff --git a/gateway/src/server/channels/state/mod.rs → .../gateway/src/server/channels/state/mod.rs b/gateway/src/server/channels/state/mod.rs → .../gateway/src/server/channels/state/mod.rs
diff --git a/gateway/src/server/mod.rs → server/gateway/src/server/mod.rs b/gateway/src/server/mod.rs → server/gateway/src/server/mod.rs
diff --git a/gateway/src/server/session.rs → server/gateway/src/server/session.rs b/gateway/src/server/session.rs → server/gateway/src/server/session.rs
diff --git a/gateway/src/server/ws.rs → server/gateway/src/server/ws.rs b/gateway/src/server/ws.rs → server/gateway/src/server/ws.rs
diff --git a/gateway/src/util.rs → server/gateway/src/util.rs b/gateway/src/util.rs → server/gateway/src/util.rs
diff --git a/gateway/src/voice_instance/integrated.rs → .../gateway/src/voice_instance/integrated.rs b/gateway/src/voice_instance/integrated.rs → .../gateway/src/voice_instance/integrated.rs
diff --git a/gateway/src/voice_instance/mod.rs → server/gateway/src/voice_instance/mod.rs b/gateway/src/voice_instance/mod.rs → server/gateway/src/voice_instance/mod.rs
diff --git a/gateway/src/voice_instance/remote.rs → server/gateway/src/voice_instance/remote.rs b/gateway/src/voice_instance/remote.rs → server/gateway/src/voice_instance/remote.rs
diff --git a/...way/src/voice_instance/voice_server.v1.rs → ...way/src/voice_instance/voice_server.v1.rs b/...way/src/voice_instance/voice_server.v1.rs → ...way/src/voice_instance/voice_server.v1.rs
diff --git a/server/gateway/tests/it/main.rs b/server/gateway/tests/it/main.rs
@@ -0,0 +1,2 @@
+#[tokio::test]
+async fn test() {}
diff --git a/udp-proto/Cargo.toml → server/udp-proto/Cargo.toml b/udp-proto/Cargo.toml → server/udp-proto/Cargo.toml
diff --git a/udp-proto/src/lib.rs → server/udp-proto/src/lib.rs b/udp-proto/src/lib.rs → server/udp-proto/src/lib.rs
diff --git a/voice/core/Cargo.toml → server/voice/core/Cargo.toml b/voice/core/Cargo.toml → server/voice/core/Cargo.toml
diff --git a/voice/core/src/channel/connection.rs → server/voice/core/src/channel/connection.rs b/voice/core/src/channel/connection.rs → server/voice/core/src/channel/connection.rs
diff --git a/voice/core/src/channel/mod.rs → server/voice/core/src/channel/mod.rs b/voice/core/src/channel/mod.rs → server/voice/core/src/channel/mod.rs
diff --git a/voice/core/src/config.rs → server/voice/core/src/config.rs b/voice/core/src/config.rs → server/voice/core/src/config.rs
diff --git a/voice/core/src/lib.rs → server/voice/core/src/lib.rs b/voice/core/src/lib.rs → server/voice/core/src/lib.rs
diff --git a/voice/core/src/ports.rs → server/voice/core/src/ports.rs b/voice/core/src/ports.rs → server/voice/core/src/ports.rs
diff --git a/voice/core/src/test.rs → server/voice/core/src/test.rs b/voice/core/src/test.rs → server/voice/core/src/test.rs
diff --git a/voice/crypto/Cargo.toml → server/voice/crypto/Cargo.toml b/voice/crypto/Cargo.toml → server/voice/crypto/Cargo.toml
diff --git a/voice/crypto/src/lib.rs → server/voice/crypto/src/lib.rs b/voice/crypto/src/lib.rs → server/voice/crypto/src/lib.rs
diff --git a/voice/grpc/Cargo.toml → server/voice/grpc/Cargo.toml b/voice/grpc/Cargo.toml → server/voice/grpc/Cargo.toml
diff --git a/voice/grpc/Dockerfile → server/voice/grpc/Dockerfile b/voice/grpc/Dockerfile → server/voice/grpc/Dockerfile
diff --git a/voice/grpc/build.rs → server/voice/grpc/build.rs b/voice/grpc/build.rs → server/voice/grpc/build.rs
diff --git a/voice/grpc/service.proto → server/voice/grpc/service.proto b/voice/grpc/service.proto → server/voice/grpc/service.proto
diff --git a/voice/grpc/src/main.rs → server/voice/grpc/src/main.rs b/voice/grpc/src/main.rs → server/voice/grpc/src/main.rs
diff --git a/voice/grpc/src/registry/mod.rs → server/voice/grpc/src/registry/mod.rs b/voice/grpc/src/registry/mod.rs → server/voice/grpc/src/registry/mod.rs
diff --git a/voice/grpc/src/registry/voice_channels.v1.rs → ...ce/grpc/src/registry/voice_channels.v1.rs b/voice/grpc/src/registry/voice_channels.v1.rs → ...ce/grpc/src/registry/voice_channels.v1.rs
diff --git a/voice/grpc/src/server.rs → server/voice/grpc/src/server.rs b/voice/grpc/src/server.rs → server/voice/grpc/src/server.rs
diff --git a/voice/grpc/src/service.rs → server/voice/grpc/src/service.rs b/voice/grpc/src/service.rs → server/voice/grpc/src/service.rs
diff --git a/voice/grpc/src/voice_server.v1.rs → server/voice/grpc/src/voice_server.v1.rs b/voice/grpc/src/voice_server.v1.rs → server/voice/grpc/src/voice_server.v1.rs
diff --git a/voice/models/Cargo.toml → server/voice/models/Cargo.toml b/voice/models/Cargo.toml → server/voice/models/Cargo.toml
diff --git a/voice/models/src/lib.rs → server/voice/models/src/lib.rs b/voice/models/src/lib.rs → server/voice/models/src/lib.rs
diff --git a/voice/proto/Cargo.toml → server/voice/proto/Cargo.toml b/voice/proto/Cargo.toml → server/voice/proto/Cargo.toml
diff --git a/voice/proto/build.rs → server/voice/proto/build.rs b/voice/proto/build.rs → server/voice/proto/build.rs
diff --git a/voice/proto/src/lib.rs → server/voice/proto/src/lib.rs b/voice/proto/src/lib.rs → server/voice/proto/src/lib.rs
diff --git a/voice/proto/voice.proto → server/voice/proto/voice.proto b/voice/proto/voice.proto → server/voice/proto/voice.proto
diff --git a/ws-proto/Cargo.toml → server/ws-proto/Cargo.toml b/ws-proto/Cargo.toml → server/ws-proto/Cargo.toml
diff --git a/ws-proto/src/client.rs → server/ws-proto/src/client.rs b/ws-proto/src/client.rs → server/ws-proto/src/client.rs
diff --git a/ws-proto/src/lib.rs → server/ws-proto/src/lib.rs b/ws-proto/src/lib.rs → server/ws-proto/src/lib.rs