Solved conundrum about Server separation of Subscribe and SendCommand streams

libbonknet/src/lib.rs

@@ -32,12 +32,32 @@ pub enum RequiredReplyValues {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub enum FromServerMessage {
-    RequiredReply(RequiredReplyValues),
+pub enum FromServerConnTypeMessage {
+    SendCommand,
+    Subscribe,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum ToServerConnTypeReply {
+    OkSendCommand,
+    OkSubscribe,
+    GenericFailure,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum FromServerCommandMessage {
     ChangeName { name: String },
     WhoAmI,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub enum ToServerCommandReply {
+    NameChanged,
+    NameNotAvailable,
+    YouAre { name: String },
+    GenericFailure,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub enum YouAreValues {
     Registered { name: String },
@@ -47,7 +67,6 @@ pub enum YouAreValues {
 #[derive(Debug, Serialize, Deserialize)]
 pub enum ToServerMessage {
     Required { id: String },
-    YouAre(YouAreValues),
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -57,7 +76,7 @@ pub enum FromGuestServerMessage {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub enum ToGuestServerMessage {
-    OkAnnounce {server_cert: Vec<u8>, server_prkey: Vec<u8>},
+    OkAnnounce { server_cert: Vec<u8>, server_prkey: Vec<u8> },
     FailedNameAlreadyOccupied,
 }
 
@@ -69,7 +88,7 @@ pub fn okannounce_to_cert<'a>(server_cert: Vec<u8>, server_prkey: Vec<u8>) -> (C
 
 impl ToGuestServerMessage {
     pub fn make_okannounce(server_cert: CertificateDer, server_prkey: PrivatePkcs8KeyDer) -> Self {
-        ToGuestServerMessage::OkAnnounce{
+        ToGuestServerMessage::OkAnnounce {
             server_cert: server_cert.to_vec(),
             server_prkey: server_prkey.secret_pkcs8_der().to_vec()
         }