Align types

crates/trycp_api/src/lib.rs

@@ -160,6 +160,14 @@ pub enum MessageToClient {
     },
 }
 
+/// Messages returned directly by the TryCp server, rather than relayed from Holochain
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "snake_case", tag = "type", content = "data")]
+pub enum TryCpServerResponse {
+    /// See [DownloadLogsResponse].
+    DownloadLogs(DownloadLogsResponse),
+}
+
 /// The successful response type for a [Request::DownloadLogs] request.
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct DownloadLogsResponse {

crates/trycp_server/src/download_logs.rs

@@ -3,7 +3,7 @@ use crate::{
     CONDUCTOR_STDOUT_LOG_FILENAME, LAIR_STDERR_LOG_FILENAME,
 };
 use snafu::{ResultExt, Snafu};
-use trycp_api::DownloadLogsResponse;
+use trycp_api::{DownloadLogsResponse, MessageResponse, TryCpServerResponse};
 
 #[derive(Debug, Snafu)]
 pub(crate) enum DownloadLogsError {
@@ -23,30 +23,33 @@ pub(crate) enum DownloadLogsError {
         source
     ))]
     HolochainStderr { id: String, source: std::io::Error },
+    #[snafu(display("Could not serialize response: {}", source))]
+    SerializeResponse { source: rmp_serde::encode::Error },
 }
 
-pub(crate) fn download_logs(id: String) -> Result<DownloadLogsResponse, DownloadLogsError> {
+pub(crate) fn download_logs(id: String) -> Result<MessageResponse, DownloadLogsError> {
     if !player_config_exists(&id) {
         return Err(DownloadLogsError::PlayerNotConfigured { id });
     }
 
     let player_dir = get_player_dir(&id);
 
     let lair_stderr = player_dir.join(LAIR_STDERR_LOG_FILENAME);
-    let lair_stderr =
-        std::fs::read(&lair_stderr).context(LairStdErr { id: id.clone() })?;
+    let lair_stderr = std::fs::read(&lair_stderr).context(LairStdErr { id: id.clone() })?;
 
     let conductor_stdout = player_dir.join(CONDUCTOR_STDOUT_LOG_FILENAME);
     let conductor_stdout =
         std::fs::read(&conductor_stdout).context(HolochainStdout { id: id.clone() })?;
 
     let conductor_stderr = player_dir.join(CONDUCTOR_STDERR_LOG_FILENAME);
-    let conductor_stderr =
-        std::fs::read(&conductor_stderr).context(HolochainStderr { id })?;
+    let conductor_stderr = std::fs::read(&conductor_stderr).context(HolochainStderr { id })?;
 
-    Ok(DownloadLogsResponse {
-        lair_stderr,
-        conductor_stdout,
-        conductor_stderr,
-    })
+    Ok(MessageResponse::Bytes(
+        rmp_serde::to_vec_named(&TryCpServerResponse::DownloadLogs(DownloadLogsResponse {
+            lair_stderr,
+            conductor_stdout,
+            conductor_stderr,
+        }))
+        .context(SerializeResponse)?,
+    ))
 }

ts/src/trycp/conductor/conductor.ts

@@ -319,8 +319,10 @@ export class TryCpConductor implements IConductor {
       id: this.id,
     });
     assert(response !== TRYCP_SUCCESS_RESPONSE);
-    assert(typeof response !== "string");
-    return response as DownloadLogsResponse;
+    assert(typeof response === "object");
+    assert("type" in response);
+    assert(response.type === "download_logs");
+    return response.data;
   }
 
   /**

ts/src/trycp/trycp-client.ts

@@ -261,11 +261,7 @@ export class TryCpClient {
   }
 
   private processSuccessResponse(response: _TryCpSuccessResponseSeralized) {
-    if (
-      response === TRYCP_SUCCESS_RESPONSE ||
-      typeof response === "string" ||
-      (typeof response === "object" && response.length === undefined) // Some object, duck-typed to not be a bytearray
-    ) {
+    if (response === TRYCP_SUCCESS_RESPONSE || typeof response === "string") {
       logger.debug(`response ${JSON.stringify(response, null, 4)}\n`);
       return response;
     }

ts/src/trycp/types.ts

@@ -253,7 +253,12 @@ export type TryCpApiResponse =
   | TryCpControlResponse
   | ApiErrorResponse;
 
-export type TryCpControlResponse = DownloadLogsResponse;
+export type TryCpControlResponse = DownloadLogsResponseType;
+
+export interface DownloadLogsResponseType {
+  type: "download_logs";
+  data: DownloadLogsResponse;
+}
 
 export interface DownloadLogsResponse {
   lair_stderr: Uint8Array;