Split out WebSocket errors

Author: shepmaster

ui/src/server_axum.rs

@@ -60,8 +60,6 @@ const MAX_AGE_ONE_YEAR: HeaderValue = HeaderValue::from_static("public, max-age=
 const DOCKER_PROCESS_TIMEOUT_SOFT: Duration = Duration::from_secs(10);
 
 mod websocket;
-pub use websocket::CoordinatorManagerError as WebsocketCoordinatorManagerError;
-pub(crate) use websocket::ExecuteError as WebsocketExecuteError;
 
 #[derive(Debug, Clone)]
 struct CoordinatorOneOffFactory(Arc<CoordinatorFactory>);
@@ -997,9 +995,6 @@ enum Error {
     #[snafu(display("{PLAYGROUND_GITHUB_TOKEN} not set up for reading/writing gists"))]
     NoGithubToken,
 
-    #[snafu(display("Unable to deserialize request"))]
-    Deserialization { source: serde_json::Error },
-
     #[snafu(transparent)]
     EvaluateRequest {
         source: api_orchestrator_integration_impls::ParseEvaluateRequestError,
@@ -1035,9 +1030,6 @@ enum Error {
         source: api_orchestrator_integration_impls::ParseMacroExpansionRequestError,
     },
 
-    #[snafu(display("The WebSocket worker panicked: {}", text))]
-    WebSocketTaskPanic { text: String },
-
     #[snafu(display("Unable to find the available crates"))]
     Crates {
         source: orchestrator::coordinator::CratesError,
@@ -1093,24 +1085,6 @@ enum Error {
 
     #[snafu(display("The operation timed out"))]
     Timeout { source: tokio::time::error::Elapsed },
-
-    #[snafu(display("Unable to spawn a coordinator task"))]
-    StreamingCoordinatorSpawn {
-        source: WebsocketCoordinatorManagerError,
-    },
-
-    #[snafu(display("Unable to idle the coordinator"))]
-    StreamingCoordinatorIdle {
-        source: WebsocketCoordinatorManagerError,
-    },
-
-    #[snafu(display("Unable to perform a streaming execute"))]
-    StreamingExecute { source: WebsocketExecuteError },
-
-    #[snafu(display("Unable to pass stdin to the active execution"))]
-    StreamingCoordinatorExecuteStdin {
-        source: tokio::sync::mpsc::error::SendError<()>,
-    },
 }
 
 type Result<T, E = Error> = ::std::result::Result<T, E>;

ui/src/server_axum/websocket.rs

@@ -30,12 +30,6 @@ use tokio::{
 use tokio_util::sync::CancellationToken;
 use tracing::{error, instrument, warn, Instrument};
 
-use super::{
-    DeserializationSnafu, Error, Result, StreamingCoordinatorExecuteStdinSnafu,
-    StreamingCoordinatorIdleSnafu, StreamingCoordinatorSpawnSnafu, StreamingExecuteSnafu,
-    WebSocketTaskPanicSnafu,
-};
-
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 struct MetaInner {
@@ -797,3 +791,26 @@ pub(crate) enum ExecuteError {
 }
 
 type ExecuteResult<T, E = ExecuteError> = std::result::Result<T, E>;
+
+#[derive(Debug, Snafu)]
+enum Error {
+    #[snafu(display("Unable to deserialize request"))]
+    Deserialization { source: serde_json::Error },
+
+    #[snafu(display("The WebSocket worker panicked: {}", text))]
+    WebSocketTaskPanic { text: String },
+
+    #[snafu(display("Unable to spawn a coordinator task"))]
+    StreamingCoordinatorSpawn { source: CoordinatorManagerError },
+
+    #[snafu(display("Unable to idle the coordinator"))]
+    StreamingCoordinatorIdle { source: CoordinatorManagerError },
+
+    #[snafu(display("Unable to perform a streaming execute"))]
+    StreamingExecute { source: ExecuteError },
+
+    #[snafu(display("Unable to pass stdin to the active execution"))]
+    StreamingCoordinatorExecuteStdin {
+        source: tokio::sync::mpsc::error::SendError<()>,
+    },
+}