Merge pull request #32 from tomgeorge/chore/rpc

Rework message handling logic

Author: tomgeorge

.gitignore

@@ -1 +1,2 @@
-deps/
+deps/
+.eca/

README.md

@@ -168,7 +168,6 @@ require("eca").setup({
 | `:EcaServerStart` | Starts ECA server manually | `:EcaServerStart` |
 | `:EcaServerStop` | Stops ECA server | `:EcaServerStop` |
 | `:EcaServerRestart` | Restarts ECA server | `:EcaServerRestart` |
-| `:EcaServerStatus` | Shows detailed server status | `:EcaServerStatus` |
 | `:EcaSend <message>` | Sends message directly | `:EcaSend Explain this function` |
 
 ## ⌨️ Keyboard Shortcuts
@@ -459,9 +458,6 @@ Consider readability and maintainability.
 #### Server Management
 
 ```vim
-" Check status
-:EcaServerStatus
-
 " Restart if there are issues
 :EcaServerRestart
 
@@ -515,7 +511,6 @@ Consider readability and maintainability.
 
 - Check if `curl` and `unzip` are installed
 - Try setting `server_path` manually with absolute path
-- Run `:EcaServerStatus` for diagnostics
 - Check logs with `debug = true` in configuration
 - Try `:EcaServerRestart`
 

lua/eca/commands.lua

@@ -157,34 +157,6 @@ function M.setup()
     desc = "Restart ECA server",
   })
 
-  vim.api.nvim_create_user_command("EcaServerStatus", function()
-    local eca = require("eca")
-    local status = eca.server and eca.server:status() or "Not initialized"
-    local status_icon = "○"
-
-    if status == "Running" then
-      status_icon = "✓"
-    elseif status == "Starting" then
-      status_icon = "⋯"
-    elseif status == "Failed" then
-      status_icon = "✗"
-    end
-
-    Logger.notify("ECA Server Status: " .. status .. " " .. status_icon, vim.log.levels.INFO)
-
-    -- Also show path info if available
-    if eca.server and eca.server._path_finder then
-      local config = require("eca.config")
-      if config.server_path and config.server_path ~= "" then
-        Logger.notify("Server path: " .. config.server_path .. " (custom)", vim.log.levels.INFO)
-      else
-        Logger.notify("Server path: auto-detected/downloaded", vim.log.levels.INFO)
-      end
-    end
-  end, {
-    desc = "Show ECA server status with details",
-  })
-
   vim.api.nvim_create_user_command("EcaLogs", function(opts)
     local Api = require("eca.api")
     local subcommand = opts.args and opts.args:match("%S+") or "show"
@@ -293,8 +265,6 @@ function M.setup()
     desc = "Emergency stop for infinite loops or runaway responses",
   })
 
-
-
   vim.api.nvim_create_user_command("EcaFixTreesitter", function()
     local Utils = require("eca.utils")
 

lua/eca/init.lua

@@ -6,7 +6,6 @@ local Logger = require("eca.logger")
 local Sidebar = require("eca.sidebar")
 local Config = require("eca.config")
 local Server = require("eca.server")
-local StatusBar = require("eca.status_bar")
 
 ---@class Eca
 local M = {
@@ -16,8 +15,6 @@ local M = {
   current = { sidebar = nil },
   ---@type eca.Server
   server = nil,
-  ---@type eca.StatusBar
-  status_bar = nil,
 }
 
 M.did_setup = false
@@ -245,23 +242,9 @@ function M.setup(opts)
   H.signs()
 
   -- Initialize status bar
-  M.status_bar = StatusBar:new()
 
   -- Initialize the ECA server with callbacks
-  M.server = Server:new({
-    on_started = function(connection)
-      M.status_bar:update("Running")
-      Logger.debug("ECA server started and ready!")
-    end,
-    on_status_changed = function(status)
-      M.status_bar:update(status)
-      if status == "Failed" then
-        Logger.notify("ECA server failed to start. Check :messages for details.", vim.log.levels.ERROR)
-      elseif status == "Starting" then
-        Logger.debug("Starting ECA server...")
-      end
-    end,
-  })
+  M.server = Server.new()
 
   -- Start server automatically in background
   vim.defer_fn(function()

lua/eca/logger.lua

@@ -89,6 +89,12 @@ end
 ---@param message string
 ---@param level integer
 function M.log(message, level)
+  if vim.in_fast_event() then
+    return vim.schedule(function()
+      M.log(message, level)
+    end)
+  end
+
   if not M.config then
     return
   end
@@ -98,6 +104,7 @@ function M.log(message, level)
   end
 
   local log_path = M.get_log_path()
+
   vim.fn.mkdir(vim.fn.fnamemodify(log_path, ":h"), "p")
 
   local timestamp = os.date("%Y-%m-%d %H:%M:%S")

lua/eca/message_handler.lua

@@ -0,0 +1,21 @@
+local M = {}
+
+--- Parse raw messages coming from the ECA server
+---@param data string
+---@return {content_length: integer, content: string}[]
+function M.parse_raw_messages(data)
+  local messages = {}
+  local seek_head = 1
+  while true do
+    local first, last, capture = string.find(data, "Content%-Length: (%d+)[\r\n]+", seek_head)
+    if not first then
+      break
+    end
+    capture = tonumber(capture)
+    seek_head = last + capture
+    table.insert(messages, { content_length = capture, content = string.sub(data, last + 1, seek_head) })
+  end
+  return messages
+end
+
+return M