use Uuid to generate unique server socket names

3 files changed, 13 insertions, 5 deletions

diff --git a/src/common/mod.rs b/src/common/mod.rs
index 6061f1a6..4baf503f 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -11,8 +11,10 @@ pub mod wasm_vm;
 
 use crate::panes::PaneId;
 use crate::server::ServerInstruction;
+use crate::utils::consts::ZELLIJ_IPC_PIPE;
 use async_std::task_local;
 use errors::{get_current_ctx, ErrorContext};
+use lazy_static::lazy_static;
 use std::cell::RefCell;
 use std::sync::mpsc;
 
@@ -73,3 +75,8 @@ task_local! {
     /// stack in the form of an [`ErrorContext`].
     static ASYNCOPENCALLS: RefCell<ErrorContext> = RefCell::default()
 }
+
+lazy_static! {
+    pub static ref UNIQUE_ZELLIJ_IPC_PIPE: String =
+        ZELLIJ_IPC_PIPE.to_string() + uuid::Uuid::new_v4().to_string().as_str();
+}
diff --git a/src/common/os_input_output.rs b/src/common/os_input_output.rs
index a99a0d16..d8ef45f9 100644
--- a/src/common/os_input_output.rs
+++ b/src/common/os_input_output.rs
@@ -17,10 +17,10 @@ use std::process::{Child, Command};
 use std::sync::{Arc, Mutex};
 
 use crate::client::ClientInstruction;
+use crate::common::UNIQUE_ZELLIJ_IPC_PIPE;
 use crate::errors::{get_current_ctx, ErrorContext};
 use crate::panes::PositionAndSize;
 use crate::server::ServerInstruction;
-use crate::utils::consts::ZELLIJ_IPC_PIPE;
 
 const IPC_BUFFER_SIZE: usize = 262144;
 
@@ -404,7 +404,7 @@ impl ClientOsApi for ClientOsInputOutput {
         }
     }
     fn connect_to_server(&self) {
-        let socket = LocalSocketStream::connect(ZELLIJ_IPC_PIPE).unwrap();
+        let socket = LocalSocketStream::connect(UNIQUE_ZELLIJ_IPC_PIPE.as_str()).unwrap();
         let sock_fd = socket.as_raw_fd();
         let dup_fd = unistd::dup(sock_fd).unwrap();
         let receiver = unsafe { LocalSocketStream::from_raw_fd(dup_fd) };
diff --git a/src/server/mod.rs b/src/server/mod.rs
index ca34861b..3e0500b0 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -16,6 +16,7 @@ use zellij_tile::data::{Event, EventType, ModeInfo};
 
 use crate::cli::CliArgs;
 use crate::client::ClientInstruction;
+use crate::common::UNIQUE_ZELLIJ_IPC_PIPE;
 use crate::common::{
     errors::{ContextType, PluginContext, PtyContext, ScreenContext, ServerContext},
     input::actions::{Action, Direction},
@@ -29,7 +30,6 @@ use crate::common::{
 use crate::layout::Layout;
 use crate::panes::PaneId;
 use crate::panes::PositionAndSize;
-use crate::utils::consts::ZELLIJ_IPC_PIPE;
 
 /// Instructions related to server-side application including the
 /// ones sent by client to server
@@ -83,8 +83,8 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>, opts: CliArgs) -> thread::Jo
         let sessions = sessions.clone();
         let send_server_instructions = send_server_instructions.clone();
         move || {
-            drop(std::fs::remove_file(ZELLIJ_IPC_PIPE));
-            let listener = LocalSocketListener::bind(ZELLIJ_IPC_PIPE).unwrap();
+            drop(std::fs::remove_file(UNIQUE_ZELLIJ_IPC_PIPE.as_str()));
+            let listener = LocalSocketListener::bind(UNIQUE_ZELLIJ_IPC_PIPE.as_str()).unwrap();
             for stream in listener.incoming() {
                 match stream {
                     Ok(stream) => {
@@ -132,6 +132,7 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>, opts: CliArgs) -> thread::Jo
                     ServerInstruction::ClientExit => {
                         *sessions.write().unwrap() = None;
                         os_input.send_to_client(ClientInstruction::Exit);
+                        drop(std::fs::remove_file(UNIQUE_ZELLIJ_IPC_PIPE.as_str()));
                         break;
                     }
                     ServerInstruction::Render(output) => {