Use the shared protocol

Signed-off-by: kerthcet <kerthcet@gmail.com>

Author: kerthcet

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["server", "sandd"]
+members = ["protocol", "server", "sandd"]
 resolver = "2"
 
 [workspace.dependencies]

Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "sandd-protocol"
+version = "0.0.0"
+edition = "2021"
+
+[dependencies]
+serde = { workspace = true }
+serde_json = { workspace = true }
+base64 = "0.22"

protocol/Cargo.toml

@@ -1,10 +1,21 @@
+// Shared protocol between daemon and server
+
 use serde::{Deserialize, Serialize};
 
-/// Protocol messages exchanged between agent and daemon
+/// Snapshot metadata (shared between daemon and server)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SnapshotInfo {
+    pub id: String,
+    pub created_at: u64,  // Unix timestamp in milliseconds
+    pub message: String,
+    pub tags: Vec<String>,
+    pub file_count: usize,
+    pub total_size: u64,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Message {
-    // Connection management
     Register {
         daemon_id: String,
         metadata: DaemonMetadata,
@@ -15,8 +26,6 @@ pub enum Message {
     },
     Heartbeat,
     Pong,
-
-    // Command execution (simple mode)
     ExecuteCommand {
         request_id: String,
         command: String,
@@ -38,8 +47,6 @@ pub enum Message {
         request_id: String,
         error: String,
     },
-
-    // Interactive session (PTY mode)
     NewSession {
         session_id: String,
         rows: u16,
@@ -74,14 +81,12 @@ pub enum Message {
         session_id: String,
         exit_code: i32,
     },
-
-    // File transfer
     FileUploadStart {
         request_id: String,
         path: String,
         total_size: u64,
         #[serde(default)]
-        mode: Option<u32>, // Unix file permissions
+        mode: Option<u32>,
     },
     FileUploadChunk {
         request_id: String,
@@ -109,7 +114,6 @@ pub enum Message {
         request_id: String,
         error: String,
     },
-
     // Snapshot operations
     CreateSnapshot {
         request_id: String,
@@ -138,7 +142,7 @@ pub enum Message {
     },
     SnapshotList {
         request_id: String,
-        snapshots: Vec<serde_json::Value>,
+        snapshots: Vec<SnapshotInfo>,
     },
     FindSnapshotByTag {
         request_id: String,
@@ -150,7 +154,7 @@ pub enum Message {
     },
     SnapshotDetails {
         request_id: String,
-        snapshot: Option<serde_json::Value>,
+        snapshot: Option<SnapshotInfo>,
     },
     DeleteSnapshot {
         request_id: String,
@@ -163,8 +167,6 @@ pub enum Message {
         request_id: String,
         error: String,
     },
-
-    // Error handling
     Error {
         message: String,
         #[serde(default)]
@@ -184,14 +186,13 @@ pub struct DaemonMetadata {
 }
 
 fn default_timeout() -> u64 {
-    300 // 5 minutes
+    300
 }
 
 fn default_term() -> String {
     "xterm-256color".to_string()
 }
 
-// Base64 encoding for binary data in JSON
 mod base64_bytes {
     use serde::{Deserialize, Deserializer, Serializer};
 
@@ -209,7 +210,6 @@ mod base64_bytes {
             .map_err(serde::de::Error::custom)
     }
 }
-
 #[cfg(test)]
 mod tests {
     use super::*;

server/src/protocol.rs protocol/src/lib.rsserver/src/protocol.rs renamed to protocol/src/lib.rs

@@ -28,6 +28,7 @@ name = "snapshot_real_project"
 path = "../examples/snapshot_real_project.rs"
 
 [dependencies]
+sandd-protocol = { path = "../protocol" }
 tokio = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

sandd/Cargo.toml

@@ -1,13 +1,13 @@
 mod executor;
-mod protocol;
+// Use shared protocol crate
 mod session;
 pub mod snapshot;
 
 use anyhow::{Context, Result};
 use clap::Parser;
 use executor::CommandExecutor;
 use futures_util::{SinkExt, StreamExt};
-use protocol::Message;
+use sandd_protocol::Message;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
@@ -148,7 +148,7 @@ async fn connect_and_serve(
     let (mut ws_tx, mut ws_rx) = ws_stream.split();
 
     // Gather system metadata
-    let metadata = protocol::DaemonMetadata {
+    let metadata = sandd_protocol::DaemonMetadata {
         hostname: System::host_name().unwrap_or_else(|| "unknown".to_string()),
         platform: std::env::consts::OS.to_string(),
         arch: std::env::consts::ARCH.to_string(),