chore: clean up unused protos and fuctions (#294)

Author: grant0417

crates/fig_desktop/src/main.rs

@@ -75,12 +75,6 @@ use webview::{
 #[macro_use]
 extern crate objc;
 
-#[derive(Debug, Default)]
-pub struct DebugState {
-    pub debug_lines: RwLock<Vec<String>>,
-    pub color: RwLock<Option<String>>,
-}
-
 #[derive(Debug, Default)]
 pub struct InterceptState {
     pub intercept_bound_keystrokes: RwLock<bool>,

crates/fig_desktop/src/platform/linux/mod.rs

@@ -4,7 +4,6 @@ pub mod integrations;
 mod sway;
 mod x11;
 
-use std::borrow::Cow;
 use std::sync::Arc;
 use std::sync::atomic::{
     AtomicBool,
@@ -305,15 +304,6 @@ impl PlatformStateImpl {
         }
     }
 
-    pub(super) fn shell() -> Cow<'static, str> {
-        for shell in &["bash", "zsh", "sh"] {
-            if let Ok(shell_path) = which::which(shell) {
-                return shell_path.to_string_lossy().to_string().into();
-            }
-        }
-        "/bin/bash".into()
-    }
-
     pub fn accessibility_is_enabled() -> Option<bool> {
         None
     }

crates/fig_desktop/src/platform/macos.rs

@@ -1,7 +1,6 @@
 // This is needed for objc
 #![allow(unexpected_cfgs)]
 
-use std::borrow::Cow;
 use std::ffi::CString;
 use std::path::Path;
 use std::slice;
@@ -789,10 +788,6 @@ impl PlatformStateImpl {
         Some((Arc::new(data.into()), AssetKind::Png))
     }
 
-    pub(super) fn shell() -> Cow<'static, str> {
-        "/bin/bash".into()
-    }
-
     pub(super) fn accessibility_is_enabled() -> Option<bool> {
         Some(ACCESSIBILITY_ENABLED.load(Ordering::SeqCst))
     }

crates/fig_desktop/src/platform/mod.rs

@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::sync::Arc;
 
 #[cfg(target_os = "macos")]
@@ -93,11 +92,6 @@ impl PlatformState {
         PlatformStateImpl::icon_lookup(name).await
     }
 
-    /// The shell to execute processes in
-    pub fn shell() -> Cow<'static, str> {
-        PlatformStateImpl::shell()
-    }
-
     /// Whether or not accessibility is enabled
     pub fn accessibility_is_enabled() -> Option<bool> {
         PlatformStateImpl::accessibility_is_enabled()

crates/fig_desktop/src/protocol/api.rs

@@ -24,7 +24,6 @@ use crate::request::{
 };
 use crate::webview::{
     DASH_KV_STORE,
-    DEBUG_STATE,
     FIGTERM_STATE,
     GLOBAL_PROXY,
     INTERCEPT_STATE,
@@ -54,7 +53,6 @@ pub async fn handle(
         EventHandler::default(),
         Context {
             window_id: &window_id,
-            debug_state: DEBUG_STATE.get().unwrap().as_ref(),
             figterm_state: FIGTERM_STATE.get().unwrap().as_ref(),
             intercept_state: INTERCEPT_STATE.get().unwrap().as_ref(),
             notifications_state: NOTIFICATIONS_STATE.get().unwrap().as_ref(),

crates/fig_desktop/src/request/debug.rs

@@ -1,4 +1,3 @@
-mod debug;
 mod figterm;
 mod notifications;
 mod onboarding;
@@ -30,14 +29,11 @@ use fig_proto::fig::server_originated_message::Submessage as ServerOriginatedSub
 use fig_proto::fig::{
     AggregateSessionMetricActionRequest,
     ClientOriginatedMessage,
-    DebuggerUpdateRequest,
     DragWindowRequest,
     InsertTextRequest,
     NotificationRequest,
     OnboardingRequest,
     PositionWindowRequest,
-    PseudoterminalExecuteRequest,
-    PseudoterminalWriteRequest,
     RunProcessRequest,
     ServerOriginatedMessage,
     UpdateApplicationPropertiesRequest,
@@ -65,13 +61,11 @@ use crate::event::{
 use crate::webview::WindowId;
 use crate::webview::notification::WebviewNotificationsState;
 use crate::{
-    DebugState,
     EventLoopProxy,
     InterceptState,
 };
 
 pub struct Context<'a> {
-    pub debug_state: &'a DebugState,
     pub figterm_state: &'a FigtermState,
     pub intercept_state: &'a InterceptState,
     pub notifications_state: &'a WebviewNotificationsState,
@@ -136,10 +130,6 @@ impl<'a> fig_desktop_api::handler::EventHandler for EventHandler<'a> {
         .await
     }
 
-    async fn debugger_update(&self, request: Wrapped<Self::Ctx, DebuggerUpdateRequest>) -> RequestResult {
-        debug::update(request.request, request.context.debug_state).await
-    }
-
     async fn insert_text(&self, request: Wrapped<Self::Ctx, InsertTextRequest>) -> RequestResult {
         figterm::insert_text(request.request, request.context.figterm_state).await
     }
@@ -187,14 +177,6 @@ impl<'a> fig_desktop_api::handler::EventHandler for EventHandler<'a> {
         process::run(request.request, request.context.figterm_state).await
     }
 
-    async fn pseudoterminal_execute(&self, request: Wrapped<Self::Ctx, PseudoterminalExecuteRequest>) -> RequestResult {
-        process::execute(request.request, request.context.figterm_state).await
-    }
-
-    async fn pseudoterminal_write(&self, _request: Wrapped<Self::Ctx, PseudoterminalWriteRequest>) -> RequestResult {
-        process::write().await
-    }
-
     async fn update_application_properties(
         &self,
         request: Wrapped<Self::Ctx, UpdateApplicationPropertiesRequest>,
@@ -223,7 +205,6 @@ impl<'a> fig_desktop_api::handler::EventHandler for EventHandler<'a> {
 pub async fn api_request(
     window_id: WindowId,
     message: fig_desktop_api::error::Result<ClientOriginatedMessage>,
-    debug_state: &DebugState,
     figterm_state: &FigtermState,
     intercept_state: &InterceptState,
     notifications_state: &WebviewNotificationsState,
@@ -237,7 +218,6 @@ pub async fn api_request(
             match fig_desktop_api::handler::api_request(
                 EventHandler::default(),
                 Context {
-                    debug_state,
                     figterm_state,
                     intercept_state,
                     notifications_state,

crates/fig_desktop/src/request/mod.rs

@@ -1,11 +1,7 @@
 use std::time::Duration;
 
-use fig_desktop_api::requests::Error;
 use fig_proto::fig::server_originated_message::Submessage as ServerOriginatedSubMessage;
 use fig_proto::fig::{
-    EnvironmentVariable,
-    PseudoterminalExecuteRequest,
-    PseudoterminalExecuteResponse,
     RunProcessRequest,
     RunProcessResponse,
 };
@@ -21,29 +17,9 @@ use fig_util::env_var::{
 };
 use tokio::process::Command;
 use tokio::time::timeout;
-use tracing::{
-    debug,
-    warn,
-};
+use tracing::debug;
 
-use super::{
-    RequestResult,
-    RequestResultImpl,
-};
-use crate::platform::PlatformState;
-
-fn shell_args(shell_path: &str) -> &'static [&'static str] {
-    let (_, shell_name) = shell_path.rsplit_once(['/', '\\']).unwrap_or(("", shell_path));
-    match shell_name {
-        "bash" | "bash.exe" => &["--norc", "--noprofile", "-c"],
-        "zsh" | "zsh.exe" => &["--norcs", "-c"],
-        "fish" | "fish.exe" => &["--no-config", "-c"],
-        _ => {
-            warn!(%shell_name, "unknown shell");
-            &[]
-        },
-    }
-}
+use super::RequestResult;
 
 fn set_fig_vars(cmd: &mut Command) {
     cmd.env(Q_TERM, env!("CARGO_PKG_VERSION"));
@@ -54,98 +30,6 @@ fn set_fig_vars(cmd: &mut Command) {
     cmd.env("TERM", "xterm-256color");
 }
 
-pub async fn execute(request: PseudoterminalExecuteRequest, figterm_state: &FigtermState) -> RequestResult {
-    debug!({
-        term_session =? request.terminal_session_id,
-        command = request.command,
-        cwd = request.working_directory(),
-        env =? request.env,
-        background = request.background_job,
-        pipelined = request.is_pipelined
-    }, "Executing command");
-
-    let session_sender = figterm_state
-        .with_maybe_id(&request.terminal_session_id.map(FigtermSessionId::new), |session| {
-            session.sender.clone()
-        });
-
-    if let Some(session_sender) = session_sender {
-        let (message, rx) = FigtermCommand::pseudoterminal_execute(
-            request.command,
-            request.working_directory,
-            request.background_job,
-            request.is_pipelined,
-            request.env,
-        );
-        session_sender
-            .send(message)
-            .map_err(|err| format!("failed sending command to figterm: {err}"))?;
-        drop(session_sender);
-
-        let response = timeout(Duration::from_secs(10), rx)
-            .await
-            .map_err(|err| Error::from_std(err).wrap_err("Qterm response timed out after 10 sec"))?
-            .map_err(|err| Error::from_std(err).wrap_err("Qterm response failed to receive from sender"))?;
-
-        if let hostbound::response::Response::PseudoterminalExecute(response) = response {
-            RequestResult::Ok(Box::new(ServerOriginatedSubMessage::PseudoterminalExecuteResponse(
-                PseudoterminalExecuteResponse {
-                    stdout: response.stdout,
-                    stderr: response.stderr,
-                    exit_code: response.exit_code,
-                },
-            )))
-        } else {
-            Err("invalid response type".to_string().into())
-        }
-    } else {
-        debug!("executing locally");
-
-        let shell = PlatformState::shell();
-
-        // note: we don't know what shell they use because we don't have any figterm sessions to check
-        let args = shell_args(&shell);
-
-        let mut cmd = Command::new(&*shell);
-        #[cfg(target_os = "windows")]
-        cmd.creation_flags(windows::Win32::System::Threading::DETACHED_PROCESS.0);
-        // TODO: better SHELL_ARGs handling here based on shell.
-        // TODO: handle wsl distro from FigtermState here.
-        cmd.args(args);
-        cmd.arg(&request.command);
-
-        if let Some(working_directory) = request.working_directory {
-            cmd.current_dir(working_directory);
-        }
-
-        set_fig_vars(&mut cmd);
-
-        for EnvironmentVariable { key, value } in &request.env {
-            match value {
-                Some(value) => cmd.env(key, value),
-                None => cmd.env_remove(key),
-            };
-        }
-
-        let output = cmd
-            .output()
-            .await
-            .map_err(|err| format!("Failed running command {:?}: {err}", request.command))?;
-
-        RequestResult::Ok(Box::new(ServerOriginatedSubMessage::PseudoterminalExecuteResponse(
-            PseudoterminalExecuteResponse {
-                stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-                stderr: if output.stderr.is_empty() {
-                    None
-                } else {
-                    Some(String::from_utf8_lossy(&output.stderr).to_string())
-                },
-                exit_code: output.status.code(),
-            },
-        )))
-    }
-}
-
 pub async fn run(request: RunProcessRequest, state: &FigtermState) -> RequestResult {
     debug!({
         term_session =? request.terminal_session_id,
@@ -230,7 +114,3 @@ pub async fn run(request: RunProcessRequest, state: &FigtermState) -> RequestRes
         )))
     }
 }
-
-pub async fn write() -> RequestResult {
-    RequestResult::error("PseudoterminalWriteRequest is deprecated".to_string())
-}

crates/fig_desktop/src/request/process.rs

@@ -44,7 +44,6 @@ use crate::webview::LOGIN_PATH;
 use crate::{
     AUTOCOMPLETE_ID,
     DASHBOARD_ID,
-    DebugState,
     EventLoopProxy,
     EventLoopWindowTarget,
 };
@@ -261,7 +260,6 @@ fn load_icon(path: impl AsRef<std::path::Path>) -> Option<Icon> {
 
 pub async fn build_tray(
     _event_loop_window_target: &EventLoopWindowTarget,
-    _debug_state: &DebugState,
     _figterm_state: &FigtermState,
 ) -> tray_icon::Result<TrayIcon> {
     let is_logged_in = fig_auth::is_logged_in().await;