chore(core): review changes

Author: Cammisuli

Cargo.lock

@@ -244,7 +244,6 @@
         "serveStaticTargetName": "serve-static"
       }
     },
-    "@nx/enterprise-cloud",
     {
       "plugin": "@nx/storybook/plugin",
       "options": {

nx.json

@@ -68,8 +68,6 @@ vt100-ctt = { git = "https://github.com/JamesHenry/vt100-rust", rev = "b15dc3b0f
 serde = "1.0.219"
 serde_json = "1.0.140"
 
-sha2 = "0.10.8"
-
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["fileapi", "psapi", "shellapi"] }
 

packages/nx/Cargo.toml

@@ -36,5 +36,5 @@ pub enum Action {
     EndTasks(Vec<TaskResult>),
     ToggleDebugMode,
     SendConsoleMessage(String),
-    ConsoleMessagesAvailable(bool),
+    ConsoleMessengerAvailable(bool),
 }

packages/nx/src/native/tui/action.rs

@@ -1562,7 +1562,7 @@ impl App {
             .as_ref()
             .is_some_and(|c| c.is_connected())
         {
-            self.dispatch_action(Action::ConsoleMessagesAvailable(true));
+            self.dispatch_action(Action::ConsoleMessengerAvailable(true));
         }
     }
 }

packages/nx/src/native/tui/app.rs

@@ -388,7 +388,7 @@ impl Component for HelpPopup {
             Action::Resize(w, h) => {
                 self.handle_resize(w, h);
             }
-            Action::ConsoleMessagesAvailable(available) => {
+            Action::ConsoleMessengerAvailable(available) => {
                 self.set_console_available(available);
             }
             _ => {}

packages/nx/src/native/tui/components/help_popup.rs

@@ -15,7 +15,7 @@ use tui_term::widget::PseudoTerminal;
 
 use crate::native::tui::components::tasks_list::TaskStatus;
 use crate::native::tui::theme::THEME;
-use crate::native::tui::{action::Action, nx_console, pty::PtyInstance};
+use crate::native::tui::{action::Action, pty::PtyInstance};
 
 pub struct TerminalPaneData {
     pub pty: Option<Arc<PtyInstance>>,
@@ -509,16 +509,14 @@ impl<'a> StatefulWidget for TerminalPane<'a> {
                                 ),
                             ])
                         } else {
-                            let spans = vec![
+                            Line::from(vec![
                                 Span::raw("  "),
                                 Span::styled("i", Style::default().fg(THEME.info)),
                                 Span::styled(
                                     " to make interactive  ",
                                     Style::default().fg(THEME.secondary_fg),
                                 ),
-                            ];
-
-                            Line::from(spans)
+                            ])
                         };
 
                         let text_width = bottom_text

packages/nx/src/native/tui/components/terminal_pane.rs

@@ -1,23 +1,20 @@
-use sha2::{Digest, Sha256};
 use std::env;
 use std::fs;
 use std::path::PathBuf;
 
+use crate::native::hasher::hash;
+
 const DAEMON_DIR_FOR_CURRENT_WORKSPACE: &str = "./nx/workspace-data/d";
 
 fn socket_dir_name(workspace_root: &str, unique_name: Option<&'static str>) -> PathBuf {
-    let mut hasher = Sha256::new();
-    hasher.update(workspace_root.to_lowercase());
+    let mut hashing_string = workspace_root.to_lowercase();
     if let Some(name) = unique_name {
-        hasher.update(name)
+        hashing_string.push(',');
+        hashing_string.push_str(name);
     }
-    let result = hasher.finalize();
-
-    let result_hex = format!("{:x}", result);
-    let unique = result_hex.chars().take(20).collect::<String>();
-
+    let result = hash(hashing_string.as_bytes());
     let temp_dir = std::env::temp_dir();
-    temp_dir.join(unique)
+    temp_dir.join(result)
 }
 
 fn get_socket_dir(workspace_root: &str, unique_name: Option<&'static str>) -> PathBuf {
@@ -31,7 +28,7 @@ fn get_socket_dir(workspace_root: &str, unique_name: Option<&'static str>) -> Pa
     } else {
         match fs::create_dir_all(&dir_path) {
             Ok(_) => dir_path,
-            Err(_) => PathBuf::from(DAEMON_DIR_FOR_CURRENT_WORKSPACE),
+            Err(_) => PathBuf::from(workspace_root).join(DAEMON_DIR_FOR_CURRENT_WORKSPACE),
         }
     };
 
@@ -50,3 +47,49 @@ pub fn get_full_os_socket_path(workspace_root: &str) -> PathBuf {
 pub fn get_full_nx_console_socket_path(workspace_root: &str) -> PathBuf {
     get_socket_dir(workspace_root, Some("nx-console")).join("nx-console.sock")
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::env;
+
+    #[test]
+    fn test_socket_dir_name_basic() {
+        let root = "/tmp/test_workspace";
+        let dir = socket_dir_name(root, None);
+        assert_eq!(dir.to_string_lossy(), "/tmp/17684150229889955837");
+        assert!(dir.is_absolute());
+    }
+
+    #[test]
+    fn test_socket_dir_name_with_unique_name() {
+        let root = "/tmp/test_workspace";
+        let dir = socket_dir_name(root, Some("unique"));
+        assert_eq!(dir.to_string_lossy(), "/tmp/10757852796479033769");
+        assert!(dir.is_absolute());
+    }
+
+    #[test]
+    fn test_get_socket_dir_env_var() {
+        let root = "/tmp/test_workspace";
+        let temp_dir = std::env::temp_dir().join("nx_test_socket_dir");
+        unsafe { env::set_var("NX_SOCKET_DIR", &temp_dir) };
+        let dir = get_socket_dir(root, None);
+        assert_eq!(dir.to_string_lossy(), "/tmp/nx_test_socket_dir");
+        unsafe { env::remove_var("NX_SOCKET_DIR") };
+    }
+
+    #[test]
+    fn test_get_full_os_socket_path() {
+        let root = "/tmp/test_workspace";
+        let path = get_full_os_socket_path(root);
+        assert!(path.is_absolute() || path.starts_with("./nx/workspace-data/d"));
+    }
+
+    #[test]
+    fn test_get_full_nx_console_socket_path() {
+        let root = "/tmp/test_workspace";
+        let path = get_full_nx_console_socket_path(root);
+        assert!(path.to_string_lossy().contains("nx-console.sock"));
+    }
+}