chore: cleanup rivet-engine tests

Author: abcxff

Cargo.lock

@@ -1,26 +1,8 @@
 use anyhow::Result;
 use gas::prelude::*;
 use rivet_api_builder::ApiCtx;
+use rivet_api_types::actors::delete::*;
 use rivet_util::Id;
-use serde::{Deserialize, Serialize};
-use utoipa::{IntoParams, ToSchema};
-
-#[derive(Debug, Deserialize, Serialize, IntoParams)]
-#[serde(deny_unknown_fields)]
-#[into_params(parameter_in = Query)]
-pub struct DeleteQuery {
-	pub namespace: Option<String>,
-}
-
-#[derive(Serialize, ToSchema)]
-#[schema(as = ActorsDeleteResponse)]
-pub struct DeleteResponse {}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct DeletePath {
-	pub actor_id: Id,
-}
 
 #[utoipa::path(
 	delete,

engine/packages/api-peer/src/actors/delete.rs

@@ -10,7 +10,7 @@ pub struct CachePurgeRequest {
 	pub keys: Vec<rivet_cache::RawCacheKey>,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct CachePurgeResponse {}
 
@@ -38,7 +38,7 @@ pub struct SetTracingConfigRequest {
 	pub sampler_ratio: Option<Option<f64>>,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct SetTracingConfigResponse {}
 
@@ -66,11 +66,11 @@ pub async fn set_tracing_config(
 	Ok(SetTracingConfigResponse {})
 }
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct ReplicaReconfigureRequest {}
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct ReplicaReconfigureResponse {}
 
@@ -97,7 +97,7 @@ pub async fn epoxy_replica_reconfigure(
 	Ok(ReplicaReconfigureResponse {})
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct GetEpoxyStateResponse {
 	pub config: epoxy::types::ClusterConfig,
@@ -126,13 +126,13 @@ pub async fn get_epoxy_state(ctx: ApiCtx, _path: (), _query: ()) -> Result<GetEp
 	})
 }
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct SetEpoxyStateRequest {
 	pub config: epoxy::types::ClusterConfig,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct SetEpoxyStateResponse {}
 

engine/packages/api-peer/src/internal.rs

@@ -69,8 +69,8 @@ pub async fn list(ctx: ApiCtx, _path: (), query: ListQuery) -> Result<ListRespon
 #[serde(deny_unknown_fields)]
 #[schema(as = NamespacesCreateRequest)]
 pub struct CreateRequest {
-	name: String,
-	display_name: String,
+	pub name: String,
+	pub display_name: String,
 }
 
 #[derive(Serialize, Deserialize, ToSchema)]

engine/packages/api-peer/src/namespaces.rs

@@ -1,8 +1,6 @@
 use anyhow::Result;
 use rivet_api_builder::ApiCtx;
-use rivet_api_types::{pagination::Pagination, runners::list::*};
-use serde::{Deserialize, Serialize};
-use utoipa::{IntoParams, ToSchema};
+use rivet_api_types::{pagination::Pagination, runners::list::*, runners::list_names::*};
 
 #[utoipa::path(
 	get,
@@ -69,23 +67,6 @@ pub async fn list(ctx: ApiCtx, _path: (), query: ListQuery) -> Result<ListRespon
 	}
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, IntoParams)]
-#[serde(deny_unknown_fields)]
-#[into_params(parameter_in = Query)]
-pub struct ListNamesQuery {
-	pub namespace: String,
-	pub limit: Option<usize>,
-	pub cursor: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(deny_unknown_fields)]
-#[schema(as = RunnersListNamesResponse)]
-pub struct ListNamesResponse {
-	pub names: Vec<String>,
-	pub pagination: Pagination,
-}
-
 #[tracing::instrument(skip_all)]
 pub async fn list_names(
 	ctx: ApiCtx,

engine/packages/api-peer/src/runners.rs

@@ -4,20 +4,11 @@ use rivet_api_builder::{
 	ApiError,
 	extract::{Extension, Json, Query},
 };
-use rivet_api_types::actors::create::{CreateRequest, CreateResponse};
+use rivet_api_types::actors::create::*;
 use rivet_api_util::request_remote_datacenter;
-use serde::{Deserialize, Serialize};
-use utoipa::IntoParams;
 
 use crate::ctx::ApiCtx;
 
-#[derive(Debug, Serialize, Deserialize, IntoParams)]
-#[serde(deny_unknown_fields)]
-#[into_params(parameter_in = Query)]
-pub struct CreateQuery {
-	pub namespace: String,
-}
-
 /// ## Datacenter Round Trips
 ///
 /// **If actor is created in the current datacenter:**

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

@@ -4,30 +4,12 @@ use rivet_api_builder::{
 	ApiError,
 	extract::{Extension, Json, Path, Query},
 };
+use rivet_api_types::actors::delete::*;
 use rivet_api_util::request_remote_datacenter_raw;
 use rivet_util::Id;
-use serde::{Deserialize, Serialize};
-use utoipa::{IntoParams, ToSchema};
 
 use crate::ctx::ApiCtx;
 
-#[derive(Debug, Deserialize, Serialize, IntoParams)]
-#[serde(deny_unknown_fields)]
-#[into_params(parameter_in = Query)]
-pub struct DeleteQuery {
-	pub namespace: Option<String>,
-}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct DeletePath {
-	pub actor_id: Id,
-}
-
-#[derive(Serialize, ToSchema)]
-#[schema(as = ActorsDeleteResponse)]
-pub struct DeleteResponse {}
-
 /// ## Datacenter Round Trips
 ///
 /// 2 round trip:
@@ -63,13 +45,7 @@ async fn delete_inner(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Resu
 	ctx.auth().await?;
 
 	if path.actor_id.label() == ctx.config().dc_label() {
-		let peer_path = rivet_api_peer::actors::delete::DeletePath {
-			actor_id: path.actor_id,
-		};
-		let peer_query = rivet_api_peer::actors::delete::DeleteQuery {
-			namespace: query.namespace,
-		};
-		let res = rivet_api_peer::actors::delete::delete(ctx.into(), peer_path, peer_query).await?;
+		let res = rivet_api_peer::actors::delete::delete(ctx.into(), path, query).await?;
 
 		Ok(Json(res).into_response())
 	} else {

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

@@ -1,42 +1,14 @@
 use anyhow::{Context, Result};
 use axum::response::{IntoResponse, Response};
-use gas::prelude::*;
 use rivet_api_builder::{
 	ApiError,
 	extract::{Extension, Json, Query},
 };
-use rivet_api_types::pagination::Pagination;
+use rivet_api_types::{actors::list::*, pagination::Pagination};
 use rivet_api_util::fanout_to_datacenters;
-use serde::{Deserialize, Serialize};
-use utoipa::{IntoParams, ToSchema};
 
 use crate::{actors::utils::fetch_actors_by_ids, ctx::ApiCtx, errors};
 
-#[derive(Debug, Serialize, Deserialize, Clone, IntoParams)]
-#[serde(deny_unknown_fields)]
-#[into_params(parameter_in = Query)]
-pub struct ListQuery {
-	pub namespace: String,
-	pub name: Option<String>,
-	pub key: Option<String>,
-	/// Deprecated.
-	#[serde(default)]
-	pub actor_ids: Option<String>,
-	#[serde(default)]
-	pub actor_id: Vec<Id>,
-	pub include_destroyed: Option<bool>,
-	pub limit: Option<usize>,
-	pub cursor: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(deny_unknown_fields)]
-#[schema(as = ActorsListResponse)]
-pub struct ListResponse {
-	pub actors: Vec<rivet_types::actors::Actor>,
-	pub pagination: Pagination,
-}
-
 /// ## Datacenter Round Trips
 ///
 /// **If key is some & `include_destroyed` is false**
@@ -80,7 +52,7 @@ async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result<ListResponse> {
 
 	// Parse query
 	let actor_ids = [
-		query.actor_id,
+		query.actor_id.clone(),
 		query
 			.actor_ids
 			.as_ref()
@@ -128,15 +100,25 @@ async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result<ListResponse> {
 		.ok_or_else(|| namespace::errors::Namespace::NotFound.build())?;
 
 		// Fetch actors
-		let actors = fetch_actors_by_ids(
+		let mut actors = fetch_actors_by_ids(
 			&ctx,
 			actor_ids,
 			query.namespace.clone(),
 			query.include_destroyed,
-			query.limit,
+			None, // Don't apply limit in fetch, we'll apply it after cursor filtering
 		)
 		.await?;
 
+		// Apply cursor filtering if provided
+		if let Some(cursor_str) = &query.cursor {
+			let cursor_ts: i64 = cursor_str.parse().context("invalid cursor format")?;
+			actors.retain(|actor| actor.create_ts < cursor_ts);
+		}
+
+		// Apply limit after cursor filtering
+		let limit = query.limit.unwrap_or(100);
+		actors.truncate(limit);
+
 		let cursor = actors.last().map(|x| x.create_ts.to_string());
 
 		Ok(ListResponse {
@@ -201,41 +183,25 @@ async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result<ListResponse> {
 			.build());
 		}
 
-		// Prepare peer query for local handler
-		let peer_query = rivet_api_types::actors::list::ListQuery {
-			namespace: query.namespace.clone(),
-			name: Some(query.name.as_ref().unwrap().clone()),
-			key: query.key.clone(),
-			actor_ids: None,
-			actor_id: Vec::new(),
-			include_destroyed: query.include_destroyed,
-			limit: query.limit,
-			cursor: query.cursor.clone(),
-		};
+		let limit = query.limit.unwrap_or(100);
 
 		// Fanout to all datacenters
-		let mut actors = fanout_to_datacenters::<
-			rivet_api_types::actors::list::ListResponse,
-			_,
-			_,
-			_,
-			_,
-			Vec<rivet_types::actors::Actor>,
-		>(
-			ctx.into(),
-			"/actors",
-			peer_query,
-			|ctx, query| async move { rivet_api_peer::actors::list::list(ctx, (), query).await },
-			|_, res, agg| agg.extend(res.actors),
-		)
-		.await?;
+		let mut actors =
+			fanout_to_datacenters::<ListResponse, _, _, _, _, Vec<rivet_types::actors::Actor>>(
+				ctx.into(),
+				"/actors",
+				query,
+				|ctx, query| async move { rivet_api_peer::actors::list::list(ctx, (), query).await },
+				|_, res, agg| agg.extend(res.actors),
+			)
+			.await?;
 
 		// Sort by create ts desc
 		actors.sort_by_cached_key(|x| std::cmp::Reverse(x.create_ts));
 
 		// Shorten array since returning all actors from all regions could end up returning `regions *
 		// limit` results, which is a lot.
-		actors.truncate(query.limit.unwrap_or(100));
+		actors.truncate(limit);
 
 		let cursor = actors.last().map(|x| x.create_ts.to_string());