chore: clean up errors

Author: MasterPtato

engine/artifacts/errors/guard.actor_destroyed.json

@@ -141,7 +141,7 @@ pub async fn find_dc_for_actor_creation(
 		// Use user-configured DC
 		ctx.config()
 			.dc_for_name(dc_name)
-			.ok_or_else(|| crate::errors::Datacenter::NotFound.build())?
+			.ok_or_else(|| rivet_api_util::errors::Datacenter::NotFound.build())?
 			.datacenter_label
 	} else {
 		// Find the nearest DC with runners

engine/artifacts/errors/guard.actor_not_found.json

@@ -1,13 +1,6 @@
 use rivet_error::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(RivetError, Debug, Deserialize, Serialize)]
-#[error("datacenter")]
-pub enum Datacenter {
-	#[error("not_found", "The provided datacenter does not exist.")]
-	NotFound,
-}
-
 #[derive(RivetError, Debug, Deserialize, Serialize)]
 #[error("validation")]
 pub enum Validation {

…e/artifacts/errors/api.rate_limited.json …ifacts/errors/test.api_rate_limited.jsonengine/artifacts/errors/api.rate_limited.json renamed to engine/artifacts/errors/test.api_rate_limited.json engine/artifacts/errors/api.rate_limited.json renamed to engine/artifacts/errors/test.api_rate_limited.json

@@ -96,7 +96,7 @@ async fn upsert_inner(
 
 	// Check for leftover datacenters in the body, this means those datacenters don't exist
 	if !body.datacenters.is_empty() {
-		return Err(crate::errors::Datacenter::NotFound.build());
+		return Err(rivet_api_util::errors::Datacenter::NotFound.build());
 	}
 
 	let any_endpoint_config_changed = futures_util::stream::iter(dcs)

…facts/errors/namespace.invalid_name.json …/errors/test.namespace_invalid_name.jsonengine/artifacts/errors/namespace.invalid_name.json renamed to engine/artifacts/errors/test.namespace_invalid_name.json engine/artifacts/errors/namespace.invalid_name.json renamed to engine/artifacts/errors/test.namespace_invalid_name.json

@@ -5,7 +5,7 @@ use rivet_api_builder::{ApiCtx, ErrorResponse, RawErrorResponse, X_RIVET_RAY_ID}
 use serde::{Serialize, de::DeserializeOwned};
 use std::future::Future;
 
-mod errors;
+pub mod errors;
 
 pub use axum::http::{HeaderMap, Method};
 

engine/packages/api-public/src/actors/utils.rs

@@ -121,8 +121,8 @@ fn test_error_chaining() {
 // Test struct without formatted description (from derive.rs)
 #[derive(RivetError, Serialize, Deserialize)]
 #[error(
-	"namespace",
-	"invalid_name",
+	"test",
+	"namespace_invalid_name",
 	"
 	Invalid namespace name.
 	
@@ -144,8 +144,8 @@ fn test_struct_without_formatted_description() {
 	.build();
 	let rivet_error = RivetError::extract(&error);
 
-	assert_eq!(rivet_error.group(), "namespace");
-	assert_eq!(rivet_error.code(), "invalid_name");
+	assert_eq!(rivet_error.group(), "test");
+	assert_eq!(rivet_error.code(), "namespace_invalid_name");
 	assert!(rivet_error.message().contains("Invalid namespace name"));
 	assert!(rivet_error.meta.is_some());
 
@@ -159,8 +159,8 @@ fn test_struct_without_formatted_description() {
 // Test multiline description formatting (from derive.rs)
 #[derive(RivetError, Serialize, Deserialize)]
 #[error(
-	"api",
-	"rate_limited",
+	"test",
+	"api_rate_limited",
 	"
 	Rate limit exceeded.
 	
@@ -184,8 +184,8 @@ fn test_multiline_descriptions() {
 	.build();
 	let rivet_error = RivetError::extract(&error);
 
-	assert_eq!(rivet_error.group(), "api");
-	assert_eq!(rivet_error.code(), "rate_limited");
+	assert_eq!(rivet_error.group(), "test");
+	assert_eq!(rivet_error.code(), "api_rate_limited");
 	assert_eq!(
 		rivet_error.message(),
 		"Rate limit exceeded. Limit: 100, resets at: 1234567890"

engine/packages/api-public/src/errors.rs

@@ -1,6 +1,5 @@
 mod common;
 
-use anyhow::bail;
 use bytes::Bytes;
 use futures_util::StreamExt;
 use http_body_util::{BodyExt, Full};
@@ -246,15 +245,15 @@ fn create_streaming_routing_fn(server_addr: SocketAddr) -> RoutingFn {
 						path: path.to_string(),
 					};
 
-					Ok(RoutingOutput::Route(RouteConfig {
+					return Ok(RoutingOutput::Route(RouteConfig {
 						targets: vec![target],
 						timeout: RoutingTimeout {
 							routing_timeout: 30, // 30 seconds for routing timeout
 						},
-					}))
+					}));
 				}
 
-				bail!("bad path");
+				Err(anyhow::anyhow!("bad path"))
 			})
 		},
 	)