fix: fix ts generator

rivet-gg · Dec 6, 2024 · 4707547 · 4707547
1 parent f70947c
commit 4707547
Show file tree

Hide file tree

Showing 144 changed files with 1,075 additions and 537 deletions.
diff --git a/packages/common/config/src/config/mod.rs b/packages/common/config/src/config/mod.rs
@@ -1,6 +1,6 @@
 use global_error::prelude::*;
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 pub mod server;
 

diff --git a/packages/common/config/src/config/server/mod.rs b/packages/common/config/src/config/server/mod.rs
@@ -1,9 +1,9 @@
 use std::collections::HashMap;
 
 use global_error::prelude::*;
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use url::Url;
-use schemars::JsonSchema;
 
 use crate::secret::Secret;
 

diff --git a/packages/common/config/src/config/server/rivet/cluster_provision.rs b/packages/common/config/src/config/server/rivet/cluster_provision.rs
@@ -1,8 +1,8 @@
 use std::net::Ipv4Addr;
 
 use ipnet::{Ipv4AddrRange, Ipv4Net};
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 use url::Url;
 
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]

diff --git a/packages/common/config/src/config/server/rivet/dc_provision.rs b/packages/common/config/src/config/server/rivet/dc_provision.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]

diff --git a/packages/common/config/src/config/server/rivet/mod.rs b/packages/common/config/src/config/server/rivet/mod.rs
@@ -1,9 +1,9 @@
 use global_error::prelude::*;
 use maplit::hashmap;
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, net::IpAddr, path::PathBuf};
 use url::Url;
-use schemars::JsonSchema;
 use uuid::Uuid;
 
 use crate::secret::Secret;

diff --git a/packages/common/config/src/secret.rs b/packages/common/config/src/secret.rs
@@ -1,6 +1,6 @@
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt;
-use schemars::JsonSchema;
 
 /// Wraps a given value in a container that does not implement `Debug` or `Display` in order to
 /// prevent accidentally logging the inner secret.

diff --git a/packages/common/convert/src/convert/game.rs b/packages/common/convert/src/convert/game.rs
@@ -21,8 +21,8 @@ pub fn summary(
 	config: &rivet_config::Config,
 	game: &backend::game::Game,
 	dev_team: &backend::team::Team,
-) -> GlobalResult<models::GameSummary> {
-	Ok(models::GameSummary {
+) -> GlobalResult<models::GameGameSummary> {
+	Ok(models::GameGameSummary {
 		game_id: unwrap_ref!(game.game_id).as_uuid(),
 		name_id: game.name_id.to_owned(),
 		display_name: game.display_name.to_owned(),

diff --git a/packages/common/convert/src/convert/group.rs b/packages/common/convert/src/convert/group.rs
@@ -28,7 +28,7 @@ pub fn summary(
 	team: &backend::team::Team,
 	team_member_counts: &[team::member_count::response::Team],
 	is_current_identity_member: bool,
-) -> GlobalResult<models::GroupSummary> {
+) -> GlobalResult<models::GroupGroupSummary> {
 	let team_id_proto = unwrap_ref!(team.team_id);
 
 	let member_count = unwrap!(team_member_counts
@@ -39,7 +39,7 @@ pub fn summary(
 	let team_id = team_id_proto.as_uuid();
 	let owner_user_id = unwrap_ref!(team.owner_user_id).as_uuid();
 
-	Ok(models::GroupSummary {
+	Ok(models::GroupGroupSummary {
 		group_id: team_id,
 		display_name: team.display_name.clone(),
 		bio: team.bio.clone(),

diff --git a/packages/common/convert/src/fetch/game.rs b/packages/common/convert/src/fetch/game.rs
@@ -12,7 +12,7 @@ use crate::convert;
 pub async fn summaries(
 	ctx: &OperationContext<()>,
 	game_ids: Vec<Uuid>,
-) -> GlobalResult<Vec<models::GameSummary>> {
+) -> GlobalResult<Vec<models::GameGameSummary>> {
 	if game_ids.is_empty() {
 		return Ok(Vec::new());
 	}

diff --git a/packages/common/convert/src/fetch/group.rs b/packages/common/convert/src/fetch/group.rs
@@ -7,7 +7,7 @@ pub async fn summaries(
 	ctx: &OperationContext<()>,
 	current_user_id: Option<Uuid>,
 	group_ids: Vec<Uuid>,
-) -> GlobalResult<Vec<models::GroupSummary>> {
+) -> GlobalResult<Vec<models::GroupGroupSummary>> {
 	if group_ids.is_empty() {
 		return Ok(Vec::new());
 	}

diff --git a/packages/common/convert/src/impls/cloud/version/cdn.rs b/packages/common/convert/src/impls/cloud/version/cdn.rs
@@ -4,10 +4,10 @@ use rivet_operation::prelude::*;
 
 use crate::{ApiTryFrom, ApiTryInto};
 
-impl ApiTryFrom<models::CloudVersionCdnConfig> for backend::cdn::VersionConfig {
+impl ApiTryFrom<models::CloudVersionCdnCdnConfig> for backend::cdn::VersionConfig {
 	type Error = GlobalError;
 
-	fn api_try_from(value: models::CloudVersionCdnConfig) -> GlobalResult<Self> {
+	fn api_try_from(value: models::CloudVersionCdnCdnConfig) -> GlobalResult<Self> {
 		Ok(backend::cdn::VersionConfig {
 			site_id: value.site_id.map(Into::into),
 			routes: value
@@ -92,13 +92,13 @@ impl ApiTryFrom<models::CloudVersionCdnHeader> for backend::cdn::custom_headers_
 	}
 }
 
-impl ApiTryFrom<backend::cdn::VersionConfig> for models::CloudVersionCdnConfig {
+impl ApiTryFrom<backend::cdn::VersionConfig> for models::CloudVersionCdnCdnConfig {
 	type Error = GlobalError;
 
 	fn api_try_from(value: backend::cdn::VersionConfig) -> GlobalResult<Self> {
 		let site_id = unwrap_ref!(value.site_id).as_uuid();
 
-		Ok(models::CloudVersionCdnConfig {
+		Ok(models::CloudVersionCdnCdnConfig {
 			build_command: None,
 			build_output: None,
 			build_env: None,

diff --git a/packages/common/convert/src/impls/cloud/version/identity.rs b/packages/common/convert/src/impls/cloud/version/identity.rs
@@ -4,10 +4,10 @@ use rivet_operation::prelude::*;
 
 use crate::{ApiTryFrom, ApiTryInto};
 
-impl ApiTryFrom<models::CloudVersionIdentityConfig> for backend::identity::VersionConfig {
+impl ApiTryFrom<models::CloudVersionIdentityIdentityConfig> for backend::identity::VersionConfig {
 	type Error = GlobalError;
 
-	fn api_try_from(value: models::CloudVersionIdentityConfig) -> GlobalResult<Self> {
+	fn api_try_from(value: models::CloudVersionIdentityIdentityConfig) -> GlobalResult<Self> {
 		Ok(backend::identity::VersionConfig {
 			custom_display_names: value
 				.custom_display_names
@@ -57,11 +57,11 @@ impl ApiTryFrom<models::CloudVersionIdentityCustomAvatar> for backend::identity:
 	}
 }
 
-impl ApiTryFrom<backend::identity::VersionConfig> for models::CloudVersionIdentityConfig {
+impl ApiTryFrom<backend::identity::VersionConfig> for models::CloudVersionIdentityIdentityConfig {
 	type Error = GlobalError;
 
 	fn api_try_from(value: backend::identity::VersionConfig) -> GlobalResult<Self> {
-		Ok(models::CloudVersionIdentityConfig {
+		Ok(models::CloudVersionIdentityIdentityConfig {
 			display_names: Some(
 				value
 					.custom_display_names

diff --git a/packages/common/convert/src/impls/cloud/version/matchmaker/game_mode.rs b/packages/common/convert/src/impls/cloud/version/matchmaker/game_mode.rs
@@ -9,7 +9,7 @@ use crate::{ApiFrom, ApiInto, ApiTryFrom, ApiTryInto};
 pub fn game_mode_to_proto(
 	name_id: String,
 	game_mode: &models::CloudVersionMatchmakerGameMode,
-	matchmaker: &models::CloudVersionMatchmakerConfig,
+	matchmaker: &models::CloudVersionMatchmakerMatchmakerConfig,
 	all_regions: &[backend::region::Region],
 ) -> GlobalResult<backend::matchmaker::LobbyGroup> {
 	// Derive regions
@@ -278,7 +278,7 @@ fn region_to_proto(
 	name_id: String,
 	region: &models::CloudVersionMatchmakerGameModeRegion,
 	game_mode: &models::CloudVersionMatchmakerGameMode,
-	matchmaker: &models::CloudVersionMatchmakerConfig,
+	matchmaker: &models::CloudVersionMatchmakerMatchmakerConfig,
 	regions_data: &[backend::region::Region],
 ) -> GlobalResult<backend::matchmaker::lobby_group::Region> {
 	let region_id = regions_data

diff --git a/packages/common/convert/src/impls/cloud/version/matchmaker/mod.rs b/packages/common/convert/src/impls/cloud/version/matchmaker/mod.rs
@@ -12,7 +12,7 @@ pub mod lobby_group;
 pub async fn config_to_proto(
 	ctx: &OperationContext<()>,
 	game_id: Uuid,
-	value: models::CloudVersionMatchmakerConfig,
+	value: models::CloudVersionMatchmakerMatchmakerConfig,
 ) -> GlobalResult<backend::matchmaker::VersionConfig> {
 	// Fetch region data required to convert models
 	let mut all_region_name_ids = HashSet::new();
@@ -57,7 +57,7 @@ pub async fn config_to_proto(
 pub async fn config_to_openapi(
 	ctx: &OperationContext<()>,
 	value: backend::matchmaker::VersionConfig,
-) -> GlobalResult<models::CloudVersionMatchmakerConfig> {
+) -> GlobalResult<models::CloudVersionMatchmakerMatchmakerConfig> {
 	// Fetch region data required to convert models
 	let all_region_ids = value
 		.lobby_groups
@@ -73,7 +73,7 @@ pub async fn config_to_openapi(
 	})
 	.await?;
 
-	Ok(models::CloudVersionMatchmakerConfig {
+	Ok(models::CloudVersionMatchmakerMatchmakerConfig {
 		game_modes: Some(
 			value
 				.lobby_groups

diff --git a/packages/infra/client/config/src/manager.rs b/packages/infra/client/config/src/manager.rs
@@ -4,9 +4,9 @@ use std::{
 };
 
 use pegboard::protocol;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use url::Url;
-use schemars::JsonSchema;
 use uuid::Uuid;
 
 #[derive(Clone, Deserialize)]

diff --git a/packages/infra/schema-generator/build.rs b/packages/infra/schema-generator/build.rs
@@ -1,31 +1,43 @@
-use std::{fs::File, path::PathBuf, io::Write};
+use std::{fs::File, io::Write, path::PathBuf};
 
 use anyhow::*;
-use schemars::{JsonSchema, gen::{SchemaSettings, SchemaGenerator}};
+use schemars::{
+	gen::{SchemaGenerator, SchemaSettings},
+	JsonSchema,
+};
 
 fn main() -> Result<()> {
 	let cwd = std::env::current_dir()?;
 	let docs_output_path = cwd.join("../../../docs/src/content/docs/");
 
 	let settings = SchemaSettings::draft07().with(|s| {
-        s.option_nullable = true;
-        s.option_add_null_type = false;
-    });
-    let generator = settings.into_generator();
+		s.option_nullable = true;
+		s.option_add_null_type = false;
+	});
+	let generator = settings.into_generator();
 
-	generate_spec::<rivet_config::config::server::Server>(generator.clone(), docs_output_path.join("self-hosting/server-spec.json"))?;
-	generate_spec::<pegboard_config::Client>(generator.clone(), docs_output_path.join("self-hosting/client-spec.json"))?;
-	generate_spec::<rivet_toolchain::config::Root>(generator.clone(), docs_output_path.join("toolchain-spec.json"))?;
+	generate_spec::<rivet_config::config::server::Server>(
+		generator.clone(),
+		docs_output_path.join("self-hosting/server-spec.json"),
+	)?;
+	generate_spec::<pegboard_config::Client>(
+		generator.clone(),
+		docs_output_path.join("self-hosting/client-spec.json"),
+	)?;
+	generate_spec::<rivet_toolchain::config::Root>(
+		generator.clone(),
+		docs_output_path.join("toolchain-spec.json"),
+	)?;
 
 	Ok(())
 }
 
 fn generate_spec<T: JsonSchema>(generator: SchemaGenerator, path: PathBuf) -> Result<()> {
 	let schema = generator.into_root_schema_for::<T>();
 	let schema_text = serde_json::to_string_pretty(&schema)?;
-	
+
 	let mut file = File::create(path)?;
 	file.write_all(schema_text.as_bytes())?;
 
 	Ok(())
-}
+}
diff --git a/packages/infra/schema-generator/src/lib.rs b/packages/infra/schema-generator/src/lib.rs
@@ -0,0 +1 @@
+
diff --git a/packages/services/ds/src/workflows/server/mod.rs b/packages/services/ds/src/workflows/server/mod.rs
@@ -582,7 +582,8 @@ async fn get_server_meta(
 	let project_id = unwrap!(env.game_id).as_uuid();
 	let projects_res = op!([ctx] game_get {
 		game_ids: vec![project_id.into()],
-	}).await?;
+	})
+	.await?;
 	let project = unwrap!(projects_res.games.first());
 
 	Ok(GetServerMetaOutput {

diff --git a/packages/toolchain/cli/src/commands/actor/create.rs b/packages/toolchain/cli/src/commands/actor/create.rs
@@ -3,9 +3,8 @@ use clap::{Parser, ValueEnum};
 use serde::Deserialize;
 use std::collections::HashMap;
 use toolchain::{
-	build,
+	build, errors,
 	rivet_api::{apis, models},
-	errors,
 };
 use uuid::Uuid;
 

diff --git a/packages/toolchain/cli/src/commands/manager/endpoint.rs b/packages/toolchain/cli/src/commands/manager/endpoint.rs
@@ -2,9 +2,7 @@ use anyhow::*;
 use clap::Parser;
 use toolchain::tasks::manager::get_endpoint;
 
-use crate::util::{
-	task::{run_task, TaskOutputStyle},
-};
+use crate::util::task::{run_task, TaskOutputStyle};
 
 #[derive(Parser)]
 pub struct Opts {
@@ -16,9 +14,11 @@ impl Opts {
 	pub async fn execute(&self) -> Result<()> {
 		let ctx = toolchain::toolchain_ctx::load().await?;
 		let env = crate::util::env::get_or_select(&ctx, self.environment.as_ref()).await?;
-		let res =
-			run_task::<get_endpoint::Task>(TaskOutputStyle::None, get_endpoint::Input { env_slug: env })
-			.await?;
+		let res = run_task::<get_endpoint::Task>(
+			TaskOutputStyle::None,
+			get_endpoint::Input { env_slug: env },
+		)
+		.await?;
 		println!("{}", res.endpoint);
 		Ok(())
 	}

diff --git a/packages/toolchain/cli/src/commands/mod.rs b/packages/toolchain/cli/src/commands/mod.rs
@@ -1,12 +1,12 @@
 pub mod actor;
 pub mod build;
 pub mod deno;
-pub mod manager;
 pub mod deploy;
 pub mod environment;
 pub mod init;
 pub mod login;
 pub mod logout;
+pub mod manager;
 pub mod metadata;
 pub mod region;
 

diff --git a/packages/toolchain/toolchain/src/config/build/docker.rs b/packages/toolchain/toolchain/src/config/build/docker.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 use super::Compression;
 

diff --git a/packages/toolchain/toolchain/src/config/build/javascript.rs b/packages/toolchain/toolchain/src/config/build/javascript.rs
@@ -1,5 +1,5 @@
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 use super::Compression;
 

diff --git a/packages/toolchain/toolchain/src/config/build/mod.rs b/packages/toolchain/toolchain/src/config/build/mod.rs
@@ -1,5 +1,5 @@
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 pub mod docker;
 pub mod javascript;

diff --git a/packages/toolchain/toolchain/src/config/mod.rs b/packages/toolchain/toolchain/src/config/mod.rs
@@ -6,8 +6,8 @@ use std::{
 };
 
 use anyhow::*;
-use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 pub mod build;
 
@@ -86,12 +86,11 @@ pub struct Unstable {
 #[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]
 pub struct ManagerUnstable {
-	pub enable: Option<bool>
+	pub enable: Option<bool>,
 }
 
 impl ManagerUnstable {
 	pub fn enable(&self) -> bool {
 		self.enable.unwrap_or(true)
 	}
-
 }
diff --git a/packages/toolchain/toolchain/src/tasks/deploy/docker.rs b/packages/toolchain/toolchain/src/tasks/deploy/docker.rs
@@ -1,7 +1,7 @@
 use anyhow::*;
+use std::collections::HashMap;
 use std::path::Path;
 use uuid::Uuid;
-use std::collections::HashMap;
 
 use crate::{
 	config, paths,

diff --git a/packages/toolchain/toolchain/src/tasks/deploy/js.rs b/packages/toolchain/toolchain/src/tasks/deploy/js.rs
@@ -1,7 +1,7 @@
 use anyhow::*;
 use futures_util::{StreamExt, TryStreamExt};
 use rivet_api::{apis, models};
-use std::{path::PathBuf, sync::Arc, collections::HashMap};
+use std::{collections::HashMap, path::PathBuf, sync::Arc};
 use tokio::fs;
 use uuid::Uuid;