tcp-server 1.1.3-java → 1.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcae7fb08cc3df7627fb5679ed5784a20b53205d60ead5fe401f978080e39e9
-  data.tar.gz: 4fd6a0775dd11cc06f3ab53f4caeed3efcc85eb59902acbb0b37b7e607cfa3ae
+  metadata.gz: 2174a5497f0b0358242e9592b698912fd8f06943deaa8291cd24045478eac44e
+  data.tar.gz: c21770eddc3798b518c2685c5e93adf56d560b8380264b4673914b59a24cc26a
 SHA512:
-  metadata.gz: 9834bab4ba9000b972100fcff462e7ce21f60b4630dfe2b488a0025ac0c0a844a5e4a585804abdf3e4fc2e1eadc2bb9d4468beff8050a2ae9e5921cb48a64dfb
-  data.tar.gz: 0d808e91710feef4004b0b52e8139cde6c496202339de4b3ca299cc8f9616f98586e9f9348efe58e07b269caac247fc487ef1066676ccd71a2e90387b52faf34
+  metadata.gz: 8811e5ba0e0d1556f0b31d13b04fbaf40465031c0b568a390432330eefdc991346eb5507ee76ca72254629de2a5cbfd928870d6e20a942daf6accb9f0bc36f83
+  data.tar.gz: 178e6ef353f59025743761d138fc51a7c0e1c4f0b517f3b4f1ab7a50d55e2652d3094a2b817ff48497ee1522197efed04b4ea380761a29f2e53f080a7312bab8

data/README.md

@@ -26,7 +26,7 @@ docker-compose down
 Building the image or running the container:
 
 ```sh
-docker build --squash --tag tcp-server-jruby .
+docker build --tag tcp-server-jruby .
 docker run --detach --publish 4000:4000 --name tcp-server-jruby tcp-server-jruby
 ```
 
@@ -208,7 +208,7 @@ curl --silent --show-error --location --request POST "https://gitlab.com/api/v4/
 ```
 
 [license]: https://gitlab.com/nelsnelson/tcp-server-jruby/blob/master/LICENSE
-[asdf]: https://mise.jdx.dev/
+[mise]: https://mise.jdx.dev/
 [colima]: https://github.com/abiosoft/colima
 [Netty project]: https://github.com/netty/netty
 [Java JDK]: https://www.java.com/en/download/

data/lib/server/argument_parser.rb

@@ -33,11 +33,11 @@ module Server
       @parser.separator 'Options:'
     end
 
-    def validated_port(val, integer_pattern = /^\d+$/)
-      raise OptionParser::InvalidArgument, "Invalid port: #{v}" unless \
-        integer_pattern.match?(val.to_s) && val.positive? && val < 65_536
+    def validated_port(value, integer_pattern = /^\d+$/)
+      raise OptionParser::InvalidArgument, "Invalid port: #{value}" unless \
+        integer_pattern.match?(value.to_s) && value.positive? && value < 65_536
 
-      val
+      value
     end
 
     def port
@@ -97,7 +97,8 @@ module Server
   def parse_arguments(arguments_parser = ::Server::ArgumentsParser.new)
     arguments_parser.parser.parse!(ARGV)
     arguments_parser.options
-  rescue OptionParser::InvalidOption, OptionParser::AmbiguousOption => e
+  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption,
+         OptionParser::AmbiguousOption => e
     abort e.message
   end
 end

data/lib/server/config.rb

@@ -10,25 +10,43 @@
 #
 # =end
 
+require 'java'
 require 'netty'
 
 require 'logger'
 
 # The Server module
 module Server
+  DEFAULT_LOG_LEVEL = Logger::INFO
+  DEFAULT_HOST = '0.0.0.0'.freeze
+  DEFAULT_PORT = 8080
+  DEFAULT_SSL_ENABLED = false
+  DEFAULT_IDLE_READING_SECONDS = 5 * 60 # seconds
+  DEFAULT_IDLE_WRITING_SECONDS = 30 # seconds
+  DEFAULT_KEEP_ALIVE = false
+  DEFAULT_MAX_QUEUED_INCOMING_CONNECTIONS = 100
+  DEFAULT_MAX_FRAME_LENGTH = 8192
+  DEFAULT_DELIMITER = Java::io.netty.handler.codec.Delimiters.lineDelimiter
+  DEFAULT_LOG_REQUESTS = false
+  DEFAULT_QUIT_COMMANDS = %i[
+    bye cease desist exit leave quit stop terminate
+  ].freeze
+
   # rubocop: disable Metrics/MethodLength
   def server_config
     @server_config ||= {
-      host: '0.0.0.0',
-      port: 8080,
-      ssl: false,
-      idle_reading: 5 * 60, # seconds
-      idle_writing: 30, # seconds
-      log_requests: false,
-      log_level: Logger::INFO,
-      quit_commands: %i[bye cease desist exit leave quit stop terminate],
-      max_frame_length: 8192,
-      delimiter: Java::io.netty.handler.codec.Delimiters.lineDelimiter
+      host: DEFAULT_HOST,
+      port: DEFAULT_PORT,
+      ssl: DEFAULT_SSL_ENABLED,
+      idle_reading: DEFAULT_IDLE_READING_SECONDS,
+      idle_writing: DEFAULT_IDLE_WRITING_SECONDS,
+      max_queued_incoming_connections: DEFAULT_MAX_QUEUED_INCOMING_CONNECTIONS,
+      log_requests: DEFAULT_LOG_REQUESTS,
+      log_level: DEFAULT_LOG_LEVEL,
+      quit_commands: DEFAULT_QUIT_COMMANDS,
+      max_frame_length: DEFAULT_MAX_FRAME_LENGTH,
+      keep_alive: DEFAULT_KEEP_ALIVE,
+      delimiter: DEFAULT_DELIMITER
     }.freeze
   end
   module_function :server_config

data/lib/server/instance_methods.rb

@@ -28,19 +28,26 @@ module Server
 
   # The InstanceMethods module
   module InstanceMethods
+    # rubocop: disable Metrics/AbcSize
+    def bootstrap
+      @bootstrap = ServerBootstrap.new
+      @bootstrap.group(boss_group, worker_group)
+      @bootstrap.channel(channel_type)
+      @bootstrap.option(ChannelOption::SO_BACKLOG, max_queued_incoming_connections)
+      @bootstrap.childOption(ChannelOption::SO_KEEPALIVE, keep_alive) if keep_alive
+      @bootstrap.handler(logging_handler) if options.fetch(:log_requests, false)
+      @bootstrap.childHandler(channel_initializer)
+    end
+    # rubocop: enable Metrics/AbcSize
+
     def configure_handlers(*handlers, &block)
       add_listener(self)
       channel_initializer << block if block_given?
       add_listener(*handlers)
     end
 
-    def bootstrap
-      @bootstrap = ServerBootstrap.new
-      @bootstrap.group(boss_group, worker_group)
-      @bootstrap.channel(Server::CHANNEL_TYPE)
-      @bootstrap.option(ChannelOption::SO_BACKLOG, 100.to_java(java.lang.Integer))
-      @bootstrap.handler(logging_handler) if options[:log_requests]
-      @bootstrap.childHandler(channel_initializer)
+    def channel_type
+      @channel_type ||= Server::CHANNEL_TYPE
     end
 
     def channel_initializer
@@ -65,7 +72,7 @@ module Server
 
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/MethodLength
-    def run(port = @options[:port])
+    def run(port = self.port)
       channel = bootstrap.bind(port).sync().channel()
       channel_group.add(channel)
       ::Server::ShutdownHook.new(self)
@@ -83,6 +90,14 @@ module Server
     # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/MethodLength
 
+    def port
+      @port ||= begin
+        value = @options[:port]
+        value = DEFAULT_PORT if value.nil?
+        value.to_i
+      end
+    end
+
     def shutdown
       channel_group.disconnect().awaitUninterruptibly()
       channel_group.close().awaitUninterruptibly()
@@ -104,6 +119,22 @@ module Server
     def replace_listeners(*listener)
       channel_initializer.replace_listeners(*listener)
     end
+
+    def keep_alive
+      @keep_alive ||= begin
+        value = @options[:keep_alive]
+        value = DEFAULT_KEEP_ALIVE if value.nil?
+        value
+      end
+    end
+
+    def max_queued_incoming_connections
+      @max_queued_incoming_connections ||= begin
+        value = @options[:max_queued_incoming_connections]
+        value = DEFAULT_MAX_QUEUED_INCOMING_CONNECTIONS if value.nil?
+        value.to_java(java.lang.Integer)
+      end
+    end
   end
   # module ServerInstanceMethods
 end

data/lib/server/listenable.rb

@@ -22,8 +22,6 @@ module Server
 
     def add_listener(*listener)
       listeners.addAll(listener)
-    ensure
-      log.trace "Listeners: #{listeners}"
     end
 
     def remove_listener(*listener)
@@ -33,6 +31,8 @@ module Server
     def replace_listeners(*listener)
       listeners.clear
       add_listener(*listener)
+    ensure
+      log.trace "Listeners after replacement: #{listeners}"
     end
 
     def notify(event, *args)

data/lib/server/server.rb

@@ -28,13 +28,16 @@ module Server
       raise ArgumentError, 'Parameter may not be nil: options' if options.nil?
       @options = ::Server.server_config.merge(options)
       configure_handlers(*handlers, &block)
+    ensure
+      log.trace "Listeners after initialization of #{self}: #{channel_initializer.default_handler.listeners}"
     end
 
     # rubocop: disable Metrics/AbcSize
     def message_received(ctx, msg)
+      return if msg.nil?
+      msg.chomp! if msg.respond_to?(:chomp!)
+      return if msg.respond_to?(:empty?) && msg.empty?
       log.trace "##{__method__} channel: #{ctx.channel}, message: #{msg.inspect}"
-      msg&.chomp!
-      return if msg.nil? || msg.empty?
       return ctx.close() if @options[:quit_commands].include?(msg.downcase.to_sym)
       response = msg.upcase
       log.debug "Sending response: #{response.inspect}"

data/lib/server/shutdown_hook.rb

@@ -29,7 +29,7 @@ module Server
       $stdout.write "\r\e[0K"
       $stdout.flush
       ::Server.log.info 'Shutting down'
-      @server.shutdown if server.respond_to?(:shutdown)
+      server.shutdown if server.respond_to?(:shutdown)
     end
   end
 end

data/lib/server/version.rb

@@ -12,5 +12,5 @@
 
 # The Server module
 module Server
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcp-server
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: java
 authors:
 - Nels Nelson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-23 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement