tcp-server 1.0.5-java → 1.0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4915c8f9c555eccbae820aef2e73e1742a27da1765616019d5a48c9b62e40264
-  data.tar.gz: 79a2ef5e23262aea916f25b0244e4ba965d4ecdeffd609c254899ca51a5f5d06
+  metadata.gz: adb40677b97f1b1ce0fb1fad9308d527d3086c927044f5e71d1e378c5e0d8e25
+  data.tar.gz: 7e489022262138faae081772672bb99ca5eef415f943ff2b9cf96120390cb984
 SHA512:
-  metadata.gz: d8436967a6786d2321eda7d4ffd7248d8f128d5c2d8b48dc1b3b30a064553067ce5abd5f1a09d87fb3161106614c1370465c17216c703e2d6333a5314a7a7f8e
-  data.tar.gz: 47989e7e6028d4f421cea50e328e7b35abcc5007c86f90864ceb1ebc72a408310ad256aea949e9e9a7b9eb1082b211797eae96097afb447b3ea479713d0e234a
+  metadata.gz: 1d8afb5280d5a8bfe5dd234dcb5f0dfb26558543074b917de3c39bd08cd5331319a32bd764400d7183fa8814d8b978a57532306dfb2b7464c28cc58aacc5c732
+  data.tar.gz: 8a6c94c3ee130ea33a8c4e95009b75414d9622916b4277a38664f3f08d3f238d787941c9c0e7ed5c566a2c3efd2b2d064dda83f0cdce513fd95036c08c959e09

data/lib/server/channel_initializer.rb

@@ -30,7 +30,6 @@ module Server
 
   # The ChannelInitializer class
   class ChannelInitializer < Java::io.netty.channel.ChannelInitializer
-    DefaultServerHandler = ModularHandler.new
     FrameDecoderBufferBytesSize = 8192
     # The encoder and decoder are sharable. If they were not, then
     # constant definitions could not be used.
@@ -39,8 +38,9 @@ module Server
     attr_accessor :user_handlers
     attr_reader :options
 
-    def initialize(options = {})
+    def initialize(channel_group, options = {})
       super()
+      @channel_group = channel_group
       @options = options
       @user_handlers = []
     end
@@ -58,7 +58,15 @@ module Server
         Encoder
       )
       add_user_handlers(pipeline)
-      pipeline.addLast(DefaultServerHandler)
+      pipeline.addLast(default_handler)
+    end
+
+    def default_handler
+      @default_handler ||= ::Server::ModularHandler.new(@channel_group)
+    end
+
+    def add_listener(listener)
+      default_handler.add_listener(listener)
     end
 
     protected

data/lib/server/instance_methods.rb

@@ -20,9 +20,11 @@ require_relative 'shutdown_hook'
 module Server
   java_import Java::io.netty.bootstrap.ServerBootstrap
   java_import Java::io.netty.channel.ChannelOption
+  java_import Java::io.netty.channel.group.DefaultChannelGroup
   java_import Java::io.netty.channel.nio.NioEventLoopGroup
   java_import Java::io.netty.handler.logging.LogLevel
   java_import Java::io.netty.handler.logging.LoggingHandler
+  java_import Java::io.netty.util.concurrent.GlobalEventExecutor
 
   # The InstanceMethods module
   module InstanceMethods
@@ -41,7 +43,7 @@ module Server
     end
 
     def channel_initializer
-      @channel_initializer ||= ::Server::ChannelInitializer.new(@options)
+      @channel_initializer ||= ::Server::ChannelInitializer.new(channel_group, @options)
     end
 
     def boss_group
@@ -52,6 +54,10 @@ module Server
       @worker_group ||= NioEventLoopGroup.new
     end
 
+    def channel_group
+      @channel_group ||= DefaultChannelGroup.new('server_channels', GlobalEventExecutor::INSTANCE)
+    end
+
     def logging_handler
       @logging_handler ||= LoggingHandler.new(LogLevel::INFO)
     end
@@ -60,7 +66,7 @@ module Server
     # rubocop: disable Metrics/MethodLength
     def run(port = @options[:port])
       channel = bootstrap.bind(port).sync().channel()
-      ::Server::Channels.add(channel)
+      channel_group.add(channel)
       ::Server::ShutdownHook.new(self)
       log.info "Listening on #{channel.local_address}"
       channel.closeFuture().sync()
@@ -77,8 +83,8 @@ module Server
     # rubocop: enable Metrics/MethodLength
 
     def shutdown
-      ::Server::Channels.disconnect().awaitUninterruptibly()
-      ::Server::Channels.close().awaitUninterruptibly()
+      channel_group.disconnect().awaitUninterruptibly()
+      channel_group.close().awaitUninterruptibly()
     end
 
     def stop
@@ -91,7 +97,7 @@ module Server
     end
 
     def add_listener(listener)
-      ::Server::ChannelInitializer::DefaultServerHandler.add_listener(listener)
+      channel_initializer.add_listener(listener)
     end
   end
   # module ServerInstanceMethods

data/lib/server/modular_handler.rb

@@ -18,19 +18,16 @@ require_relative 'listenable'
 # The Server module
 module Server
   java_import Java::io.netty.channel.SimpleChannelInboundHandler
-  java_import Java::io.netty.channel.group.DefaultChannelGroup
-  java_import Java::io.netty.util.concurrent.GlobalEventExecutor
-
-  # rubocop: disable Style/IfUnlessModifier
-  unless defined?(::Server::Channels)
-    Channels = DefaultChannelGroup.new('channels', GlobalEventExecutor::INSTANCE)
-  end
-  # rubocop: enable Style/IfUnlessModifier
 
   # The ModularHandler class notifies listeners about events.
   class ModularHandler < SimpleChannelInboundHandler
     include ::Server::Listenable
 
+    def initialize(channel_group)
+      super()
+      @channel_group = channel_group
+    end
+
     def isSharable
       true
     end
@@ -49,7 +46,7 @@ module Server
 
     def channelActive(ctx)
       log.trace "##{__method__} channel: #{ctx.channel}"
-      ::Server::Channels.add(ctx.channel)
+      @channel_group.add(ctx.channel)
       notify :channel_active, ctx
       super(ctx)
     end
@@ -107,10 +104,10 @@ module Server
       super(ctx, cause) if listeners.nil? || listeners.empty?
     end
 
-    IdentiferTemplate = '#<%<class>s:0x%<id>s>'.freeze
+    IdentifierTemplate = '#<%<class>s:0x%<id>s>'.freeze
 
     def to_s
-      format(IdentiferTemplate, class: self.class.name, id: object_id.to_s(16))
+      format(IdentifierTemplate, class: self.class.name, id: object_id.to_s(16))
     end
     alias inspect to_s
   end

data/lib/server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcp-server
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: java
 authors:
 - Nels Nelson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement