enh: build multiple projects at the same time

Author: kkharji

Makefile

@@ -31,7 +31,7 @@ install: clean
 install_debug: clean
 	killall xbase xbase-sourcekit-helper || true
 	mkdir $(XBASE_LOCAL_ROOT)
-	cargo build -p xbase -p xbase-sourcekit-helper
+	RUST_LOG=trace cargo build -p xbase -p xbase-sourcekit-helper
 	ln -sf $(ROOT_DIR)/target/debug/xbase                       $(XBASE_LOCAL_ROOT)/xbase
 	ln -sf $(ROOT_DIR)/target/debug/xbase-sourcekit-helper      $(XBASE_LOCAL_ROOT)/xbase-sourcekit-helper
 	echo "DONE"

dev.md

@@ -23,9 +23,11 @@ Here's an overview of the project architecture to help you contribute.
   - [Build Handler `build.rs`](./src/server/build.rs)
   - [Runners Handler `runners.rs`](./src/server/runners.rs)
   - [ProjectInfo Handler `project_info.rs`](./src/server/project_info.rs)
-- [Project Running Logic `runner/*`](./src/runner/)
-- [Project Watching Logic `watcher/*`](./src/wathcer/)
-- [Project Handling Logic `project/*`](./src/project/mod.rs)
+- [Project Runtime `runtime/*`](./src/runtime/mod.rs)
+  - [Messages that can be processed by Project Runtime](./src/runtime/message.rs)
+- [Project Running `runner/*`](./src/runner/)
+- [Project Watching `watcher/*`](./src/watcher/)
+- [Project Support`project/*`](./src/project/mod.rs)
   - [XCodeGen Project Support `xcodegen.rs`](./src/project/xcodegen.rs)
   - [Tuist Project Support `tuist.rs`](./src/project/tuist.rs)
   - [Barebone Project Support `barebone.rs`](./src/project/barebone.rs)

lua/xbase/broadcast.lua

@@ -6,7 +6,9 @@ local msg, tkind, tstatus = types.Message, types.TaskKind, types.TaskStatus
 local config = require("xbase.config").values
 
 local M = {}
+
 M.expect_second_run = false
+
 local function task_set(args)
   M.has_task = true
   local running, _ = tkind:prefix(args.kind)
@@ -86,9 +88,15 @@ local function task_finish(args)
   end)
 end
 
-function M.start(address)
+function M.start(root, address)
   local socket = socket:connect(address)
 
+  socket._socket:write(string.format("%s\n", vim.loop.os_getpid()), function(err)
+    if err then
+      print(socket._stream_error or err)
+    end
+  end)
+
   socket:read_start(function(chunk)
     local chunk = vim.trim(chunk)
     for _, chunk in ipairs(vim.split(chunk, "\n")) do
@@ -109,7 +117,15 @@ function M.start(address)
         end
 
         if msg.is_notify(type) then
-          return notify(args.content, args.level)
+          notify(args.content, args.level)
+          if string.find(args.content, "Registered") ~= nil then
+            vim.schedule(function()
+              vim.defer_fn(function()
+                print "  "
+              end, 2000)
+            end)
+          end
+          return
         end
 
         if msg.is_reload_lsp_server(type) then
@@ -124,6 +140,16 @@ function M.start(address)
           return logger.log(args.content, args.level)
         end
 
+        if msg.is_set_state(type) then
+          local key, value = args.key, args.value
+          if key == "runners" then
+            require("xbase.state").runners = value
+          elseif key == "projectInfo" then
+            require("xbase.state").project_info[root] = value
+          end
+          return
+        end
+
         ---@diagnostic disable-next-line: empty-block
         if msg.is_set_watching(type) then
           -- ()

lua/xbase/pickers.lua

@@ -63,7 +63,8 @@ local insert_entry = function(acc, picker, command, target, configuration, watch
   acc[#acc + 1] = item
 end
 
-local get_selections = function(project_info, picker)
+local get_selections = function(root, picker)
+  local project_info = require("xbase.state").project_info[root]
   local commands = picker == C.Watch and { C.Build, C.Run } or { picker }
   local targets = project_info.targets
   local include_devices = picker == C.Run or picker == C.Watch
@@ -158,26 +159,15 @@ end
 local find = function(name, opts)
   opts = themes.get_dropdown(opts or {})
   opts.root = opts.root or vim.loop.cwd()
-  local _find = function(opts)
-    picker(opts, {
-      prompt_title = opts.name,
-      sorter = sorter {},
-      finder = finder {
-        results = get_selections(opts.project_info, name),
-        entry_maker = entry_maker,
-      },
-      attach_mappings = mappings,
-    }):find()
-  end
-
-  if opts.project_info then
-    _find(opts)
-  else
-    server.get_project_info(opts.root, function(project_info)
-      opts.project_info = project_info
-      _find(opts)
-    end)
-  end
+  picker(opts, {
+    prompt_title = opts.name,
+    sorter = sorter {},
+    finder = finder {
+      results = get_selections(opts.root, name),
+      entry_maker = entry_maker,
+    },
+    attach_mappings = mappings,
+  }):find()
 end
 
 M.watch = function(opts)
@@ -195,55 +185,51 @@ end
 M.actions = function(opts)
   opts = require("telescope.themes").get_dropdown(opts or {})
   opts.root = opts.root or vim.loop.cwd()
-  server.get_project_info(opts.root, function(project_info)
-    opts.project_info = project_info
-
-    picker(opts, {
-      sorter = sorter {},
-      prompt_title = "Pick Xbase Action Category",
-      finder = finder {
-        results = {
-          { value = C.Build },
-          { value = C.Watch },
-          { value = C.Run },
-        },
-        entry_maker = function(entry)
-          entry.ordinal = entry.value
-          entry.display = function(e)
-            local opts = {}
-
-            opts.separator = " "
-            opts.hl_chars = { ["|"] = "TelescopeResultsNumber" }
-            opts.items = { { width = 40 } }
-
-            return maker(opts) { { e.value, "TelescopeResultsMethod" } }
-          end
-
-          return entry
-        end,
+  picker(opts, {
+    sorter = sorter {},
+    prompt_title = "Pick Xbase Action Category",
+    finder = finder {
+      results = {
+        { value = C.Build },
+        { value = C.Watch },
+        { value = C.Run },
       },
-      attach_mappings = function(_, _)
-        a.select_default:replace(function(bufnr)
-          local selected = s.get_selected_entry()
-
-          a.close(bufnr)
-          if not selected then
-            print "No selection"
-            return
-          end
+      entry_maker = function(entry)
+        entry.ordinal = entry.value
+        entry.display = function(e)
+          local opts = {}
 
-          if selected.value == C.Watch then
-            M.watch(opts)
-          elseif selected.value == C.Build then
-            M.build(opts)
-          elseif selected.value == C.Run then
-            M.run(opts)
-          end
-        end)
-        return true
+          opts.separator = " "
+          opts.hl_chars = { ["|"] = "TelescopeResultsNumber" }
+          opts.items = { { width = 40 } }
+
+          return maker(opts) { { e.value, "TelescopeResultsMethod" } }
+        end
+
+        return entry
       end,
-    }):find()
-  end)
+    },
+    attach_mappings = function(_, _)
+      a.select_default:replace(function(bufnr)
+        local selected = s.get_selected_entry()
+
+        a.close(bufnr)
+        if not selected then
+          print "No selection"
+          return
+        end
+
+        if selected.value == C.Watch then
+          M.watch(opts)
+        elseif selected.value == C.Build then
+          M.build(opts)
+        elseif selected.value == C.Run then
+          M.run(opts)
+        end
+      end)
+      return true
+    end,
+  }):find()
 end
 
 return M

lua/xbase/server.lua

@@ -5,6 +5,7 @@ local notify = require "xbase.notify"
 local broadcast = require "xbase.broadcast"
 local constants = require "xbase.constants"
 local uv = vim.loop
+local id = vim.loop.os_getpid()
 
 ---@class XBase
 local M = {
@@ -87,47 +88,19 @@ end
 ---@return boolean
 function M.register(root)
   validate { root = { root, "string", false } }
+  if M.roots[root] then
+    return
+  end
 
   require("xbase.logger").setup()
-  local req = {
-    method = "register",
-    args = {
-      root = root,
-    },
-  }
 
+  local req = { method = "register", args = { id = id, root = root } }
   M.request(req, function(broadcast_address)
-    notify.info(("[%s] Connected "):format(util.project_name(root)))
-    vim.schedule(function()
-      --- Clear statusline
-      vim.defer_fn(function()
-        print "  "
-      end, 2000)
-    end)
-
-    broadcast.start(broadcast_address)
-
-    M.roots[#M.roots + 1] = root
-
-    -- Fill state with available runners
-    if not require("xbase.state").runners then
-      M.request({ method = "get_runners" }, function(runners)
-        require("xbase.state").runners = runners
-      end)
-    end
+    broadcast.start(root, broadcast_address)
+    M.roots[root] = true
   end)
 end
 
----Get Project information
-function M.get_project_info(root, on_response)
-  M.request({
-    method = "get_project_info",
-    args = {
-      root = root,
-    },
-  }, on_response)
-end
-
 ---Drop a given root or drop all tracked roots if root is nil
 ---@param root string
 function M.drop(root)

lua/xbase/state.lua

@@ -2,6 +2,8 @@ local M = {
   --- Devices index by platform
   ---@type table<string, string>
   runners = nil,
+  ---@type table<string, table>
+  project_info = {},
 }
 
 return M

lua/xbase/types.lua

@@ -63,6 +63,9 @@ M.Message = {
   is_set_watching = function(ty)
     return ty == "SetWatching"
   end,
+  is_set_state = function(ty)
+    return ty == "SetState"
+  end,
 }
 
 return M

src/bin/gen_bindings.rs

@@ -30,13 +30,7 @@ fn gen_ts_types_file(path: PathBuf) {
     options.root_namespace = None;
     options.header = None;
 
-    type Requests = (
-        Request,
-        RunRequest,
-        RegisterRequest,
-        DropRequest,
-        GetProjectInfoRequest,
-    );
+    type Requests = (Request, RunRequest, RegisterRequest, DropRequest);
     type Responses = (Response, ServerError);
     type Transports = (
         ProjectInfo,
@@ -45,6 +39,7 @@ fn gen_ts_types_file(path: PathBuf) {
         Operation,
         BuildSettings,
         DeviceLookup,
+        State,
     );
     type Messages = (Message, ContentLevel, TaskKind, TaskStatus);
     type API = (Messages, Transports, Responses, Requests);