Async-ify everything, and Delete DO Deployment Stuff

backend/Cargo.toml

@@ -12,6 +12,4 @@ serde_json = "1"
 thiserror = "1"
 smithe_lib = { path = "../lib" }
 rocket-governor = "0.2.0-rc.1"
-
-[target.'cfg(target_os = "linux")'.dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
+tokio = { version = "1", features = ["full"] }

backend/src/main.rs

@@ -42,22 +42,27 @@ impl<'r, 'o: 'r> Responder<'r, 'o> for Error {
 
 #[get("/")]
 fn index(_limitguard: RocketGovernor<'_, RateLimitGuard>) -> &'static str {
-    "Hello, world!"
+    "Hello, world! (backend)"
 }
 
 #[get("/<tag>")]
-fn search_players(
+async fn search_players(
     tag: String,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_all_like(&tag)?)?)
+    Ok(serde_json::to_string(&get_all_like(&tag).await?)?)
 }
 
 #[get("/<id>")]
-fn view_player(id: i32, _limitguard: RocketGovernor<'_, RateLimitGuard>) -> Result<String, Error> {
+async fn view_player(
+    id: i32,
+    _limitguard: RocketGovernor<'_, RateLimitGuard>,
+) -> Result<String, Error> {
     // insert player page view
-    smithe_lib::player_page_views::insert_player_page_view(id).unwrap();
-    Ok(serde_json::to_string(&get_player(id)?)?)
+    smithe_lib::player_page_views::insert_player_page_view(id)
+        .await
+        .unwrap();
+    Ok(serde_json::to_string(&get_player(id).await?)?)
 }
 
 #[get("/<id>")]
@@ -75,47 +80,49 @@ async fn get_player_set_wins_without_dqs(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_set_wins_without_dqs(id)?)?)
+    Ok(serde_json::to_string(&get_set_wins_without_dqs(id).await?)?)
 }
 
 #[get("/<id>/losses_without_dqs")]
 async fn get_player_set_losses_without_dqs(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_set_losses_without_dqs(id)?)?)
+    Ok(serde_json::to_string(
+        &get_set_losses_without_dqs(id).await?,
+    )?)
 }
 
 #[get("/<id>/wins_by_dqs")]
 async fn get_player_set_wins_by_dqs(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_set_wins_by_dq(id)?)?)
+    Ok(serde_json::to_string(&get_set_wins_by_dq(id).await?)?)
 }
 
 #[get("/<id>/losses_by_dqs")]
 async fn get_player_set_losses_by_dqs(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_set_losses_by_dq(id)?)?)
+    Ok(serde_json::to_string(&get_set_losses_by_dq(id).await?)?)
 }
 
 #[get("/<id>/winrate")]
 async fn get_player_winrate(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_winrate(id)?)?)
+    Ok(serde_json::to_string(&get_winrate(id).await?)?)
 }
 
 #[get("/<id>/competitor_type")]
 async fn get_player_competitor_type(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    let ct = get_competitor_type(id)?;
+    let ct = get_competitor_type(id).await?;
     Ok(serde_json::to_string(&format!("{}-{}er", ct.0, ct.1))?)
 }
 
@@ -125,7 +132,7 @@ async fn get_player_top_two_characters(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_top_two_characters(id)?)?)
+    Ok(serde_json::to_string(&get_top_two_characters(id).await?)?)
 }
 
 // get sets by player id
@@ -134,7 +141,7 @@ async fn get_player_sets(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_sets_per_player_id(id)?)?)
+    Ok(serde_json::to_string(&get_sets_per_player_id(id).await?)?)
 }
 
 // get head to head by player id
@@ -143,14 +150,14 @@ async fn get_player_head_to_head(
     id: i32,
     _limitguard: RocketGovernor<'_, RateLimitGuard>,
 ) -> Result<String, Error> {
-    Ok(serde_json::to_string(&get_head_to_head_record(id)?)?)
+    Ok(serde_json::to_string(&get_head_to_head_record(id).await?)?)
 }
 
 fn rocket() -> Rocket<Build> {
-    #[cfg(debug_assertions)]
-    let allowed_origins = AllowedOrigins::some_exact(&[DEV_ADDRESS, DEV_ADDRESS_2]);
+    // #[cfg(debug_assertions)]
+    // let allowed_origins = AllowedOrigins::some_exact(&[DEV_ADDRESS, DEV_ADDRESS_2]);
 
-    #[cfg(not(debug_assertions))]
+    // #[cfg(not(debug_assertions))]
     let allowed_origins = AllowedOrigins::some_exact(&[PROD_ADDRESS, PROD_ADDRESS_2]);
 
     let cors = rocket_cors::CorsOptions {

database/Cargo.toml

@@ -15,4 +15,6 @@ serde = "1"
 startgg = { path = "../startgg_api/" }
 chrono = "0.4"
 tracing = "0.1"
-tracing-subscriber = "0.3"
+tracing-subscriber = "0.3"
+diesel-async = { version = "0.4.1", features = ["postgres"] }
+tokio = { version = "1", features = ["full", "macros"] }

database/src/lib.rs

@@ -8,10 +8,10 @@
 pub mod db_models;
 pub mod schema;
 
-use std::env;
+use std::{env, io::Write};
 
 use anyhow::Result;
-use diesel::{Connection, ConnectionResult, PgConnection};
+use diesel_async::{AsyncConnection, AsyncPgConnection};
 use tracing::Level;
 use tracing_subscriber::FmtSubscriber;
 
@@ -27,16 +27,18 @@
     Ok(())
 }
 
-pub fn connect() -> Result<PgConnection> {
+pub async fn connect() -> Result<AsyncPgConnection> {
     // Try to connect forever until we succeed for a maximum of 100 (arbitraty) tries
     let tries = 100;
     for _ in 0..tries {
-        match try_connect() {
+        match try_connect().await {
             Ok(conn) => return Ok(conn),
             Err(e) => {
+                println!("Failed to connect to database: {}", e);
+                std::io::stdout().flush().unwrap();
                 tracing::error!("Failed to connect to database: {}", e);
                 tracing::info!("Retrying in 5 seconds...");
-                std::thread::sleep(std::time::Duration::from_secs(5));
+                tokio::time::sleep(std::time::Duration::from_secs(5)).await;
             }
         }
     }
@@ -46,15 +48,19 @@
     ))
 }
 
-fn try_connect() -> ConnectionResult<PgConnection> {
-    PgConnection::establish(
+async fn try_connect() -> Result<AsyncPgConnection> {
+    println!("Connecting to database...");
+    std::io::stdout().flush().unwrap();
+    AsyncPgConnection::establish(
         &env::var(PIDGTM_DATABASE_URL_ENVVAR_NAME).unwrap_or_else(|_| {
             panic!(
                 "{} environment variable not set",
                 PIDGTM_DATABASE_URL_ENVVAR_NAME
             )
         }),
     )
+    .await
+    .map_err(|e| anyhow::anyhow!(e))
 }
 
 #[cfg(test)]
@@ -63,10 +69,10 @@
     use super::*;
     use anyhow::Result;
 
-    #[test]
-    fn test_connect() -> Result<()> {
+    #[tokio::test]
+    async fn test_connect() -> Result<()> {
         init_logger()?;
-        assert!(connect().is_ok());
+        assert!(connect().await.is_ok());
 
         Ok(())
     }

lib/Cargo.toml

@@ -19,6 +19,8 @@ ctrlc = "3.4"
 as-any = "0.3"
 tokio = { version = "1.1", features = [ "rt", "macros" ] }
 chrono = "0.4"
+diesel-async = { version = "0.4.1", features = ["postgres"] }
+
 
 [features]
 default = ["skip_db_tests"]