refactor: interact with libuv pipes in async context (#808)

Also now properly close pipes (shutdown -> close).

3 files changed, 17 insertions, 10 deletions

diff --git a/lua/mason-core/async/uv.lua b/lua/mason-core/async/uv.lua
index f3d25b04..9a998be5 100644
--- a/lua/mason-core/async/uv.lua
+++ b/lua/mason-core/async/uv.lua
@@ -11,6 +11,9 @@ local M = setmetatable({}, {
 return M
 
 ---@alias UvMethod
+---| '"write"'
+---| '"shutdown"'
+---| '"close"'
 ---| '"fs_close"'
 ---| '"fs_open"'
 ---| '"fs_read"'
diff --git a/lua/mason-core/fetch.lua b/lua/mason-core/fetch.lua
index fbb755b8..a6db7c6b 100644
--- a/lua/mason-core/fetch.lua
+++ b/lua/mason-core/fetch.lua
@@ -1,3 +1,5 @@
+local a = require "mason-core.async"
+local async_uv = require "mason-core.async.uv"
 local log = require "mason-core.log"
 local platform = require "mason-core.platform"
 local Result = require "mason-core.result"
@@ -105,14 +107,15 @@ local function fetch(url, opts)
             opts.data and { "-d", "@-" } or vim.NIL,
             opts.out_file and { "-o", opts.out_file } or vim.NIL,
             url,
-            on_spawn = function(_, stdio)
+            on_spawn = a.scope(function(_, stdio)
                 local stdin = stdio[1]
                 if opts.data then
                     log.trace("Writing stdin to curl", opts.data)
-                    stdin:write(opts.data)
+                    async_uv.write(stdin, opts.data)
                 end
-                stdin:close()
-            end,
+                async_uv.shutdown(stdin)
+                async_uv.close(stdin)
+            end),
         }
     end
 
diff --git a/lua/mason-core/managers/powershell/init.lua b/lua/mason-core/managers/powershell/init.lua
index 786645db..4133df23 100644
--- a/lua/mason-core/managers/powershell/init.lua
+++ b/lua/mason-core/managers/powershell/init.lua
@@ -1,4 +1,5 @@
 local a = require "mason-core.async"
+local async_uv = require "mason-core.async.uv"
 local spawn = require "mason-core.spawn"
 local process = require "mason-core.process"
 
@@ -23,12 +24,12 @@ function M.script(script, opts, custom_spawn)
         "-NoProfile",
         on_spawn = a.scope(function(_, stdio)
             local stdin = stdio[1]
-            local write = a.promisify(vim.loop.write)
-            write(stdin, PWSHOPT.error_action_preference)
-            write(stdin, PWSHOPT.progress_preference)
-            write(stdin, PWSHOPT.security_protocol)
-            write(stdin, script)
-            stdin:shutdown()
+            async_uv.write(stdin, PWSHOPT.error_action_preference)
+            async_uv.write(stdin, PWSHOPT.progress_preference)
+            async_uv.write(stdin, PWSHOPT.security_protocol)
+            async_uv.write(stdin, script)
+            async_uv.shutdown(stdin)
+            async_uv.close(stdin)
         end),
         env_raw = process.graft_env(opts.env or {}, { "PSMODULEPATH" }),
     }, opts))