update dependencies

Author: 0x7d8

Cargo.lock

@@ -14,17 +14,17 @@ dotenvy = "0.15.7"
 rustis = "0.13.3"
 serde = { version = "1.0.218", features = ["derive"] }
 serde_json = { version = "1.0.140", features = ["preserve_order"] }
-tokio = { version = "1.43.0", features = ["full"] }
+tokio = { version = "1.43.0", features = ["rt-multi-thread"] }
 utoipa = { version = "5.3.1", features = ["axum_extras", "preserve_order", "chrono"] }
 utoipa-axum = "0.2.0"
 chrono = { version = "0.4.40", features = ["serde"] }
 indexmap = { version = "2.7.1", features = ["serde"] }
 tower-http = { version = "0.6.2", features = ["catch-panic", "trace", "cors", "normalize-path"] }
-sentry = { version = "0.36.0", default-features = false, features = ["rustls", "reqwest", "backtrace", "contexts", "debug-images", "panic"] }
+sentry = { version = "0.37.0", default-features = false, features = ["rustls", "reqwest", "backtrace", "contexts", "debug-images", "panic"] }
 tracing = "0.1.41"
 reqwest = { version = "0.12.12", default-features = false, features = ["json", "rustls-tls"] }
 nestify = "0.3.3"
 sha2 = "0.10.8"
-sentry-tower = { version = "0.36.0", features = ["http", "axum-matched-path"] }
+sentry-tower = { version = "0.37.0", features = ["http", "axum-matched-path"] }
 sha1 = "0.10.6"
 tower = "0.5.2"

Cargo.toml

@@ -61,7 +61,7 @@ impl Cache {
         instance
     }
 
-    #[inline(always)]
+    #[inline]
     pub async fn cached<T, F, Fut>(&self, key: &str, ttl: u64, fn_compute: F) -> T
     where
         T: Serialize + DeserializeOwned,

src/cache.rs

@@ -81,12 +81,12 @@ impl Database {
         instance
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn write(&self) -> &sqlx::PgPool {
         &self.write
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn read(&self) -> &sqlx::PgPool {
         self.read.as_ref().unwrap_or(&self.write)
     }

src/database.rs

@@ -5,6 +5,7 @@ pub enum LoggerLevel {
     Error,
 }
 
+#[inline]
 pub fn log(level: LoggerLevel, message: String) {
     let level = match level {
         LoggerLevel::Info => " INF ".on_blue(),

src/logger.rs

@@ -51,6 +51,7 @@ impl Author {
         }
     }
 
+    #[inline]
     pub async fn by_key(database: &crate::database::Database, key: &str) -> Option<Self> {
         let row = sqlx::query(&format!(
             "SELECT {} FROM authors WHERE authors.key = $1",
@@ -194,6 +195,7 @@ impl Extension {
         }
     }
 
+    #[inline]
     pub async fn all(database: &crate::database::Database) -> Result<Vec<Self>, sqlx::Error> {
         let rows = sqlx::query(&format!(
             r#"
@@ -213,6 +215,7 @@ impl Extension {
         Ok(rows.into_iter().map(Self::map).collect())
     }
 
+    #[inline]
     pub async fn by_id(database: &crate::database::Database, id: i32) -> Option<Self> {
         let row = sqlx::query(&format!(
             r#"
@@ -234,6 +237,7 @@ impl Extension {
         row.map(Self::map)
     }
 
+    #[inline]
     pub async fn by_identifier(
         database: &crate::database::Database,
         identifier: &str,

src/models.rs

@@ -3,7 +3,10 @@ use rustis::commands::{ExpireOption, GenericCommands, StringCommands};
 use serde::{Deserialize, Serialize};
 use sha2::Digest;
 use sqlx::types::Uuid;
-use std::{collections::HashMap, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+};
 use tokio::sync::Mutex;
 
 nestify::nest! {
@@ -70,6 +73,8 @@ pub struct TelemetryLogger {
     database: Arc<crate::database::Database>,
     cache: Arc<crate::cache::Cache>,
     env: Arc<crate::env::Env>,
+
+    client: reqwest::Client,
 }
 
 impl TelemetryLogger {
@@ -83,9 +88,15 @@ impl TelemetryLogger {
             database,
             cache,
             env,
+
+            client: reqwest::Client::builder()
+                .user_agent("Blueprint API https://blueprint.zip")
+                .build()
+                .unwrap(),
         }
     }
 
+    #[inline]
     pub async fn log(&self, ip: &str, telemetry: TelemetryData) -> Option<()> {
         let mut processing = self.processing.lock().await;
 
@@ -119,13 +130,14 @@ impl TelemetryLogger {
         Some(())
     }
 
-    async fn lookup_ips(&self, ips: &[&str]) -> HashMap<String, (String, String)> {
+    #[inline]
+    async fn lookup_ips(&self, ips: &[&str]) -> HashMap<String, [String; 2]> {
         let mut result = HashMap::new();
 
-        let data = reqwest::Client::new()
+        let data = self
+            .client
             .post("http://ip-api.com/batch")
             .header("Content-Type", "application/json")
-            .header("User-Agent", "Blueprint API/1.0.0 https://blueprint.zip")
             .json(
                 &ips.iter()
                     .map(|ip| {
@@ -134,7 +146,7 @@ impl TelemetryLogger {
                             "fields": "continentCode,countryCode,query"
                         })
                     })
-                    .collect::<Vec<_>>(),
+                    .collect::<HashSet<_>>(),
             )
             .send()
             .await
@@ -150,10 +162,10 @@ impl TelemetryLogger {
 
             result.insert(
                 entry["query"].as_str().unwrap().to_string(),
-                (
+                [
                     entry["continentCode"].as_str().unwrap().to_string(),
                     entry["countryCode"].as_str().unwrap().to_string(),
-                ),
+                ],
             );
         }
 
@@ -183,7 +195,7 @@ impl TelemetryLogger {
             .await;
 
         for t in telemetry.iter_mut() {
-            if let Some((continent, country)) = ips.get(&t.ip) {
+            if let Some([continent, country]) = ips.get(&t.ip) {
                 t.continent = Some(continent.clone());
                 t.country = Some(country.clone());
             }