perf: proper handling around sshfs process and channels

Author: nosduco

.gitignore

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

.nvimlog

@@ -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")
+      local password = vim.fn.inputsecret("Enter password for host: ")
+      vim.fn.chansend(id, password .. "\n")
     end
   end
   start_job()

lua/remote-sshfs/connections.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)