perf: various performance fixes (#40)

Author: nosduco

.github/workflows/ci.yml

@@ -1,19 +1,24 @@
-on: [push, pull_request]
-
+---
 name: CI
 
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
 jobs:
   check:
     name: Check
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lunarmodules/luacheck@v0
   fmt:
     name: Fmt
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: JohnnyMorganz/stylua-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -39,3 +39,4 @@ luac.out
 *.x86_64
 *.hex
 
+.nvimlog

lua/remote-sshfs/connections.lua

@@ -133,10 +133,9 @@ M.mount_host = function(host, mount_dir, ask_pass)
   local function start_job()
     vim.notify("Connecting to host (" .. remote_host .. ")...")
     local skip_clean = false
-    mount_point = mount_dir .. "/"
-    current_host = host
-    -- Spawn SSHFS without a shell
-    sshfs_job_id = vim.fn.jobstart(cmd, {
+    local spec_mount_point = mount_dir .. "/"
+    local spec_host = host
+    local id = vim.fn.jobstart(cmd, {
       on_stdout = function(_, data)
         handler.sshfs_wrapper(data, mount_dir, function(event)
           if event == "ask_pass" then
@@ -153,18 +152,27 @@ M.mount_host = function(host, mount_dir, ask_pass)
           end
         end)
       end,
-      on_exit = function(_, _, data)
+      on_exit = function(jid, _, data)
+        if jid ~= sshfs_job_id then
+          return
+        end
         handler.on_exit_handler(data, mount_dir, skip_clean, function()
           sshfs_job_id = nil
           mount_point = nil
           current_host = nil
         end)
       end,
     })
-    -- If using password, send it on stdin
+    if id <= 0 then
+      vim.notify("[remote-sshfs] failed to start sshfs (code " .. tostring(id) .. ")", vim.log.levels.ERROR)
+      return
+    end
+    sshfs_job_id = id
+    mount_point = spec_mount_point
+    current_host = spec_host
     if ask_pass then
       local password = vim.fn.inputsecret "Enter password for host: "
-      vim.fn.chansend(sshfs_job_id, password .. "\n")
+      vim.fn.chansend(id, password .. "\n")
     end
   end
   start_job()
@@ -187,6 +195,8 @@ M.unmount_host = function()
     sshfs_job_id = nil
     mount_point = nil
     current_host = nil
+    -- Clear Telescope extension cache for remote-find commands
+    pcall(require, "telescope._extensions.remote-sshfs").clear_cache()
   end
 end
 

lua/remote-sshfs/log.lua

@@ -29,7 +29,7 @@ end
 
 M.setup = function(opts)
   if opts.log.enabled and opts.log.types then
-    M.path = string.format("%s/remote-sshfs.log", vim.fn.stdpath "cache", os.date "%H:%M:%S", vim.env.USER)
+    M.path = string.format("%s/remote-sshfs.log", vim.fn.stdpath "cache")
     M.types = opts.log.types
     if opts.log.truncate then
       os.remove(M.path)

lua/remote-sshfs/utils.lua

@@ -5,12 +5,10 @@ local M = {}
 M.setup_sshfs = function(config)
   local sshfs_folder = config.mounts.base_dir
   if not vim.loop.fs_stat(sshfs_folder) then
-    vim.loop.fs_mkdir(sshfs_folder, tonumber("700", 8), function(err)
-      if err then
-        vim.notify("Error creating mount base dir (" .. sshfs_folder .. "):", err)
-        return
-      end
-    end)
+    local ok, err = vim.loop.fs_mkdir(sshfs_folder, tonumber("700", 8))
+    if not ok then
+      vim.notify("Error creating mount base dir (" .. sshfs_folder .. "): " .. tostring(err), vim.log.levels.ERROR)
+    end
   end
 end
 
@@ -23,15 +21,13 @@ M.setup_mount_dir = function(mount_dir, callback)
   log.line("util", "Setting up mount directory " .. mount_dir)
   if not M.file_exists(mount_dir) then
     log.line("util", "Creating mount directory " .. mount_dir)
-    local success = vim.loop.fs_mkdir(mount_dir, tonumber("700", 8))
-    if not success then
-      vim.notify("Error creating mount directory (" .. mount_dir .. ").")
-    else
-      callback()
+    local ok, err = vim.loop.fs_mkdir(mount_dir, tonumber("700", 8))
+    if not ok then
+      vim.notify("Error creating mount directory (" .. mount_dir .. "): " .. tostring(err), vim.log.levels.ERROR)
+      return
     end
-  else
-    callback()
   end
+  callback()
 end
 
 M.cleanup_mount_dir = function(mount_dir, callback)

lua/telescope/_extensions/remote-sshfs.lua

@@ -114,10 +114,44 @@ local function edit_config(_)
     :find()
 end
 
+local command_exists_cache = {}
+
 local function command_exists_on_remote(command, server)
+  local key = server .. ":" .. command
+  if command_exists_cache[key] ~= nil then
+    return command_exists_cache[key]
+  end
   local ssh_cmd = string.format('ssh %s "which %s"', server, command)
-  local result = vim.fn.system(ssh_cmd)
-  return result ~= ""
+  vim.fn.system(ssh_cmd)
+  local exists = (vim.v.shell_error == 0)
+  command_exists_cache[key] = exists
+  return exists
+end
+
+-- Cache per-host computed find command to avoid repeated ssh which calls
+local _find_command_cache = {}
+local function get_find_command_for_host(server)
+  if _find_command_cache[server] ~= nil then
+    return _find_command_cache[server]
+  end
+  local cmd = nil
+  if command_exists_on_remote("rg", server) then
+    cmd = { "ssh", server, "-C", "rg", "--files", "--color", "never" }
+  elseif command_exists_on_remote("fd", server) then
+    cmd = { "ssh", server, "fd", "--type", "f", "--color", "never" }
+  elseif command_exists_on_remote("fdfind", server) then
+    cmd = { "ssh", server, "fdfind", "--type", "f", "--color", "never" }
+  elseif command_exists_on_remote("where", server) then
+    cmd = { "ssh", server, "where", "/r", ".", "*" }
+  end
+  _find_command_cache[server] = cmd
+  return cmd
+end
+
+-- Clears cached remote-find commands and existence checks
+local function clear_cache()
+  command_exists_cache = {}
+  _find_command_cache = {}
 end
 
 -- Remote find_files implementation
@@ -160,22 +194,16 @@ local function find_files(opts)
   local mount_point = opts.mount_point or connections.get_current_mount_point()
   local current_host = connections.get_current_host()
 
-  local find_command = (function()
-    if opts.find_command then
-      if type(opts.find_command) == "function" then
-        return opts.find_command(opts)
-      end
-      return opts.find_command
-    elseif command_exists_on_remote("rg", current_host["Name"]) then
-      return { "ssh", current_host["Name"], "-C", "rg", "--files", "--color", "never" }
-    elseif command_exists_on_remote("fd", current_host["Name"]) then
-      return { "ssh", current_host["Name"], "fd", "--type", "f", "--color", "never" }
-    elseif command_exists_on_remote("fdfind", current_host["Name"]) then
-      return { "ssh", current_host["Name"], "fdfind", "--type", "f", "--color", "never" }
-    elseif command_exists_on_remote("where", current_host["Name"]) then
-      return { "ssh", current_host["Name"], "where", "/r", ".", "*" }
+  local find_command
+  if opts.find_command then
+    if type(opts.find_command) == "function" then
+      find_command = opts.find_command(opts)
+    else
+      find_command = opts.find_command
     end
-  end)()
+  else
+    find_command = get_find_command_for_host(current_host["Name"])
+  end
 
   if not find_command then
     vim.notify "Remote host does not support any available find commands (rg, fd, fdfind, where)."
@@ -477,18 +505,19 @@ local present, telescope = pcall(require, "telescope")
 if present then
   return telescope.register_extension {
     exports = {
-      connect = function(_)
-        connect(_)
+      connect = function(opts)
+        connect(opts)
       end,
-      edit = function(_)
-        edit_config(_)
+      edit = function(opts)
+        edit_config(opts)
       end,
       find_files = function(opts)
         find_files(opts)
       end,
       live_grep = function(opts)
         live_grep(opts)
       end,
+      clear_cache = clear_cache,
     },
   }
 else