websocket-server 1.1.3-java → 1.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a2cb20b197ce3a122e050b1d03039bd80f088a18bc3144807485c357b0ad69
-  data.tar.gz: f265d4c946eb0c801ca46784ec993d865ec1958dc83f39fcc53eb02a25b06878
+  metadata.gz: 58298e46b315a6b0a3b263a24b5ce82644a75e26b828d5bbee46b9206c4bb944
+  data.tar.gz: 8ab9652cb207c8c3f180ffb85792782b4665a9842d71299e5bf368fedef5737d
 SHA512:
-  metadata.gz: 54d832e3cbabff5e220b1666e6c36216c56c7cd4ededefdb3e9172af94340e4037e1388b6c94302c79bf6326ce5960fb91d4b0e1ccbb77bf7120b418ecf9240e
-  data.tar.gz: f1a635b06fd752ef345b156050044c5c4c9231efbfd5d7015dbf06294da526dc65fe28066c61556b20e76d7a5c878dfb6c5c67ac3c96eabe269f95dbaa50675b
+  metadata.gz: 94ad7799ec5713d5e4f0671158d488856f91e99cbd7e8d8dd9d9a06e622c273d28e95bfe3d377efe571ba779149bd62ec1dd8402ace97f66c11921b894b11312
+  data.tar.gz: ebefc7c8ec573d5266d72c76e54e7bcd240efe8289f3aefc74c679a29f83e61b27edc7a8a59ecaf96491948b84c2686ae4e9db0496fb30aad30c64226e101a18

data/lib/logging.rb

@@ -156,7 +156,7 @@ module Logging
   java_import Java::org.apache.logging.log4j.LogManager
   end
 
-  FORWARD_SLASH_PATTERN = %r{/}
+  FORWARD_SLASH_PATTERN = %r{/} unless defined? FORWARD_SLASH_PATTERN
 
   def init_logger(level = :info, logger_name = nil)
     return init_java_logger(level, logger_name, caller[2]) if defined?(Java)

data/lib/websocket/config.rb

@@ -41,6 +41,8 @@ module WebSocket
         inspect_ssl: false,
         idle_reading: 5 * 60, # seconds
         idle_writing: 30, # seconds
+        keep_alive: true,
+        max_queued_incoming_connections: 100,
         index_page: 'index.html',
         web_root: File.join(project_dir_path, 'web'),
         web_socket_path: '/websocket',
@@ -51,7 +53,7 @@ module WebSocket
         insecure_uri_pattern: /.*[<>&"].*/,
         allowed_file_name: /[A-Za-z0-9][-_A-Za-z0-9\\.]*/,
         log_requests: false
-      }
+      }.freeze
     end
   end
   module_function :server_config

data/lib/websocket/instance_methods.rb

@@ -19,23 +19,15 @@ require_relative 'shutdown_hook'
 # The WebSocket module
 module WebSocket
   java_import Java::io.netty.bootstrap.ServerBootstrap
-  java_import Java::io.netty.channel.group.DefaultChannelGroup
-  java_import Java::io.netty.channel.nio.NioEventLoopGroup
-  java_import Java::io.netty.handler.logging.LoggingHandler
-  java_import Java::io.netty.handler.logging.LogLevel
-  java_import Java::io.netty.util.concurrent.GlobalEventExecutor
+  java_import Java::io.netty.channel.ChannelOption
 
   # The InstanceMethods module
   module InstanceMethods
-    def configure_handlers(&block)
-      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(channel_type)
+      @bootstrap.option(ChannelOption::SO_BACKLOG, max_queued_incoming_connections)
       @bootstrap.handler(logging_handler) if @options[:log_requests]
       @bootstrap.childHandler(channel_initializer)
     end
@@ -44,22 +36,6 @@ module WebSocket
       @channel_initializer ||= ::WebSocket::ChannelInitializer.new(channel_group, @options)
     end
 
-    def boss_group
-      @boss_group ||= NioEventLoopGroup.new(2)
-    end
-
-    def worker_group
-      @worker_group ||= NioEventLoopGroup.new
-    end
-
-    def channel_group
-      @channel_group ||= DefaultChannelGroup.new('server_channels', GlobalEventExecutor::INSTANCE)
-    end
-
-    def logging_handler
-      LoggingHandler.new(LogLevel::INFO)
-    end
-
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/MethodLength
     def run(params = {})
@@ -82,33 +58,6 @@ module WebSocket
     def port
       @port ||= (@options[:ssl] ? @options[:ssl_port] : @options[:port]).to_i
     end
-
-    def shutdown
-      channel_group.disconnect().awaitUninterruptibly()
-      channel_group.close().awaitUninterruptibly()
-    end
-
-    def stop
-      boss_group&.shutdownGracefully()
-      worker_group&.shutdownGracefully()
-    end
-
-    def <<(handler)
-      channel_initializer.handlers << handler
-    end
-
-    def add_listener(*listener)
-      channel_initializer.add_listener(*listener)
-    end
-
-    # def all_exist?(*files)
-    #   files.all? { |f| File.exist?(f) }
-    # end
-
-    # def init_ssl_context(certificate, private_key)
-    #   return certificate_key_pair(certificate, private_key) if all_exist?(certificate, private_key)
-    #   options[:use_jdk_ssl_provider] ? jdk_ssl_provider : self_signed_certificate
-    # end
   end
   # module ServerInstanceMethods
 end

data/lib/websocket/server.rb

@@ -19,6 +19,11 @@ module WebSocket
   # The Server class sets up the netty server
   class Server < ::Server::Server
     include ::WebSocket::InstanceMethods
+
+    def initialize(options = {}, *handlers, &block)
+      raise ArgumentError, 'Parameter may not be nil: options' if options.nil?
+      super(::WebSocket.server_config.merge(options), *handlers, &block)
+    end
   end
 end
 # module WebSocket

data/lib/websocket/ssl_context_initialization.rb

@@ -36,6 +36,15 @@ module WebSocket
       channel_initializer.ssl_context = context unless context.nil?
     end
 
+    def all_exist?(*files)
+      files.all? { |f| File.exist?(f) }
+    end
+
+    def init_ssl_context(certificate, private_key)
+      return certificate_key_pair(certificate, private_key) if all_exist?(certificate, private_key)
+      options[:use_jdk_ssl_provider] ? jdk_ssl_provider : self_signed_certificate
+    end
+
     def ssl_context
       @ssl_context ||= init_ssl_context(options[:ssl_certificate_file_path], options[:ssl_private_key_file_path])
     end

data/lib/websocket/version.rb

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

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: websocket-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-04-08 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   name: tcp-server
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   force_ruby_platform: false
 description: Websocket Server for JRuby is a websocket server with a file server to
   support a demo javascript client application which interfaces with a demo echo server