Admin nrepl (#63)

* Add command for connecting to the nrepl

* Deprecate UUID in favor or ULID

* Short-circuit out of failure condition

* Fixes on nrepl alias spawning + skipping autocmds

* Add deprecation warning.

* Add admin session

* Auto-spawn admin session if configured.

Author: hkupty

lua/acid/connections.lua

@@ -19,9 +19,9 @@ end
 --- Stores connection for reuse later
 -- @tparam {string,string} addr Address tuple with ip and port.
 connections.add = function(addr)
-  local uuid = utils.uuid()
-  connections.store[uuid] = addr
-  return uuid
+  local ulid = utils.ulid()
+  connections.store[ulid] = addr
+  return ulid
 end
 
 connections.remove = function(addr)

lua/acid/core.lua

@@ -27,6 +27,7 @@ core.send = function(conn, obj, handler)
 
   if conn == nil then
     log.msg("No active connection to a nrepl session. Aborting")
+    return
   end
 
   if obj.id == nil then

lua/acid/init.lua

@@ -51,4 +51,29 @@ acid.callback = function(ret)
   end
 end
 
+--- Setup admin nrepl session
+-- This nrepl session should be used by plugins to deal with clojure code
+-- without injecting things in the user nrepl session
+-- or for things that clojure could deal with better while not having a 
+-- nrepl session to use.
+acid.admin_session_start = function()
+  local pwd = "/tmp/acid/admin/"
+  if require("acid.nrepl").cache[pwd] ~= nil then
+    return acid.admin_session()
+  end
+
+  local nrepl = require("acid.nrepl")
+  vim.api.nvim_call_function("mkdir", {pwd, "p"})
+  nrepl.start{pwd = pwd, skip_autocmd = true}
+end
+
+acid.admin_session = function()
+  local pwd = "/tmp/acid/admin/"
+  local conn = connections.get(pwd)
+  if conn ~= nil and conn[2] ~= nil then
+    return conn
+  end
+  return
+end
+
 return acid

lua/acid/nrepl.lua

@@ -64,7 +64,8 @@ local build_cmd = function(obj)
   end
 
   if obj.alias ~= nil then
-    table.insert(opts, 4, obj.alias)
+    table.insert(opts, 4, "-C" .. table.concat(obj.alias, ""))
+    table.insert(opts, 4, "-R" .. table.concat(obj.alias, ""))
   end
 
   if obj.port ~= nil then
@@ -89,7 +90,6 @@ local build_cmd = function(obj)
   return opts
 end
 
-
 nrepl.cache = {}
 
 --- Default middlewares that will be used by the nrepl server
@@ -100,9 +100,10 @@ nrepl.default_middlewares = {'nrepl/nrepl', 'cider/cider-nrepl', 'refactor-nrepl
 -- @tparam table obj Configuration for the nrepl process to be spawn
 -- @tparam[opt] string obj.pwd Path where the nrepl process will be started
 -- @tparam[opt] table obj.middlewares List of middlewares.
--- @tparam[opt] string obj.alias alias on the local deps.edn
+-- @tparam[opt] string obj.alias aliases on the local deps.edn
 -- @tparam[opt] string obj.connect -c parameter for the nrepl process
 -- @tparam[opt] string obj.bind -b parameter for the nrepl process
+-- @tparam[opt] boolean obj.skip_autocmd don't fire an autocmd after starting this repl
 -- @treturn boolean Whether it was possible to spawn a nrepl process
 nrepl.start = function(obj)
   local pwd = obj.pwd or vim.api.nvim_call_function("getcwd", {})
@@ -141,6 +142,7 @@ nrepl.start = function(obj)
    local conn = {bind, obj.port}
 
    nrepl.cache[pwd] = {
+     skip_autocmd = obj.skip_autocmd,
      job = ret,
      addr = conn
    }
@@ -178,9 +180,11 @@ nrepl.handle = {
           local port = ln:match("%d+")
           connections.store[opts.ix][2] = port
           connections.select(opts.pwd, opts.ix)
-          log.msg("Connected on port", tostring(port))
-          vim.api.nvim_command("doautocmd User AcidConnected")
           pending[ch] = nil
+          if not nrepl.cache[opts.pwd].skip_autocmd then
+            log.msg("Connected on port", tostring(port))
+            vim.api.nvim_command("doautocmd User AcidConnected")
+          end
         end
       end
     end

lua/acid/utils.lua

@@ -130,6 +130,7 @@ utils.random = function(sz)
 end
 
 utils.uuid = function()
+  vim.api.nvim_err_writeln("Deprecated. Please use utils.ulid instead")
  return vim.api.nvim_call_function("AcidNewUUID", {})
 end
 

plugin/acid.vim

@@ -2,6 +2,10 @@ if !exists("g:acid_skip_test_paths")
   let g:acid_skip_test_paths = 1
 endif
 
+if !exists("g:acid_start_admin_nrepl")
+  let g:acid_start_admin_nrepl = 0
+endif
+
 let g:acid_no_default_keymappings = get(g:, 'acid_no_default_keymappings', 0)
 
 function! AcidWrappedSend(payload, handler)
@@ -121,6 +125,11 @@ if !g:acid_no_default_keymappings
   augroup END
 endif
 
+if g:acid_start_admin_nrepl
+  lua require('acid').admin_session_start()
+endif
+
+command! -nargs=0 AcidConnectNrepl lua require('acid.nrepl').start{}
 command! -nargs=? AcidClearVtext lua require('acid.middlewares.virtualtext').clear(<f-args>)
 command! -nargs=* AcidRequire lua require('acid.features').do_require(<f-args>)
 command! -nargs=1 AcidAddRequire call AcidFnAddRequire("[<args>]")