Backend tweaks (#106)

1. upgrade dependencies.
2. add index to db.

server/Cargo.toml

@@ -9,12 +9,12 @@ edition = "2021"
 members = [".", "entity", "migration"]
 
 [dependencies]
-tokio = { version = "1.19.2", features = ["full"] }
+tokio = { version = "1.40.0", features = ["full"] }
 serde = "1.0"
 serde_json = "1.0"
-reqwest = { version = "0.11", features = ["json"] }
-rocket = { version = "0.5.0", features = ["json"] }
-envconfig = "0.10"
+reqwest = { version = "0.12", features = ["json"] }
+rocket = { version = "0.5.1", features = ["json"] }
+envconfig = "0.11"
 dotenv = "0.15"
 anyhow = "1.0"
 entity = { path = "entity" }
@@ -25,14 +25,14 @@ hmac = "0.12"
 sha2 = "0.10"
 jwt = "0.16"
 rand = "0.8.5"
-email_address = "0.2.1"
+email_address = "0.2.9"
 rocket_cors = "0.6.0"
-base64 = "0.13.0"
-byte-unit = "4.0.14"
-tempfile = "3.3.0"
+base64 = "0.22.1"
+byte-unit = "5.1.4"
+tempfile = "3.12.0"
 md5 = "0.7.0"
-lazy_static = "1.4.0"
-zip = "0.6.2"
+lazy_static = "1.5.0"
+zip = "2.2.0"
 endorphin = "0.1.9"
 log = "0.4"
 sea-orm-rocket = "0.5.4"

server/entity/Cargo.toml

@@ -11,4 +11,4 @@ path = "src/lib.rs"
 [dependencies]
 serde = "1.0"
 serde_json = "1.0"
-sea-orm = { version = "^0.9.2", features = [ "sqlx-postgres", "runtime-tokio-native-tls", "macros" ] }
+sea-orm = { version = "^1.0.1", features = [ "sqlx-postgres", "runtime-tokio-native-tls", "macros" ] }

server/entity/src/snapshot.rs

@@ -1,4 +1,4 @@
-use sea_orm::entity::prelude::*;
+use sea_orm::{entity::prelude::*, FromJsonQueryResult};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 

server/entity/src/snapshot_task.rs

@@ -1,4 +1,4 @@
-use sea_orm::entity::prelude::*;
+use sea_orm::{entity::prelude::*, FromJsonQueryResult};
 use serde::{Deserialize, Serialize};
 
 // NOTE: sea_orm doesn't seem to support `u16`

server/migration/Cargo.toml

@@ -13,7 +13,7 @@ async-std = { version = "^1", features = ["attributes", "tokio1"] }
 entity = { path = "../entity" }
 
 [dependencies.sea-orm-migration]
-version = "^0.9.0"
+version = "^1.0.1"
 features = [
   "sqlx-postgres", "runtime-tokio-native-tls"
 ]

server/migration/src/lib.rs

@@ -1,12 +1,16 @@
 pub use sea_orm_migration::prelude::*;
 
 mod m20220101_000001_create_table;
+mod m20240914_025248_add_index;
 
 pub struct Migrator;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
-        vec![Box::new(m20220101_000001_create_table::Migration)]
+        vec![
+            Box::new(m20220101_000001_create_table::Migration),
+            Box::new(m20240914_025248_add_index::Migration),
+        ]
     }
 }

server/migration/src/m20240914_025248_add_index.rs

@@ -0,0 +1,31 @@
+use sea_orm_migration::{
+    prelude::*,
+    sea_orm::{DbBackend, Schema},
+};
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let schema = Schema::new(DbBackend::Postgres);
+        for stmt in schema.create_index_from_entity(entity::user::Entity) {
+            manager.create_index(stmt).await?;
+        }
+        for stmt in schema.create_index_from_entity(entity::snapshot::Entity) {
+            manager.create_index(stmt).await?;
+        }
+        for stmt in schema.create_index_from_entity(entity::snapshot_log::Entity) {
+            manager.create_index(stmt).await?;
+        }
+        for stmt in schema.create_index_from_entity(entity::snapshot_task::Entity) {
+            manager.create_index(stmt).await?;
+        }
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        Ok(())
+    }
+}

server/src/data_fetcher.rs

@@ -2,6 +2,7 @@ use crate::file_storage;
 use crate::limit;
 use crate::user_handler::User;
 use anyhow::Error;
+use base64::Engine;
 use chrono::prelude::*;
 use chrono::Duration;
 use entity::snapshot::SyncFiles;
@@ -102,7 +103,7 @@ pub enum ValidationError {
 fn onedrive_api_of_link(url: &str) -> String {
     format!(
         "https://api.onedrive.com/v1.0/shares/u!{}",
-        base64::encode_config(url, base64::URL_SAFE_NO_PAD)
+        base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(url)
     )
 }
 

server/src/file_storage.rs

@@ -9,8 +9,8 @@ use tempfile::TempDir;
 // TODO: unit tests
 
 pub fn byte_unit_to_string_hum(bytes: u64) -> String {
-    byte_unit::Byte::from_bytes(bytes.into())
-        .get_appropriate_unit(true)
+    byte_unit::Byte::from_u64(bytes)
+        .get_appropriate_unit(byte_unit::UnitType::Decimal)
         .to_string()
 }
 

server/src/misc_handler.rs

@@ -91,7 +91,7 @@ async fn download<'r>(
                     };
                     let mut buf = Vec::new();
                     let mut zip = zip::ZipWriter::new(std::io::Cursor::new(&mut buf));
-                    let options = zip::write::FileOptions::default()
+                    let options = zip::write::SimpleFileOptions::default()
                         .compression_method(zip::CompressionMethod::Stored);
                     zip.add_directory("Sync/", options)?;
 
@@ -104,7 +104,6 @@ async fn download<'r>(
                         std::io::copy(&mut file, &mut zip)?;
                     }
                     zip.finish()?;
-                    drop(zip);
 
                     Ok(FileResponse::Ok {
                         filename: String::from("Sync.zip"),

server/src/snapshot_handler.rs

@@ -29,8 +29,8 @@ struct SnapshotJson {
 async fn list_snapshots(
     conn: Connection<'_, Db>,
     user: User,
-    page: Option<usize>,
-    page_size: Option<usize>,
+    page: Option<u64>,
+    page_size: Option<u64>,
 ) -> APIResponse {
     let db = conn.into_inner();