diff --git a/Cargo.toml b/Cargo.toml index 1a587c7..6705538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,105 +24,5 @@ vercel_runtime = "1.1.4" 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" - -[[bin]] -name = "openvsx-versions-latest" -path = "api/openvsx/[namespace]/[extension]/versions/latest.rs" - -[[bin]] -name = "openvsx-versions-all" -path = "api/openvsx/[namespace]/[extension]/versions/all.rs" +name = "main" +path = "api/main.rs" diff --git a/api/crate/[crate]/versions/[version].rs b/api/crate/[crate]/versions/[version].rs index 811b6bb..73d60b3 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 1324e65..0fb820f 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) @@ -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/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 e25d4cc..37b56b7 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}, CacheControl, 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 { @@ -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/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..a9f1671 --- /dev/null +++ b/api/main.rs @@ -0,0 +1,13 @@ +use mason_registry_api::setup_tracing; +use vercel_runtime::{bundled_api, run, Body, Error, Request, Response}; + +#[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/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/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..68c3a16 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.7" } }, "rewrites": [