chore: cleanup, move ee changes

MasterPtato · MasterPtato · commit 7514d8410d88 · 2025-09-12T18:14:25.000-07:00
diff --git a/frontend/packages/components/src/lib/config.ts b/frontend/packages/components/src/lib/config.ts
@@ -31,6 +31,8 @@ const getApiEndpoint = (apiEndpoint: string) => {
 		}
 		// Default to staging servers for all other endpoints
 		return "https://api.staging2.gameinc.io";
+	} else if (apiEndpoint === "__SAME__") {
+		return location.origin;
 	}
 	return apiEndpoint;
 };
diff --git a/frontend/src/components/lib/config.ts b/frontend/src/components/lib/config.ts
@@ -31,6 +31,8 @@ const getApiEndpoint = (apiEndpoint: string) => {
 		}
 		// Default to staging servers for all other endpoints
 		return "https://api.staging2.gameinc.io";
+	} else if (apiEndpoint === "__SAME__") {
+		return location.origin;
 	}
 	return apiEndpoint;
 };
diff --git a/packages/common/universaldb/src/error.rs b/packages/common/universaldb/src/error.rs
@@ -12,8 +12,6 @@ pub enum DatabaseError {
 
 	#[error("operation issued while a commit was outstanding")]
 	UsedDuringCommit,
-	// #[error(transparent)]
-	// Custom(Box<dyn std::error::Error + Send + Sync>),
 }
 
 impl DatabaseError {
diff --git a/packages/core/bootstrap/src/lib.rs b/packages/core/bootstrap/src/lib.rs
@@ -42,7 +42,7 @@ async fn setup_epoxy_coordinator(ctx: &StandaloneCtx) -> Result<()> {
 	//
 	// This does not guarantee the config will change immediately since we can't guarantee that the
 	// coordinator workflow is running on a node with the newest version of the config.
-	ctx.signal(epoxy::workflows::coordinator::ReconfigureSignal {})
+	ctx.signal(epoxy::workflows::coordinator::Reconfigure {})
 		.to_workflow_id(workflow_id)
 		.send()
 		.await?;
diff --git a/packages/services/epoxy/src/ops/explicit_prepare.rs b/packages/services/epoxy/src/ops/explicit_prepare.rs
@@ -20,7 +20,10 @@ pub enum ExplicitPrepareResult {
 }
 
 #[operation]
-pub async fn explicit_prepare(ctx: &OperationCtx, input: &Input) -> Result<ExplicitPrepareResult> {
+pub async fn epoxy_explicit_prepare(
+	ctx: &OperationCtx,
+	input: &Input,
+) -> Result<ExplicitPrepareResult> {
 	let replica_id = ctx.config().epoxy_replica_id();
 	let instance = &input.instance;
 
diff --git a/packages/services/epoxy/src/ops/kv/get_local.rs b/packages/services/epoxy/src/ops/kv/get_local.rs
@@ -18,7 +18,7 @@ pub struct Output {
 }
 
 #[operation]
-pub async fn get_local(ctx: &OperationCtx, input: &Input) -> Result<Output> {
+pub async fn epoxy_kv_get_local(ctx: &OperationCtx, input: &Input) -> Result<Output> {
 	// Read from local KV store only
 	let kv_key = keys::keys::KvValueKey::new(input.key.clone());
 	let subspace = keys::subspace(input.replica_id);
diff --git a/packages/services/epoxy/src/ops/kv/get_optimistic.rs b/packages/services/epoxy/src/ops/kv/get_optimistic.rs
@@ -35,7 +35,7 @@ pub struct Output {
 ///
 /// We cannot use quorum reads for the fanout read because of the constraints of Epaxos.
 #[operation]
-pub async fn get_optimistic(ctx: &OperationCtx, input: &Input) -> Result<Output> {
+pub async fn epoxy_kv_get_optimistic(ctx: &OperationCtx, input: &Input) -> Result<Output> {
 	// Try to read locally
 	let kv_key = keys::keys::KvValueKey::new(input.key.clone());
 	let cache_key = keys::keys::KvOptimisticCacheKey::new(input.key.clone());
diff --git a/packages/services/epoxy/src/ops/propose.rs b/packages/services/epoxy/src/ops/propose.rs
@@ -27,7 +27,7 @@ pub struct Input {
 }
 
 #[operation]
-pub async fn propose(ctx: &OperationCtx, input: &Input) -> Result<ProposalResult> {
+pub async fn epoxy_propose(ctx: &OperationCtx, input: &Input) -> Result<ProposalResult> {
 	let replica_id = ctx.config().epoxy_replica_id();
 
 	// Read config
diff --git a/packages/services/epoxy/src/ops/read_cluster_config.rs b/packages/services/epoxy/src/ops/read_cluster_config.rs
@@ -15,7 +15,7 @@ pub struct Output {
 }
 
 #[operation]
-pub async fn read_config(ctx: &OperationCtx, input: &Input) -> Result<Output> {
+pub async fn epoxy_read_cluster_config(ctx: &OperationCtx, input: &Input) -> Result<Output> {
 	let config = ctx
 		.udb()?
 		.run(|tx| {
diff --git a/packages/services/epoxy/src/replica/message_request.rs b/packages/services/epoxy/src/replica/message_request.rs
@@ -100,7 +100,7 @@ pub async fn message_request(
 				"received coordinator update replica status request"
 			);
 
-			ctx.signal(crate::workflows::coordinator::ReplicaStatusChangeSignal {
+			ctx.signal(crate::workflows::coordinator::ReplicaStatusChange {
 				replica_id: req.replica_id,
 				status: req.status.into(),
 			})
@@ -118,7 +118,7 @@ pub async fn message_request(
 				"received begin learning request"
 			);
 
-			ctx.signal(crate::workflows::replica::BeginLearningSignal {
+			ctx.signal(crate::workflows::replica::BeginLearning {
 				config: req.config.clone().into(),
 			})
 			.to_workflow::<crate::workflows::replica::Workflow>()
diff --git a/packages/services/epoxy/src/workflows/coordinator/mod.rs b/packages/services/epoxy/src/workflows/coordinator/mod.rs
@@ -25,16 +25,16 @@ pub struct ReplicaState {
 }
 
 #[workflow]
-pub async fn coordinator(ctx: &mut WorkflowCtx, _input: &Input) -> Result<()> {
+pub async fn epoxy_coordinator(ctx: &mut WorkflowCtx, _input: &Input) -> Result<()> {
 	ctx.activity(InitInput {}).await?;
 
 	ctx.repeat(|ctx| {
 		async move {
 			match ctx.listen::<Main>().await? {
-				Main::ReconfigureSignal(_) => {
+				Main::Reconfigure(_) => {
 					reconfigure::reconfigure(ctx).await?;
 				}
-				Main::ReplicaStatusChangeSignal(sig) => {
+				Main::ReplicaStatusChange(sig) => {
 					replica_status_change::replica_status_change(ctx, sig).await?;
 				}
 			}
@@ -73,15 +73,15 @@ pub struct ConfigChangeMessage {
 ///
 /// This gets called any time an engine node starts.
 #[signal("epoxy_coordinator_reconfigure")]
-pub struct ReconfigureSignal {}
+pub struct Reconfigure {}
 
 #[signal("epoxy_coordinator_replica_status_change")]
-pub struct ReplicaStatusChangeSignal {
+pub struct ReplicaStatusChange {
 	pub replica_id: protocol::ReplicaId,
 	pub status: types::ReplicaStatus,
 }
 
 join_signal!(Main {
-	ReconfigureSignal,
-	ReplicaStatusChangeSignal,
+	Reconfigure,
+	ReplicaStatusChange,
 });
diff --git a/packages/services/epoxy/src/workflows/coordinator/replica_status_change.rs b/packages/services/epoxy/src/workflows/coordinator/replica_status_change.rs
@@ -8,7 +8,7 @@ use crate::types;
 
 pub async fn replica_status_change(
 	ctx: &mut WorkflowCtx,
-	signal: super::ReplicaStatusChangeSignal,
+	signal: super::ReplicaStatusChange,
 ) -> Result<()> {
 	// Update replica status
 	let should_increment_epoch = ctx
diff --git a/packages/services/epoxy/src/workflows/replica/mod.rs b/packages/services/epoxy/src/workflows/replica/mod.rs
@@ -14,14 +14,14 @@ pub use setup::*;
 pub struct Input {}
 
 #[workflow]
-pub async fn replica(ctx: &mut WorkflowCtx, input: &Input) -> Result<()> {
+pub async fn epoxy_replica(ctx: &mut WorkflowCtx, input: &Input) -> Result<()> {
 	setup_replica(ctx, input).await?;
 
 	// Main loop
 	ctx.repeat(|ctx| {
 		async move {
 			// Noop for now
-			ctx.listen::<MainSignal>().await?;
+			ctx.listen::<Main>().await?;
 			Ok(Loop::<()>::Continue)
 		}
 		.boxed()
@@ -32,9 +32,9 @@ pub async fn replica(ctx: &mut WorkflowCtx, input: &Input) -> Result<()> {
 }
 
 #[signal("epoxy_replica_begin_learning")]
-pub struct BeginLearningSignal {
+pub struct BeginLearning {
 	pub config: types::ClusterConfig,
 }
 
-#[signal("main")]
-pub struct MainSignal {}
+#[signal("epoxy_replica_main")]
+pub struct Main {}
diff --git a/packages/services/epoxy/src/workflows/replica/setup.rs b/packages/services/epoxy/src/workflows/replica/setup.rs
@@ -10,14 +10,14 @@ use universaldb::{KeySelector, RangeOption, options::StreamingMode};
 use crate::types;
 
 // IMPORTANT: Do not use `read_cluster_config`. Instead, use the config provided by
-// `BeginLearningSignal`. This is because the value of `read_cluster_config` may change between
+// `BeginLearning`. This is because the value of `read_cluster_config` may change between
 // activities which can cause the learning process to enter an invalid state.
 
 pub async fn setup_replica(ctx: &mut WorkflowCtx, _input: &super::Input) -> Result<()> {
-	// Wait for cooridinator to send begin learning signal
-	let begin_learning = ctx.listen::<super::BeginLearningSignal>().await?;
+	// Wait for coordiinator to send begin learning signal
+	let begin_learning = ctx.listen::<super::BeginLearning>().await?;
 
-	// TODO: Paralellize replicas
+	// TODO: Parallelize replicas
 	let total_replicas = begin_learning.config.replicas.len();
 	let mut replica_index = 0;
 
@@ -134,7 +134,7 @@ pub async fn setup_replica(ctx: &mut WorkflowCtx, _input: &super::Input) -> Resu
 
 #[derive(Debug, Clone, Serialize, Deserialize, Hash)]
 pub struct DownloadInstancesChunkInput {
-	/// Config received from BeginLearningSignal
+	/// Config received from BeginLearning
 	pub learning_config: types::ClusterConfig,
 	pub from_replica_id: protocol::ReplicaId,
 	pub after_instance: Option<types::Instance>,
@@ -312,7 +312,7 @@ async fn apply_log_entry(
 
 #[derive(Debug, Clone, Serialize, Deserialize, Hash)]
 pub struct RecoverKeysChunkInput {
-	/// Config received from BeginLearningSignal
+	/// Config received from BeginLearning
 	pub learning_config: types::ClusterConfig,
 	/// The last key value from the previous chunk, used for pagination
 	pub after_key: Option<Vec<u8>>,
@@ -728,7 +728,7 @@ struct CommittedEntry {
 
 #[derive(Debug, Clone, Serialize, Deserialize, Hash)]
 pub struct NotifyActiveInput {
-	/// Config received from BeginLearningSignal
+	/// Config received from BeginLearning
 	pub learning_config: types::ClusterConfig,
 }
 
diff --git a/packages/services/epoxy/tests/common/mod.rs b/packages/services/epoxy/tests/common/mod.rs
@@ -284,7 +284,7 @@ async fn setup_epoxy_coordinator_wf(
 		)
 		.await?;
 	leader_ctx
-		.signal(epoxy::workflows::coordinator::ReconfigureSignal {})
+		.signal(epoxy::workflows::coordinator::Reconfigure {})
 		.to_workflow_id(workflow_id)
 		.send()
 		.await?;
diff --git a/packages/services/epoxy/tests/reconfigure.rs b/packages/services/epoxy/tests/reconfigure.rs
@@ -321,7 +321,7 @@ async fn test_inner(config: TestConfig) {
 		.await
 		.unwrap();
 	leader_ctx
-		.signal(epoxy::workflows::coordinator::ReconfigureSignal {})
+		.signal(epoxy::workflows::coordinator::Reconfigure {})
 		.to_workflow_id(test_ctx.coordinator_workflow_id)
 		.send()
 		.await
diff --git a/sdks/typescript/test-runner/src/main.ts b/sdks/typescript/test-runner/src/main.ts

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ const getApiEndpoint = (apiEndpoint: string) => {`
`31`	`31`	`}`
`32`	`32`	`// Default to staging servers for all other endpoints`
`33`	`33`	`return "https://api.staging2.gameinc.io";`
	`34`	`+ } else if (apiEndpoint === "__SAME__") {`
	`35`	`+ return location.origin;`
`34`	`36`	`}`
`35`	`37`	`return apiEndpoint;`
`36`	`38`	`};`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ pub enum DatabaseError {`
`12`	`12`
`13`	`13`	`#[error("operation issued while a commit was outstanding")]`
`14`	`14`	`UsedDuringCommit,`
`15`		`- // #[error(transparent)]`
`16`		`- // Custom(Box<dyn std::error::Error + Send + Sync>),`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`impl DatabaseError {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub struct Output {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`#[operation]`
`21`		`-pub async fn get_local(ctx: &OperationCtx, input: &Input) -> Result<Output> {`
	`21`	`+pub async fn epoxy_kv_get_local(ctx: &OperationCtx, input: &Input) -> Result<Output> {`
`22`	`22`	`// Read from local KV store only`
`23`	`23`	`let kv_key = keys::keys::KvValueKey::new(input.key.clone());`
`24`	`24`	`let subspace = keys::subspace(input.replica_id);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pub struct Input {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`#[operation]`
`30`		`-pub async fn propose(ctx: &OperationCtx, input: &Input) -> Result<ProposalResult> {`
	`30`	`+pub async fn epoxy_propose(ctx: &OperationCtx, input: &Input) -> Result<ProposalResult> {`
`31`	`31`	`let replica_id = ctx.config().epoxy_replica_id();`
`32`	`32`
`33`	`33`	`// Read config`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ pub struct Output {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`#[operation]`
`18`		`-pub async fn read_config(ctx: &OperationCtx, input: &Input) -> Result<Output> {`
	`18`	`+pub async fn epoxy_read_cluster_config(ctx: &OperationCtx, input: &Input) -> Result<Output> {`
`19`	`19`	`let config = ctx`
`20`	`20`	`.udb()?`
`21`	`21`	`.run(\|tx\| {`