haplo 2.5.3-java → 2.5.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a85d1c5d29a836c427c9a6045622e964b626746ca6e6d14b1db57d8488e6a4d
-  data.tar.gz: 50ed9669ca59195140d415eddd50d559815e320d81bcb8b0cfddf87ff3244c87
+  metadata.gz: afd010eec2bb0bd821533f4637c5b9f061a39978e957ed7581b32dc12ab657cd
+  data.tar.gz: 1fc5a49c99b680c25a25f1a2cb9c840673fdba938282613e69bcf7613dcb715b
 SHA512:
-  metadata.gz: 5763f67233ec3bb7ad05bd016608cc211b6d339db362fb266d37a49486b73389367ab6f8717f3caa9bcb53f8a4714878c1699b4fa6c9c54a915c5955d577c9b0
-  data.tar.gz: '0278435b6a89f641b30fc80619604f7be2d56cb155f8496ef0e3969a645a61c35b1cd04cdec98d31e6d2421943aaf97c3bb16e6fce554924b8adadd9f9c93f45'
+  metadata.gz: 74dcee72560160abcf2f018bd054cb08289ca596dbc28d425ebfd9ba4c9771402a036e83678683d9b8aa2adacbf31f80e8d3a0b62084f3466d3c410939c6fa5e
+  data.tar.gz: c8a68477be81d243e4dc5b2737953f0e6275fcc1ef4112c4a7731cd0fc08bc260b13f08f02d16539fc0ed53e045bca166a6378c70b61239cd30ed314e8b4d9cf

data/haplo.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'haplo'
-  s.version     = '2.5.3'
-  s.date        = '2021-07-13'
+  s.version     = '2.5.7'
+  s.date        = '2021-11-16'
   s.summary     = "Haplo Plugin Tool"
   s.description = "Development tools for developing Haplo plugins, see https://haplo.org"
   s.licenses    = ["MPL-2.0"]

data/lib/check.rb

@@ -22,7 +22,7 @@ module PluginTool
     puts
     if @@check_ok && !@@check_warn
       puts "PASSED"
-    elsif @@check_warn
+    elsif @@check_ok && @@check_warn
       puts "PASSED WITH WARNINGS"
     else
       puts "FAILED"

data/lib/debuggers.rb

@@ -107,3 +107,157 @@ module PluginTool
 
 end
 
+# -------------------------------------------------------------------------
+
+module DebugAdapterProtocolTunnel
+
+  @@dap_plugins = nil
+  @@dap_debugger_option = nil
+  @@dap_server = nil
+  @@dap_connection = nil
+
+  def self.prepare(plugins, options)
+    @@dap_plugins = plugins
+    @@dap_debugger_option = options.debugger
+    raise "BAD DEBUGGER OPTION #{@@dap_debugger_option}" unless @@dap_debugger_option =~ /\A(\d+)\z/
+    @@dap_server = TCPServer.new("127.0.0.1", @@dap_debugger_option.to_i)
+    Thread.new do
+      while true
+        connection = @@dap_server.accept
+        if connection
+          if @@dap_connection
+            connection.close
+          else
+            @@dap_connection = DAPConnection.new(connection, @@dap_plugins)
+            Thread.new do
+              @@dap_connection.run
+              _stop_remote_debugger()
+              @@dap_connection = nil
+            end
+          end
+        end
+      end
+    rescue => e
+      # ignore
+    end
+    at_exit do
+      @@dap_server.close
+      @@dap_connection.close if @@dap_connection
+      _stop_remote_debugger()
+    end
+  end
+
+  def self._stop_remote_debugger
+    puts "DEBUGGER: Stopping remote debugger..."
+    result = PluginTool.post("/api/development-plugin-loader/debugger-dap-stop")
+    if result == 'OK'
+      puts "DEBUGGER: Remote debugger stopped."
+    else
+      puts "DEBUGGER: Error stopping remote debugger, application server may be in non-functioning state."
+    end
+  end
+
+  def self.log_message_from_server(text)
+    if @@dap_connection
+      @@dap_connection._write({
+        'type' => 'event',
+        'event' => 'output',
+        'body' => {
+          'category' => 'console',
+          'output' => text+"\n"
+        }
+      })
+    end
+  end
+
+  def self.dap_message_from_server(json)
+    if @@dap_connection
+      @@dap_connection._write(JSON.parse(json))
+    end
+  end
+
+  class DAPConnection
+    def initialize(connection, plugins)
+      @connection = connection
+      @plugins = plugins
+      @running = false
+      @next_seq = 1
+      @write_mutex = Mutex.new
+      @_dump_messages = (ENV['HAPLO_DAP_DEBUG'] == '1')
+    end
+
+    def close
+      begin
+        @connection.close
+      rescue => e
+        # ignore any errors
+      end
+    end
+
+    def run
+      begin
+        run2
+      rescue => e
+        puts "DEBUGGER: Local connection closed"
+      end
+      self.close
+    end
+
+    def run2
+      @running = true
+      have_initialized = false
+      while @running
+        header = @connection.readline
+        blank = @connection.readline
+        if header =~ /\Acontent-length:\s+(\d+)\r\n\z/i && blank == "\r\n"
+          body = @connection.read($1.to_i)
+          message = JSON.parse(body)
+          puts "DAP READ: #{JSON.pretty_generate(message)}\n" if @_dump_messages
+          unless have_initialized
+            if message['type'] == 'request' && message['command'] == 'initialize'
+              puts "DEBUGGER: Local connection from #{message['arguments']['clientName']} (#{message['arguments']['clientID']})\nDEBUGGER: Starting remote debugger..."
+              plugin_locations = {}
+              @plugins.each { |p| plugin_locations[p.name] = p.plugin_dir }
+              start_response = PluginTool.post("/api/development-plugin-loader/debugger-dap-start", {
+                :plugin_locations => JSON.generate(plugin_locations)
+              })
+              unless start_response =~ /\ATOKEN: (.+)\z/
+                raise "Remote debugger failed to start"
+              end
+              @token = $1
+              puts "DEBUGGER: Remote debugger started."
+              have_initialized = true
+            else
+              raise "Expected initialize message after DAP connection"
+            end
+          end
+          # TODO: Send messages in another thread, so that they can be batched together
+          message_response = PluginTool.post_with_json_response("/api/development-plugin-loader/debugger-dap-messages", {
+            :token => @token,
+            :messages => JSON.generate([message])
+          })
+          if message_response['error']
+            puts "DEBUGGER: Server responded with error: #{message_response['error']}"
+          else
+            message_response['messages'].each do |response|
+              _write(response) if response
+            end
+          end
+        end
+      end
+    end
+
+    def _write(message)
+      @write_mutex.synchronize do
+        m = {'seq' => @next_seq}
+        @next_seq += 1
+        m.merge!(message)
+        puts "DAP WRITE: #{JSON.pretty_generate(m)}\n" if @_dump_messages
+        msg_json = JSON.generate(m)
+        @connection.write("Content-Length: #{msg_json.bytesize}\r\n\r\n")
+        @connection.write(msg_json)
+      end
+    end
+  end
+
+end

data/lib/notifications.rb

@@ -69,6 +69,9 @@ module PluginTool
     when 'log '
       # Output from console.log()
       puts "LOG:#{data}"
+      DebugAdapterProtocolTunnel.log_message_from_server(data)
+    when 'DAP1'
+      DebugAdapterProtocolTunnel.dap_message_from_server(data)
     when 'prof'
       # Profiler report
       PluginTool.profiler_handle_report(data)

data/lib/plugin_tool.rb

@@ -23,7 +23,7 @@ NO_DEPENDENCY_COMMANDS.delete('list')
 PLUGIN_SEARCH_PATH = ['.']
 
 # Options for passing to plugin objects
-options = Struct.new(:output, :minimiser, :no_dependency, :with_dependency, :exclude_with_prefix, :no_console, :show_system_audit, :args, :force, :turbo, :profile, :profile_file, :profile_format, :coverage_file, :coverage_format, :server_substring, :restrict_to_app_id).new
+options = Struct.new(:output, :minimiser, :no_dependency, :with_dependency, :exclude_with_prefix, :no_console, :show_system_audit, :args, :force, :turbo, :debugger, :profile, :profile_file, :profile_format, :coverage_file, :coverage_format, :server_substring, :restrict_to_app_id).new
 
 # Parse arguments
 show_help = false
@@ -37,6 +37,7 @@ opts = GetoptLong.new(
   ['--server', '-s', GetoptLong::REQUIRED_ARGUMENT],
   ['--force', GetoptLong::NO_ARGUMENT],
   ['--turbo', GetoptLong::NO_ARGUMENT],
+  ['--debugger', GetoptLong::REQUIRED_ARGUMENT],
   ['--profile', GetoptLong::REQUIRED_ARGUMENT],
   ['--profile-file', GetoptLong::REQUIRED_ARGUMENT],
   ['--profile-format', GetoptLong::REQUIRED_ARGUMENT],
@@ -77,6 +78,8 @@ opts.each do |opt, argument|
     options.force = true
   when '--turbo'
     options.turbo = true
+  when '--debugger'
+    options.debugger = argument
   when '--profile'
     options.profile = argument.to_f
   when '--profile-file'
@@ -365,6 +368,11 @@ PluginTool.start_syntax_check
 # Notifications support (including console)
 PluginTool.start_notifications(options) unless options.no_console
 
+# If the debugger is requested, open the listening socket. Debugger initialised on connection.
+if options.debugger
+  DebugAdapterProtocolTunnel.prepare(plugins, options)
+end
+
 # Open watcher
 watcher = PluginTool.make_watcher(plugins.map { |p| p.plugin_dir })
 

data/lib/server.rb

@@ -11,6 +11,7 @@ module PluginTool
     @@server_hostname = hostname
     @@server_port = port
     @@server_key = key
+    @@request_mutex = Mutex.new
   end
 
   def self.get_server_hostname
@@ -76,7 +77,9 @@ module PluginTool
     http = get_http
     request = Net::HTTP::Get.new(path)
     setup_request(request)
-    http.request(request).body
+    @@request_mutex.synchronize do
+      http.request(request).body
+    end
   end
 
   def self.get_with_json_response(path)
@@ -117,7 +120,9 @@ EOF
       body << "--#{boundary}--\r"
       request.body = body
     end
-    http.request(request).body
+    @@request_mutex.synchronize do
+      http.request(request).body
+    end
   end
 
   def self.post_with_json_response(path, params = nil, files = nil)

data/lib/version.txt

@@ -1 +1 @@
-a60e0f9
+402e1ac

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haplo
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.7
 platform: java
 authors:
 - Haplo Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies: []
 description: Development tools for developing Haplo plugins, see https://haplo.org
 email: client.services@haplo-services.com