tcp-server 1.0.3-java → 1.0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee220a0690f6cfd1a8adeb7a7147f93755082ee6e947f2ee9823cea6e4ddda2b
-  data.tar.gz: d9ef67e6d0bf3e8496d4c0b73b47bcb2cca158706d38de245cd5cbfa15db6ac1
+  metadata.gz: adb40677b97f1b1ce0fb1fad9308d527d3086c927044f5e71d1e378c5e0d8e25
+  data.tar.gz: 7e489022262138faae081772672bb99ca5eef415f943ff2b9cf96120390cb984
 SHA512:
-  metadata.gz: 56326ddbedd68dd85915bb3616ef02204a17b36643224106f72f134fabc723e29de06baae753e08821af4c85d943fbadf39f30a743d6150107d8e2756400bae5
-  data.tar.gz: 807ba39230059812a6e6d0075ec41029dd3f5da11234e13705e46a04f66ed45f6e60b12f29f24a10fc9d03294a9be2b348e0840fe95ad6607f95a4caa267cb42
+  metadata.gz: 1d8afb5280d5a8bfe5dd234dcb5f0dfb26558543074b917de3c39bd08cd5331319a32bd764400d7183fa8814d8b978a57532306dfb2b7464c28cc58aacc5c732
+  data.tar.gz: 8a6c94c3ee130ea33a8c4e95009b75414d9622916b4277a38664f3f08d3f238d787941c9c0e7ed5c566a2c3efd2b2d064dda83f0cdce513fd95036c08c959e09

data/README.md

@@ -173,6 +173,33 @@ Use the GitLab CI Linting API to validate the syntax of a CI definition file.
 jq --null-input --arg yaml "$(<.gitlab/ci/gem.gitlab-ci.yml)" '.content=$yaml' | curl --silent --location https://gitlab.com/api/v4/ci/lint --header "PRIVATE-TOKEN: ${GITLAB_COM_API_PRIVATE_TOKEN}" --header "Content-Type: application/json" --data @- | jq --raw-output '.errors[0]'
 ```
 
+## CI configuration
+
+Generate a deploy key.
+
+```sh
+ssh-keygen -t ed25519 -C deploy_key
+```
+
+Use the GitLab Project-level Variables API to add the deploy key as a ssh private key variable.
+
+```sh
+project_path="nelsnelson/$(basename $(pwd))"
+
+project=$(curl --silent --show-error --location "https://gitlab.com/api/v4/search?scope=projects&search=${project_path}" --header "PRIVATE-TOKEN: ${GITLAB_COM_API_PRIVATE_TOKEN}" | jq --arg project_path "${project_path}" '.[] | select(.path_with_namespace == $project_path)')
+
+project_id=$(curl --silent --show-error --location "https://gitlab.com/api/v4/search?scope=projects&search=${project_path}" --header "PRIVATE-TOKEN: ${GITLAB_COM_API_PRIVATE_TOKEN}" | jq --arg project_path "${project_path}" '.[] | select(.path_with_namespace == $project_path) | .id')
+
+# Add the deploy_token as a CI variable:
+curl --silent --show-error --location --request POST "https://gitlab.com/api/v4/projects/${project_id}/variables" --header "PRIVATE-TOKEN: ${GITLAB_COM_API_PRIVATE_TOKEN}" --form "key=SSH_PRIVATE_KEY" --form "value=$(cat ./deploy_token)" --form "protected=true" | jq
+```
+
+Use the Deploy keys API to add a the public deploy key as a deploy key for the project.
+
+```sh
+curl --silent --show-error --location --request POST "https://gitlab.com/api/v4/projects/${project_id}/deploy_keys" --header "PRIVATE-TOKEN: ${GITLAB_COM_API_PRIVATE_TOKEN}" --data '{"title": "deploy_key", "key": "$(cat ./deploy_token.pub)", "can_push": "true"}' | jq
+```
+
 [license]: https://gitlab.com/nelsnelson/tcp-server-jruby/blob/master/LICENSE
 [asdf]: https://asdf-vm.com/
 [Netty project]: https://github.com/netty/netty

data/lib/server/channel_initializer.rb

@@ -30,7 +30,6 @@ module Server
 
   # The ChannelInitializer class
   class ChannelInitializer < Java::io.netty.channel.ChannelInitializer
-    DefaultHandler = 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(DefaultHandler)
+      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
@@ -67,7 +75,7 @@ module Server
       @user_handlers.each do |handler|
         case handler
         when Class then pipeline.addLast(handler.new)
-        when Proc then pipeline.addLast(Server::MessageHandler.new(&handler))
+        when Proc then pipeline.addLast(::Server::MessageHandler.new(&handler))
         else pipeline.addLast(handler)
         end
       end

data/lib/server/instance_methods.rb

@@ -20,28 +20,30 @@ 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
     def configure_handlers(&block)
-      ::Server::ChannelInitializer::DefaultHandler.add_listener(self)
+      add_listener(self)
       channel_initializer << block if block_given?
     end
 
     def bootstrap
       @bootstrap = ServerBootstrap.new
       @bootstrap.group(boss_group, worker_group)
-      @bootstrap.channel(::Server::CHANNEL_TYPE)
+      @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)
     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
@@ -89,6 +95,10 @@ module Server
     def <<(handler)
       channel_initializer << handler
     end
+
+    def add_listener(listener)
+      channel_initializer.add_listener(listener)
+    end
   end
   # module ServerInstanceMethods
 end

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/server.rb

@@ -18,10 +18,9 @@ require_relative 'listenable'
 
 # The Server module
 module Server
-  CHANNEL_TYPE = Java::io.netty.channel.socket.nio.NioServerSocketChannel.java_class
-
   # The Server class sets up the netty server.
   class Server
+    CHANNEL_TYPE = Java::io.netty.channel.socket.nio.NioServerSocketChannel.java_class
     include ::Server::InstanceMethods
     attr_reader :options
 
@@ -40,10 +39,6 @@ module Server
       log.debug "Sending response: #{response.inspect}"
       ctx.writeAndFlush("#{response}\n")
     end
-
-    def add_listener(listener)
-      ::Server::ChannelInitializer::DefaultHandler.add_listener(listener)
-    end
     # rubocop: enable Metrics/AbcSize
   end
   # class Server

data/lib/server/version.rb

@@ -12,5 +12,5 @@
 
 # The Server module
 module Server
-  VERSION = '1.0.3'.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.3
+  version: 1.0.6
 platform: java
 authors:
 - Nels Nelson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement