From 24d7aeaa04df6c6375026660cb45ab5348a9dfcc Mon Sep 17 00:00:00 2001 From: William Boman Date: Mon, 5 Jun 2023 12:56:43 +0200 Subject: [PATCH 1/3] refactor: merged routes --- Cargo.toml | 96 +------------------ api/crate/[crate]/versions/[version].rs | 10 +- api/crate/[crate]/versions/all.rs | 10 +- api/crate/[crate]/versions/latest.rs | 10 +- .../[owner]/[name]/releases/[release].rs | 10 +- api/github/[owner]/[name]/releases/all.rs | 10 +- api/github/[owner]/[name]/releases/latest.rs | 10 +- api/github/[owner]/[name]/tags/[tag].rs | 10 +- api/github/[owner]/[name]/tags/all.rs | 10 +- api/github/[owner]/[name]/tags/latest.rs | 10 +- api/golang/[package]/versions/all.rs | 10 +- api/main.rs | 13 +++ api/mason/renovate/badge.rs | 10 +- api/mason/sponsors.rs | 10 +- .../[scope]/[package]/versions/[version].rs | 10 +- api/npm/[scope]/[package]/versions/all.rs | 10 +- api/npm/[scope]/[package]/versions/latest.rs | 10 +- .../[vendor]/[package]/versions/[version].rs | 10 +- .../[vendor]/[package]/versions/all.rs | 10 +- .../[vendor]/[package]/versions/latest.rs | 10 +- api/pypi/[package]/versions/[version].rs | 10 +- api/pypi/[package]/versions/all.rs | 10 +- api/pypi/[package]/versions/latest.rs | 10 +- api/rubygems/[gem]/versions/[version].rs | 10 +- api/rubygems/[gem]/versions/all.rs | 10 +- api/rubygems/[gem]/versions/latest.rs | 10 +- vercel.json | 4 +- 27 files changed, 65 insertions(+), 288 deletions(-) create mode 100644 api/main.rs diff --git a/Cargo.toml b/Cargo.toml index 2144a21..0e192d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,97 +24,5 @@ vercel_runtime = "1.0.1" path = "src/lib.rs" [[bin]] -name = "crate-versions-all" -path = "api/crate/[crate]/versions/all.rs" - -[[bin]] -name = "crate-versions-version" -path = "api/crate/[crate]/versions/[version].rs" - -[[bin]] -name = "crate-versions-latest" -path = "api/crate/[crate]/versions/latest.rs" - -[[bin]] -name = "github-releases-latest" -path = "api/github/[owner]/[name]/releases/latest.rs" - -[[bin]] -name = "github-releases-all" -path = "api/github/[owner]/[name]/releases/all.rs" - -[[bin]] -name = "github-releases-release" -path = "api/github/[owner]/[name]/releases/[release].rs" - -[[bin]] -name = "github-tags-latest" -path = "api/github/[owner]/[name]/tags/latest.rs" - -[[bin]] -name = "github-tags-all" -path = "api/github/[owner]/[name]/tags/all.rs" - -[[bin]] -name = "github-tags-tag" -path = "api/github/[owner]/[name]/tags/[tag].rs" - -[[bin]] -name = "npm-versions-latest" -path = "api/npm/[scope]/[package]/versions/latest.rs" - -[[bin]] -name = "npm-versions-all" -path = "api/npm/[scope]/[package]/versions/all.rs" - -[[bin]] -name = "npm-versions-version" -path = "api/npm/[scope]/[package]/versions/[version].rs" - -[[bin]] -name = "pypi-versions-latest" -path = "api/pypi/[package]/versions/latest.rs" - -[[bin]] -name = "pypi-versions-all" -path = "api/pypi/[package]/versions/all.rs" - -[[bin]] -name = "pypi-versions-version" -path = "api/pypi/[package]/versions/[version].rs" - -[[bin]] -name = "rubygems-versions-latest" -path = "api/rubygems/[gem]/versions/latest.rs" - -[[bin]] -name = "rubygems-versions-all" -path = "api/rubygems/[gem]/versions/all.rs" - -[[bin]] -name = "rubygems-versions-version" -path = "api/rubygems/[gem]/versions/[version].rs" - -[[bin]] -name = "packagist-versions-latest" -path = "api/packagist/[vendor]/[package]/versions/latest.rs" - -[[bin]] -name = "packagist-versions-all" -path = "api/packagist/[vendor]/[package]/versions/all.rs" - -[[bin]] -name = "packagist-versions-version" -path = "api/packagist/[vendor]/[package]/versions/[version].rs" - -[[bin]] -name = "golang-versions-all" -path = "api/golang/[package]/versions/all.rs" - -[[bin]] -name = "mason-sponsors" -path = "api/mason/sponsors.rs" - -[[bin]] -name = "mason-renovate-badge" -path = "api/mason/renovate/badge.rs" +name = "main" +path = "api/main.rs" diff --git a/api/crate/[crate]/versions/[version].rs b/api/crate/[crate]/versions/[version].rs index f6894ed..717f570 100644 --- a/api/crate/[crate]/versions/[version].rs +++ b/api/crate/[crate]/versions/[version].rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -27,9 +27,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/crate/[crate]/versions/all.rs b/api/crate/[crate]/versions/all.rs index 830c616..7988a48 100644 --- a/api/crate/[crate]/versions/all.rs +++ b/api/crate/[crate]/versions/all.rs @@ -1,9 +1,9 @@ use http::{Method, StatusCode}; use mason_registry_api::{crates::manager::CratesManager, vercel::parse_url, QueryParams}; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -23,9 +23,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/crate/[crate]/versions/latest.rs b/api/crate/[crate]/versions/latest.rs index b360545..1a7d95e 100644 --- a/api/crate/[crate]/versions/latest.rs +++ b/api/crate/[crate]/versions/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -29,9 +29,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/github/[owner]/[name]/releases/[release].rs b/api/github/[owner]/[name]/releases/[release].rs index 1ec278f..e1d6767 100644 --- a/api/github/[owner]/[name]/releases/[release].rs +++ b/api/github/[owner]/[name]/releases/[release].rs @@ -3,9 +3,9 @@ use mason_registry_api::{ github::{client::GitHubClient, manager::GitHubManager, GitHubTag}, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -28,9 +28,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/github/[owner]/[name]/releases/all.rs b/api/github/[owner]/[name]/releases/all.rs index 840b44d..b03f430 100644 --- a/api/github/[owner]/[name]/releases/all.rs +++ b/api/github/[owner]/[name]/releases/all.rs @@ -8,7 +8,7 @@ use mason_registry_api::{ }; use serde::Serialize; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; #[derive(Serialize)] struct ReleasesResponse(Vec); @@ -19,7 +19,7 @@ impl From> for ReleasesResponse { } } -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -41,9 +41,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/github/[owner]/[name]/releases/latest.rs b/api/github/[owner]/[name]/releases/latest.rs index 712e889..5b02f83 100644 --- a/api/github/[owner]/[name]/releases/latest.rs +++ b/api/github/[owner]/[name]/releases/latest.rs @@ -3,9 +3,9 @@ use mason_registry_api::{ github::{client::GitHubClient, manager::GitHubManager}, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -24,9 +24,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/github/[owner]/[name]/tags/[tag].rs b/api/github/[owner]/[name]/tags/[tag].rs index 0dec143..d56d071 100644 --- a/api/github/[owner]/[name]/tags/[tag].rs +++ b/api/github/[owner]/[name]/tags/[tag].rs @@ -3,9 +3,9 @@ use mason_registry_api::{ github::{api::TagResponse, client::GitHubClient, manager::GitHubManager, GitHubTag}, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -28,9 +28,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/github/[owner]/[name]/tags/all.rs b/api/github/[owner]/[name]/tags/all.rs index ed0dc20..f97f79a 100644 --- a/api/github/[owner]/[name]/tags/all.rs +++ b/api/github/[owner]/[name]/tags/all.rs @@ -8,7 +8,7 @@ use mason_registry_api::{ QueryParams, }; use serde::Serialize; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; #[derive(Serialize)] struct TagsResponse(Vec); @@ -19,7 +19,7 @@ impl From> for TagsResponse { } } -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -41,9 +41,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/github/[owner]/[name]/tags/latest.rs b/api/github/[owner]/[name]/tags/latest.rs index c80ff9f..e51859e 100644 --- a/api/github/[owner]/[name]/tags/latest.rs +++ b/api/github/[owner]/[name]/tags/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -28,9 +28,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/golang/[package]/versions/all.rs b/api/golang/[package]/versions/all.rs index a11c142..1226056 100644 --- a/api/golang/[package]/versions/all.rs +++ b/api/golang/[package]/versions/all.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/main.rs b/api/main.rs new file mode 100644 index 0000000..72e760b --- /dev/null +++ b/api/main.rs @@ -0,0 +1,13 @@ +use mason_registry_api::setup_tracing; +use vercel_runtime::{run, bundled_api, Error, Request, Response, Body}; + +#[tokio::main] +async fn main() -> Result<(), Error> { + setup_tracing(); + run(handler).await +} + +#[bundled_api] +async fn handler(req: Request) -> Result, Error> { + tracing::info!("Handling request: {:?req}"); +} diff --git a/api/mason/renovate/badge.rs b/api/mason/renovate/badge.rs index 281abfa..40aa4b5 100644 --- a/api/mason/renovate/badge.rs +++ b/api/mason/renovate/badge.rs @@ -3,9 +3,9 @@ use mason_registry_api::{ github::GitHubRepo, renovate::{client::RenovateClient, manager::RenovateManager}, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -23,9 +23,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/mason/sponsors.rs b/api/mason/sponsors.rs index 29870e6..5d525a0 100644 --- a/api/mason/sponsors.rs +++ b/api/mason/sponsors.rs @@ -4,7 +4,7 @@ use mason_registry_api::github::{ manager::GitHubManager, }; use serde::Serialize; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; #[derive(Serialize)] pub struct SponsorsResponse { @@ -19,7 +19,7 @@ impl From> for SponsorsResponse { } } -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { let api_key: String = std::env::var("GITHUB_API_KEY")?; if request.method() != Method::GET { @@ -37,9 +37,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/npm/[scope]/[package]/versions/[version].rs b/api/npm/[scope]/[package]/versions/[version].rs index 0976b75..e034f62 100644 --- a/api/npm/[scope]/[package]/versions/[version].rs +++ b/api/npm/[scope]/[package]/versions/[version].rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -30,9 +30,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/npm/[scope]/[package]/versions/all.rs b/api/npm/[scope]/[package]/versions/all.rs index 307ce15..c5ca6d7 100644 --- a/api/npm/[scope]/[package]/versions/all.rs +++ b/api/npm/[scope]/[package]/versions/all.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/npm/[scope]/[package]/versions/latest.rs b/api/npm/[scope]/[package]/versions/latest.rs index bbac1c4..c853fc4 100644 --- a/api/npm/[scope]/[package]/versions/latest.rs +++ b/api/npm/[scope]/[package]/versions/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -29,9 +29,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/packagist/[vendor]/[package]/versions/[version].rs b/api/packagist/[vendor]/[package]/versions/[version].rs index 9f97682..bc8d62f 100644 --- a/api/packagist/[vendor]/[package]/versions/[version].rs +++ b/api/packagist/[vendor]/[package]/versions/[version].rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -27,9 +27,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/packagist/[vendor]/[package]/versions/all.rs b/api/packagist/[vendor]/[package]/versions/all.rs index 9fd9761..715a9b0 100644 --- a/api/packagist/[vendor]/[package]/versions/all.rs +++ b/api/packagist/[vendor]/[package]/versions/all.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/packagist/[vendor]/[package]/versions/latest.rs b/api/packagist/[vendor]/[package]/versions/latest.rs index 5187ad7..f60d270 100644 --- a/api/packagist/[vendor]/[package]/versions/latest.rs +++ b/api/packagist/[vendor]/[package]/versions/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/pypi/[package]/versions/[version].rs b/api/pypi/[package]/versions/[version].rs index 38cf8d5..701696c 100644 --- a/api/pypi/[package]/versions/[version].rs +++ b/api/pypi/[package]/versions/[version].rs @@ -5,9 +5,9 @@ use mason_registry_api::{ QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -28,9 +28,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/pypi/[package]/versions/all.rs b/api/pypi/[package]/versions/all.rs index f86dd7d..f27294f 100644 --- a/api/pypi/[package]/versions/all.rs +++ b/api/pypi/[package]/versions/all.rs @@ -5,9 +5,9 @@ use mason_registry_api::{ QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -27,9 +27,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/pypi/[package]/versions/latest.rs b/api/pypi/[package]/versions/latest.rs index 4c40fb0..a4db953 100644 --- a/api/pypi/[package]/versions/latest.rs +++ b/api/pypi/[package]/versions/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/rubygems/[gem]/versions/[version].rs b/api/rubygems/[gem]/versions/[version].rs index 2c82498..09c2347 100644 --- a/api/rubygems/[gem]/versions/[version].rs +++ b/api/rubygems/[gem]/versions/[version].rs @@ -5,9 +5,9 @@ use mason_registry_api::{ QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -28,9 +28,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/rubygems/[gem]/versions/all.rs b/api/rubygems/[gem]/versions/all.rs index 1b8b591..ac115ae 100644 --- a/api/rubygems/[gem]/versions/all.rs +++ b/api/rubygems/[gem]/versions/all.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/rubygems/[gem]/versions/latest.rs b/api/rubygems/[gem]/versions/latest.rs index e899a2e..659bdd7 100644 --- a/api/rubygems/[gem]/versions/latest.rs +++ b/api/rubygems/[gem]/versions/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/vercel.json b/vercel.json index 87f2766..84a713a 100644 --- a/vercel.json +++ b/vercel.json @@ -1,8 +1,8 @@ { "ignoreCommand": "[ \"$VERCEL_ENV\" != production ]", "functions": { - "api/**/*.rs": { - "runtime": "vercel-rust@4.0.0-beta.1" + "api/main.rs": { + "runtime": "vercel-rust@4.0.1" } }, "rewrites": [ From cf97a328a8cbac445b995eee6ffffc74f6779c10 Mon Sep 17 00:00:00 2001 From: William Boman Date: Wed, 7 Jun 2023 17:25:46 +0200 Subject: [PATCH 2/3] downgrade tracing --- Cargo.lock | 308 ++++++++++++++++------------------------------------- Cargo.toml | 2 +- 2 files changed, 95 insertions(+), 215 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b75ab78..2019304 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -45,7 +45,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -56,7 +56,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -91,9 +91,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -103,9 +103,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" @@ -144,16 +144,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "core-foundation" version = "0.9.3" @@ -188,50 +178,6 @@ dependencies = [ "url", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - [[package]] name = "encoding_rs" version = "0.8.32" @@ -357,7 +303,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -398,9 +344,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -525,9 +471,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -539,12 +485,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -578,9 +523,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -601,9 +546,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -670,33 +615,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "linux-raw-sys" -version = "0.3.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "mason-registry-api" @@ -732,14 +665,13 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -781,15 +713,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ "bitflags", "cfg-if", @@ -808,7 +740,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -819,9 +751,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ "cc", "libc", @@ -848,22 +780,22 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -880,15 +812,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -906,9 +838,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -924,9 +856,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -935,9 +867,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" @@ -945,7 +877,7 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -978,9 +910,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.15" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -1005,17 +937,11 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -1026,9 +952,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -1057,7 +983,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1133,9 +1059,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1144,24 +1070,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", + "windows-sys 0.48.0", ] [[package]] @@ -1181,7 +1099,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1245,7 +1163,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1330,10 +1248,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.38" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -1348,14 +1267,14 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -1385,9 +1304,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -1398,12 +1317,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "url" version = "2.4.0" @@ -1428,7 +1341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef52f9a3a27969627d798b16ab04e9775eee6b03cf88bf24664b93fbfded6734" dependencies = [ "async-trait", - "base64 0.21.0", + "base64 0.21.2", "bytes", "lambda_http", "lambda_runtime", @@ -1493,9 +1406,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1503,24 +1416,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -1530,9 +1443,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1540,28 +1453,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -1583,15 +1496,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -1604,7 +1508,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] @@ -1622,37 +1526,13 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ff1e06e..988fce7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" thiserror = "1.0.40" tokio = { version = "1.28.2", features = ["macros"] } -tracing = { version = "0.1.38", features = ["log"]} +tracing = { version = "0.1.37", features = ["log"]} tracing-subscriber = { version = "0.3.17", default-features = false, features = ["fmt"] } url = "2.4.0" vercel_runtime = "1.0.2" From e7eabe6de028e7efe3307b042c35a93095ed84e8 Mon Sep 17 00:00:00 2001 From: William Boman Date: Wed, 19 Jun 2024 10:13:19 +0200 Subject: [PATCH 3/3] [WIP]: --- api/main.rs | 2 +- api/openvsx/[namespace]/[extension]/versions/all.rs | 10 ++-------- api/openvsx/[namespace]/[extension]/versions/latest.rs | 10 ++-------- vercel.json | 2 +- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/api/main.rs b/api/main.rs index 3b1e90a..a9f1671 100644 --- a/api/main.rs +++ b/api/main.rs @@ -1,5 +1,5 @@ use mason_registry_api::setup_tracing; -use vercel_runtime::{run, bundled_api, Error}; +use vercel_runtime::{bundled_api, run, Body, Error, Request, Response}; #[tokio::main] async fn main() -> Result<(), Error> { diff --git a/api/openvsx/[namespace]/[extension]/versions/all.rs b/api/openvsx/[namespace]/[extension]/versions/all.rs index b0482f7..6b0dbf9 100644 --- a/api/openvsx/[namespace]/[extension]/versions/all.rs +++ b/api/openvsx/[namespace]/[extension]/versions/all.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/api/openvsx/[namespace]/[extension]/versions/latest.rs b/api/openvsx/[namespace]/[extension]/versions/latest.rs index fd0d3f2..3b09410 100644 --- a/api/openvsx/[namespace]/[extension]/versions/latest.rs +++ b/api/openvsx/[namespace]/[extension]/versions/latest.rs @@ -4,9 +4,9 @@ use mason_registry_api::{ vercel::parse_url, QueryParams, }; -use vercel_runtime::{run, Body, Error, Request, Response}; +use vercel_runtime::{Body, Error, Request, Response}; -async fn handler(request: Request) -> Result, Error> { +pub async fn handler(request: Request) -> Result, Error> { if request.method() != Method::GET { return Ok(Response::builder() .status(StatusCode::METHOD_NOT_ALLOWED) @@ -26,9 +26,3 @@ async fn handler(request: Request) -> Result, Error> { Err(err) => mason_registry_api::vercel::err_json(err), } } - -#[tokio::main] -async fn main() -> Result<(), Error> { - mason_registry_api::setup_tracing(); - run(handler).await -} diff --git a/vercel.json b/vercel.json index 84a713a..68c3a16 100644 --- a/vercel.json +++ b/vercel.json @@ -2,7 +2,7 @@ "ignoreCommand": "[ \"$VERCEL_ENV\" != production ]", "functions": { "api/main.rs": { - "runtime": "vercel-rust@4.0.1" + "runtime": "vercel-rust@4.0.7" } }, "rewrites": [