lsp_router 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ba53e8db9e41cea66c0d4f935517fe4f3e4e8e24a6173794e53ea409556847
-  data.tar.gz: 984ea810f99d29a70efbb798b76c5d9f161b5bb5433ab0b96c52ed015529699c
+  metadata.gz: 5b81686d10b1edcb9c6b6ab51eedd3f8bd4ca71c3bd3d44b820fd416f2a48f0e
+  data.tar.gz: 85e81047822d36218ac021ccccb240af5fdc896dcb0218a8c835f613343dea1a
 SHA512:
-  metadata.gz: 40903c06994c73209c64535f12b417c913e59db4a7b856eae9504aac1e86102a273656e6f3a4148b3fa54e8c862855cd846e5e29d00f457b6a8e691b727ee919
-  data.tar.gz: bde44dd17b4288879bf96dee727320241ebf143d13e4e5ee8fadbf562223db6a0c5214c584847369a6ff97f20b2048192dc2faaea076fbfc7f213b68b479818c
+  metadata.gz: 289f4683fc2aead84ac11c7655b1faeb142f3692d26af1683d62181a3fb6ea7ac345f016e1e27946c5229dd755c9e49afed0ef4d00b5b28a481e42b6763dc933
+  data.tar.gz: c1e65b91db8a71ba1ebfacd134dc2b3a133d569a7ae67346fcc7a004502a4eff1fba2924d755f9f14420f3ff6369e89bb36f60a60a01f014f5249aba160f7e02

data/README.md

@@ -17,7 +17,7 @@ logfile '/tmp/lsp_router'
 loglevel :info
 
 server :rubocop do
-  command 'rubocop-lsp'
+  command 'rubocop --lsp'
   mode :stdio
 end
 
@@ -27,7 +27,7 @@ server :solargraph do
 end
 ```
 
-この例では、`rubocop-lsp` と `solargraph stdio` を起動して、クライアントからの処理を振り分ける。
+この例では、`rubocop --lsp` と `solargraph stdio` を起動して、クライアントからの処理を振り分ける。
 最初に各サーバーの capabilities を確認して、各サーバーにどの機能があるかを確認し、クライアントからの REQUEST は対応しているサーバーに渡す。複数のサーバーが同じ機能を持っていれば上に書いたサーバーが優先される。NOTIFICATION は全サーバーに渡す。
 
 ## Example
@@ -37,3 +37,7 @@ Emacs の Eglot の場合はこんな感じに設定するといいっぽい。
 ```
 (add-to-list 'eglot-server-programs '((ruby-mode ruby-ts-mode) . ("lsp_router" "--error=lsp_router.err" "lsp_router.conf")))
 ```
+
+## License
+
+GPLv3

data/lib/lsp_router/server_side.rb

@@ -16,6 +16,7 @@ class LspRouter
       @command = server.attr[:command]
       @stdin, @stdout, @stderr = Open3.popen3(@command)
       @capabilities = {}
+      @terminated = false
     end
 
     # @param req [Hash]
@@ -31,6 +32,7 @@ class LspRouter
 
     # @param data [Hash]
     def write(data)
+      return if @terminated
       log("#{name}<", data)
       json = data.to_json
       @stdin.puts "Content-Length: #{json.bytesize}\r\n\r\n"
@@ -40,8 +42,12 @@ class LspRouter
 
     # @return [Hash]
     def read
+      return nil if @terminated
       header = @stdout.gets("\r\n\r\n")
-      return unless header
+      unless header
+        @terminated = true
+        return nil
+      end
       fields = header.lines.map do |line|
         n, v = line.chomp.split(/: */, 2)
         [n.downcase, v] if n

data/lib/lsp_router/version.rb

@@ -1,3 +1,3 @@
 class LspRouter
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/lsp_router.rb

@@ -42,13 +42,21 @@ class LspRouter
   end
 
   def loop
-    req = @client.read
-    servers = @config.servers.map{LspRouter::ServerSide.new(_1, logger: @logger)}
-    primary = servers.first
+    @servers = @config.servers.map{LspRouter::ServerSide.new(_1, logger: @logger)}
+    @primary = @servers.first
+    @server_map = @servers.map.to_h{[_1.name.to_s, _1]}
+    @capa_server = {}
+
+    initial_packet
+    threads = server_loop
+    threads.push client_loop
+    threads.each(&:join)
+  end
 
+  def initial_packet
+    req = @client.read
     res = nil
-    capa_server = {}
-    servers.each do |server|
+    @servers.each do |server|
       data = server.init(req)
       if res
         res['result']['capabilities'].update(data.dig('result', 'capabilities')){|_, v, _| v}
@@ -56,40 +64,58 @@ class LspRouter
         res = data
       end
       server.capabilities.each_key do |key|
-        capa_server[key] ||= server
+        @capa_server[key] ||= server
       end
     end
     @client.write(res)
+  end
 
-    thr = Thread.new do
+  def client_loop
+    Thread.new do
       Thread.abort_on_exception = true
       while true
         data = @client.read
         break unless data
-        if data['id']
-          # request
+        if data['method'] == 'shutdown' || data['method'] == 'exit'
+          @servers.each{_1.write(data)}
+          break if data['method'] == 'exit'
+          next
+        end
+        if data['id'] # request or response
           method = data['method']&.split('/')&.last
-          server = capa_server[method] || primary
-          server.write(data)
-        else
-          # notification
-          servers.each do |server|
-            server.write(data)
+          if data['method']  # request
+            server = @capa_server[method] || @primary
+            data['id'] = [server.name, data['id']].to_json
+          else  # response
+            server_name, id = JSON.parse(data['id'])
+            data['id'] = id
+            server = @server_map[server_name]
           end
+          server.write(data)
+        else # notification
+          @servers.each{_1.write(data)}
         end
       end
+      @logger.info "client: end"
     end
+  end
 
-    servers.each do |server|
+  def server_loop
+    @servers.map do |server|
       Thread.new do
         Thread.abort_on_exception = true
         while true
           data = server.read
           break unless data
+          if data['id'] && data['method']  # request
+            data['id'] = [server.name, data['id']].to_json
+          elsif data['id']  # response
+            data['id'] = JSON.parse(data['id']).last rescue data['id']
+          end
           @client.write(data)
         end
+        @logger.info "server: [#{server.name}] end"
       end
     end
-    thr.join
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lsp_router
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - TOMITA Masahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies: []
 description: routing multiple LSP server by capability
 email: