From d2fc7cb3c4e6f47984df2eee02f48113ac52a16f Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:59:15 -0800 Subject: [PATCH 01/14] add database migrations and .env.local --- .gitignore | 2 +- README.md | 2 +- docs/database.md | 103 ++++++++++++++++++ .../down.sql | 1 + .../2025-01-10-191952_create_packages/up.sql | 8 ++ .../down.sql | 1 + .../up.sql | 20 ++++ .../down.sql | 2 + .../up.sql | 4 + src/db/mod.rs | 4 +- src/middleware/cors.rs | 5 +- src/pinata/mod.rs | 9 +- src/schema.rs | 42 ++++++- src/util.rs | 43 +++++++- 14 files changed, 232 insertions(+), 14 deletions(-) create mode 100644 docs/database.md create mode 100644 migrations/2025-01-10-191952_create_packages/down.sql create mode 100644 migrations/2025-01-10-191952_create_packages/up.sql create mode 100644 migrations/2025-01-10-194911_create_package_versions/down.sql create mode 100644 migrations/2025-01-10-194911_create_package_versions/up.sql create mode 100644 migrations/2025-01-10-203250_update_packages_default_version_fk/down.sql create mode 100644 migrations/2025-01-10-203250_update_packages_default_version_fk/up.sql diff --git a/.gitignore b/.gitignore index 4b00868..6691ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ build node_modules tmp .vscode/* -.env +.env.local # Forc binaries installed by the server. /forc-* \ No newline at end of file diff --git a/README.md b/README.md index 0a4747f..baaf94f 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ cargo install diesel_cli --no-default-features --features postgres RUSTFLAGS='-L /opt/homebrew/opt/libpq/lib' cargo install diesel_cli --no-default-features --features postgres ``` -It is also recommended to install a Postgres client like [DBeaver](https://dbeaver.io/) to connect and inspect the database while developing locally. +See [docs/database.md](database.md) for more information about working with the database. ### Building the `forc.pub` server diff --git a/docs/database.md b/docs/database.md new file mode 100644 index 0000000..91ec0ae --- /dev/null +++ b/docs/database.md @@ -0,0 +1,103 @@ +# Working with the Database for Forc.pub + +This guide will help you set up and interact with the database. + +## Installing Diesel + +To use Diesel, you need the Diesel CLI and the Rust library. + +```sh +# Mac only +brew install libpq + +# Ubuntu only +apt-get install libpq5 + +# Install diesel CLI +cargo install diesel_cli --no-default-features --features postgres + +# On macOS-arm64, you may need additional rust flags: +RUSTFLAGS='-L /opt/homebrew/opt/libpq/lib' cargo install diesel_cli --no-default-features --features postgres +``` + +The environment variables for connecting to the local database are set in `.env`. + +## Creating a Table + +1. **Generate a migration:** + Run the following Diesel CLI command to create a new migration: + ```bash + diesel migration generate create_users + ``` + This creates two files under `migrations/_create_users/`: + - `up.sql`: Commands to apply the migration + - `down.sql`: Commands to undo the migration + +2. **Define the table in the `up.sql` file:** + ```sql + CREATE TABLE users ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + full_name VARCHAR NOT NULL, + github_login VARCHAR NOT NULL UNIQUE, + github_url VARCHAR NOT NULL, + avatar_url VARCHAR, + email VARCHAR, + is_admin BOOLEAN NOT NULL DEFAULT FALSE, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP + ) + ``` + +3. **Define the rollback in the `down.sql` file:** + ```sql + DROP TABLE users; + ``` + +4. **Run the migration:** + Execute the migration to apply the changes to your database: + ```bash + diesel migration run + ``` + +## Viewing the Generated Schema + +Diesel generates a Rust representation of your database schema in `src/schema.rs`. + +The file will contain Rust definitions for your tables, like this: +```rust +diesel::table! { + users (id) { + id -> Uuid, + full_name -> Varchar, + github_login -> Varchar, + github_url -> Varchar, + avatar_url -> Nullable, + email -> Nullable, + is_admin -> Bool, + created_at -> Timestamp, + } +} +``` + +This schema is used in Diesel queries to ensure type safety. + +## Using a Database Client + +For easier database management and visualization, you can use a database client such as DBeaver. + +1. **Install DBeaver:** + Download and install DBeaver from [dbeaver.io](https://dbeaver.io/). + +2. **Connect to your database:** + - Open DBeaver and create a new database connection. + - Select your database type (e.g., PostgreSQL). + - Provide your database URL, username, and password (as specified in the `.env` file). + +3. **Explore the database:** + - View and edit tables, run SQL queries, and inspect relationships between tables. + - This tool can be especially helpful for debugging and testing your database setup. + +## Organizing Feature-Specific Modules + +To keep the project modular and maintainable, create separate modules for each feature in `src/db`. + +Multiple tables can be used for a single feature. diff --git a/migrations/2025-01-10-191952_create_packages/down.sql b/migrations/2025-01-10-191952_create_packages/down.sql new file mode 100644 index 0000000..6974945 --- /dev/null +++ b/migrations/2025-01-10-191952_create_packages/down.sql @@ -0,0 +1 @@ +DROP TABLE packages; diff --git a/migrations/2025-01-10-191952_create_packages/up.sql b/migrations/2025-01-10-191952_create_packages/up.sql new file mode 100644 index 0000000..ace24c6 --- /dev/null +++ b/migrations/2025-01-10-191952_create_packages/up.sql @@ -0,0 +1,8 @@ +CREATE TABLE packages ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + user_owner uuid NOT NULL, + package_name VARCHAR NOT NULL UNIQUE, + default_version uuid DEFAULT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (user_owner) REFERENCES users(id) ON DELETE RESTRICT +); \ No newline at end of file diff --git a/migrations/2025-01-10-194911_create_package_versions/down.sql b/migrations/2025-01-10-194911_create_package_versions/down.sql new file mode 100644 index 0000000..e2a95ef --- /dev/null +++ b/migrations/2025-01-10-194911_create_package_versions/down.sql @@ -0,0 +1 @@ +DROP TABLE package_versions; diff --git a/migrations/2025-01-10-194911_create_package_versions/up.sql b/migrations/2025-01-10-194911_create_package_versions/up.sql new file mode 100644 index 0000000..e39e191 --- /dev/null +++ b/migrations/2025-01-10-194911_create_package_versions/up.sql @@ -0,0 +1,20 @@ +CREATE TABLE package_versions ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + package_id uuid NOT NULL, + publish_token uuid NOT NULL, + published_by uuid NOT NULL, + upload_id uuid NOT NULL, + num VARCHAR NOT NULL, + package_description VARCHAR, + repository VARCHAR, + documentation VARCHAR, + homepage VARCHAR, + urls TEXT[] NOT NULL DEFAULT '{}', + readme VARCHAR, + license VARCHAR, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (package_id) REFERENCES packages(id) ON DELETE CASCADE, + FOREIGN KEY (publish_token) REFERENCES api_tokens(id) ON DELETE RESTRICT, + FOREIGN KEY (published_by) REFERENCES users(id) ON DELETE RESTRICT, + FOREIGN KEY (upload_id) REFERENCES uploads(id) ON DELETE RESTRICT +); \ No newline at end of file diff --git a/migrations/2025-01-10-203250_update_packages_default_version_fk/down.sql b/migrations/2025-01-10-203250_update_packages_default_version_fk/down.sql new file mode 100644 index 0000000..95d5855 --- /dev/null +++ b/migrations/2025-01-10-203250_update_packages_default_version_fk/down.sql @@ -0,0 +1,2 @@ +ALTER TABLE packages +DROP CONSTRAINT packages_default_version_fkey; diff --git a/migrations/2025-01-10-203250_update_packages_default_version_fk/up.sql b/migrations/2025-01-10-203250_update_packages_default_version_fk/up.sql new file mode 100644 index 0000000..da640ff --- /dev/null +++ b/migrations/2025-01-10-203250_update_packages_default_version_fk/up.sql @@ -0,0 +1,4 @@ +ALTER TABLE packages +ADD CONSTRAINT packages_default_version_fkey +FOREIGN KEY (default_version) REFERENCES package_versions(id) +ON DELETE SET DEFAULT; diff --git a/src/db/mod.rs b/src/db/mod.rs index f3f2e84..54a0902 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -4,11 +4,11 @@ pub mod upload; mod user_session; use self::error::DatabaseError; +use crate::util::load_env; use crate::{api, models, schema}; use diesel::pg::PgConnection; use diesel::r2d2::{ConnectionManager, Pool, PooledConnection}; use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness}; -use dotenvy::dotenv; use std::env; use tracing::info; use uuid::Uuid; @@ -63,7 +63,7 @@ pub(crate) fn string_to_uuid(s: String) -> Result { } fn db_url() -> String { - dotenv().ok(); + load_env(); let user = env::var("POSTGRES_USER").expect("POSTGRES_USER must be set"); let password = env::var("POSTGRES_PASSWORD").expect("POSTGRES_PASSWORD must be set"); let uri = env::var("POSTGRES_URI").expect("POSTGRES_URI must be set"); diff --git a/src/middleware/cors.rs b/src/middleware/cors.rs index 7e7c99b..36eb237 100644 --- a/src/middleware/cors.rs +++ b/src/middleware/cors.rs @@ -1,4 +1,3 @@ -use dotenvy::dotenv; use regex::Regex; use reqwest::header::ACCESS_CONTROL_ALLOW_ORIGIN; use rocket::fairing::{Fairing, Info, Kind}; @@ -7,11 +6,13 @@ use rocket::http::{Header, HeaderMap}; use rocket::{Request, Response}; use std::env; +use crate::util::load_env; + // Build an open cors module so this server can be used accross many locations on the web. pub struct Cors; fn get_allowed_origin(headers: &HeaderMap<'_>) -> Option { - dotenv().ok(); + load_env(); if let Some(req_origin) = headers.get_one(header::ORIGIN.as_str()) { // If the environment variable CORS_HTTP_ORIGIN is set, only allow that origin. diff --git a/src/pinata/mod.rs b/src/pinata/mod.rs index d9fda00..ad49415 100644 --- a/src/pinata/mod.rs +++ b/src/pinata/mod.rs @@ -1,9 +1,6 @@ -use std::{env, path::Path}; - -use dotenvy::dotenv; +use crate::{upload::UploadError, util::load_env}; use pinata_sdk::{PinByFile, PinataApi}; - -use crate::upload::UploadError; +use std::{env, path::Path}; pub trait PinataClient: Sized { fn new() -> impl std::future::Future> + Send; @@ -19,7 +16,7 @@ pub struct PinataClientImpl { impl PinataClient for PinataClientImpl { async fn new() -> Result { - dotenv().ok(); + load_env(); let (api_key, secret_api_key) = match (env::var("PINATA_API_KEY"), env::var("PINATA_API_SECRET")) { diff --git a/src/schema.rs b/src/schema.rs index ddfd09c..5cda303 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -11,6 +11,35 @@ diesel::table! { } } +diesel::table! { + package_versions (id) { + id -> Uuid, + package_id -> Uuid, + publish_token -> Uuid, + published_by -> Uuid, + upload_id -> Uuid, + num -> Varchar, + package_description -> Nullable, + repository -> Nullable, + documentation -> Nullable, + homepage -> Nullable, + urls -> Array>, + readme -> Nullable, + license -> Nullable, + created_at -> Timestamp, + } +} + +diesel::table! { + packages (id) { + id -> Uuid, + user_owner -> Uuid, + package_name -> Varchar, + default_version -> Nullable, + created_at -> Timestamp, + } +} + diesel::table! { sessions (id) { id -> Uuid, @@ -45,6 +74,17 @@ diesel::table! { } diesel::joinable!(api_tokens -> users (user_id)); +diesel::joinable!(package_versions -> api_tokens (publish_token)); +diesel::joinable!(package_versions -> uploads (upload_id)); +diesel::joinable!(package_versions -> users (published_by)); +diesel::joinable!(packages -> users (user_owner)); diesel::joinable!(sessions -> users (user_id)); -diesel::allow_tables_to_appear_in_same_query!(api_tokens, sessions, uploads, users,); +diesel::allow_tables_to_appear_in_same_query!( + api_tokens, + package_versions, + packages, + sessions, + uploads, + users, +); diff --git a/src/util.rs b/src/util.rs index 0c964ec..04e2b03 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,5 +1,5 @@ use semver::Version; -use std::time::SystemTime; +use std::{path::Path, time::SystemTime}; pub fn sys_time_to_epoch(sys_time: SystemTime) -> u64 { sys_time @@ -23,9 +23,24 @@ pub fn validate_or_format_semver(version: &str) -> Option { } } +pub fn load_env() { + // Try to load variables from `.env` first + if let Err(e) = dotenvy::dotenv() { + tracing::error!("Could not load .env: {}", e); + } + + // Then load `.env.local`, potentially overwriting values from `.env` + if let Err(e) = dotenvy::from_path_override(Path::new(".env.local")) { + tracing::error!("Could not load .env.local: {}", e); + } +} + #[cfg(test)] mod tests { use super::*; + use std::env; + use std::fs; + use tempfile::tempdir; #[test] fn test_validate_or_format_semver() { @@ -52,4 +67,30 @@ mod tests { ); } } + + #[test] + fn test_load_env() { + // Create a temporary directory + let dir = tempdir().unwrap(); + let env_path = dir.path().join(".env"); + let local_env_path = dir.path().join(".env.local"); + env::set_current_dir(&dir).unwrap(); + + // No env files exist + load_env(); + assert!(env::var("TEST_VAR").is_err()); + + // Only .env file exists + fs::write(&env_path, "TEST_VAR=from_env\n").unwrap(); + load_env(); + assert_eq!(env::var("TEST_VAR").unwrap(), "from_env"); + + // Both .env and .env.local files exist + fs::write(&local_env_path, "TEST_VAR=from_env_local\n").unwrap(); + load_env(); + assert_eq!(env::var("TEST_VAR").unwrap(), "from_env_local"); + + // Cleanup + env::remove_var("TEST_VAR"); + } } From 6ba1e32af35151ad9c5fd091f0bcaf2faffe9057 Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:26:14 -0800 Subject: [PATCH 02/14] add db integration test --- .../up.sql | 5 +- src/api/publish.rs | 13 +- src/db/api_token.rs | 8 +- src/db/error.rs | 35 +++-- src/db/mod.rs | 1 + src/db/package_version.rs | 138 ++++++++++++++++++ src/db/upload.rs | 6 +- src/db/user_session.rs | 14 +- src/main.rs | 19 ++- src/middleware/token_auth.rs | 11 +- src/models.rs | 54 +++++++ tests/db_integration.rs | 124 +++++++++++++++- 12 files changed, 387 insertions(+), 41 deletions(-) create mode 100644 src/db/package_version.rs diff --git a/migrations/2025-01-10-194911_create_package_versions/up.sql b/migrations/2025-01-10-194911_create_package_versions/up.sql index e39e191..7938723 100644 --- a/migrations/2025-01-10-194911_create_package_versions/up.sql +++ b/migrations/2025-01-10-194911_create_package_versions/up.sql @@ -9,10 +9,13 @@ CREATE TABLE package_versions ( repository VARCHAR, documentation VARCHAR, homepage VARCHAR, - urls TEXT[] NOT NULL DEFAULT '{}', + urls non_null_text_array NOT NULL DEFAULT '{}', readme VARCHAR, license VARCHAR, created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + -- There can only be one version with the same number per package + UNIQUE (package_id, num), + -- FK constraints FOREIGN KEY (package_id) REFERENCES packages(id) ON DELETE CASCADE, FOREIGN KEY (publish_token) REFERENCES api_tokens(id) ON DELETE RESTRICT, FOREIGN KEY (published_by) REFERENCES users(id) ON DELETE RESTRICT, diff --git a/src/api/publish.rs b/src/api/publish.rs index f839fee..973adf2 100644 --- a/src/api/publish.rs +++ b/src/api/publish.rs @@ -4,9 +4,16 @@ use uuid::Uuid; /// The publish request. #[derive(Deserialize, Debug)] pub struct PublishRequest { - pub name: String, - pub version: String, - pub upload_id: String, + pub package_name: String, + pub upload_id: Uuid, + pub num: String, + pub package_description: Option, + pub repository: Option, + pub documentation: Option, + pub homepage: Option, + pub urls: Vec>, + pub readme: Option, + pub license: Option, } /// The response to an upload_project request. diff --git a/src/db/api_token.rs b/src/db/api_token.rs index 3a04ac9..ebacc62 100644 --- a/src/db/api_token.rs +++ b/src/db/api_token.rs @@ -73,7 +73,7 @@ impl DbConn { .values(&new_token) .returning(models::ApiToken::as_returning()) .get_result(self.inner()) - .map_err(|_| DatabaseError::InsertTokenFailed(user_id.to_string()))?; + .map_err(|err| DatabaseError::InsertTokenFailed(user_id.to_string(), err))?; Ok((saved_token, plain_token)) } @@ -88,7 +88,7 @@ impl DbConn { .filter(schema::api_tokens::user_id.eq(user_id)), ) .execute(self.inner()) - .map_err(|_| DatabaseError::NotFound(token_id))?; + .map_err(|err| DatabaseError::NotFound(token_id, err))?; Ok(()) } @@ -102,7 +102,7 @@ impl DbConn { .filter(schema::api_tokens::user_id.eq(user_id)) .select(models::ApiToken::as_returning()) .load(self.inner()) - .map_err(|_| DatabaseError::NotFound(user_id.to_string())) + .map_err(|err| DatabaseError::NotFound(user_id.to_string(), err)) } /// Fetch an API token given the plaintext token. @@ -115,7 +115,7 @@ impl DbConn { .filter(schema::api_tokens::token.eq(hashed)) .select(models::ApiToken::as_returning()) .first::(self.inner()) - .map_err(|_| DatabaseError::NotFound("API Token".to_string())) + .map_err(|err| DatabaseError::NotFound("API Token".to_string(), err)) } } diff --git a/src/db/error.rs b/src/db/error.rs index 83e5500..0a68261 100644 --- a/src/db/error.rs +++ b/src/db/error.rs @@ -5,18 +5,33 @@ pub enum DatabaseError { #[error("Invalid UUID: {0}")] InvalidUuid(String), - #[error("Entry for ID not found: {0}")] - NotFound(String), + #[error("Entry for ID not found: {0}: {1}")] + NotFound(String, diesel::result::Error), - #[error("Failed to save user: {0}")] - InsertUserFailed(String), + #[error("Failed to save user: {0}: {1}")] + InsertUserFailed(String, diesel::result::Error), - #[error("Failed to save session for user: {0}")] - InsertSessionFailed(String), + #[error("Failed to save session for user: {0}: {1}")] + InsertSessionFailed(String, diesel::result::Error), - #[error("Failed to save token for user: {0}")] - InsertTokenFailed(String), + #[error("Failed to save token for user: {0}: {1}")] + InsertTokenFailed(String, diesel::result::Error), - #[error("Failed to upload: {0}")] - InsertUploadFailed(String), + #[error("Failed to upload: {0}: {1}")] + InsertUploadFailed(String, diesel::result::Error), + + #[error("Failed to save package: {0}: {1}")] + InsertPackageFailed(String, diesel::result::Error), + + #[error("Failed to update package: {0}: {1}")] + UpdatePackageFailed(String, diesel::result::Error), + + #[error("Invalid publish token")] + InvalidPublishToken, + + #[error("Failed to save package version: {0} {1}: {2}")] + InsertPackageVersionFailed(String, String, diesel::result::Error), + + #[error("Failed to query: {0}: {1}")] + QueryFailed(String, diesel::result::Error), } diff --git a/src/db/mod.rs b/src/db/mod.rs index 54a0902..2124155 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -1,5 +1,6 @@ pub mod api_token; pub mod error; +pub mod package_version; pub mod upload; mod user_session; diff --git a/src/db/package_version.rs b/src/db/package_version.rs new file mode 100644 index 0000000..afe79e1 --- /dev/null +++ b/src/db/package_version.rs @@ -0,0 +1,138 @@ +use crate::api::publish::PublishRequest; +use crate::models::ApiToken; +use crate::schema::api_tokens::expires_at; +use crate::schema::package_versions::{package_description, urls}; +use crate::schema::packages::package_name; + +use super::error::DatabaseError; +use super::{api, models, schema, DbConn}; +use diesel::prelude::*; +use diesel::upsert::excluded; +use std::time::{Duration, SystemTime}; +use uuid::Uuid; + +impl DbConn { + /// Insert a package version into the database and return the package version. + /// If the package doesn't exist, insert the package as well. + pub fn new_package_version( + &mut self, + api_token: &ApiToken, + request: &PublishRequest, + ) -> Result { + // Check if the package exists. + let pkg_name = request.package_name.clone(); + let package = if let Some(existing_package) = schema::packages::table + .filter(schema::packages::package_name.eq(package_name.clone())) + .select(schema::packages::all_columns) + .first::(self.inner()) + .optional() + .map_err(|err| DatabaseError::QueryFailed(pkg_name.clone(), err))? + { + if existing_package.user_owner != api_token.user_id.clone() { + // The package exists but the user is not the owner. + return Err(DatabaseError::InvalidPublishToken); + } + Ok(existing_package) + } else { + // Insert a new package. + let new_package: models::NewPackage = models::NewPackage { + user_owner: api_token.user_id.clone(), + package_name: pkg_name.clone(), + }; + + let saved_package = diesel::insert_into(schema::packages::table) + .values(&new_package) + .returning(models::Package::as_returning()) + .get_result(self.inner()) + .map_err(|err| DatabaseError::InsertPackageFailed(pkg_name.clone(), err))?; + Ok(saved_package) + }?; + + // Insert a new package version. + let new_version = models::NewPackageVersion { + package_id: package.id, + publish_token: api_token.id.clone(), + published_by: api_token.user_id.clone(), + upload_id: request.upload_id, + num: request.num.clone(), + package_description: request.package_description.clone(), + repository: request.repository.clone(), + documentation: request.documentation.clone(), + homepage: request.homepage.clone(), + urls: request.urls.clone(), + readme: request.readme.clone(), + license: request.license.clone(), + }; + + let saved_version = diesel::insert_into(schema::package_versions::table) + .values(&new_version) + .returning(models::PackageVersion::as_returning()) + .get_result(self.inner()) + .map_err(|err| { + DatabaseError::InsertPackageVersionFailed( + pkg_name.clone(), + request.num.clone(), + err, + ) + })?; + + // Update the package default version. + diesel::update(schema::packages::table.filter(schema::packages::id.eq(package.id))) + .set(schema::packages::default_version.eq(saved_version.id)) + .execute(self.inner()) + .map_err(|err| DatabaseError::UpdatePackageFailed(pkg_name.clone(), err))?; + + Ok(saved_version) + } + + /// Fetch a package given the package ID. + pub fn get_package_by_id( + &mut self, + package_id: Uuid, + ) -> Result { + schema::packages::table + .filter(schema::packages::id.eq(package_id)) + .select(models::Package::as_returning()) + .first::(self.inner()) + .map_err(|err| DatabaseError::NotFound(package_id.to_string(), err)) + } + + /// Fetch a package given the package name. + pub fn get_package_by_name(&mut self, name: String) -> Result { + schema::packages::table + .filter(schema::packages::package_name.eq(name.clone())) + .select(models::Package::as_returning()) + .first::(self.inner()) + .map_err(|err| DatabaseError::NotFound(name.clone(), err)) + } + + // /// Fetch a user given the user ID. + // pub fn get_session(&mut self, session_id: Uuid) -> Result { + // schema::sessions::table + // .filter(schema::sessions::id.eq(session_id)) + // .select(models::Session::as_returning()) + // .first::(self.inner()) + // .map_err(|_| DatabaseError::NotFound(session_id.to_string())) + // } + + // /// Fetch a user from the database for a given session ID. + // pub fn get_user_for_session( + // &mut self, + // session_id: Uuid, + // ) -> Result { + // schema::sessions::table + // .inner_join(schema::users::table) + // .filter(schema::sessions::id.eq(session_id)) + // .select(models::User::as_returning()) + // .first::(self.inner()) + // .map_err(|_| DatabaseError::NotFound(session_id.to_string())) + // } + + // /// Delete a session given its ID. + // pub fn delete_session(&mut self, session_id: Uuid) -> Result<(), DatabaseError> { + // diesel::delete(schema::sessions::table.filter(schema::sessions::id.eq(session_id))) + // .execute(self.inner()) + // .map_err(|_| DatabaseError::NotFound(session_id.to_string()))?; + // Ok(()) + // } +} diff --git a/src/db/upload.rs b/src/db/upload.rs index a65972f..b26ec91 100644 --- a/src/db/upload.rs +++ b/src/db/upload.rs @@ -5,7 +5,7 @@ use uuid::Uuid; impl DbConn { /// Insert an upload record into the database and return the record. - pub fn insert_upload( + pub fn new_upload( &mut self, upload: &models::NewUpload, ) -> Result { @@ -14,7 +14,7 @@ impl DbConn { .values(upload) .returning(models::Upload::as_returning()) .get_result(self.inner()) - .map_err(|_| DatabaseError::InsertUploadFailed(upload.id.to_string()))?; + .map_err(|err| DatabaseError::InsertUploadFailed(upload.id.to_string(), err))?; Ok(saved_upload) } @@ -25,6 +25,6 @@ impl DbConn { .filter(schema::uploads::id.eq(upload_id)) .select(models::Upload::as_returning()) .first::(self.inner()) - .map_err(|_| DatabaseError::NotFound(upload_id.to_string())) + .map_err(|err| DatabaseError::NotFound(upload_id.to_string(), err)) } } diff --git a/src/db/user_session.rs b/src/db/user_session.rs index 318eec9..43cacaa 100644 --- a/src/db/user_session.rs +++ b/src/db/user_session.rs @@ -9,7 +9,7 @@ impl DbConn { /// Insert a user session into the database and return the session ID. /// If the user doesn't exist, insert the user as well. /// If the user does exist, update the user's full name and avatar URL if they have changed. - pub fn insert_user_session( + pub fn new_user_session( &mut self, user: &api::auth::User, expires_in: u32, @@ -34,7 +34,7 @@ impl DbConn { schema::users::avatar_url.eq(excluded(schema::users::avatar_url)), )) .get_result(self.inner()) - .map_err(|_| DatabaseError::InsertUserFailed(user.github_login.clone()))?; + .map_err(|err| DatabaseError::InsertUserFailed(user.github_login.clone(), err))?; let new_session = models::NewSession { user_id: saved_user.id, @@ -46,7 +46,7 @@ impl DbConn { .values(&new_session) .returning(models::Session::as_returning()) .get_result(self.inner()) - .map_err(|_| DatabaseError::InsertSessionFailed(user.github_login.clone()))?; + .map_err(|err| DatabaseError::InsertSessionFailed(user.github_login.clone(), err))?; Ok(saved_session) } @@ -57,7 +57,7 @@ impl DbConn { .filter(schema::users::id.eq(user_id)) .select(models::User::as_returning()) .first::(self.inner()) - .map_err(|_| DatabaseError::NotFound(user_id.to_string())) + .map_err(|err| DatabaseError::NotFound(user_id.to_string(), err)) } /// Fetch a user given the user ID. @@ -66,7 +66,7 @@ impl DbConn { .filter(schema::sessions::id.eq(session_id)) .select(models::Session::as_returning()) .first::(self.inner()) - .map_err(|_| DatabaseError::NotFound(session_id.to_string())) + .map_err(|err| DatabaseError::NotFound(session_id.to_string(), err)) } /// Fetch a user from the database for a given session ID. @@ -79,14 +79,14 @@ impl DbConn { .filter(schema::sessions::id.eq(session_id)) .select(models::User::as_returning()) .first::(self.inner()) - .map_err(|_| DatabaseError::NotFound(session_id.to_string())) + .map_err(|err| DatabaseError::NotFound(session_id.to_string(), err)) } /// Delete a session given its ID. pub fn delete_session(&mut self, session_id: Uuid) -> Result<(), DatabaseError> { diesel::delete(schema::sessions::table.filter(schema::sessions::id.eq(session_id))) .execute(self.inner()) - .map_err(|_| DatabaseError::NotFound(session_id.to_string()))?; + .map_err(|err| DatabaseError::NotFound(session_id.to_string(), err))?; Ok(()) } } diff --git a/src/main.rs b/src/main.rs index bacd579..5721662 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,6 +15,7 @@ use forc_pub::github::handle_login; use forc_pub::middleware::cors::Cors; use forc_pub::middleware::session_auth::{SessionAuth, SESSION_COOKIE_NAME}; use forc_pub::middleware::token_auth::TokenAuth; +use forc_pub::models::NewPackageVersion; use forc_pub::pinata::{PinataClient, PinataClientImpl}; use forc_pub::upload::{handle_project_upload, install_forc_at_path, UploadError}; use forc_pub::util::validate_or_format_semver; @@ -47,7 +48,7 @@ async fn login( request: Json, ) -> ApiResult { let (user, expires_in) = handle_login(request.code.clone()).await?; - let session = db.conn().insert_user_session(&user, expires_in)?; + let session = db.conn().new_user_session(&user, expires_in)?; let session_id = session.id.to_string(); cookies.add(Cookie::build(SESSION_COOKIE_NAME, session_id.clone()).finish()); Ok(Json(LoginResponse { user, session_id })) @@ -103,12 +104,14 @@ fn tokens(db: &State, auth: SessionAuth) -> ApiResult } #[post("/publish", data = "")] -fn publish(request: Json, auth: TokenAuth) -> ApiResult { - info!( - "Publishing: {:?} for token: {:?}", - request, auth.token.friendly_name - ); - +fn publish( + db: &State, + request: Json, + auth: TokenAuth, +) -> ApiResult { + let _ = db.conn().new_package_version(&auth.token, &request)?; + // TODO: Publish to GitHub index repo. + // TODO: Publish to block explorer API. Ok(Json(EmptyResponse)) } @@ -166,7 +169,7 @@ async fn upload_project( ) .await?; - let _ = db.conn().insert_upload(&upload_entry)?; + let _ = db.conn().new_upload(&upload_entry)?; // Clean up the temporary directory. tmp_dir diff --git a/src/middleware/token_auth.rs b/src/middleware/token_auth.rs index a15654b..3d220d1 100644 --- a/src/middleware/token_auth.rs +++ b/src/middleware/token_auth.rs @@ -1,3 +1,5 @@ +use std::time::SystemTime; + use crate::db::api_token::PlainToken; use crate::db::Database; use crate::models; @@ -14,6 +16,7 @@ pub struct TokenAuth { pub enum TokenAuthError { Missing, Invalid, + Expired, DatabaseConnection, } @@ -39,7 +42,13 @@ impl<'r> FromRequest<'r> for TokenAuth { if auth_header.starts_with("Bearer ") { let token = auth_header.trim_start_matches("Bearer "); if let Ok(token) = db.get_token(PlainToken::from(token.to_string())) { - return Outcome::Success(TokenAuth { token }); + if token + .expires_at + .map_or(true, |expires_at| expires_at > SystemTime::now()) + { + return Outcome::Success(TokenAuth { token }); + } + return Outcome::Failure((Status::Unauthorized, TokenAuthError::Expired)); } } return Outcome::Failure((Status::Unauthorized, TokenAuthError::Invalid)); diff --git a/src/models.rs b/src/models.rs index fa9e418..7128f8e 100644 --- a/src/models.rs +++ b/src/models.rs @@ -85,3 +85,57 @@ pub struct NewUpload { pub abi_ipfs_hash: Option, pub bytecode_identifier: Option, } + +#[derive(Queryable, Selectable, Debug, Clone)] +#[diesel(table_name = crate::schema::packages)] +#[diesel(check_for_backend(diesel::pg::Pg))] +pub struct Package { + pub id: Uuid, + pub user_owner: Uuid, + pub package_name: String, + pub default_version: Option, + pub created_at: SystemTime, +} + +#[derive(Insertable, Debug)] +#[diesel(table_name = crate::schema::packages)] +pub struct NewPackage { + pub user_owner: Uuid, + pub package_name: String, +} + +#[derive(Queryable, Selectable, Debug, Clone, Eq, PartialEq)] +#[diesel(table_name = crate::schema::package_versions)] +#[diesel(check_for_backend(diesel::pg::Pg))] +pub struct PackageVersion { + pub id: Uuid, + pub package_id: Uuid, + pub published_by: Uuid, + pub upload_id: Uuid, + pub num: String, + pub package_description: Option, + pub repository: Option, + pub documentation: Option, + pub homepage: Option, + pub urls: Vec>, + pub readme: Option, + pub license: Option, + pub created_at: SystemTime, +} + +#[derive(Insertable, Debug)] +#[diesel(table_name = crate::schema::package_versions)] +pub struct NewPackageVersion { + pub package_id: Uuid, + pub publish_token: Uuid, + pub published_by: Uuid, + pub upload_id: Uuid, + pub num: String, + pub package_description: Option, + pub repository: Option, + pub documentation: Option, + pub homepage: Option, + pub urls: Vec>, + pub readme: Option, + pub license: Option, +} diff --git a/tests/db_integration.rs b/tests/db_integration.rs index 0e47330..e61f853 100644 --- a/tests/db_integration.rs +++ b/tests/db_integration.rs @@ -1,6 +1,7 @@ use diesel::RunQueryDsl as _; use forc_pub::api; use forc_pub::db::{Database, DbConn}; +use forc_pub::models::{NewUpload, PackageVersion}; use serial_test::serial; /// Note: Integration tests for the database module assume that the database is running and that the DATABASE_URL environment variable is set. @@ -16,6 +17,12 @@ const TEST_TOKEN_NAME_1: &str = "test token 1"; const TEST_TOKEN_NAME_2: &str = "test token 2"; fn clear_tables(db: &mut DbConn) { + diesel::delete(forc_pub::schema::package_versions::table) + .execute(db.inner()) + .expect("clear package_versions table"); + diesel::delete(forc_pub::schema::packages::table) + .execute(db.inner()) + .expect("clear packages table"); diesel::delete(forc_pub::schema::api_tokens::table) .execute(db.inner()) .expect("clear api_tokens table"); @@ -53,13 +60,13 @@ fn test_user_sessions() { let user1 = mock_user_1(); let user2 = mock_user_2(); - let session1 = db.insert_user_session(&user1, 1000).expect("result is ok"); + let session1 = db.new_user_session(&user1, 1000).expect("result is ok"); // Insert an existing user - let session2 = db.insert_user_session(&user1, 1000).expect("result is ok"); + let session2 = db.new_user_session(&user1, 1000).expect("result is ok"); // Insert another user - let session3 = db.insert_user_session(&user2, 1000).expect("result is ok"); + let session3 = db.new_user_session(&user2, 1000).expect("result is ok"); let result = db.get_user_for_session(session1.id).expect("result is ok"); assert_eq!(result.github_login, TEST_LOGIN_1); @@ -84,7 +91,7 @@ fn test_api_tokens() { let db = &mut Database::default().conn(); let session = db - .insert_user_session(&mock_user_1(), 1000) + .new_user_session(&mock_user_1(), 1000) .expect("result is ok"); let user = db.get_user_for_session(session.id).expect("result is ok"); @@ -121,3 +128,112 @@ fn test_api_tokens() { clear_tables(db); } + +#[test] +#[serial] +fn test_package_versions() { + let db = &mut Database::default().conn(); + + // Set up session, user, token, and upload. + let session = db + .new_user_session(&mock_user_1(), 1000) + .expect("result is ok"); + let user = db.get_user_for_session(session.id).expect("user is ok"); + let (token, _) = db + .new_token(user.id, "test token".to_string()) + .expect("token is ok"); + let upload = db + .new_upload(&NewUpload { + id: uuid::Uuid::new_v4(), + forc_version: "0.1.0".into(), + source_code_ipfs_hash: "test-ipfs-hash".into(), + abi_ipfs_hash: None, + bytecode_identifier: None, + }) + .expect("result is ok"); + + // Insert a package version for a package that doesn't exist + let request = api::publish::PublishRequest { + package_name: "test-package".into(), + upload_id: upload.id, + num: "0.1.0".into(), + package_description: Some("test description".into()), + repository: Some("test repository".into()), + documentation: Some("test documentation".into()), + homepage: Some("test homepage".into()), + urls: vec![Some("test url".into())], + readme: Some("test readme".into()), + license: Some("test license".into()), + }; + let version_result = db + .new_package_version(&token, &request) + .expect("version result is ok"); + assert_eq!( + version_result, + PackageVersion { + id: version_result.id, + package_id: version_result.package_id, + published_by: user.id, + upload_id: upload.id, + num: request.num, + package_description: request.package_description, + repository: request.repository, + documentation: request.documentation, + homepage: request.homepage, + urls: request.urls, + readme: request.readme, + license: request.license, + created_at: version_result.created_at, + } + ); + let pkg_result = db + .get_package_by_id(version_result.package_id) + .expect("result is ok"); + assert_eq!(pkg_result.package_name, request.package_name); + assert_eq!(pkg_result.user_owner, user.id); + assert_eq!(pkg_result.default_version, Some(version_result.id)); + + // Insert a package version for a package that already exists + let request = api::publish::PublishRequest { + package_name: "test-package".into(), + upload_id: upload.id, + num: "0.2.0".into(), + package_description: Some("test description 2".into()), + repository: Some("test repository 2".into()), + documentation: Some("test documentation 2".into()), + homepage: Some("test homepage 2".into()), + urls: vec![Some("test url 2".into())], + readme: Some("test readme 2".into()), + license: Some("test licens 2".into()), + }; + + let version_result = db + .new_package_version(&token, &request) + .expect("version result is ok"); + assert_eq!( + version_result, + PackageVersion { + id: version_result.id, + package_id: version_result.package_id, + published_by: user.id, + upload_id: upload.id, + num: request.num, + package_description: request.package_description, + repository: request.repository, + documentation: request.documentation, + homepage: request.homepage, + urls: request.urls, + readme: request.readme, + license: request.license, + created_at: version_result.created_at, + } + ); + let pkg_result = db + .get_package_by_id(version_result.package_id) + .expect("result is ok"); + assert_eq!(pkg_result.package_name, request.package_name); + assert_eq!(pkg_result.user_owner, user.id); + assert_eq!(pkg_result.default_version, Some(version_result.id)); + + clear_tables(db); +} From c27058357745c4ee196d670e407388ecae14605c Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:46:50 -0800 Subject: [PATCH 03/14] clippy --- src/db/package_version.rs | 49 ++++++--------------------------------- src/main.rs | 1 - src/upload.rs | 4 ++-- src/util.rs | 4 ++++ 4 files changed, 13 insertions(+), 45 deletions(-) diff --git a/src/db/package_version.rs b/src/db/package_version.rs index afe79e1..772e44a 100644 --- a/src/db/package_version.rs +++ b/src/db/package_version.rs @@ -1,14 +1,9 @@ +use super::error::DatabaseError; +use super::{models, schema, DbConn}; use crate::api::publish::PublishRequest; use crate::models::ApiToken; -use crate::schema::api_tokens::expires_at; -use crate::schema::package_versions::{package_description, urls}; use crate::schema::packages::package_name; - -use super::error::DatabaseError; -use super::{api, models, schema, DbConn}; use diesel::prelude::*; -use diesel::upsert::excluded; -use std::time::{Duration, SystemTime}; use uuid::Uuid; impl DbConn { @@ -22,13 +17,13 @@ impl DbConn { // Check if the package exists. let pkg_name = request.package_name.clone(); let package = if let Some(existing_package) = schema::packages::table - .filter(schema::packages::package_name.eq(package_name.clone())) + .filter(schema::packages::package_name.eq(package_name)) .select(schema::packages::all_columns) .first::(self.inner()) .optional() .map_err(|err| DatabaseError::QueryFailed(pkg_name.clone(), err))? { - if existing_package.user_owner != api_token.user_id.clone() { + if existing_package.user_owner != api_token.user_id { // The package exists but the user is not the owner. return Err(DatabaseError::InvalidPublishToken); } @@ -36,7 +31,7 @@ impl DbConn { } else { // Insert a new package. let new_package: models::NewPackage = models::NewPackage { - user_owner: api_token.user_id.clone(), + user_owner: api_token.user_id, package_name: pkg_name.clone(), }; @@ -51,8 +46,8 @@ impl DbConn { // Insert a new package version. let new_version = models::NewPackageVersion { package_id: package.id, - publish_token: api_token.id.clone(), - published_by: api_token.user_id.clone(), + publish_token: api_token.id, + published_by: api_token.user_id, upload_id: request.upload_id, num: request.num.clone(), package_description: request.package_description.clone(), @@ -105,34 +100,4 @@ impl DbConn { .first::(self.inner()) .map_err(|err| DatabaseError::NotFound(name.clone(), err)) } - - // /// Fetch a user given the user ID. - // pub fn get_session(&mut self, session_id: Uuid) -> Result { - // schema::sessions::table - // .filter(schema::sessions::id.eq(session_id)) - // .select(models::Session::as_returning()) - // .first::(self.inner()) - // .map_err(|_| DatabaseError::NotFound(session_id.to_string())) - // } - - // /// Fetch a user from the database for a given session ID. - // pub fn get_user_for_session( - // &mut self, - // session_id: Uuid, - // ) -> Result { - // schema::sessions::table - // .inner_join(schema::users::table) - // .filter(schema::sessions::id.eq(session_id)) - // .select(models::User::as_returning()) - // .first::(self.inner()) - // .map_err(|_| DatabaseError::NotFound(session_id.to_string())) - // } - - // /// Delete a session given its ID. - // pub fn delete_session(&mut self, session_id: Uuid) -> Result<(), DatabaseError> { - // diesel::delete(schema::sessions::table.filter(schema::sessions::id.eq(session_id))) - // .execute(self.inner()) - // .map_err(|_| DatabaseError::NotFound(session_id.to_string()))?; - // Ok(()) - // } } diff --git a/src/main.rs b/src/main.rs index 5721662..52bcb47 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,6 @@ use forc_pub::github::handle_login; use forc_pub::middleware::cors::Cors; use forc_pub::middleware::session_auth::{SessionAuth, SESSION_COOKIE_NAME}; use forc_pub::middleware::token_auth::TokenAuth; -use forc_pub::models::NewPackageVersion; use forc_pub::pinata::{PinataClient, PinataClientImpl}; use forc_pub::upload::{handle_project_upload, install_forc_at_path, UploadError}; use forc_pub::util::validate_or_format_semver; diff --git a/src/upload.rs b/src/upload.rs index 504b39e..bbfa456 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -235,8 +235,8 @@ mod tests { let forc_version = "0.66.5"; let forc_path_str = format!("forc-{forc_version}"); let forc_path = PathBuf::from(&forc_path_str); - fs::create_dir_all(forc_path.clone()).unwrap(); - let forc_path = fs::canonicalize(forc_path.clone()).unwrap(); + fs::create_dir_all(forc_path.clone()).ok(); + let forc_path = fs::canonicalize(forc_path.clone()).expect("forc path ok"); install_forc_at_path(forc_version, &forc_path).expect("forc installed"); let mock_client = MockPinataClient::new().await.expect("mock pinata client"); diff --git a/src/util.rs b/src/util.rs index 04e2b03..b180fa8 100644 --- a/src/util.rs +++ b/src/util.rs @@ -70,6 +70,9 @@ mod tests { #[test] fn test_load_env() { + // Save the current directory + let original_dir = env::current_dir().unwrap(); + // Create a temporary directory let dir = tempdir().unwrap(); let env_path = dir.path().join(".env"); @@ -92,5 +95,6 @@ mod tests { // Cleanup env::remove_var("TEST_VAR"); + env::set_current_dir(&original_dir).unwrap(); } } From f60424b7c0cb4b45fe0a930b5bb0112b93af20ab Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:32:03 -0800 Subject: [PATCH 04/14] add recently uploaded package API --- .env | 3 + Cargo.lock | 2247 +++++++++-------- Cargo.toml | 3 +- .../dahboard/components/PackageDashboard.tsx | 163 ++ .../detail/components/PackageDetail.tsx | 183 ++ .../toolbar/components/UserButton.tsx | 2 +- app/src/index.tsx | 5 + app/src/pages/Home.tsx | 3 +- .../2025-01-10-191952_create_packages/up.sql | 2 +- .../up.sql | 4 +- src/api/mod.rs | 30 +- src/api/search.rs | 8 + src/db/package_version.rs | 42 +- src/main.rs | 16 +- src/middleware/session_auth.rs | 6 +- src/middleware/token_auth.rs | 8 +- src/models.rs | 22 +- src/schema.rs | 4 +- 18 files changed, 1735 insertions(+), 1016 deletions(-) create mode 100644 app/src/features/dahboard/components/PackageDashboard.tsx create mode 100644 app/src/features/detail/components/PackageDetail.tsx create mode 100644 src/api/search.rs diff --git a/.env b/.env index 8a3e991..844016e 100644 --- a/.env +++ b/.env @@ -11,6 +11,9 @@ CORS_HTTP_ORIGIN="http://localhost:3000" # Diesel CLI env DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_URI}/${POSTGRES_DB_NAME}" +# Github App env +GITHUB_CLIENT_SECRET="" + # IPFS env PINATA_API_KEY="" PINATA_API_SECRET="" diff --git a/Cargo.lock b/Cargo.lock index ee62c6a..60b8dea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,60 +4,19 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.28.1", + "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "aead" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.8.11" @@ -82,9 +41,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -122,9 +81,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -152,28 +111,28 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arrayvec" @@ -183,43 +142,50 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.96", ] [[package]] name = "async-trait" -version = "0.1.60" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.96", ] [[package]] name = "atomic" -version = "0.5.1" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" dependencies = [ - "autocfg", + "bytemuck", ] [[package]] @@ -232,36 +198,31 @@ dependencies = [ ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.2", - "object 0.32.2", + "miniz_oxide", + "object", "rustc-demangle", "serde", + "windows-targets 0.52.6", ] [[package]] @@ -270,18 +231,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" - [[package]] name = "base64" version = "0.21.7" @@ -320,9 +269,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" dependencies = [ "serde", ] @@ -350,9 +299,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -369,9 +318,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -385,6 +334,12 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" +[[package]] +name = "bytemuck" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" + [[package]] name = "byteorder" version = "1.5.0" @@ -393,15 +348,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.3.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.0.90" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "ad0cf6e91fde44c773c6ee7ec6bba798504641a8bc2eb7e37a04ffbf4dfaa55a" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -411,32 +369,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", -] - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", + "windows-targets 0.52.6", ] [[package]] name = "clap" -version = "4.5.21" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" dependencies = [ "clap_builder", "clap_derive", @@ -444,9 +392,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" dependencies = [ "anstream", "anstyle", @@ -456,21 +404,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "cobs" @@ -491,7 +439,7 @@ dependencies = [ "k256", "serde", "sha2", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -507,7 +455,7 @@ dependencies = [ "pbkdf2", "rand", "sha2", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -527,7 +475,7 @@ dependencies = [ "serde_derive", "sha2", "sha3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -544,18 +492,11 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "cookie" -version = "0.16.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ - "aes-gcm", - "base64 0.20.0", - "hkdf", - "hmac", "percent-encoding", - "rand", - "sha2", - "subtle", "time", "version_check", ] @@ -572,15 +513,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -602,9 +543,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -621,9 +562,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -650,7 +591,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] @@ -675,15 +615,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -707,7 +638,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -741,7 +672,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -755,7 +686,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -766,7 +697,7 @@ checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" dependencies = [ "darling_core 0.12.4", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -777,7 +708,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -808,7 +739,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -829,7 +760,7 @@ dependencies = [ "darling 0.12.4", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -839,7 +770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" dependencies = [ "derive_builder_core", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -850,14 +781,14 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "devise" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595" +checksum = "f1d90b0c4c777a2cad215e3c7be59ac7c15adf45cf76317009b7d096d46f651d" dependencies = [ "devise_codegen", "devise_core", @@ -865,9 +796,9 @@ dependencies = [ [[package]] name = "devise_codegen" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" +checksum = "71b28680d8be17a570a2334922518be6adc3f58ecc880cbb404eaeb8624fd867" dependencies = [ "devise_core", "quote", @@ -875,49 +806,51 @@ dependencies = [ [[package]] name = "devise_core" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" +checksum = "b035a542cf7abf01f2e3c4d5a7acbaebfefe120ae4efc7bde3df98186e4b8af7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.7.0", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 1.0.107", + "syn 2.0.96", ] [[package]] name = "diesel" -version = "2.1.6" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" +checksum = "ccf1bedf64cdb9643204a36dd15b19a6ce8e7aa7f7b105868e9f1fad5ffa7d12" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "byteorder", "diesel_derives", "itoa", "pq-sys", "r2d2", + "time", "uuid", ] [[package]] name = "diesel_derives" -version = "2.1.4" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "diesel_migrations" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" +checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" dependencies = [ "diesel", "migrations_internals", @@ -926,11 +859,11 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -987,6 +920,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1005,6 +949,20 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dsl_auto_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" +dependencies = [ + "darling 0.20.10", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "ecdsa" version = "0.16.9" @@ -1049,7 +1007,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1097,9 +1055,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1114,7 +1072,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -1123,14 +1081,24 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1174,7 +1142,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -1195,7 +1163,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "synstructure 0.12.6", ] @@ -1207,9 +1175,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fd-lock" @@ -1240,14 +1208,14 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "figment" -version = "0.10.8" +version = "0.10.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" dependencies = [ - "atomic", + "atomic 0.6.0", "pear", "serde", - "toml 0.5.10", + "toml 0.8.19", "uncased", "version_check", ] @@ -1259,19 +1227,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fe00b427b7c4835f8b82170eb7b9a63634376b63d73b9a9093367e82570bbaa" dependencies = [ "regex", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -1294,12 +1262,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1310,9 +1278,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" [[package]] name = "forc-tracing" @@ -1370,7 +1338,7 @@ dependencies = [ "pinata-sdk", "rand", "regex", - "reqwest 0.12.2", + "reqwest 0.12.12", "rocket", "semver", "serde", @@ -1379,7 +1347,8 @@ dependencies = [ "sha2", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", + "time", "tokio", "tracing", "tracing-subscriber", @@ -1403,9 +1372,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1423,8 +1392,8 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.57", - "thiserror", + "syn 2.0.96", + "thiserror 1.0.69", ] [[package]] @@ -1433,7 +1402,7 @@ version = "0.58.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f325971bf9047ec70004f80a989e03456316bc19cbef3ff3a39a38b192ab56e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "fuel-types", "serde", "strum 0.24.1", @@ -1468,7 +1437,7 @@ checksum = "ab0bc46a3552964bae5169e79b383761a54bd115ea66951a1a7a229edcefa55a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", "synstructure 0.13.1", ] @@ -1485,7 +1454,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.69", "uint", ] @@ -1512,11 +1481,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eed51e8869a40529c44dc6d971f3509f2a3aa55dc9b213d6f88ee2da38a3d44" dependencies = [ "educe", - "indexmap 1.9.2", + "indexmap 1.9.3", "quote", "serde", "snafu", - "toml 0.5.10", + "toml 0.5.11", ] [[package]] @@ -1546,14 +1515,14 @@ version = "0.58.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6723bb8710ba2b70516ac94d34459593225870c937670fb3afaf82e0354667ac" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "derivative", "derive_more", "fuel-asm", "fuel-crypto", "fuel-merkle", "fuel-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "itertools 0.10.5", "postcard", "rand", @@ -1581,7 +1550,7 @@ checksum = "54b5362d7d072c72eec20581f67fc5400090c356a7f3ae77c79880b3b177b667" dependencies = [ "async-trait", "backtrace", - "bitflags 2.5.0", + "bitflags 2.7.0", "derivative", "derive_more", "ethnum", @@ -1591,7 +1560,7 @@ dependencies = [ "fuel-storage", "fuel-tx", "fuel-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "itertools 0.10.5", "libm", "paste", @@ -1612,9 +1581,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1627,9 +1596,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1637,15 +1606,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1654,27 +1623,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1689,9 +1658,9 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", "libc", @@ -1702,9 +1671,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1713,31 +1682,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", "wasi", ] -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - [[package]] name = "gimli" version = "0.31.1" @@ -1745,15 +1698,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" dependencies = [ "fallible-iterator", - "indexmap 2.6.0", + "indexmap 2.7.0", "stable_deref_trait", ] [[package]] name = "glob" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "graph-cycles" @@ -1763,7 +1716,7 @@ checksum = "3a6ad932c6dd3cfaf16b66754a42f87bbeefd591530c4b6a8334270a7df3e853" dependencies = [ "ahash", "petgraph", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1779,17 +1732,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.8", - "indexmap 1.9.2", + "http 0.2.12", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1798,17 +1751,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 1.1.0", - "indexmap 2.6.0", + "http 1.2.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1841,9 +1794,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1852,9 +1805,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "foldhash", ] @@ -1869,7 +1822,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -1887,12 +1840,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" @@ -1906,15 +1856,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -1926,9 +1867,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1937,9 +1878,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -1948,68 +1889,68 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.8", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.15", - "http 0.2.8", - "http-body 0.4.5", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.7", + "socket2", "tokio", "tower-service", "tracing", @@ -2018,16 +1959,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.3", - "http 1.1.0", - "http-body 1.0.0", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", "httparse", "itoa", "pin-project-lite", @@ -2036,6 +1977,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +dependencies = [ + "futures-util", + "http 1.2.0", + "hyper 1.5.2", + "hyper-util", + "rustls 0.23.21", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.1", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -2043,7 +2001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.23", + "hyper 0.14.32", "native-tls", "tokio", "tokio-native-tls", @@ -2057,7 +2015,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.2.0", + "hyper 1.5.2", "hyper-util", "native-tls", "tokio", @@ -2067,20 +2025,19 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.2.0", + "http 1.2.0", + "http-body 1.0.1", + "hyper 1.5.2", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -2109,122 +2066,242 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] [[package]] -name = "idna" -version = "0.3.0" +name = "icu_locid" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", ] [[package]] -name = "im" -version = "15.1.0" +name = "icu_locid_transform" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ - "bitmaps", - "rand_core", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", ] [[package]] -name = "impl-codec" -version = "0.6.0" +name = "icu_locid_transform_data" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec", -] +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" [[package]] -name = "impl-rlp" -version = "0.3.0" +name = "icu_normalizer" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" dependencies = [ - "rlp", + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", ] [[package]] -name = "impl-serde" -version = "0.4.0" +name = "icu_normalizer_data" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" -dependencies = [ - "serde", -] +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" [[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" +name = "icu_properties" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", ] [[package]] -name = "in_definite" -version = "1.0.0" +name = "icu_properties_data" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bd47a3c8188d842aa7ff4dd65a9732f740fcbe04689ecfbfef43c465b381de" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" [[package]] -name = "indexmap" -version = "1.9.2" +name = "icu_provider" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", ] [[package]] -name = "indexmap" -version = "2.6.0" +name = "icu_provider_macros" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ - "equivalent", - "hashbrown 0.15.1", - "rayon", - "serde", + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] -name = "inlinable_string" -version = "0.1.15" +name = "ident_case" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] -name = "inout" -version = "0.1.3" +name = "idna" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "generic-array", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "im" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +dependencies = [ + "bitmaps", + "rand_core", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] +name = "impl-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + +[[package]] +name = "impl-serde" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" +dependencies = [ + "serde", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "in_definite" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5bd47a3c8188d842aa7ff4dd65a9732f740fcbe04689ecfbfef43c465b381de" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", + "rayon", + "serde", ] +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -2263,16 +2340,17 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2301,15 +2379,15 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -2323,21 +2401,28 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "libc", + "redox_syscall", ] [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2345,11 +2430,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d" dependencies = [ - "cfg-if", + "value-bag", ] [[package]] @@ -2384,19 +2469,19 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "migrations_internals" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" dependencies = [ "serde", - "toml 0.7.8", + "toml 0.8.19", ] [[package]] name = "migrations_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" dependencies = [ "migrations_internals", "proc-macro2", @@ -2405,9 +2490,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -2421,48 +2506,38 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "multer" -version = "2.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 0.2.8", + "http 1.2.0", "httparse", - "log", "memchr", "mime", - "spin 0.9.8", + "spin", "tokio", "tokio-util", "version_check", @@ -2479,11 +2554,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2551,56 +2625,41 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "crc32fast", "flate2", - "hashbrown 0.15.1", - "indexmap 2.6.0", + "hashbrown 0.15.2", + "indexmap 2.7.0", "memchr", "ruzstd", ] [[package]] name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "cfg-if", "foreign-types", "libc", @@ -2617,7 +2676,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -2628,9 +2687,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2700,14 +2759,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2715,15 +2774,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-targets 0.52.6", ] [[package]] @@ -2744,9 +2803,9 @@ dependencies = [ [[package]] name = "pear" -version = "0.2.3" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" dependencies = [ "inlinable_string", "pear_codegen", @@ -2755,14 +2814,14 @@ dependencies = [ [[package]] name = "pear_codegen" -version = "0.2.3" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 1.0.107", + "syn 2.0.96", ] [[package]] @@ -2800,20 +2859,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.11", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -2821,22 +2880,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "pest_meta" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", @@ -2850,14 +2909,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.7.0", ] [[package]] name = "phf" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_macros", "phf_shared", @@ -2865,9 +2924,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", "rand", @@ -2875,51 +2934,31 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2955,27 +2994,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "polyval" -version = "0.6.0" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "postcard" -version = "1.0.10" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" +checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -2992,15 +3019,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pq-sys" -version = "0.4.8" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd" +checksum = "f6cc05d7ea95200187117196eee9edd0644424911821aeb28a18ce60ea0b8793" dependencies = [ "vcpkg", ] @@ -3054,40 +3084,40 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "proc-macro2-diagnostics" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.96", "version_check", "yansi", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -3170,20 +3200,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.7.0", ] [[package]] @@ -3194,27 +3215,27 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "ref-cast" -version = "1.0.14" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.14" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.96", ] [[package]] @@ -3235,7 +3256,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.6.28", + "regex-syntax 0.6.29", ] [[package]] @@ -3251,9 +3272,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" @@ -3272,10 +3293,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.15", - "http 0.2.8", - "http-body 0.4.5", - "hyper 0.14.23", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -3286,12 +3307,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tower-service", @@ -3304,20 +3325,21 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.2" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.3", - "http 1.1.0", - "http-body 1.0.0", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.2.0", + "hyper 1.5.2", + "hyper-rustls", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -3328,20 +3350,21 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 2.2.0", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 1.0.2", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", + "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] @@ -3356,17 +3379,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3390,20 +3413,19 @@ dependencies = [ [[package]] name = "rocket" -version = "0.5.0-rc.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317" +checksum = "a516907296a31df7dc04310e7043b61d71954d703b603cc6867a026d7e72d73f" dependencies = [ "async-stream", "async-trait", - "atomic", - "atty", + "atomic 0.5.3", "binascii", "bytes", "either", "figment", "futures", - "indexmap 1.9.2", + "indexmap 2.7.0", "log", "memchr", "multer", @@ -3429,55 +3451,56 @@ dependencies = [ [[package]] name = "rocket_codegen" -version = "0.5.0-rc.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47" +checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46" dependencies = [ "devise", "glob", - "indexmap 1.9.2", + "indexmap 2.7.0", "proc-macro2", "quote", "rocket_http", - "syn 1.0.107", + "syn 2.0.96", "unicode-xid", + "version_check", ] [[package]] name = "rocket_http" -version = "0.5.0-rc.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2" +checksum = "e274915a20ee3065f611c044bd63c40757396b6dbc057d6046aec27f14f882b9" dependencies = [ "cookie", "either", "futures", - "http 0.2.8", - "hyper 0.14.23", - "indexmap 1.9.2", + "http 0.2.12", + "hyper 0.14.32", + "indexmap 2.7.0", "log", "memchr", "pear", "percent-encoding", "pin-project-lite", "ref-cast", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "smallvec", "stable-pattern", "state", "time", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "uncased", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3502,58 +3525,107 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", + "rustls-webpki 0.101.7", "sct", - "webpki", +] + +[[package]] +name = "rustls" +version = "0.23.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ - "base64 0.13.1", + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ruzstd" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3938e133aac070997ddc684d4b393777d293ba170f2988c8fd5ea2ad4ce21" +checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" dependencies = [ "twox-hash", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3566,20 +3638,20 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96560eea317a9cc4e0bb1f6a2c93c09a19b8c4fc5cb3fcc0ec1c094cd783e2" +checksum = "28e1c91382686d21b5ac7959341fcb9780fa7c03773646995a87c950fa7be640" dependencies = [ "sdd", ] [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3599,15 +3671,15 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -3615,15 +3687,15 @@ dependencies = [ [[package]] name = "sdd" -version = "0.2.0" +version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" +checksum = "478f121bb72bbf63c52c93011ea1791dca40140dfe13f8336c4c5ac952c33aa9" [[package]] name = "sec1" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -3654,11 +3726,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.7.0", "core-foundation", "core-foundation-sys", "libc", @@ -3667,9 +3739,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -3677,46 +3749,56 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", +] + +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3735,15 +3817,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "base64 0.22.1", "chrono", "hex", - "indexmap 1.9.2", - "indexmap 2.6.0", + "indexmap 1.9.3", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -3753,21 +3835,21 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "serial_test" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" dependencies = [ "futures", "log", @@ -3779,13 +3861,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -3811,18 +3893,24 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3839,9 +3927,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "sized-chunks" @@ -3855,9 +3943,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3897,35 +3985,19 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.107", -] - -[[package]] -name = "socket2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -dependencies = [ - "libc", - "winapi", + "syn 1.0.109", ] [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -3962,9 +4034,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" dependencies = [ "loom", ] @@ -4015,7 +4087,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4028,14 +4100,92 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "sval" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6dc0f9830c49db20e73273ffae9b5240f63c42e515af1da1fceefb69fceafd8" + +[[package]] +name = "sval_buffer" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "429922f7ad43c0ef8fd7309e14d750e38899e32eb7e8da656ea169dd28ee212f" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f16ff5d839396c11a30019b659b0976348f3803db0626f736764c473b50ff4" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c27a80b6151b0557f9ccbe89c11db571dc5f68113690c1e028d7e974bae94" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0deef63c70da622b2a8069d8600cf4b05396459e665862e7bdb290fd6cf3f155" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_nested" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a39ce5976ae1feb814c35d290cf7cf8cd4f045782fe1548d6bc32e21f6156e9f" +dependencies = [ + "sval", + "sval_buffer", + "sval_ref", +] + +[[package]] +name = "sval_ref" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7c6ee3751795a728bc9316a092023529ffea1783499afbc5c66f5fabebb1fa" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5572d0321b68109a343634e3a5d576bf131b82180c6c442dee06349dfc652a" +dependencies = [ + "serde", + "sval", + "sval_nested", +] [[package]] name = "sway-ast" @@ -4066,14 +4216,14 @@ dependencies = [ "fuel-etk-asm", "fuel-etk-ops", "fuel-vm", - "gimli 0.31.1", + "gimli", "graph-cycles", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "im", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "lazy_static", - "object 0.36.5", + "object", "parking_lot", "paste", "pest", @@ -4092,7 +4242,7 @@ dependencies = [ "sway-types", "sway-utils", "sysinfo", - "thiserror", + "thiserror 1.0.69", "tracing", "uint", "vec1", @@ -4110,7 +4260,7 @@ dependencies = [ "smallvec", "strsim 0.11.1", "sway-types", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4132,7 +4282,7 @@ dependencies = [ "anyhow", "downcast-rs", "filecheck", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "once_cell", "peg", @@ -4155,7 +4305,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -4171,7 +4321,7 @@ dependencies = [ "sway-ast", "sway-error", "sway-types", - "thiserror", + "thiserror 1.0.69", "unicode-bidi", "unicode-xid", ] @@ -4186,7 +4336,7 @@ dependencies = [ "fuel-asm", "fuel-crypto", "fuel-tx", - "indexmap 2.6.0", + "indexmap 2.7.0", "lazy_static", "num-bigint", "num-traits", @@ -4194,7 +4344,7 @@ dependencies = [ "rustc-hash", "serde", "sway-utils", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4209,9 +4359,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -4220,9 +4370,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.57" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -4235,6 +4385,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -4243,7 +4402,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "unicode-xid", ] @@ -4255,7 +4414,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -4281,7 +4440,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.7.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -4294,6 +4464,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -4302,9 +4482,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -4313,15 +4493,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4337,38 +4518,59 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -4387,9 +4589,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -4404,11 +4606,21 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -4421,32 +4633,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -4461,20 +4672,29 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls", + "rustls 0.23.21", "tokio", - "webpki", ] [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -4483,99 +4703,86 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "toml" -version = "0.7.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", "winnow", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.6.0", - "toml_datetime", - "winnow", -] - [[package]] name = "tower" -version = "0.4.13" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "pin-project", "pin-project-lite", + "sync_wrapper 1.0.2", "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4583,7 +4790,6 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4597,7 +4803,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", ] [[package]] @@ -4654,9 +4860,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" @@ -4668,17 +4874,23 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ubyte" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" +checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea" dependencies = [ "serde", ] @@ -4703,9 +4915,9 @@ dependencies = [ [[package]] name = "uncased" -version = "0.9.7" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" dependencies = [ "serde", "version_check", @@ -4713,33 +4925,21 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-width" @@ -4749,37 +4949,39 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "universal-hash" -version = "0.5.1" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -4788,9 +4990,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" dependencies = [ "getrandom", "serde", @@ -4802,6 +5004,42 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb773bd36fd59c7ca6e336c94454d9c66386416734817927ac93d81cb3c5b0b" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a916a702cac43a88694c97657d449775667bcd14b70419441d05b7fea4a83a" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -4816,9 +5054,9 @@ checksum = "eab68b56840f69efb0fefbe3ab6661499217ffdc58e2eef7c3f6f69835386322" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -4832,11 +5070,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -4848,9 +5085,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -4859,36 +5096,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4896,43 +5133,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "winapi" version = "0.3.9" @@ -4955,7 +5182,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4966,15 +5193,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", + "windows-targets 0.48.5", ] [[package]] @@ -4983,22 +5206,37 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows_aarch64_gnullvm 0.42.0", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm 0.42.0", - "windows_x86_64_msvc 0.42.0", + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -5016,7 +5254,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5036,25 +5283,20 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -5063,21 +5305,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5087,21 +5317,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5111,21 +5329,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5135,21 +5347,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5159,15 +5359,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5177,21 +5371,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5201,15 +5383,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] @@ -5224,6 +5406,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -5235,9 +5429,9 @@ dependencies = [ [[package]] name = "xattr" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" dependencies = [ "libc", "linux-raw-sys", @@ -5246,9 +5440,36 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +dependencies = [ + "is-terminal", +] + +[[package]] +name = "yoke" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure 0.13.1", +] [[package]] name = "zerocopy" @@ -5256,6 +5477,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -5267,7 +5489,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure 0.13.1", ] [[package]] @@ -5287,5 +5530,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.96", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] diff --git a/Cargo.toml b/Cargo.toml index 40a6061..cf0edf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ rocket = { version = "0.5.0-rc.2", features = ["tls", "json"] } serde = { version = "1.0", features = ["derive"] } reqwest = { version = "0.12.2", features = ["json"] } thiserror = "1.0.58" -diesel = { version = "2.1.6", features = ["postgres", "uuid", "r2d2"] } +diesel = { version = "2.1.6", features = ["postgres", "uuid", "r2d2", "time"] } dotenvy = "0.15" uuid = { version = "1.8.0", features = ["v4", "serde"] } diesel_migrations = "2.1.0" @@ -32,3 +32,4 @@ semver = "1.0.23" tracing = "0.1.41" tracing-subscriber = "0.3.19" tempfile = "3.14.0" +time = { version = "0.3.37", features = ["serde"] } diff --git a/app/src/features/dahboard/components/PackageDashboard.tsx b/app/src/features/dahboard/components/PackageDashboard.tsx new file mode 100644 index 0000000..661229d --- /dev/null +++ b/app/src/features/dahboard/components/PackageDashboard.tsx @@ -0,0 +1,163 @@ +import React, { useEffect, useState } from 'react'; +import { + Box, + Card, + CardContent, + Typography, + Grid, + CircularProgress, + Container, +} from '@mui/material'; +import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; +import { useNavigate } from 'react-router-dom'; + +type Package = { + id: string; + packageName: string; + version: string; + description: string; + repository: string; + updatedAt?: string; + createdAt?: string; +}; + +type PackageData = { justUpdated: Package[]; newPackages: Package[] }; + +// Example API fetch function (replace with your actual API call) +const fetchPackages = async (): Promise => { + return { + justUpdated: [ + { + id: '1', + packageName: 'example-package', + version: '1.0.1', + description: 'An example package with a recent update.', + repository: 'https://github.com/example/example-package', + updatedAt: '2025-01-10T15:34:56Z', + }, + { + id: '2', + packageName: 'another-package', + version: '2.1.0', + description: 'Another package with cool features recently updated.', + repository: 'https://github.com/example/another-package', + updatedAt: '2025-01-09T12:20:30Z', + }, + ], + newPackages: [ + { + id: '3', + packageName: 'new-package', + version: '1.0.0', + description: 'A brand new package for demonstration purposes.', + repository: 'https://github.com/example/new-package', + createdAt: '2025-01-10T10:00:00Z', + }, + { + id: '4', + packageName: 'cool-package', + version: '0.1.0', + description: 'A cool new package to explore.', + repository: 'https://github.com/example/cool-package', + createdAt: '2025-01-09T18:45:30Z', + }, + ], + }; +}; + +const PackageDashboard: React.FC = () => { + const [data, setData] = useState({ + justUpdated: [], + newPackages: [], + }); + const [loading, setLoading] = useState(true); + const navigate = useNavigate(); + + useEffect(() => { + const loadPackages = async () => { + try { + const result = await fetchPackages(); + setData(result); + } catch (error) { + console.error('Failed to fetch packages:', error); + } finally { + setLoading(false); + } + }; + + loadPackages(); + }, []); + + if (loading) { + return ( + + + + ); + } + + const renderPackages = (packages: Package[], type: string) => ( + <> + + {type} + + {packages.map((pkg) => ( + navigate('/package/' + pkg.packageName)} + onMouseEnter={(e) => + (e.currentTarget.style.backgroundColor = '#f0f8ff') + } + onMouseLeave={(e) => + (e.currentTarget.style.backgroundColor = 'white') + }> + + + + {pkg.packageName} (v{pkg.version}) + + + {type === 'Just Updated' + ? `Updated: ${new Date(pkg.updatedAt!).toLocaleString()}` + : `Added: ${new Date(pkg.createdAt!).toLocaleString()}`} + + + {pkg.description || 'No description available.'} + + + + + + ))} + + ); + + return ( + + + + {renderPackages(data.justUpdated, 'Just Updated')} + + + {renderPackages(data.newPackages, 'New Packages')} + + + + ); +}; + +export default PackageDashboard; diff --git a/app/src/features/detail/components/PackageDetail.tsx b/app/src/features/detail/components/PackageDetail.tsx new file mode 100644 index 0000000..b3f921f --- /dev/null +++ b/app/src/features/detail/components/PackageDetail.tsx @@ -0,0 +1,183 @@ +import React, { useState } from "react"; +import { + Container, + Typography, + Box, + Grid, + Card, + CardContent, + Tabs, + Tab, +} from "@mui/material"; +import { useParams } from "react-router-dom"; + +const PackageDetail: React.FC = () => { + const { name } = useParams<{ name: string }>(); + const [activeTab, setActiveTab] = useState(0); + + // Simulate version data + const versionCount: number = 2; // Example: Replace with dynamic fetch or prop + + const handleTabChange = (event: React.SyntheticEvent, newValue: number) => { + setActiveTab(newValue); + }; + + return ( + + + Package: {name} + + + + + + + {/* Main Content */} + + + {activeTab === 0 && ( + + + + Readme + + + The readme content for the package "{name}" will be shown here, giving users + an insight into the package's purpose and usage. + + + + )} + {activeTab === 1 && ( + + + + Versions + + + A list of all versions for the package "{name}" will be displayed here, along + with their release dates and changelogs. + + + + )} + + + + {/* Sidebar */} + + + + + + Maintainers + + + A list of maintainers for the package will be displayed here, including their + contact information or profiles. + + + + + + + Links + + + Repository: https://github.com/example/{name} + + + Documentation: https://docs.example.com/{name} + + + Homepage: https://www.example.com/{name} + + + + + + + Downloads + + + Total Downloads: 123,456 + + + Weekly Downloads: 1,234 + + + + + + + + ); +}; + +export default PackageDetail; diff --git a/app/src/features/toolbar/components/UserButton.tsx b/app/src/features/toolbar/components/UserButton.tsx index 0a03291..35d8c2c 100644 --- a/app/src/features/toolbar/components/UserButton.tsx +++ b/app/src/features/toolbar/components/UserButton.tsx @@ -4,7 +4,7 @@ import Button from '@mui/material/Button/Button'; import styled from '@emotion/styled'; import Menu from '@mui/material/Menu/Menu'; import MenuItem from '@mui/material/MenuItem/MenuItem'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router-dom'; import { useGithubAuth } from '../hooks/useGithubAuth'; import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown'; import { REDIRECT_URI } from '../../../constants'; diff --git a/app/src/index.tsx b/app/src/index.tsx index a926e98..378db3e 100644 --- a/app/src/index.tsx +++ b/app/src/index.tsx @@ -7,6 +7,7 @@ import { createBrowserRouter, RouterProvider } from 'react-router-dom'; import Home from './pages/Home'; import ApiTokens from './pages/ApiTokens'; import SearchResults from './pages/SearchResults'; +import PackageDetail from './features/detail/components/PackageDetail'; const root = ReactDOM.createRoot( document.getElementById('root') as HTMLElement @@ -25,6 +26,10 @@ const router = createBrowserRouter([ path: '/search', element: , }, + { + path: '/package/:name', + element: , + } ]); root.render( diff --git a/app/src/pages/Home.tsx b/app/src/pages/Home.tsx index d42358c..152da93 100644 --- a/app/src/pages/Home.tsx +++ b/app/src/pages/Home.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import PackageDashboard from '../features/dahboard/components/PackageDashboard'; function Home() { return ( @@ -6,7 +7,7 @@ function Home() {

{"The Sway community's package registry"}

-
{'Under construction'}
+ ); } diff --git a/migrations/2025-01-10-191952_create_packages/up.sql b/migrations/2025-01-10-191952_create_packages/up.sql index ace24c6..fa6d0e0 100644 --- a/migrations/2025-01-10-191952_create_packages/up.sql +++ b/migrations/2025-01-10-191952_create_packages/up.sql @@ -3,6 +3,6 @@ CREATE TABLE packages ( user_owner uuid NOT NULL, package_name VARCHAR NOT NULL UNIQUE, default_version uuid DEFAULT NULL, - created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY (user_owner) REFERENCES users(id) ON DELETE RESTRICT ); \ No newline at end of file diff --git a/migrations/2025-01-10-194911_create_package_versions/up.sql b/migrations/2025-01-10-194911_create_package_versions/up.sql index 7938723..76bfa90 100644 --- a/migrations/2025-01-10-194911_create_package_versions/up.sql +++ b/migrations/2025-01-10-194911_create_package_versions/up.sql @@ -9,10 +9,10 @@ CREATE TABLE package_versions ( repository VARCHAR, documentation VARCHAR, homepage VARCHAR, - urls non_null_text_array NOT NULL DEFAULT '{}', + urls TEXT[] NOT NULL DEFAULT '{}', readme VARCHAR, license VARCHAR, - created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, -- There can only be one version with the same number per package UNIQUE (package_id, num), -- FK constraints diff --git a/src/api/mod.rs b/src/api/mod.rs index fcbaa97..4ec2be2 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -1,13 +1,17 @@ pub mod api_token; pub mod auth; pub mod publish; +pub mod search; + +use std::io::Cursor; use rocket::{ - http::Status, + http::{ContentType, Status}, response::Responder, serde::{json::Json, Serialize}, Request, }; +use serde_json::json; use thiserror::Error; use tracing::error; @@ -33,10 +37,24 @@ pub enum ApiError { impl<'r, 'o: 'r> Responder<'r, 'o> for ApiError { fn respond_to(self, _request: &'r Request<'_>) -> rocket::response::Result<'o> { error!("API error: {}", self); - match self { - ApiError::Database(_) => Err(Status::InternalServerError), - ApiError::Github(_) => Err(Status::Unauthorized), - ApiError::Upload(_) => Err(Status::BadRequest), - } + let (status, message) = match self { + ApiError::Database(ref err) => ( + Status::InternalServerError, + format!("Database error: {}", err), + ), + ApiError::Github(ref err) => (Status::Unauthorized, format!("GitHub error: {}", err)), + ApiError::Upload(ref err) => (Status::BadRequest, format!("Upload error: {}", err)), + }; + let body = json!({ + "status": status.code, + "error": message, + }) + .to_string(); + + rocket::Response::build() + .status(status) + .sized_body(body.len(), Cursor::new(body)) + .header(ContentType::JSON) + .ok() } } diff --git a/src/api/search.rs b/src/api/search.rs new file mode 100644 index 0000000..0f66536 --- /dev/null +++ b/src/api/search.rs @@ -0,0 +1,8 @@ +use crate::models::RecentPackage; +use serde::Serialize; + +#[derive(Serialize, Debug)] +pub struct RecentPackagesResponse { + pub recently_created: Vec, + pub recently_updated: Vec, +} diff --git a/src/db/package_version.rs b/src/db/package_version.rs index 772e44a..2d914bc 100644 --- a/src/db/package_version.rs +++ b/src/db/package_version.rs @@ -1,7 +1,7 @@ use super::error::DatabaseError; use super::{models, schema, DbConn}; use crate::api::publish::PublishRequest; -use crate::models::ApiToken; +use crate::models::{ApiToken, RecentPackage}; use crate::schema::packages::package_name; use diesel::prelude::*; use uuid::Uuid; @@ -100,4 +100,44 @@ impl DbConn { .first::(self.inner()) .map_err(|err| DatabaseError::NotFound(name.clone(), err)) } + + /// Fetch the most recently updated packages. + pub fn get_recently_updated(&mut self) -> Result, DatabaseError> { + let packages = diesel::sql_query( + r#"SELECT + p.package_name as name, + pv.num as version, + pv.package_description as description, + p.created_at as created_at, + pv.created_at as updated_at + FROM package_versions pv + JOIN packages p on pv.package_id = p.id + ORDER BY pv.created_at DESC + LIMIT 10"#, + ) + .load::(self.inner()) + .map_err(|err| DatabaseError::QueryFailed("recently updated".to_string(), err))?; + + Ok(packages) + } + + /// Fetch the most recently created packages. + pub fn get_recently_created(&mut self) -> Result, DatabaseError> { + let packages = diesel::sql_query( + r#"SELECT + p.package_name as name, + pv.num as version, + pv.package_description as description, + p.created_at as created_at, + pv.created_at as updated_at + FROM package_versions pv + JOIN packages p on pv.package_id = p.id + ORDER BY p.created_at DESC + LIMIT 10"#, + ) + .load::(self.inner()) + .map_err(|err| DatabaseError::QueryFailed("recently created".to_string(), err))?; + + Ok(packages) + } } diff --git a/src/main.rs b/src/main.rs index 52bcb47..8fb8dac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,6 +5,7 @@ extern crate rocket; use forc_pub::api::api_token::{CreateTokenRequest, CreateTokenResponse, Token, TokensResponse}; use forc_pub::api::publish::{PublishRequest, UploadResponse}; +use forc_pub::api::search::RecentPackagesResponse; use forc_pub::api::ApiError; use forc_pub::api::{ auth::{LoginRequest, LoginResponse, UserResponse}, @@ -49,7 +50,7 @@ async fn login( let (user, expires_in) = handle_login(request.code.clone()).await?; let session = db.conn().new_user_session(&user, expires_in)?; let session_id = session.id.to_string(); - cookies.add(Cookie::build(SESSION_COOKIE_NAME, session_id.clone()).finish()); + cookies.add(Cookie::build((SESSION_COOKIE_NAME, session_id.clone()))); Ok(Json(LoginResponse { user, session_id })) } @@ -178,6 +179,18 @@ async fn upload_project( Ok(Json(UploadResponse { upload_id })) } +#[get("/recent_packages")] +fn recent_packages(db: &State) -> ApiResult { + let recently_created = db.conn().get_recently_created()?; + let recently_updated = db.conn().get_recently_updated()?; + // TODO: Publish to GitHub index repo. + // TODO: Publish to block explorer API. + Ok(Json(RecentPackagesResponse { + recently_created, + recently_updated, + })) +} + /// Catches all OPTION requests in order to get the CORS related Fairing triggered. #[options("/<_..>")] fn all_options() { @@ -222,6 +235,7 @@ async fn rocket() -> _ { publish, upload_project, tokens, + recent_packages, all_options, health ], diff --git a/src/middleware/session_auth.rs b/src/middleware/session_auth.rs index 9caf84c..0cf5b59 100644 --- a/src/middleware/session_auth.rs +++ b/src/middleware/session_auth.rs @@ -31,7 +31,7 @@ impl<'r> FromRequest<'r> for SessionAuth { let mut db = match request.rocket().state::() { Some(db) => db.conn(), None => { - return Outcome::Failure(( + return Outcome::Error(( Status::InternalServerError, SessionAuthError::DatabaseConnection, )) @@ -49,8 +49,8 @@ impl<'r> FromRequest<'r> for SessionAuth { } } } - return Outcome::Failure((Status::Unauthorized, SessionAuthError::Invalid)); + return Outcome::Error((Status::Unauthorized, SessionAuthError::Invalid)); } - return Outcome::Failure((Status::Unauthorized, SessionAuthError::Missing)); + return Outcome::Error((Status::Unauthorized, SessionAuthError::Missing)); } } diff --git a/src/middleware/token_auth.rs b/src/middleware/token_auth.rs index 3d220d1..cb9f61c 100644 --- a/src/middleware/token_auth.rs +++ b/src/middleware/token_auth.rs @@ -31,7 +31,7 @@ impl<'r> FromRequest<'r> for TokenAuth { let mut db = match request.rocket().state::() { Some(db) => db.conn(), None => { - return Outcome::Failure(( + return Outcome::Error(( Status::InternalServerError, TokenAuthError::DatabaseConnection, )) @@ -48,11 +48,11 @@ impl<'r> FromRequest<'r> for TokenAuth { { return Outcome::Success(TokenAuth { token }); } - return Outcome::Failure((Status::Unauthorized, TokenAuthError::Expired)); + return Outcome::Error((Status::Unauthorized, TokenAuthError::Expired)); } } - return Outcome::Failure((Status::Unauthorized, TokenAuthError::Invalid)); + return Outcome::Error((Status::Unauthorized, TokenAuthError::Invalid)); } - return Outcome::Failure((Status::Unauthorized, TokenAuthError::Missing)); + return Outcome::Error((Status::Unauthorized, TokenAuthError::Missing)); } } diff --git a/src/models.rs b/src/models.rs index 7128f8e..7d7a9c3 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1,5 +1,9 @@ use diesel::prelude::*; +use diesel::sql_types::{Nullable, Text, Timestamptz}; +use diesel::QueryableByName; +use serde::Serialize; use std::time::SystemTime; +use time::PrimitiveDateTime; use uuid::Uuid; #[derive(Queryable, Selectable, Debug, Clone)] @@ -94,7 +98,7 @@ pub struct Package { pub user_owner: Uuid, pub package_name: String, pub default_version: Option, - pub created_at: SystemTime, + pub created_at: PrimitiveDateTime, } #[derive(Insertable, Debug)] @@ -120,7 +124,7 @@ pub struct PackageVersion { pub urls: Vec>, pub readme: Option, pub license: Option, - pub created_at: SystemTime, + pub created_at: PrimitiveDateTime, } #[derive(Insertable, Debug)] @@ -139,3 +143,17 @@ pub struct NewPackageVersion { pub readme: Option, pub license: Option, } + +#[derive(QueryableByName, Serialize, Debug)] +pub struct RecentPackage { + #[sql_type = "Text"] + pub name: String, // Corresponds to `p.package_name as name` + #[sql_type = "Text"] + pub version: String, // Corresponds to `pv.num as version` + #[sql_type = "Nullable"] + pub description: Option, // Corresponds to `pv.package_description as description`, which might be nullable + #[sql_type = "Timestamptz"] + pub created_at: PrimitiveDateTime, // Corresponds to `p.created_at as created_at` + #[sql_type = "Timestamptz"] + pub updated_at: PrimitiveDateTime, // Corresponds to `pv.created_at as updated_at` +} diff --git a/src/schema.rs b/src/schema.rs index 5cda303..921cd32 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -26,7 +26,7 @@ diesel::table! { urls -> Array>, readme -> Nullable, license -> Nullable, - created_at -> Timestamp, + created_at -> Timestamptz, } } @@ -36,7 +36,7 @@ diesel::table! { user_owner -> Uuid, package_name -> Varchar, default_version -> Nullable, - created_at -> Timestamp, + created_at -> Timestamptz, } } From d927d548a08bfcdaea6d3100eb8434010db48873 Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:01:38 -0800 Subject: [PATCH 05/14] plug recent pkg info into frontend --- .../dahboard/components/PackageDashboard.tsx | 96 +++---------------- .../dahboard/hooks/useFetchRecentPackages.ts | 44 +++++++++ app/src/utils/http.ts | 6 ++ src/db/package_version.rs | 69 ++++++++----- 4 files changed, 110 insertions(+), 105 deletions(-) create mode 100644 app/src/features/dahboard/hooks/useFetchRecentPackages.ts diff --git a/app/src/features/dahboard/components/PackageDashboard.tsx b/app/src/features/dahboard/components/PackageDashboard.tsx index 661229d..6c5745d 100644 --- a/app/src/features/dahboard/components/PackageDashboard.tsx +++ b/app/src/features/dahboard/components/PackageDashboard.tsx @@ -10,83 +10,13 @@ import { } from '@mui/material'; import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; import { useNavigate } from 'react-router-dom'; - -type Package = { - id: string; - packageName: string; - version: string; - description: string; - repository: string; - updatedAt?: string; - createdAt?: string; -}; - -type PackageData = { justUpdated: Package[]; newPackages: Package[] }; - -// Example API fetch function (replace with your actual API call) -const fetchPackages = async (): Promise => { - return { - justUpdated: [ - { - id: '1', - packageName: 'example-package', - version: '1.0.1', - description: 'An example package with a recent update.', - repository: 'https://github.com/example/example-package', - updatedAt: '2025-01-10T15:34:56Z', - }, - { - id: '2', - packageName: 'another-package', - version: '2.1.0', - description: 'Another package with cool features recently updated.', - repository: 'https://github.com/example/another-package', - updatedAt: '2025-01-09T12:20:30Z', - }, - ], - newPackages: [ - { - id: '3', - packageName: 'new-package', - version: '1.0.0', - description: 'A brand new package for demonstration purposes.', - repository: 'https://github.com/example/new-package', - createdAt: '2025-01-10T10:00:00Z', - }, - { - id: '4', - packageName: 'cool-package', - version: '0.1.0', - description: 'A cool new package to explore.', - repository: 'https://github.com/example/cool-package', - createdAt: '2025-01-09T18:45:30Z', - }, - ], - }; -}; +import useFetchRecentPackages, { + RecentPackage, +} from '../hooks/useFetchRecentPackages'; const PackageDashboard: React.FC = () => { - const [data, setData] = useState({ - justUpdated: [], - newPackages: [], - }); - const [loading, setLoading] = useState(true); const navigate = useNavigate(); - - useEffect(() => { - const loadPackages = async () => { - try { - const result = await fetchPackages(); - setData(result); - } catch (error) { - console.error('Failed to fetch packages:', error); - } finally { - setLoading(false); - } - }; - - loadPackages(); - }, []); + const { data, loading } = useFetchRecentPackages(); if (loading) { return ( @@ -100,7 +30,7 @@ const PackageDashboard: React.FC = () => { ); } - const renderPackages = (packages: Package[], type: string) => ( + const renderPackages = (packages: RecentPackage[], type: string) => ( <> { style={{ borderBottom: '2px solid #1976d2', paddingBottom: '8px' }}> {type} - {packages.map((pkg) => ( + {packages.map((pkg, i) => ( { cursor: 'pointer', transition: 'transform 0.2s, background-color 0.2s', }} - onClick={() => navigate('/package/' + pkg.packageName)} + onClick={() => navigate('/package/' + pkg.name)} onMouseEnter={(e) => (e.currentTarget.style.backgroundColor = '#f0f8ff') } @@ -128,12 +58,12 @@ const PackageDashboard: React.FC = () => { - {pkg.packageName} (v{pkg.version}) + {pkg.name} (v{pkg.version}) {type === 'Just Updated' - ? `Updated: ${new Date(pkg.updatedAt!).toLocaleString()}` - : `Added: ${new Date(pkg.createdAt!).toLocaleString()}`} + ? `Updated: ${new Date(pkg.updated_at!).toLocaleString()}` + : `Added: ${new Date(pkg.updated_at!).toLocaleString()}`} {pkg.description || 'No description available.'} @@ -150,10 +80,10 @@ const PackageDashboard: React.FC = () => { - {renderPackages(data.justUpdated, 'Just Updated')} + {renderPackages(data.recently_updated, 'Just Updated')} - {renderPackages(data.newPackages, 'New Packages')} + {renderPackages(data.recently_created, 'New Packages')} diff --git a/app/src/features/dahboard/hooks/useFetchRecentPackages.ts b/app/src/features/dahboard/hooks/useFetchRecentPackages.ts new file mode 100644 index 0000000..d29e640 --- /dev/null +++ b/app/src/features/dahboard/hooks/useFetchRecentPackages.ts @@ -0,0 +1,44 @@ +import { useState, useEffect } from 'react'; +import axios from 'axios'; +import HTTP from '../../../utils/http'; + +export interface RecentPackage { + name: string; + version: string; + description: string | null; + created_at: string; + updated_at: string; +} + +export interface RecentPackagesResponse { + recently_updated: RecentPackage[]; + recently_created: RecentPackage[]; +} + +const useFetchRecentPackages = () => { + const [data, setData] = useState({ + recently_updated: [], + recently_created: [], + }); + const [error, setError] = useState(null); + const [loading, setLoading] = useState(true); + + useEffect(() => { + HTTP.get(`/recent_packages`) + .then(({ data }) => { + setData(data); + }) + .catch((err: any) => + setError( + axios.isAxiosError(err) + ? err.response?.data?.message || 'An error occurred' + : 'An unknown error occurred' + ) + ) + .finally(() => setLoading(false)); + }, []); + + return { data, error, loading }; +}; + +export default useFetchRecentPackages; diff --git a/app/src/utils/http.ts b/app/src/utils/http.ts index 16d3056..a628b3f 100644 --- a/app/src/utils/http.ts +++ b/app/src/utils/http.ts @@ -1,6 +1,7 @@ import type { TypedAxios } from 'typed-axios-instance'; import axios from 'axios'; import { SERVER_URI } from '../constants'; +import { RecentPackagesResponse } from '../features/dahboard/hooks/useFetchRecentPackages'; export interface AuthenticatedUser { fullName: string; @@ -74,6 +75,11 @@ type Routes = [ { route: '/token/[id]'; method: 'DELETE'; + }, + { + route: "/recent_packages", + method: "GET", + jsonResponse: RecentPackagesResponse; } ]; diff --git a/src/db/package_version.rs b/src/db/package_version.rs index 2d914bc..a864e31 100644 --- a/src/db/package_version.rs +++ b/src/db/package_version.rs @@ -2,7 +2,6 @@ use super::error::DatabaseError; use super::{models, schema, DbConn}; use crate::api::publish::PublishRequest; use crate::models::{ApiToken, RecentPackage}; -use crate::schema::packages::package_name; use diesel::prelude::*; use uuid::Uuid; @@ -17,7 +16,7 @@ impl DbConn { // Check if the package exists. let pkg_name = request.package_name.clone(); let package = if let Some(existing_package) = schema::packages::table - .filter(schema::packages::package_name.eq(package_name)) + .filter(schema::packages::package_name.eq(pkg_name.clone())) .select(schema::packages::all_columns) .first::(self.inner()) .optional() @@ -104,16 +103,29 @@ impl DbConn { /// Fetch the most recently updated packages. pub fn get_recently_updated(&mut self) -> Result, DatabaseError> { let packages = diesel::sql_query( - r#"SELECT - p.package_name as name, - pv.num as version, - pv.package_description as description, - p.created_at as created_at, - pv.created_at as updated_at - FROM package_versions pv - JOIN packages p on pv.package_id = p.id - ORDER BY pv.created_at DESC - LIMIT 10"#, + r#"WITH ranked_versions AS ( + SELECT + p.id AS package_id, + p.package_name AS name, + pv.num AS version, + pv.package_description AS description, + p.created_at AS created_at, + pv.created_at AS updated_at, + ROW_NUMBER() OVER (PARTITION BY p.id ORDER BY pv.created_at DESC) AS rank + FROM package_versions pv + JOIN packages p ON pv.package_id = p.id + ) + SELECT + name, + version, + description, + created_at, + updated_at + FROM ranked_versions + WHERE rank = 1 + ORDER BY updated_at DESC + LIMIT 10; + "#, ) .load::(self.inner()) .map_err(|err| DatabaseError::QueryFailed("recently updated".to_string(), err))?; @@ -124,16 +136,29 @@ impl DbConn { /// Fetch the most recently created packages. pub fn get_recently_created(&mut self) -> Result, DatabaseError> { let packages = diesel::sql_query( - r#"SELECT - p.package_name as name, - pv.num as version, - pv.package_description as description, - p.created_at as created_at, - pv.created_at as updated_at - FROM package_versions pv - JOIN packages p on pv.package_id = p.id - ORDER BY p.created_at DESC - LIMIT 10"#, + r#"WITH ranked_versions AS ( + SELECT + p.id AS package_id, + p.package_name AS name, + pv.num AS version, + pv.package_description AS description, + p.created_at AS created_at, + pv.created_at AS updated_at, + ROW_NUMBER() OVER (PARTITION BY p.id ORDER BY pv.created_at DESC) AS rank + FROM package_versions pv + JOIN packages p ON pv.package_id = p.id + ) + SELECT + name, + version, + description, + created_at, + updated_at + FROM ranked_versions + WHERE rank = 1 + ORDER BY created_at DESC + LIMIT 10; + "#, ) .load::(self.inner()) .map_err(|err| DatabaseError::QueryFailed("recently created".to_string(), err))?; From 7c3c0a7219d410504180dc4a0086b5e4d1ffc3f4 Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:36:10 -0800 Subject: [PATCH 06/14] fix the dates --- Cargo.lock | 6 ++++-- Cargo.toml | 4 ++-- .../features/dahboard/components/PackageDashboard.tsx | 4 ++-- .../features/dahboard/hooks/useFetchRecentPackages.ts | 4 ++-- src/models.rs | 11 ++++++----- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 60b8dea..8450d50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -375,8 +375,10 @@ checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", + "wasm-bindgen", "windows-targets 0.52.6", ] @@ -825,11 +827,11 @@ checksum = "ccf1bedf64cdb9643204a36dd15b19a6ce8e7aa7f7b105868e9f1fad5ffa7d12" dependencies = [ "bitflags 2.7.0", "byteorder", + "chrono", "diesel_derives", "itoa", "pq-sys", "r2d2", - "time", "uuid", ] @@ -1328,6 +1330,7 @@ dependencies = [ name = "forc_pub" version = "0.1.0" dependencies = [ + "chrono", "diesel", "diesel_migrations", "dotenvy", @@ -1348,7 +1351,6 @@ dependencies = [ "tar", "tempfile", "thiserror 1.0.69", - "time", "tokio", "tracing", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index cf0edf8..726107b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ rocket = { version = "0.5.0-rc.2", features = ["tls", "json"] } serde = { version = "1.0", features = ["derive"] } reqwest = { version = "0.12.2", features = ["json"] } thiserror = "1.0.58" -diesel = { version = "2.1.6", features = ["postgres", "uuid", "r2d2", "time"] } +diesel = { version = "2.1.6", features = ["postgres", "uuid", "r2d2", "chrono"] } dotenvy = "0.15" uuid = { version = "1.8.0", features = ["v4", "serde"] } diesel_migrations = "2.1.0" @@ -32,4 +32,4 @@ semver = "1.0.23" tracing = "0.1.41" tracing-subscriber = "0.3.19" tempfile = "3.14.0" -time = { version = "0.3.37", features = ["serde"] } +chrono = { version = "0.4.39", features = ["serde"] } diff --git a/app/src/features/dahboard/components/PackageDashboard.tsx b/app/src/features/dahboard/components/PackageDashboard.tsx index 6c5745d..d15174f 100644 --- a/app/src/features/dahboard/components/PackageDashboard.tsx +++ b/app/src/features/dahboard/components/PackageDashboard.tsx @@ -62,8 +62,8 @@ const PackageDashboard: React.FC = () => { {type === 'Just Updated' - ? `Updated: ${new Date(pkg.updated_at!).toLocaleString()}` - : `Added: ${new Date(pkg.updated_at!).toLocaleString()}`} + ? `Updated: ${new Date(pkg.updatedAt!).toLocaleString()}` + : `Added: ${new Date(pkg.createdAt!).toLocaleString()}`} {pkg.description || 'No description available.'} diff --git a/app/src/features/dahboard/hooks/useFetchRecentPackages.ts b/app/src/features/dahboard/hooks/useFetchRecentPackages.ts index d29e640..6057dc8 100644 --- a/app/src/features/dahboard/hooks/useFetchRecentPackages.ts +++ b/app/src/features/dahboard/hooks/useFetchRecentPackages.ts @@ -6,8 +6,8 @@ export interface RecentPackage { name: string; version: string; description: string | null; - created_at: string; - updated_at: string; + createdAt: string; + updatedAt: string; } export interface RecentPackagesResponse { diff --git a/src/models.rs b/src/models.rs index 7d7a9c3..088ab06 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1,9 +1,9 @@ +use chrono::{DateTime, Utc}; use diesel::prelude::*; use diesel::sql_types::{Nullable, Text, Timestamptz}; use diesel::QueryableByName; use serde::Serialize; use std::time::SystemTime; -use time::PrimitiveDateTime; use uuid::Uuid; #[derive(Queryable, Selectable, Debug, Clone)] @@ -98,7 +98,7 @@ pub struct Package { pub user_owner: Uuid, pub package_name: String, pub default_version: Option, - pub created_at: PrimitiveDateTime, + pub created_at: DateTime, } #[derive(Insertable, Debug)] @@ -124,7 +124,7 @@ pub struct PackageVersion { pub urls: Vec>, pub readme: Option, pub license: Option, - pub created_at: PrimitiveDateTime, + pub created_at: DateTime, } #[derive(Insertable, Debug)] @@ -145,6 +145,7 @@ pub struct NewPackageVersion { } #[derive(QueryableByName, Serialize, Debug)] +#[serde(rename_all = "camelCase")] pub struct RecentPackage { #[sql_type = "Text"] pub name: String, // Corresponds to `p.package_name as name` @@ -153,7 +154,7 @@ pub struct RecentPackage { #[sql_type = "Nullable"] pub description: Option, // Corresponds to `pv.package_description as description`, which might be nullable #[sql_type = "Timestamptz"] - pub created_at: PrimitiveDateTime, // Corresponds to `p.created_at as created_at` + pub created_at: DateTime, // Corresponds to `p.created_at as created_at` #[sql_type = "Timestamptz"] - pub updated_at: PrimitiveDateTime, // Corresponds to `pv.created_at as updated_at` + pub updated_at: DateTime, // Corresponds to `pv.created_at as updated_at` } From 5ad28caf2b6de913468710fabbdc0c446264bdac Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 21:36:27 -0800 Subject: [PATCH 07/14] move fully to chrono --- .../down.sql | 23 +++++++++++ .../up.sql | 23 +++++++++++ src/api/api_token.rs | 7 ++-- src/api/search.rs | 6 +-- src/db/package_version.rs | 10 ++--- src/db/user_session.rs | 5 ++- src/middleware/session_auth.rs | 3 +- src/middleware/token_auth.rs | 11 +++--- src/models.rs | 39 +++++++++---------- src/schema.rs | 12 +++--- src/upload.rs | 3 +- src/util.rs | 12 ++---- 12 files changed, 99 insertions(+), 55 deletions(-) create mode 100644 migrations/2025-01-11-051241_alter_timestamp_to_tstz/down.sql create mode 100644 migrations/2025-01-11-051241_alter_timestamp_to_tstz/up.sql diff --git a/migrations/2025-01-11-051241_alter_timestamp_to_tstz/down.sql b/migrations/2025-01-11-051241_alter_timestamp_to_tstz/down.sql new file mode 100644 index 0000000..c7d0467 --- /dev/null +++ b/migrations/2025-01-11-051241_alter_timestamp_to_tstz/down.sql @@ -0,0 +1,23 @@ +ALTER TABLE api_tokens +ALTER COLUMN created_at TYPE timestamp +USING created_at AT TIME ZONE 'UTC'; + +ALTER TABLE api_tokens +ALTER COLUMN expires_at TYPE timestamp +USING expires_at AT TIME ZONE 'UTC'; + +ALTER TABLE sessions +ALTER COLUMN expires_at TYPE timestamp +USING expires_at AT TIME ZONE 'UTC'; + +ALTER TABLE sessions +ALTER COLUMN created_at TYPE timestamp +USING created_at AT TIME ZONE 'UTC'; + +ALTER TABLE uploads +ALTER COLUMN created_at TYPE timestamp +USING created_at AT TIME ZONE 'UTC'; + +ALTER TABLE users +ALTER COLUMN created_at TYPE timestamp +USING created_at AT TIME ZONE 'UTC'; diff --git a/migrations/2025-01-11-051241_alter_timestamp_to_tstz/up.sql b/migrations/2025-01-11-051241_alter_timestamp_to_tstz/up.sql new file mode 100644 index 0000000..b14ab40 --- /dev/null +++ b/migrations/2025-01-11-051241_alter_timestamp_to_tstz/up.sql @@ -0,0 +1,23 @@ +ALTER TABLE api_tokens +ALTER COLUMN created_at TYPE timestamptz +USING created_at AT TIME ZONE 'UTC'; + +ALTER TABLE api_tokens +ALTER COLUMN expires_at TYPE timestamptz +USING expires_at AT TIME ZONE 'UTC'; + +ALTER TABLE sessions +ALTER COLUMN expires_at TYPE timestamptz +USING expires_at AT TIME ZONE 'UTC'; + +ALTER TABLE sessions +ALTER COLUMN created_at TYPE timestamptz +USING created_at AT TIME ZONE 'UTC'; + +ALTER TABLE uploads +ALTER COLUMN created_at TYPE timestamptz +USING created_at AT TIME ZONE 'UTC'; + +ALTER TABLE users +ALTER COLUMN created_at TYPE timestamptz +USING created_at AT TIME ZONE 'UTC'; \ No newline at end of file diff --git a/src/api/api_token.rs b/src/api/api_token.rs index 3ed5e0f..758838c 100644 --- a/src/api/api_token.rs +++ b/src/api/api_token.rs @@ -1,4 +1,5 @@ -use crate::{models, util::sys_time_to_epoch}; +use crate::models; +use chrono::{DateTime, Utc}; use rocket::serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, Clone)] @@ -6,7 +7,7 @@ use rocket::serde::{Deserialize, Serialize}; pub struct Token { pub id: String, pub name: String, - pub created_at: u64, + pub created_at: DateTime, pub token: Option, } @@ -15,7 +16,7 @@ impl From for Token { Token { id: token.id.to_string(), name: token.friendly_name, - created_at: sys_time_to_epoch(token.created_at), + created_at: token.created_at, // We don't return the hashed token, as it's a secret. token: None, } diff --git a/src/api/search.rs b/src/api/search.rs index 0f66536..1805685 100644 --- a/src/api/search.rs +++ b/src/api/search.rs @@ -1,8 +1,8 @@ -use crate::models::RecentPackage; +use crate::models::PackagePreview; use serde::Serialize; #[derive(Serialize, Debug)] pub struct RecentPackagesResponse { - pub recently_created: Vec, - pub recently_updated: Vec, + pub recently_created: Vec, + pub recently_updated: Vec, } diff --git a/src/db/package_version.rs b/src/db/package_version.rs index a864e31..79ee70d 100644 --- a/src/db/package_version.rs +++ b/src/db/package_version.rs @@ -1,7 +1,7 @@ use super::error::DatabaseError; use super::{models, schema, DbConn}; use crate::api::publish::PublishRequest; -use crate::models::{ApiToken, RecentPackage}; +use crate::models::{ApiToken, PackagePreview}; use diesel::prelude::*; use uuid::Uuid; @@ -101,7 +101,7 @@ impl DbConn { } /// Fetch the most recently updated packages. - pub fn get_recently_updated(&mut self) -> Result, DatabaseError> { + pub fn get_recently_updated(&mut self) -> Result, DatabaseError> { let packages = diesel::sql_query( r#"WITH ranked_versions AS ( SELECT @@ -127,14 +127,14 @@ impl DbConn { LIMIT 10; "#, ) - .load::(self.inner()) + .load::(self.inner()) .map_err(|err| DatabaseError::QueryFailed("recently updated".to_string(), err))?; Ok(packages) } /// Fetch the most recently created packages. - pub fn get_recently_created(&mut self) -> Result, DatabaseError> { + pub fn get_recently_created(&mut self) -> Result, DatabaseError> { let packages = diesel::sql_query( r#"WITH ranked_versions AS ( SELECT @@ -160,7 +160,7 @@ impl DbConn { LIMIT 10; "#, ) - .load::(self.inner()) + .load::(self.inner()) .map_err(|err| DatabaseError::QueryFailed("recently created".to_string(), err))?; Ok(packages) diff --git a/src/db/user_session.rs b/src/db/user_session.rs index 43cacaa..e4ea91f 100644 --- a/src/db/user_session.rs +++ b/src/db/user_session.rs @@ -1,5 +1,6 @@ use super::error::DatabaseError; use super::{api, models, schema, DbConn}; +use chrono::{DateTime, Utc}; use diesel::prelude::*; use diesel::upsert::excluded; use std::time::{Duration, SystemTime}; @@ -38,7 +39,9 @@ impl DbConn { let new_session = models::NewSession { user_id: saved_user.id, - expires_at: SystemTime::now() + Duration::from_secs(u64::from(expires_in)), + expires_at: DateTime::::from( + SystemTime::now() + Duration::from_secs(u64::from(expires_in)), + ), }; // Insert new session diff --git a/src/middleware/session_auth.rs b/src/middleware/session_auth.rs index 0cf5b59..c61148c 100644 --- a/src/middleware/session_auth.rs +++ b/src/middleware/session_auth.rs @@ -1,5 +1,6 @@ use crate::db::Database; use crate::models; +use chrono::{DateTime, Utc}; use rocket::http::Status; use rocket::request::{FromRequest, Outcome}; use rocket::Request; @@ -44,7 +45,7 @@ impl<'r> FromRequest<'r> for SessionAuth { { if let Ok(session) = db.get_session(session_id) { if let Ok(user) = db.get_user_for_session(session_id) { - if session.expires_at > SystemTime::now() { + if session.expires_at > DateTime::::from(SystemTime::now()) { return Outcome::Success(SessionAuth { user, session_id }); } } diff --git a/src/middleware/token_auth.rs b/src/middleware/token_auth.rs index cb9f61c..3eaa403 100644 --- a/src/middleware/token_auth.rs +++ b/src/middleware/token_auth.rs @@ -1,12 +1,12 @@ -use std::time::SystemTime; - use crate::db::api_token::PlainToken; use crate::db::Database; use crate::models; +use chrono::{DateTime, Utc}; use rocket::http::hyper::header; use rocket::http::Status; use rocket::request::{FromRequest, Outcome}; use rocket::Request; +use std::time::SystemTime; pub struct TokenAuth { pub token: models::ApiToken, @@ -42,10 +42,9 @@ impl<'r> FromRequest<'r> for TokenAuth { if auth_header.starts_with("Bearer ") { let token = auth_header.trim_start_matches("Bearer "); if let Ok(token) = db.get_token(PlainToken::from(token.to_string())) { - if token - .expires_at - .map_or(true, |expires_at| expires_at > SystemTime::now()) - { + if token.expires_at.map_or(true, |expires_at| { + expires_at > DateTime::::from(SystemTime::now()) + }) { return Outcome::Success(TokenAuth { token }); } return Outcome::Error((Status::Unauthorized, TokenAuthError::Expired)); diff --git a/src/models.rs b/src/models.rs index 088ab06..7d443da 100644 --- a/src/models.rs +++ b/src/models.rs @@ -3,7 +3,6 @@ use diesel::prelude::*; use diesel::sql_types::{Nullable, Text, Timestamptz}; use diesel::QueryableByName; use serde::Serialize; -use std::time::SystemTime; use uuid::Uuid; #[derive(Queryable, Selectable, Debug, Clone)] @@ -17,7 +16,7 @@ pub struct User { pub avatar_url: Option, pub email: Option, pub is_admin: bool, - pub created_at: SystemTime, + pub created_at: DateTime, } #[derive(Insertable)] @@ -37,15 +36,15 @@ pub struct NewUser { pub struct Session { pub id: Uuid, pub user_id: Uuid, - pub expires_at: SystemTime, - pub created_at: SystemTime, + pub expires_at: DateTime, + pub created_at: DateTime, } #[derive(Insertable)] #[diesel(table_name = crate::schema::sessions)] pub struct NewSession { pub user_id: Uuid, - pub expires_at: SystemTime, + pub expires_at: DateTime, } #[derive(Queryable, Selectable, Debug, PartialEq, Eq)] @@ -55,8 +54,8 @@ pub struct ApiToken { pub id: Uuid, pub user_id: Uuid, pub friendly_name: String, - pub expires_at: Option, - pub created_at: SystemTime, + pub expires_at: Option>, + pub created_at: DateTime, } #[derive(Insertable)] @@ -65,7 +64,7 @@ pub struct NewApiToken { pub user_id: Uuid, pub friendly_name: String, pub token: Vec, - pub expires_at: Option, + pub expires_at: Option>, } #[derive(Queryable, Selectable, Debug, Clone)] @@ -77,7 +76,7 @@ pub struct Upload { pub forc_version: String, pub abi_ipfs_hash: Option, pub bytecode_identifier: Option, - pub created_at: SystemTime, + pub created_at: DateTime, } #[derive(Insertable, Debug)] @@ -146,15 +145,15 @@ pub struct NewPackageVersion { #[derive(QueryableByName, Serialize, Debug)] #[serde(rename_all = "camelCase")] -pub struct RecentPackage { - #[sql_type = "Text"] - pub name: String, // Corresponds to `p.package_name as name` - #[sql_type = "Text"] - pub version: String, // Corresponds to `pv.num as version` - #[sql_type = "Nullable"] - pub description: Option, // Corresponds to `pv.package_description as description`, which might be nullable - #[sql_type = "Timestamptz"] - pub created_at: DateTime, // Corresponds to `p.created_at as created_at` - #[sql_type = "Timestamptz"] - pub updated_at: DateTime, // Corresponds to `pv.created_at as updated_at` +pub struct PackagePreview { + #[diesel(sql_type = Text)] + pub name: String, + #[diesel(sql_type = Text)] + pub version: String, + #[diesel(sql_type = Nullable)] + pub description: Option, + #[diesel(sql_type = Timestamptz)] + pub created_at: DateTime, + #[diesel(sql_type = Timestamptz)] + pub updated_at: DateTime, } diff --git a/src/schema.rs b/src/schema.rs index 921cd32..b5513c9 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -6,8 +6,8 @@ diesel::table! { user_id -> Uuid, friendly_name -> Varchar, token -> Bytea, - expires_at -> Nullable, - created_at -> Timestamp, + expires_at -> Nullable, + created_at -> Timestamptz, } } @@ -44,8 +44,8 @@ diesel::table! { sessions (id) { id -> Uuid, user_id -> Uuid, - expires_at -> Timestamp, - created_at -> Timestamp, + expires_at -> Timestamptz, + created_at -> Timestamptz, } } @@ -56,7 +56,7 @@ diesel::table! { forc_version -> Varchar, abi_ipfs_hash -> Nullable, bytecode_identifier -> Nullable, - created_at -> Timestamp, + created_at -> Timestamptz, } } @@ -69,7 +69,7 @@ diesel::table! { avatar_url -> Nullable, email -> Nullable, is_admin -> Bool, - created_at -> Timestamp, + created_at -> Timestamptz, } } diff --git a/src/upload.rs b/src/upload.rs index bbfa456..c1e82df 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -223,11 +223,12 @@ pub fn install_forc_at_path(forc_version: &str, forc_path: &Path) -> Result<(), #[cfg(test)] mod tests { + use serial_test::serial; use crate::pinata::MockPinataClient; - use super::*; #[tokio::test] + #[serial] async fn handle_project_upload_success() { let upload_id = Uuid::new_v4(); let upload_dir = PathBuf::from("tmp/uploads/").join(upload_id.to_string()); diff --git a/src/util.rs b/src/util.rs index b180fa8..563745e 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,13 +1,5 @@ use semver::Version; -use std::{path::Path, time::SystemTime}; - -pub fn sys_time_to_epoch(sys_time: SystemTime) -> u64 { - sys_time - .duration_since(SystemTime::UNIX_EPOCH) - .expect("convert time to epoch") - .as_secs() - * 1000 -} +use std::path::Path; pub fn validate_or_format_semver(version: &str) -> Option { // Remove the leading 'v' if it exists @@ -40,6 +32,7 @@ mod tests { use super::*; use std::env; use std::fs; + use serial_test::serial; use tempfile::tempdir; #[test] @@ -69,6 +62,7 @@ mod tests { } #[test] + #[serial] fn test_load_env() { // Save the current directory let original_dir = env::current_dir().unwrap(); From e95d51eb02a2b10a6103b7badc08a7fe480a7049 Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 22:17:08 -0800 Subject: [PATCH 08/14] fix fmt --- .github/workflows/backend-ci.yml | 7 +++++-- src/upload.rs | 4 ++-- src/util.rs | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 792e81a..bccee86 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -74,8 +74,11 @@ jobs: with: profile: minimal toolchain: ${{ env.RUST_VERSION }} - - uses: docker-practice/actions-setup-docker@master - timeout-minutes: 12 + # Set up Docker (already available on GitHub-hosted runners) + - name: Set up Docker + run: | + docker --version + docker info - run: ./scripts/start_local_db.sh - name: setup binstall uses: taiki-e/install-action@cargo-binstall diff --git a/src/upload.rs b/src/upload.rs index c1e82df..bd5e57a 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -223,9 +223,9 @@ pub fn install_forc_at_path(forc_version: &str, forc_path: &Path) -> Result<(), #[cfg(test)] mod tests { - use serial_test::serial; - use crate::pinata::MockPinataClient; use super::*; + use crate::pinata::MockPinataClient; + use serial_test::serial; #[tokio::test] #[serial] diff --git a/src/util.rs b/src/util.rs index 563745e..3fa6a4d 100644 --- a/src/util.rs +++ b/src/util.rs @@ -30,9 +30,9 @@ pub fn load_env() { #[cfg(test)] mod tests { use super::*; + use serial_test::serial; use std::env; use std::fs; - use serial_test::serial; use tempfile::tempdir; #[test] From a3e4c357697d1765a8e31984620abb6256dbb58f Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 23:06:51 -0800 Subject: [PATCH 09/14] clippy --- tests/db_integration.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/db_integration.rs b/tests/db_integration.rs index e61f853..775671b 100644 --- a/tests/db_integration.rs +++ b/tests/db_integration.rs @@ -7,6 +7,7 @@ use serial_test::serial; /// Note: Integration tests for the database module assume that the database is running and that the DATABASE_URL environment variable is set. /// This should be done by running `./scripts/start_local_db.sh` before running the tests. +// Test constants const TEST_LOGIN_1: &str = "AliceBobbins"; const TEST_FULL_NAME_1: &str = "Alice Bobbins"; const TEST_EMAIL_1: &str = "alice@bob.com"; From e66e9c3839dc47178a0aaea74acd714cb29945b6 Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 23:21:10 -0800 Subject: [PATCH 10/14] npm lint --- app/package-lock.json | 37 ------------------- .../dahboard/components/PackageDashboard.tsx | 2 +- .../detail/components/PackageDetail.tsx | 6 +-- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index f289321..b1c93a9 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -22,7 +22,6 @@ "@types/react-dom": "^18.2.22", "axios": "^1.6.8", "react": "^18.2.0", - "react-cookie": "^7.1.4", "react-dom": "^18.2.0", "react-router-dom": "^6.22.3", "react-scripts": "5.0.1", @@ -4524,11 +4523,6 @@ "@types/node": "*" } }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" - }, "node_modules/@types/eslint": { "version": "8.56.6", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", @@ -4582,15 +4576,6 @@ "@types/node": "*" } }, - "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", - "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", - "dependencies": { - "@types/react": "*", - "hoist-non-react-statics": "^3.3.0" - } - }, "node_modules/@types/html-minifier-terser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", @@ -15281,19 +15266,6 @@ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, - "node_modules/react-cookie": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-7.1.4.tgz", - "integrity": "sha512-wDxxa/HYaSXSMlyWJvJ5uZTzIVtQTPf1gMksFgwAz/2/W3lCtY8r4OChCXMPE7wax0PAdMY97UkNJedGv7KnDw==", - "dependencies": { - "@types/hoist-non-react-statics": "^3.3.5", - "hoist-non-react-statics": "^3.3.2", - "universal-cookie": "^7.0.0" - }, - "peerDependencies": { - "react": ">= 16.3.0" - } - }, "node_modules/react-dev-utils": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", @@ -17659,15 +17631,6 @@ "node": ">=8" } }, - "node_modules/universal-cookie": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-7.1.4.tgz", - "integrity": "sha512-Q+DVJsdykStWRMtXr2Pdj3EF98qZHUH/fXv/gwFz/unyToy1Ek1w5GsWt53Pf38tT8Gbcy5QNsj61Xe9TggP4g==", - "dependencies": { - "@types/cookie": "^0.6.0", - "cookie": "^0.6.0" - } - }, "node_modules/universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", diff --git a/app/src/features/dahboard/components/PackageDashboard.tsx b/app/src/features/dahboard/components/PackageDashboard.tsx index d15174f..4c6f848 100644 --- a/app/src/features/dahboard/components/PackageDashboard.tsx +++ b/app/src/features/dahboard/components/PackageDashboard.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React from 'react'; import { Box, Card, diff --git a/app/src/features/detail/components/PackageDetail.tsx b/app/src/features/detail/components/PackageDetail.tsx index b3f921f..b1f91d5 100644 --- a/app/src/features/detail/components/PackageDetail.tsx +++ b/app/src/features/detail/components/PackageDetail.tsx @@ -139,13 +139,13 @@ const PackageDetail: React.FC = () => { Links - Repository: https://github.com/example/{name} + Repository: https://github.com/ - Documentation: https://docs.example.com/{name} + Documentation: https://github.com/ - Homepage: https://www.example.com/{name} + Homepage: https://github.com/ From 51f0af06e4aa50c6b909d18fd9ad593f34c84ca7 Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Fri, 10 Jan 2025 23:44:17 -0800 Subject: [PATCH 11/14] clippy --- tests/db_integration.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/db_integration.rs b/tests/db_integration.rs index 775671b..535e0fb 100644 --- a/tests/db_integration.rs +++ b/tests/db_integration.rs @@ -1,12 +1,12 @@ +//! Note: Integration tests for the database module assume that the database is running and that the DATABASE_URL environment variable is set. +//! This should be done by running `./scripts/start_local_db.sh` before running the tests. + use diesel::RunQueryDsl as _; use forc_pub::api; use forc_pub::db::{Database, DbConn}; use forc_pub::models::{NewUpload, PackageVersion}; use serial_test::serial; -/// Note: Integration tests for the database module assume that the database is running and that the DATABASE_URL environment variable is set. -/// This should be done by running `./scripts/start_local_db.sh` before running the tests. - // Test constants const TEST_LOGIN_1: &str = "AliceBobbins"; const TEST_FULL_NAME_1: &str = "Alice Bobbins"; From 6d1749ac9d086e342fd442104461fe6bb6cbe97d Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:21:26 -0800 Subject: [PATCH 12/14] feedback --- README.md | 2 +- src/db/user_session.rs | 8 +++----- src/middleware/session_auth.rs | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index baaf94f..40f2cc6 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Before starting the server, the local database must be up and running. ./scripts/start_local_db.sh ``` -Next, set up the environment by filling in the `.env` file with your Pinata test gateway details. +Next, set up the environment by copying `.env` to `.env.local`, and modifying `.env.local` with your Pinata test gateway details and Github App env (if testing github login functionality). Now we can run the server with: diff --git a/src/db/user_session.rs b/src/db/user_session.rs index e4ea91f..f462770 100644 --- a/src/db/user_session.rs +++ b/src/db/user_session.rs @@ -1,9 +1,9 @@ use super::error::DatabaseError; use super::{api, models, schema, DbConn}; -use chrono::{DateTime, Utc}; +use chrono::Utc; use diesel::prelude::*; use diesel::upsert::excluded; -use std::time::{Duration, SystemTime}; +use std::time::Duration; use uuid::Uuid; impl DbConn { @@ -39,9 +39,7 @@ impl DbConn { let new_session = models::NewSession { user_id: saved_user.id, - expires_at: DateTime::::from( - SystemTime::now() + Duration::from_secs(u64::from(expires_in)), - ), + expires_at: Utc::now() + Duration::from_secs(u64::from(expires_in)), }; // Insert new session diff --git a/src/middleware/session_auth.rs b/src/middleware/session_auth.rs index c61148c..c97710d 100644 --- a/src/middleware/session_auth.rs +++ b/src/middleware/session_auth.rs @@ -1,10 +1,9 @@ use crate::db::Database; use crate::models; -use chrono::{DateTime, Utc}; +use chrono::Utc; use rocket::http::Status; use rocket::request::{FromRequest, Outcome}; use rocket::Request; -use std::time::SystemTime; use uuid::Uuid; pub const SESSION_COOKIE_NAME: &str = "fp_session"; @@ -45,7 +44,7 @@ impl<'r> FromRequest<'r> for SessionAuth { { if let Ok(session) = db.get_session(session_id) { if let Ok(user) = db.get_user_for_session(session_id) { - if session.expires_at > DateTime::::from(SystemTime::now()) { + if session.expires_at > Utc::now() { return Outcome::Success(SessionAuth { user, session_id }); } } From 80c4a30b3648dc2994b99401483c110872a8b9ec Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:25:29 -0800 Subject: [PATCH 13/14] update expects --- tests/db_integration.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/db_integration.rs b/tests/db_integration.rs index 535e0fb..90a60a3 100644 --- a/tests/db_integration.rs +++ b/tests/db_integration.rs @@ -93,7 +93,7 @@ fn test_api_tokens() { let session = db .new_user_session(&mock_user_1(), 1000) - .expect("result is ok"); + .expect("session is ok"); let user = db.get_user_for_session(session.id).expect("result is ok"); // Insert tokens @@ -138,7 +138,7 @@ fn test_package_versions() { // Set up session, user, token, and upload. let session = db .new_user_session(&mock_user_1(), 1000) - .expect("result is ok"); + .expect("session is ok"); let user = db.get_user_for_session(session.id).expect("user is ok"); let (token, _) = db .new_token(user.id, "test token".to_string()) @@ -151,7 +151,7 @@ fn test_package_versions() { abi_ipfs_hash: None, bytecode_identifier: None, }) - .expect("result is ok"); + .expect("upload is ok"); // Insert a package version for a package that doesn't exist let request = api::publish::PublishRequest { @@ -189,7 +189,7 @@ fn test_package_versions() { ); let pkg_result = db .get_package_by_id(version_result.package_id) - .expect("result is ok"); + .expect("pkg result is ok"); assert_eq!(pkg_result.package_name, request.package_name); assert_eq!(pkg_result.user_owner, user.id); assert_eq!(pkg_result.default_version, Some(version_result.id)); @@ -231,7 +231,7 @@ fn test_package_versions() { ); let pkg_result = db .get_package_by_id(version_result.package_id) - .expect("result is ok"); + .expect("pkg result is ok"); assert_eq!(pkg_result.package_name, request.package_name); assert_eq!(pkg_result.user_owner, user.id); assert_eq!(pkg_result.default_version, Some(version_result.id)); From a59937dda8833813c44046767fa07cb943b05fda Mon Sep 17 00:00:00 2001 From: Sophie <47993817+sdankel@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:47:26 -0800 Subject: [PATCH 14/14] input validation --- Cargo.lock | 2 ++ Cargo.toml | 1 + src/api/publish.rs | 31 +++++++++++++++++++++++++++---- src/db/package_version.rs | 14 ++++++++++---- tests/db_integration.rs | 39 +++++++++++++++++++++++---------------- 5 files changed, 63 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8450d50..ca6f1ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1354,6 +1354,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", + "url", "uuid", ] @@ -4970,6 +4971,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 726107b..12c6bd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,3 +33,4 @@ tracing = "0.1.41" tracing-subscriber = "0.3.19" tempfile = "3.14.0" chrono = { version = "0.4.39", features = ["serde"] } +url = { version = "2.5.4", features = ["serde"] } diff --git a/src/api/publish.rs b/src/api/publish.rs index 973adf2..d14c73e 100644 --- a/src/api/publish.rs +++ b/src/api/publish.rs @@ -1,21 +1,44 @@ +use regex::Regex; use rocket::serde::{Deserialize, Serialize}; +use serde::Deserializer; +use url::Url; use uuid::Uuid; +fn is_valid_package_name(name: &str) -> bool { + // Must start with a letter, can contain letters, numbers, underscores and hyphens + let re = Regex::new(r"^[a-zA-Z][\w-]*$").unwrap(); + re.is_match(name) +} + /// The publish request. #[derive(Deserialize, Debug)] pub struct PublishRequest { + #[serde(deserialize_with = "validate_package_name")] pub package_name: String, pub upload_id: Uuid, pub num: String, pub package_description: Option, - pub repository: Option, - pub documentation: Option, - pub homepage: Option, - pub urls: Vec>, + pub repository: Option, + pub documentation: Option, + pub homepage: Option, + pub urls: Vec, pub readme: Option, pub license: Option, } +fn validate_package_name<'de, D>(deserializer: D) -> Result +where + D: Deserializer<'de>, +{ + let name = String::deserialize(deserializer)?; + if !is_valid_package_name(&name) { + return Err(serde::de::Error::custom( + "Package name must start with a letter and contain only letters, numbers, underscores or hyphens" + )); + } + Ok(name) +} + /// The response to an upload_project request. #[derive(Serialize, Debug)] pub struct UploadResponse { diff --git a/src/db/package_version.rs b/src/db/package_version.rs index 79ee70d..1e568f5 100644 --- a/src/db/package_version.rs +++ b/src/db/package_version.rs @@ -42,6 +42,12 @@ impl DbConn { Ok(saved_package) }?; + let urls = request + .urls + .iter() + .map(|url| Some(url.to_string())) + .collect(); + // Insert a new package version. let new_version = models::NewPackageVersion { package_id: package.id, @@ -50,10 +56,10 @@ impl DbConn { upload_id: request.upload_id, num: request.num.clone(), package_description: request.package_description.clone(), - repository: request.repository.clone(), - documentation: request.documentation.clone(), - homepage: request.homepage.clone(), - urls: request.urls.clone(), + repository: request.repository.clone().map(|url| url.to_string()), + documentation: request.documentation.clone().map(|url| url.to_string()), + homepage: request.homepage.clone().map(|url| url.to_string()), + urls, readme: request.readme.clone(), license: request.license.clone(), }; diff --git a/tests/db_integration.rs b/tests/db_integration.rs index 90a60a3..ddd9c28 100644 --- a/tests/db_integration.rs +++ b/tests/db_integration.rs @@ -1,11 +1,14 @@ //! Note: Integration tests for the database module assume that the database is running and that the DATABASE_URL environment variable is set. //! This should be done by running `./scripts/start_local_db.sh` before running the tests. +use std::vec; + use diesel::RunQueryDsl as _; use forc_pub::api; use forc_pub::db::{Database, DbConn}; use forc_pub::models::{NewUpload, PackageVersion}; use serial_test::serial; +use url::Url; // Test constants const TEST_LOGIN_1: &str = "AliceBobbins"; @@ -16,6 +19,10 @@ const TEST_URL_2: &str = "url2.url"; const TEST_LOGIN_2: &str = "foobar"; const TEST_TOKEN_NAME_1: &str = "test token 1"; const TEST_TOKEN_NAME_2: &str = "test token 2"; +const TEST_URL_REPO: &str = "https://example.com/repository"; +const TEST_URL_DOC: &str = "https://example.com/documentation"; +const TEST_URL_HOME: &str = "https://example.com/homepage"; +const TEST_URL_OTHER: &str = "https://example.com/other"; fn clear_tables(db: &mut DbConn) { diesel::delete(forc_pub::schema::package_versions::table) @@ -159,10 +166,10 @@ fn test_package_versions() { upload_id: upload.id, num: "0.1.0".into(), package_description: Some("test description".into()), - repository: Some("test repository".into()), - documentation: Some("test documentation".into()), - homepage: Some("test homepage".into()), - urls: vec![Some("test url".into())], + repository: Url::parse(TEST_URL_REPO).ok(), + documentation: Url::parse(TEST_URL_DOC).ok(), + homepage: Url::parse(TEST_URL_HOME).ok(), + urls: vec![Url::parse(TEST_URL_OTHER).expect("other url")], readme: Some("test readme".into()), license: Some("test license".into()), }; @@ -178,10 +185,10 @@ fn test_package_versions() { upload_id: upload.id, num: request.num, package_description: request.package_description, - repository: request.repository, - documentation: request.documentation, - homepage: request.homepage, - urls: request.urls, + repository: Some(TEST_URL_REPO.into()), + documentation: Some(TEST_URL_DOC.into()), + homepage: Some(TEST_URL_HOME.into()), + urls: vec![Some(TEST_URL_OTHER.into())], readme: request.readme, license: request.license, created_at: version_result.created_at, @@ -200,10 +207,10 @@ fn test_package_versions() { upload_id: upload.id, num: "0.2.0".into(), package_description: Some("test description 2".into()), - repository: Some("test repository 2".into()), - documentation: Some("test documentation 2".into()), - homepage: Some("test homepage 2".into()), - urls: vec![Some("test url 2".into())], + repository: Url::parse(TEST_URL_REPO).ok(), + documentation: Url::parse(TEST_URL_DOC).ok(), + homepage: Url::parse(TEST_URL_HOME).ok(), + urls: vec![Url::parse(TEST_URL_OTHER).expect("other url")], readme: Some("test readme 2".into()), license: Some("test licens 2".into()), }; @@ -220,10 +227,10 @@ fn test_package_versions() { upload_id: upload.id, num: request.num, package_description: request.package_description, - repository: request.repository, - documentation: request.documentation, - homepage: request.homepage, - urls: request.urls, + repository: Some(TEST_URL_REPO.into()), + documentation: Some(TEST_URL_DOC.into()), + homepage: Some(TEST_URL_HOME.into()), + urls: vec![Some(TEST_URL_OTHER.into())], readme: request.readme, license: request.license, created_at: version_result.created_at,