set file extension for known file types using fourcc

Cargo.toml

@@ -1,26 +1,24 @@
+workspace = { members = ["rbx_asset"] }
 [package]
 name = "asset-tool"
-version = "0.1.0"
+version = "0.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.75"
-chrono = { version = "0.4.31", features = ["serde"] }
 clap = { version = "4.4.2", features = ["derive"] }
-flate2 = "1.0.28"
 futures = "0.3.30"
 git2 = "0.18.1"
 lazy-regex = "3.1.0"
 pollster = "0.3.0"
 rayon = "1.8.0"
-rbx_binary = { path = "../rbx-dom/rbx_binary"}
-rbx_dom_weak = { path = "../rbx-dom/rbx_dom_weak"}
-rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database"}
-rbx_xml = { path = "../rbx-dom/rbx_xml"}
-reqwest = { version = "0.11.23", features = ["cookies", "json"] }
-serde = { version = "1.0.195", features = ["derive"] }
+rbx_asset = { path = "rbx_asset" }
+rbx_binary = "0.7.4"
+rbx_dom_weak = "2.7.0"
+rbx_reflection_database = "0.2.10"
+rbx_xml = "0.13.3"
 serde_json = "1.0.111"
 tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread", "fs"] }
 

LICENSE

@@ -1,9 +1,23 @@
-MIT License
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
 
-Copyright (c) 2023 Quaternions
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

rbx_asset/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "rbx_asset"
+version = "0.1.0"
+edition = "2021"
+publish = ["strafesnet"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono = { version = "0.4.38", features = ["serde"] }
+flate2 = "1.0.29"
+reqwest = { version = "0.12.4", features = ["json"] }
+serde = { version = "1.0.199", features = ["derive"] }
+url = "2.5.0"

rbx_asset/src/context.rs

@@ -0,0 +1,311 @@
+#[derive(Debug)]
+pub enum PostError{
+	Reqwest(reqwest::Error),
+	CSRF,
+}
+impl std::fmt::Display for PostError{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for PostError{}
+
+#[derive(Debug,serde::Deserialize,serde::Serialize)]
+#[allow(nonstandard_style,dead_code)]
+pub struct CreateRequest{
+	pub name:String,
+	pub description:String,
+	pub ispublic:bool,
+	pub allowComments:bool,
+	pub groupId:Option<u64>,
+}
+#[derive(Debug)]
+pub enum CreateError{
+	ParseError(url::ParseError),
+	PostError(PostError),
+	Reqwest(reqwest::Error),
+}
+impl std::fmt::Display for CreateError{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for CreateError{}
+
+#[allow(nonstandard_style,dead_code)]
+pub struct UploadRequest{
+	pub assetid:u64,
+	pub name:Option<String>,
+	pub description:Option<String>,
+	pub ispublic:Option<bool>,
+	pub allowComments:Option<bool>,
+	pub groupId:Option<u64>,
+}
+#[derive(Debug)]
+pub enum UploadError{
+	ParseError(url::ParseError),
+	PostError(PostError),
+	Reqwest(reqwest::Error),
+	AssetIdIsZero,
+}
+impl std::fmt::Display for UploadError{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for UploadError{}
+#[derive(Debug,serde::Deserialize,serde::Serialize)]
+#[allow(nonstandard_style,dead_code)]
+pub struct UploadResponse{
+	pub AssetId:u64,
+	pub AssetVersionId:u64,
+}
+
+#[allow(nonstandard_style,dead_code)]
+pub struct DownloadRequest{
+	pub asset_id:u64,
+	pub version:Option<u64>,
+}
+#[derive(Debug)]
+pub enum DownloadError{
+	ParseError(url::ParseError),
+	Reqwest(reqwest::Error),
+	IO(std::io::Error)
+}
+impl std::fmt::Display for DownloadError{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for DownloadError{}
+
+pub struct HistoryPageRequest{
+	pub asset_id:u64,
+	pub cursor:Option<String>,
+}
+#[derive(serde::Deserialize,serde::Serialize)]
+#[allow(nonstandard_style,dead_code)]
+pub struct AssetVersion{
+	pub Id:u64,
+	pub assetId:u64,
+	pub assetVersionNumber:u64,
+	pub creatorType:String,
+	pub creatorTargetId:u64,
+	pub creatingUniverseId:Option<u64>,
+	pub created:chrono::DateTime<chrono::Utc>,
+	pub isPublished:bool,
+}
+#[derive(serde::Deserialize)]
+#[allow(nonstandard_style,dead_code)]
+pub struct HistoryPageResponse{
+	pub previousPageCursor:Option<String>,
+	pub nextPageCursor:Option<String>,
+	pub data:Vec<AssetVersion>,
+}
+#[derive(Debug)]
+pub enum HistoryPageError{
+	ParseError(url::ParseError),
+	Reqwest(reqwest::Error),
+}
+impl std::fmt::Display for HistoryPageError{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for HistoryPageError{}
+
+pub struct InventoryPageRequest{
+	pub group:u64,
+	pub cursor:Option<String>,
+}
+#[derive(serde::Deserialize,serde::Serialize)]
+#[allow(nonstandard_style,dead_code)]
+pub struct InventoryItem{
+	pub id:u64,
+	pub name:String,
+}
+#[derive(serde::Deserialize,serde::Serialize)]
+#[allow(nonstandard_style,dead_code)]
+pub struct InventoryPageResponse{
+	pub totalResults:u64,//up to 50
+	pub filteredKeyword:Option<String>,//""
+	pub searchDebugInfo:Option<String>,//null
+	pub spellCheckerResult:Option<String>,//null
+	pub queryFacets:Option<String>,//null
+	pub imageSearchStatus:Option<String>,//null
+	pub previousPageCursor:Option<String>,
+	pub nextPageCursor:Option<String>,
+	pub data:Vec<InventoryItem>,
+}
+#[derive(Debug)]
+pub enum InventoryPageError{
+	ParseError(url::ParseError),
+	Reqwest(reqwest::Error),
+}
+impl std::fmt::Display for InventoryPageError{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for InventoryPageError{}
+
+//idk how to do this better
+enum ReaderType<R:std::io::Read>{
+	GZip(flate2::read::GzDecoder<std::io::BufReader<R>>),
+	Raw(std::io::BufReader<R>),
+}
+fn maybe_gzip_decode<R:std::io::Read>(input:R)->std::io::Result<ReaderType<R>>{
+	let mut buf=std::io::BufReader::new(input);
+	let peek=std::io::BufRead::fill_buf(&mut buf)?;
+	match &peek[0..2]{
+		b"\x1f\x8b"=>Ok(ReaderType::GZip(flate2::read::GzDecoder::new(buf))),
+		_=>Ok(ReaderType::Raw(buf)),
+	}
+}
+fn read_readable(mut readable:impl std::io::Read)->std::io::Result<Vec<u8>>{
+	let mut contents=Vec::new();
+	readable.read_to_end(&mut contents)?;
+	Ok(contents)
+}
+
+#[derive(Clone)]
+pub struct RobloxContext{
+	pub cookie:String,
+	pub client:reqwest::Client,
+}
+
+impl RobloxContext{
+	pub fn new(cookie:String)->Self{
+		Self{
+			cookie,
+			client:reqwest::Client::new(),
+		}
+	}
+	async fn get(&self,url:impl reqwest::IntoUrl)->Result<reqwest::Response,reqwest::Error>{
+		self.client.get(url)
+		.header("Cookie",self.cookie.as_str())
+		.send().await
+	}
+	async fn post(&self,url:url::Url,body:impl Into<reqwest::Body>+Clone)->Result<reqwest::Response,PostError>{
+		let mut resp=self.client.post(url.clone())
+		.header("Cookie",self.cookie.as_str())
+		.body(body.clone())
+		.send().await.map_err(PostError::Reqwest)?;
+
+		//This is called a CSRF challenge apparently
+		if resp.status()==reqwest::StatusCode::FORBIDDEN{
+			if let Some(csrf_token)=resp.headers().get("X-CSRF-Token"){
+				resp=self.client.post(url)
+				.header("X-CSRF-Token",csrf_token)
+				.header("Cookie",self.cookie.as_str())
+				.body(body)
+				.send().await.map_err(PostError::Reqwest)?;
+			}else{
+				Err(PostError::CSRF)?;
+			}
+		}
+
+		Ok(resp)
+	}
+	pub async fn create(&self,config:CreateRequest,body:impl Into<reqwest::Body>+Clone)->Result<UploadResponse,CreateError>{
+		let mut url=reqwest::Url::parse("https://data.roblox.com/Data/Upload.ashx?json=1&type=Model&genreTypeId=1").map_err(CreateError::ParseError)?;
+		//url borrow scope
+		{
+			let mut query=url.query_pairs_mut();//borrow here
+			//archaic roblox api uses 0 for new asset
+			query.append_pair("assetid","0");
+			query.append_pair("name",config.name.as_str());
+			query.append_pair("description",config.description.as_str());
+			query.append_pair("ispublic",if config.ispublic{"True"}else{"False"});
+			query.append_pair("allowComments",if config.allowComments{"True"}else{"False"});
+			match config.groupId{
+				Some(group_id)=>{query.append_pair("groupId",group_id.to_string().as_str());},
+				None=>(),
+			}
+		}
+
+		let resp=self.post(url,body).await.map_err(CreateError::PostError)?;
+
+		Ok(resp.json::<UploadResponse>().await.map_err(CreateError::Reqwest)?)
+	}
+	pub async fn upload(&self,config:UploadRequest,body:impl Into<reqwest::Body>+Clone)->Result<UploadResponse,UploadError>{
+		let mut url=reqwest::Url::parse("https://data.roblox.com/Data/Upload.ashx?json=1&type=Model&genreTypeId=1").map_err(UploadError::ParseError)?;
+		//url borrow scope
+		{
+			let mut query=url.query_pairs_mut();//borrow here
+			//archaic roblox api uses 0 for new asset
+			match config.assetid{
+				0=>return Err(UploadError::AssetIdIsZero),
+				assetid=>{query.append_pair("assetid",assetid.to_string().as_str());},
+			}
+			if let Some(name)=config.name.as_deref(){
+				query.append_pair("name",name);
+			}
+			if let Some(description)=config.description.as_deref(){
+				query.append_pair("description",description);
+			}
+			if let Some(ispublic)=config.ispublic{
+				query.append_pair("ispublic",if ispublic{"True"}else{"False"});
+			}
+			if let Some(allow_comments)=config.allowComments{
+				query.append_pair("allowComments",if allow_comments{"True"}else{"False"});
+			}
+			if let Some(group_id)=config.groupId{
+				query.append_pair("groupId",group_id.to_string().as_str());
+			}
+		}
+
+		let resp=self.post(url,body).await.map_err(UploadError::PostError)?;
+
+		Ok(resp.json::<UploadResponse>().await.map_err(UploadError::Reqwest)?)
+	}
+	pub async fn download(&self,config:DownloadRequest)->Result<Vec<u8>,DownloadError>{
+		let mut url=reqwest::Url::parse("https://assetdelivery.roblox.com/v1/asset/").map_err(DownloadError::ParseError)?;
+		//url borrow scope
+		{
+			let mut query=url.query_pairs_mut();//borrow here
+			query.append_pair("ID",config.asset_id.to_string().as_str());
+			if let Some(version)=config.version{
+				query.append_pair("version",version.to_string().as_str());
+			}
+		}
+		let resp=self.get(url).await.map_err(DownloadError::Reqwest)?;
+
+		let body=resp.bytes().await.map_err(DownloadError::Reqwest)?;
+
+		match maybe_gzip_decode(&mut std::io::Cursor::new(body)){
+			Ok(ReaderType::GZip(readable))=>read_readable(readable),
+			Ok(ReaderType::Raw(readable))=>read_readable(readable),
+			Err(e)=>Err(e),
+		}.map_err(DownloadError::IO)
+	}
+	pub async fn history_page(&self,config:HistoryPageRequest)->Result<HistoryPageResponse,HistoryPageError>{
+		let mut url=reqwest::Url::parse(format!("https://develop.roblox.com/v1/assets/{}/saved-versions",config.asset_id).as_str()).map_err(HistoryPageError::ParseError)?;
+		//url borrow scope
+		{
+			let mut query=url.query_pairs_mut();//borrow here
+			//query.append_pair("sortOrder","Asc");
+			//query.append_pair("limit","100");
+			//query.append_pair("count","100");
+			if let Some(cursor)=config.cursor.as_deref(){
+				query.append_pair("cursor",cursor);
+			}
+		}
+
+		Ok(self.get(url).await.map_err(HistoryPageError::Reqwest)?
+		.json::<HistoryPageResponse>().await.map_err(HistoryPageError::Reqwest)?)
+	}
+	pub async fn inventory_page(&self,config:InventoryPageRequest)->Result<InventoryPageResponse,InventoryPageError>{
+		let mut url=reqwest::Url::parse(format!("https://apis.roblox.com/toolbox-service/v1/creations/group/{}/10?limit=50",config.group).as_str()).map_err(InventoryPageError::ParseError)?;
+		//url borrow scope
+		{
+			let mut query=url.query_pairs_mut();//borrow here
+			if let Some(cursor)=config.cursor.as_deref(){
+				query.append_pair("cursor",cursor);
+			}
+		}
+
+		Ok(self.get(url).await.map_err(InventoryPageError::Reqwest)?
+		.json::<InventoryPageResponse>().await.map_err(InventoryPageError::Reqwest)?)
+	}
+}

rbx_asset/src/lib.rs

@@ -0,0 +1 @@
+pub mod context;