Extract request_filter and dsc_webhook crates

* Extract the request_filter module from the game_api crate to a proper
  crate, for better responsibility separation architecture
* Extract the discord_webhook module from the game_api crate to a proper
  dsc_webhook crate, because it was needed by both game_api and newest
  request_filter crate.
* Remove records-lib workspace dependency (use path instead in each
  workspace crate)

Author: ahmadbky

Cargo.toml

@@ -1,10 +1,12 @@
 [workspace]
 resolver = "2"
 members = [
-  "crates/game_api",
-  "crates/records_lib",
-  "crates/socc",
-  "crates/admin",
+    "crates/game_api",
+    "crates/records_lib",
+    "crates/socc",
+    "crates/admin",
+    "crates/request_filter",
+    "crates/dsc_webhook",
 ]
 
 [workspace.dependencies]
@@ -33,5 +35,5 @@ itertools = "0.14.0"
 once_cell = "1.21.1"
 csv = "1.3.0"
 mkenv = "0.1.6"
-records-lib = { version = "1", path = "./crates/records_lib" }
 nom = "8.0.0"
+pin-project-lite = "0.2.16"

crates/admin/Cargo.toml

@@ -11,7 +11,7 @@ deadpool-redis = { workspace = true }
 dotenvy = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
-records-lib = { workspace = true, features = ["tracing"] }
+records-lib = { path = "../records_lib", features = ["tracing"] }
 reqwest = { workspace = true }
 serde = { workspace = true }
 sqlx = { workspace = true }

crates/dsc_webhook/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "dsc_webhook"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+serde = { workspace = true }

crates/game_api/src/discord_webhook.rs crates/dsc_webhook/src/lib.rscrates/game_api/src/discord_webhook.rs renamed to crates/dsc_webhook/src/lib.rs

@@ -33,13 +33,15 @@ anyhow = { workspace = true }
 dotenvy = { workspace = true }
 itertools = { workspace = true }
 once_cell = { workspace = true }
-records-lib = { workspace = true, features = ["tracing"] }
+records-lib = { path = "../records_lib", features = ["tracing"] }
 mkenv = { workspace = true }
 nom = { workspace = true }
 pin-project-lite = { version = "0.2.16", optional = true }
+request_filter = { path = "../request_filter", optional = true }
+dsc_webhook = { path = "../dsc_webhook" }
 
 [features]
 default = ["request_filter"]
 gql_schema = []
-request_filter = ["dep:pin-project-lite"]
+request_filter = ["dep:pin-project-lite", "dep:request_filter"]
 auth = []

crates/game_api/Cargo.toml

@@ -1,6 +1,7 @@
 use mkenv::{Env as _, EnvSplitIncluded as _};
 use once_cell::sync::OnceCell;
 use records_lib::{DbEnv, LibEnv};
+use tracing::instrument::WithSubscriber;
 
 #[cfg(test)]
 const DEFAULT_SESSION_KEY: &str = "";
@@ -21,7 +22,15 @@ mkenv::make_env! {pub ApiEnvUsedOnce:
         var: "RECORDS_API_SESSION_KEY",
         desc: "The session key used by the API",
         default: DEFAULT_SESSION_KEY,
-    }
+    },
+
+    wh_invalid_req_url: {
+        id: WebhookInvalidReqUrl(String),
+        kind: normal,
+        var: "WEBHOOK_INVALID_REQ_URL",
+        desc: "The URL to the Discord webhook used to flag invalid requests",
+        default: DEFAULT_WH_INVALID_REQ_URL,
+    },
 }
 
 const DEFAULT_PORT: u16 = 3000;
@@ -112,14 +121,6 @@ mkenv::make_env! {pub ApiEnv includes [
         default: DEFAULT_WH_AC_URL,
     },
 
-    wh_invalid_req_url: {
-        id: WebhookInvalidReqUrl(String),
-        kind: normal,
-        var: "WEBHOOK_INVALID_REQ_URL",
-        desc: "The URL to the Discord webhook used to flag invalid requests",
-        default: DEFAULT_WH_INVALID_REQ_URL,
-    },
-
     gql_endpoint: {
         id: GqlEndpoint(String),
         kind: normal,

crates/game_api/src/env.rs

@@ -17,12 +17,12 @@ use self::event::event_scope;
 use self::map::map_scope;
 use self::player::player_scope;
 use self::staggered::staggered_scope;
-use crate::discord_webhook::{WebhookBody, WebhookBodyEmbed, WebhookBodyEmbedField};
-#[cfg(feature = "request_filter")]
-use crate::request_filter::{FlagFalseRequest, InGameFilter};
 use crate::utils::{self, ApiStatus, get_api_status, json};
 use crate::{FitRequestId as _, ModeVersion, RecordsResponse, RecordsResultExt, Res};
 use actix_web::Responder;
+use dsc_webhook::{WebhookBody, WebhookBodyEmbed, WebhookBodyEmbedField};
+#[cfg(feature = "request_filter")]
+use request_filter::{FlagFalseRequest, InGameFilter};
 
 #[cfg(auth)]
 pub mod admin;

crates/game_api/src/http.rs

@@ -37,12 +37,12 @@ use crate::{
 use crate::{
     FitRequestId as _, RecordsErrorKind, RecordsResponse, RecordsResult, RecordsResultExt, Res,
     auth::{self, ApiAvailable, AuthHeader, MPAuthGuard, privilege},
-    discord_webhook::{WebhookBody, WebhookBodyEmbed, WebhookBodyEmbedField},
     utils::{self, json},
 };
+use dsc_webhook::{WebhookBody, WebhookBodyEmbed, WebhookBodyEmbedField};
 
 #[cfg(feature = "request_filter")]
-use crate::request_filter::{FlagFalseRequest, WebsiteFilter};
+use request_filter::{FlagFalseRequest, WebsiteFilter};
 
 use super::{
     pb,

crates/game_api/src/http/player.rs

@@ -5,10 +5,7 @@
 pub use deadpool_redis::Pool as RedisPool;
 pub use sqlx::MySqlPool;
 
-mod request_filter;
-
 mod auth;
-mod discord_webhook;
 mod env;
 mod error;
 mod graphql;

crates/game_api/src/lib.rs

@@ -54,6 +54,9 @@ async fn not_found(req_id: RequestId) -> RecordsResponse<impl Responder> {
 async fn main() -> anyhow::Result<()> {
     dotenvy::dotenv()?;
     let env = game_api_lib::init_env()?;
+    #[cfg(feature = "request_filter")]
+    request_filter::init_wh_url(env.used_once.wh_invalid_req_url)
+        .unwrap_or_else(|_| panic!("Invalid request WH URL isn't supposed to be set twice"));
 
     let mysql_pool = get_mysql_pool(env.db_env.db_url.db_url)
         .await