tcp-server 1.1.4-java → 1.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f9e64d109b0bdcc53bfe8cda1c4d113106cc7a9d1f6e423cfb4fd6a9fcff52
-  data.tar.gz: 9663b9e88b11d643b51292a705fbbb0ea8509fc288b175404a76b021c8edc945
+  metadata.gz: e929584365fe9f6f2f5acd5730590308d9ccf84b7cafc7cb611fe80290014891
+  data.tar.gz: bd0148f3ebe104cc69dd4ed9f37dd68733c3a9e9dcca711184a5dc5e940005b8
 SHA512:
-  metadata.gz: dadc64a13e62cf4981b28d1d1b1d8c90748c30ff9164a646ac5cea2a294efca2916389e608b8510733333a1f66add302e43d3a537eab7f665eba2acac45ccf96
-  data.tar.gz: 72ff75a438437b1005f8d6bc8d8d3b00e3dcc96b3f4d2f17c86db1800e0e22b4ee46a9ac5621e36998741d181c81b01f6b4e1f12beea52c7237da546061bcefa
+  metadata.gz: 6260d608a17649fe1114e0e9382398e56297a9430ac9755c516578317d2e691fde6063e096847fc9f24e5d9ce8d34b940bf1a798433e19cb736be8ad1d956ca1
+  data.tar.gz: 28e72cd37f04f4a958c638841a8742e13f991c89e91977c9298978695c8801eb29d1ca6c8a71e28ac7e6d3aea37c4022c4998e8a1fe1d308111bf0f0b7162e49

data/lib/demo_listener.rb

@@ -10,21 +10,16 @@
 #
 # =end
 
+require_relative 'server/default_handler'
+
 # The Server module
 module Server
   # The Demo class
   class Demo
-    def channel_active(ctx)
-      ::Server.log.info "Channel active: #{ctx.channel}"
-      response = 'Hello, world!'
-      log.trace "Sending response: #{response.inspect}"
-      ctx.channel.writeAndFlush("#{response}\n")
-    end
+    include Server::DefaultHandler
 
-    def exception_caught(_ctx, cause)
-      ::Server.log.error "Exception caught: #{cause}"
-      cause.backtrace.each { |t| ::Server.log.error t }
-      ctx.close()
+    def initialize(options = {})
+      @options = options
     end
   end
 end

data/lib/server/config.rb

@@ -17,21 +17,36 @@ 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: Server::DEFAULT_PORT,
-      ssl: false,
-      idle_reading: 5 * 60, # seconds
-      idle_writing: 30, # seconds
-      max_queued_incoming_connections: Server::DEFAULT_MAX_QUEUED_INCOMING_CONNECTIONS,
-      log_requests: false,
-      log_level: Logger::INFO,
-      quit_commands: %i[bye cease desist exit leave quit stop terminate],
-      max_frame_length: 8192,
-      keep_alive: Server::DEFAULT_KEEP_ALIVE,
-      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,
+      max_frame_length: DEFAULT_MAX_FRAME_LENGTH,
+      keep_alive: DEFAULT_KEEP_ALIVE,
+      delimiter: DEFAULT_DELIMITER,
+      quit_commands: DEFAULT_QUIT_COMMANDS
     }.freeze
   end
   module_function :server_config

data/lib/server/default_handler.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+# frozen_string_literal: false
+
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# =begin
+#
+# Copyright Nels Nelson 2016-2024 but freely usable (see license)
+#
+# =end
+
+# The Server module
+module Server
+  # The DefaultHandler module
+  module DefaultHandler
+    def channel_active(ctx)
+      ::Server.log.info "Channel active: #{ctx.channel}"
+      response = 'Hello, world!'
+      log.trace "Sending response: #{response.inspect}"
+      ctx.channel.writeAndFlush("#{response}\n")
+    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}"
+      return ctx.close() if @options[:quit_commands].include?(msg.downcase.to_sym)
+      response = msg.upcase
+      log.debug "Sending response: #{response.inspect}"
+      ctx.writeAndFlush("#{response}\n")
+    end
+    # rubocop: enable Metrics/AbcSize
+
+    def exception_caught(_ctx, cause)
+      ::Server.log.error "Exception caught: #{cause}"
+      cause.backtrace.each { |t| ::Server.log.error t }
+      ctx.close()
+    end
+  end
+end

data/lib/server/instance_methods.rb

@@ -14,6 +14,7 @@ require 'java'
 require 'netty'
 
 require_relative 'channel_initializer'
+require_relative 'default_handler'
 require_relative 'shutdown_hook'
 
 # The Server module
@@ -28,6 +29,8 @@ module Server
 
   # The InstanceMethods module
   module InstanceMethods
+    include ::Server::DefaultHandler
+
     # rubocop: disable Metrics/AbcSize
     def bootstrap
       @bootstrap = ServerBootstrap.new
@@ -41,7 +44,6 @@ module Server
     # rubocop: enable Metrics/AbcSize
 
     def configure_handlers(*handlers, &block)
-      add_listener(self)
       channel_initializer << block if block_given?
       add_listener(*handlers)
     end
@@ -91,11 +93,7 @@ module Server
     # rubocop: enable Metrics/MethodLength
 
     def port
-      @port ||= begin
-        value = @options[:port]
-        value = DEFAULT_PORT if value.nil?
-        value.to_i
-      end
+      @port ||= (@options[:port] || DEFAULT_PORT).to_i
     end
 
     def shutdown
@@ -123,8 +121,7 @@ module Server
     def keep_alive
       @keep_alive ||= begin
         value = @options[:keep_alive]
-        value = DEFAULT_KEEP_ALIVE if value.nil?
-        value
+        value || DEFAULT_KEEP_ALIVE
       end
     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

@@ -21,30 +21,18 @@ module Server
   # The Server class sets up the netty server.
   class Server
     CHANNEL_TYPE = Java::io.netty.channel.socket.nio.NioServerSocketChannel.java_class
-    DEFAULT_MAX_QUEUED_INCOMING_CONNECTIONS = 100
-    DEFAULT_KEEP_ALIVE = false
-    DEFAULT_PORT = 8080
     include ::Server::InstanceMethods
     attr_reader :options
 
     def initialize(options = {}, *handlers, &block)
       raise ArgumentError, 'Parameter may not be nil: options' if options.nil?
       @options = ::Server.server_config.merge(options)
-      configure_handlers(*handlers, &block)
+      log.trace "##{__method__} handlers: #{handlers}"
+      configure_handlers(*(handlers.empty? ? [self] : handlers), &block)
+    ensure
+      listeners = channel_initializer.default_handler.listeners
+      log.trace "##{__method__} listeners: #{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}"
-      return ctx.close() if @options[:quit_commands].include?(msg.downcase.to_sym)
-      response = msg.upcase
-      log.debug "Sending response: #{response.inspect}"
-      ctx.writeAndFlush("#{response}\n")
-    end
-    # rubocop: enable Metrics/AbcSize
   end
   # class Server
 end

data/lib/server/version.rb

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

data/lib/server.rb

@@ -12,6 +12,7 @@
 #
 # =end
 
+require_relative 'demo_listener'
 require_relative 'logging'
 require_relative 'server/argument_parser'
 require_relative 'server/server'
@@ -20,7 +21,8 @@ require_relative 'server/server'
 module Server
   def main(args = parse_arguments)
     Logging.log_level = args[:log_level]
-    ::Server::Server.new(args, ::Server::Demo.new).run
+    demo_handler = ::Server::Demo.new(args)
+    ::Server::Server.new(args, demo_handler).run
   rescue Interrupt => e
     warn format("\r%<class>s", class: e.class)
     exit
@@ -31,6 +33,4 @@ module Server
   end
 end
 
-require_relative 'demo_listener'
-
 Object.new.extend(Server).main if $PROGRAM_NAME == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcp-server
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: java
 authors:
 - Nels Nelson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ files:
 - lib/server/argument_parser.rb
 - lib/server/channel_initializer.rb
 - lib/server/config.rb
+- lib/server/default_handler.rb
 - lib/server/instance_methods.rb
 - lib/server/listenable.rb
 - lib/server/message_handler.rb