From e45f3c2cf995f3966b0141a5a1f17693c5013239 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Fri, 13 Dec 2024 19:35:31 -0800 Subject: [PATCH] cloud: use response_ok helper function --- rbx_asset/src/cloud.rs | 50 +++++++++++++++++++++++++---------------- rbx_asset/src/cookie.rs | 48 +++++++-------------------------------- rbx_asset/src/lib.rs | 35 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 59 deletions(-) diff --git a/rbx_asset/src/cloud.rs b/rbx_asset/src/cloud.rs index bf8a7a1..e94c1aa 100644 --- a/rbx_asset/src/cloud.rs +++ b/rbx_asset/src/cloud.rs @@ -1,3 +1,5 @@ +use crate::ResponseError; + #[derive(Debug,serde::Deserialize,serde::Serialize)] #[allow(nonstandard_style,dead_code)] pub enum AssetType{ @@ -40,6 +42,7 @@ impl AssetOperation{ #[derive(Debug)] pub enum CreateError{ Parse(url::ParseError), + Response(ResponseError), Serialize(serde_json::Error), Reqwest(reqwest::Error), } @@ -102,6 +105,7 @@ pub struct UpdatePlaceResponse{ #[derive(Debug)] pub enum UpdateError{ ParseError(url::ParseError), + Response(ResponseError), SerializeError(serde_json::Error), Reqwest(reqwest::Error), } @@ -167,6 +171,7 @@ pub struct GetAssetRequest{ #[derive(Debug)] pub enum GetError{ ParseError(url::ParseError), + Response(ResponseError), Reqwest(reqwest::Error), IO(std::io::Error) } @@ -203,6 +208,7 @@ pub struct AssetVersionsResponse{ #[derive(Debug)] pub enum AssetVersionsError{ ParseError(url::ParseError), + Response(ResponseError), Reqwest(reqwest::Error), } impl std::fmt::Display for AssetVersionsError{ @@ -238,6 +244,7 @@ pub struct InventoryPageResponse{ #[derive(Debug)] pub enum InventoryPageError{ ParseError(url::ParseError), + Response(ResponseError), Reqwest(reqwest::Error), } impl std::fmt::Display for InventoryPageError{ @@ -368,9 +375,9 @@ impl CloudContext{ .text("request",request_config) .part("fileContent",part); - let operation=self.post_form(url,form).await - .map_err(CreateError::Reqwest)? - .error_for_status().map_err(CreateError::Reqwest)? + let operation=crate::response_ok( + self.post_form(url,form).await.map_err(CreateError::Reqwest)? + ).await.map_err(CreateError::Response)? .json::().await.map_err(CreateError::Reqwest)?; Ok(AssetOperation{ @@ -387,10 +394,9 @@ impl CloudContext{ .text("request",request_config) .part("fileContent",reqwest::multipart::Part::bytes(body)); - let operation=self.patch_form(url,form).await - .map_err(UpdateError::Reqwest)? - //roblox api documentation is very poor, just give the status code and drop the json - .error_for_status().map_err(UpdateError::Reqwest)? + let operation=crate::response_ok( + self.patch_form(url,form).await.map_err(UpdateError::Reqwest)? + ).await.map_err(UpdateError::Response)? .json::().await.map_err(UpdateError::Reqwest)?; Ok(AssetOperation{ @@ -401,24 +407,27 @@ impl CloudContext{ let raw_url=format!("https://apis.roblox.com/assets/v1/operations/{}",config.operation_id); let url=reqwest::Url::parse(raw_url.as_str()).map_err(GetError::ParseError)?; - self.get(url).await.map_err(GetError::Reqwest)? - .error_for_status().map_err(GetError::Reqwest)? + crate::response_ok( + self.get(url).await.map_err(GetError::Reqwest)? + ).await.map_err(GetError::Response)? .json::().await.map_err(GetError::Reqwest) } pub async fn get_asset_info(&self,config:GetAssetInfoRequest)->Result{ let raw_url=format!("https://apis.roblox.com/assets/v1/assets/{}",config.asset_id); let url=reqwest::Url::parse(raw_url.as_str()).map_err(GetError::ParseError)?; - self.get(url).await.map_err(GetError::Reqwest)? - .error_for_status().map_err(GetError::Reqwest)? + crate::response_ok( + self.get(url).await.map_err(GetError::Reqwest)? + ).await.map_err(GetError::Response)? .json::().await.map_err(GetError::Reqwest) } pub async fn get_asset_version(&self,config:GetAssetVersionRequest)->Result,GetError>{ let raw_url=format!("https://apis.roblox.com/assets/v1/assets/{}/versions/{}",config.asset_id,config.version); let url=reqwest::Url::parse(raw_url.as_str()).map_err(GetError::ParseError)?; - let body=self.get(url).await.map_err(GetError::Reqwest)? - .error_for_status().map_err(GetError::Reqwest)? + let body=crate::response_ok( + self.get(url).await.map_err(GetError::Reqwest)? + ).await.map_err(GetError::Response)? .bytes().await.map_err(GetError::Reqwest)?; match maybe_gzip_decode(&mut std::io::Cursor::new(body)){ @@ -441,8 +450,9 @@ impl CloudContext{ let raw_url=format!("https://apis.roblox.com/assets/v1/assets/{}/versions",config.asset_id); let url=reqwest::Url::parse(raw_url.as_str()).map_err(AssetVersionsError::ParseError)?; - self.get(url).await.map_err(AssetVersionsError::Reqwest)? - .error_for_status().map_err(AssetVersionsError::Reqwest)? + crate::response_ok( + self.get(url).await.map_err(AssetVersionsError::Reqwest)? + ).await.map_err(AssetVersionsError::Response)? .json::().await.map_err(AssetVersionsError::Reqwest) } pub async fn inventory_page(&self,config:InventoryPageRequest)->Result{ @@ -455,8 +465,9 @@ impl CloudContext{ } } - self.get(url).await.map_err(InventoryPageError::Reqwest)? - .error_for_status().map_err(InventoryPageError::Reqwest)? + crate::response_ok( + self.get(url).await.map_err(InventoryPageError::Reqwest)? + ).await.map_err(InventoryPageError::Response)? .json::().await.map_err(InventoryPageError::Reqwest) } pub async fn update_place(&self,config:UpdatePlaceRequest,body:impl Into+Clone)->Result{ @@ -468,8 +479,9 @@ impl CloudContext{ query.append_pair("versionType","Published"); } - self.post(url,body).await.map_err(UpdateError::Reqwest)? - .error_for_status().map_err(UpdateError::Reqwest)? + crate::response_ok( + self.post(url,body).await.map_err(UpdateError::Reqwest)? + ).await.map_err(UpdateError::Response)? .json::().await.map_err(UpdateError::Reqwest) } } diff --git a/rbx_asset/src/cookie.rs b/rbx_asset/src/cookie.rs index f13bcb0..6881c31 100644 --- a/rbx_asset/src/cookie.rs +++ b/rbx_asset/src/cookie.rs @@ -1,3 +1,5 @@ +use crate::ResponseError; + #[derive(Debug)] pub enum PostError{ Reqwest(reqwest::Error), @@ -199,40 +201,6 @@ fn read_readable(mut readable:impl std::io::Read)->std::io::Result>{ readable.read_to_end(&mut contents)?; Ok(contents) } -#[allow(dead_code)] -#[derive(Debug)] -pub struct StatusCodeWithUrlAndBody{ - pub status_code:reqwest::StatusCode, - pub url:url::Url, - pub body:String, -} -#[derive(Debug)] -pub enum ResponseError{ - Reqwest(reqwest::Error), - StatusCodeWithUrlAndBody(StatusCodeWithUrlAndBody), -} -impl std::fmt::Display for ResponseError{ - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f,"{self:?}") - } -} -impl std::error::Error for ResponseError{} -// lazy function to draw out meaningful info from http response on failure -async fn response_ok(response:reqwest::Response)->Result{ - let status_code=response.status(); - if status_code.is_success(){ - Ok(response) - }else{ - let url=response.url().to_owned(); - let bytes=response.bytes().await.map_err(ResponseError::Reqwest)?; - let body=String::from_utf8_lossy(&bytes).to_string(); - Err(ResponseError::StatusCodeWithUrlAndBody(StatusCodeWithUrlAndBody{ - status_code, - url, - body, - })) - } -} #[derive(Clone)] pub struct Cookie(String); @@ -300,7 +268,7 @@ impl CookieContext{ } } - response_ok( + crate::response_ok( self.post(url,body).await.map_err(CreateError::PostError)? ).await.map_err(CreateError::Response)? .json::().await.map_err(CreateError::Reqwest) @@ -332,7 +300,7 @@ impl CookieContext{ } } - response_ok( + crate::response_ok( self.post(url,body).await.map_err(UploadError::PostError)? ).await.map_err(UploadError::Response)? .json::().await.map_err(UploadError::Reqwest) @@ -347,7 +315,7 @@ impl CookieContext{ query.append_pair("version",version.to_string().as_str()); } } - let body=response_ok( + let body=crate::response_ok( self.get(url).await.map_err(GetError::Reqwest)? ).await.map_err(GetError::Response)? .bytes().await.map_err(GetError::Reqwest)?; @@ -370,7 +338,7 @@ impl CookieContext{ query.append_pair("cursor",cursor); } } - response_ok( + crate::response_ok( self.get(url).await.map_err(PageError::Reqwest)? ).await.map_err(PageError::Response)? .json::().await.map_err(PageError::Reqwest) @@ -385,7 +353,7 @@ impl CookieContext{ query.append_pair("cursor",cursor); } } - response_ok( + crate::response_ok( self.get(url).await.map_err(PageError::Reqwest)? ).await.map_err(PageError::Response)? .json::().await.map_err(PageError::Reqwest) @@ -399,7 +367,7 @@ impl CookieContext{ query.append_pair("cursor",cursor); } } - response_ok( + crate::response_ok( self.get(url).await.map_err(PageError::Reqwest)? ).await.map_err(PageError::Response)? .json::().await.map_err(PageError::Reqwest) diff --git a/rbx_asset/src/lib.rs b/rbx_asset/src/lib.rs index 7baa94b..7728978 100644 --- a/rbx_asset/src/lib.rs +++ b/rbx_asset/src/lib.rs @@ -1,2 +1,37 @@ pub mod cloud; pub mod cookie; + +#[allow(dead_code)] +#[derive(Debug)] +pub struct StatusCodeWithUrlAndBody{ + pub status_code:reqwest::StatusCode, + pub url:url::Url, + pub body:String, +} +#[derive(Debug)] +pub enum ResponseError{ + Reqwest(reqwest::Error), + StatusCodeWithUrlAndBody(StatusCodeWithUrlAndBody), +} +impl std::fmt::Display for ResponseError{ + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f,"{self:?}") + } +} +impl std::error::Error for ResponseError{} +// lazy function to draw out meaningful info from http response on failure +pub async fn response_ok(response:reqwest::Response)->Result{ + let status_code=response.status(); + if status_code.is_success(){ + Ok(response) + }else{ + let url=response.url().to_owned(); + let bytes=response.bytes().await.map_err(ResponseError::Reqwest)?; + let body=String::from_utf8_lossy(&bytes).to_string(); + Err(ResponseError::StatusCodeWithUrlAndBody(StatusCodeWithUrlAndBody{ + status_code, + url, + body, + })) + } +}