websocket-server 1.0.1-java → 1.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7670d3a4e743e533e42467d4047741a0ea833cc4e7ea4d1855a1ed9b76138560
-  data.tar.gz: d1d6b8efb9502a45b44d56267d8a76fc036d46e4169c15cf93fcc605202ded8c
+  metadata.gz: efeef05a280e5bd37c7aac5e935d3be061d0d2e3cc8058af0beb431a6ac91b2f
+  data.tar.gz: ebe9d73d1f5c6cb9939551957531c78c5e93a93ffede7a6d2b14ac233ffd60ab
 SHA512:
-  metadata.gz: a7cf7669311ab73b6a1905cda6d8112052b32ddbd7da3ccfb6bcf36e36e3f1d66b8fabf11da1b0abe0dc29a61c96f10506c1a8c750f95a45a18f494e711ec24f
-  data.tar.gz: 16e0b9f2221cd9a83de57266561ea8797f40ac7d6d717e6b67fef1e078f045a5b2a5605c25c5670bc6fdde6c5db48610b85786f0a5c1a79d2a7df20c366ef6d6
+  metadata.gz: f88e570186167360f06486585614c9b94dc85246aef73036f387908f3e9d7b286552fccec802b8b7e85826c6bc87cbf21010443e9f2485d2017ce4f74fe18af3
+  data.tar.gz: d35daddf002f5f847fcd05b0d2a1f0a89616a027c410fcac25a26183d957111b213ca8f65835c3a6936e5950b4aa21a267a6e4086cb617128489042f7cdfc788

data/README.md

@@ -107,11 +107,10 @@ Here is a bird's-eye view of the project layout.
 
 ```sh
 # date && tree
-Wed Apr  6 23:05:28 CDT 2022
+Sun Jul 24 22:53:59 CDT 2022
 .
 ├── Dockerfile
 ├── Gemfile
-├── Gemfile.lock
 ├── LICENSE
 ├── README.md
 ├── Rakefile
@@ -119,10 +118,11 @@ Wed Apr  6 23:05:28 CDT 2022
 ├── exe
 │   └── websocket
 ├── lib
+│   ├── client.rb
 │   ├── log.rb
 │   ├── server
 │   │   ├── mime_types.rb
-│   │   └── server.rb
+│   │   └── modular_handler.rb
 │   ├── websocket
 │   │   ├── arguments_parser.rb
 │   │   ├── channel_initializer.rb
@@ -135,22 +135,20 @@ Wed Apr  6 23:05:28 CDT 2022
 │   │   ├── http_static_file_server_handler_instance_methods.rb
 │   │   ├── idle_handler.rb
 │   │   ├── idle_state_user_event_handler.rb
+│   │   ├── instance_methods.rb
 │   │   ├── listenable.rb
 │   │   ├── message_handler.rb
-│   │   ├── modular_handler.rb
 │   │   ├── response_helpers.rb
 │   │   ├── server.rb
-│   │   ├── server_instance_methods.rb
 │   │   ├── shutdown_hook.rb
 │   │   ├── ssl_cipher_inspector.rb
 │   │   ├── ssl_context_initialization.rb
 │   │   ├── telnet_proxy.rb
 │   │   ├── validation_helpers.rb
 │   │   └── version.rb
+│   ├── websocket-server.rb
 │   ├── websocket_client.rb
 │   └── websocket_server.rb
-├── logs
-│   └── server.log
 ├── spec
 │   ├── spec_helper.rb
 │   ├── test_spec.rb
@@ -172,10 +170,12 @@ Wed Apr  6 23:05:28 CDT 2022
 │       │   ├── console.js
 │       │   └── websocket.js
 │       └── jquery.min.js
+├── websocket-server-1.0.1-java.gem
 ├── websocket-server-jruby.gemspec
-└── websocket.rb
+├── websocket.rb
+└── websocket_server.png
 
-13 directories, 52 files
+12 directories, 53 files
 ```
 
 [license]: https://gitlab.com/nelsnelson/websocket-server-jruby/blob/master/LICENSE

data/lib/websocket/arguments_parser.rb

@@ -16,20 +16,21 @@ require_relative 'config'
 
 # The WebSocket module
 module WebSocket
+  # rubocop: disable Metrics/ClassLength
   # The ArgumentsParser class
   class ArgumentsParser
-    Flags = %i[
-      banner port telnet_proxy_host telnet_proxy_port
-      ssl ssl_certificate ssl_private_key use_jdk_ssl_provider
-      inspect_ssl idle_reading idle_writing log_requests web_root
-      verbose help version
-    ].freeze
     attr_reader :parser, :options
 
     def initialize(option_parser = OptionParser.new)
       @parser = option_parser
       @options = ::WebSocket.server_config.dup
-      Flags.each { |method_name| method(method_name).call }
+      @flags = %i[
+        banner port telnet_proxy_host telnet_proxy_port
+        ssl ssl_certificate ssl_private_key use_jdk_ssl_provider
+        inspect_ssl idle_reading idle_writing log_requests web_root
+        verbose help version
+      ]
+      @flags.each { |method_name| method(method_name)&.call if respond_to?(method_name) }
     end
 
     def banner
@@ -38,9 +39,17 @@ module WebSocket
       @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
+
+      val
+    end
+
     def port
-      @parser.on_head('-p', '--port=port', 'Listen on this port for incoming connections') do |v|
-        @options[:port] = v.to_i
+      description = "Port on which to listen for connections; default: #{@options[:port]}"
+      @parser.on('-p', '--port=<port>', Integer, description) do |v|
+        @options[:port] = validated_port(v).to_i
       end
     end
 
@@ -112,6 +121,7 @@ module WebSocket
 
     def verbose
       @parser.on_tail('-v', '--verbose', 'Increase verbosity') do
+        @options[:log_level] ||= 0
         @options[:log_level] -= 1
       end
     end
@@ -125,17 +135,23 @@ module WebSocket
 
     def version
       @parser.on_tail('--version', 'Show version') do
-        puts "#{File.basename($PROGRAM_NAME)} version #{WebSocket.version}"
+        puts "#{File.basename($PROGRAM_NAME)} version #{::WebSocket::VERSION}"
         exit
       end
     end
   end
+  # rubocop: enable Metrics/ClassLength
   # class ArgumentsParser
 
   def parse_arguments(arguments_parser = WebSocket::ArgumentsParser.new)
     arguments_parser.parser.parse!(ARGV)
     arguments_parser.options
-  rescue OptionParser::InvalidOption, OptionParser::AmbiguousOption => e
+  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption,
+         OptionParser::MissingArgument, OptionParser::NeedlessArgument => e
+    puts e.message
+    puts parser
+    exit
+  rescue OptionParser::AmbiguousOption => e
     abort e.message
   end
 end

data/lib/websocket/instance_methods.rb

@@ -63,36 +63,24 @@ module WebSocket
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/MethodLength
     def run(params = {})
-      options.merge!(params)
+      @options.merge!(params)
       channel = bootstrap.bind(port).sync().channel()
       channel_group.add(channel)
       ::WebSocket::ShutdownHook.new(self)
       log.info "Listening on #{channel.local_address}"
       channel.closeFuture().sync()
     rescue java.net.BindException => e
-      raise "Bind error: #{e.message}: #{options[:host]}:#{port}"
+      raise "Bind error: #{e.message}: #{@options[:host]}:#{port}"
     rescue java.net.SocketException => e
-      raise "Socket error: #{e.message}: #{options[:host]}:#{port}"
+      raise "Socket error: #{e.message}: #{@options[:host]}:#{port}"
     ensure
       stop
     end
     # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/MethodLength
 
-    IntegerPattern = /^\d+$/.freeze
-
-    def valid_port?(val)
-      IntegerPattern.match?(val.to_s) && val.positive? && val < 65_536
-    end
-
-    def given_port
-      value = (options[:ssl] ? options[:ssl_port] : options[:port]).to_i
-      raise 'Given port parameter is invalid' unless valid_port?(value)
-      value
-    end
-
     def port
-      @port ||= given_port
+      @port ||= (@options[:ssl] ? @options[:ssl_port] : @options[:port]).to_i
     end
 
     def shutdown
@@ -109,8 +97,8 @@ module WebSocket
       channel_initializer.handlers << handler
     end
 
-    def add_listener(listener)
-      channel_initializer.add_listener(listener)
+    def add_listener(*listener)
+      channel_initializer.add_listener(*listener)
     end
 
     # def all_exist?(*files)

data/lib/websocket/listenable.rb

@@ -16,26 +16,6 @@ require 'java'
 module WebSocket
   # The Listenable module
   module Listenable
-    def listeners
-      @listeners ||= java.util.concurrent.CopyOnWriteArrayList.new
-    end
-
-    def add_listener(listener)
-      listeners << listener
-    end
-
-    def remove_listener(listener)
-      listeners.delete(listener)
-    end
-
-    def notify(message, *args)
-      return if listeners.empty?
-      log.trace "Notifying listeners (#{listeners}) of message: #{message}"
-      listeners.each do |listener|
-        listener.send(message.to_sym, *args) if listener.respond_to?(message.to_sym)
-      end
-    end
+    include ::Server::Listenable
   end
-  # module Listenable
 end
-# module WebSocket

data/lib/websocket/version.rb

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

data/lib/websocket_client.rb

@@ -260,23 +260,32 @@ module WebSocket
       @listeners ||= java.util.concurrent.CopyOnWriteArrayList.new
     end
 
-    def add_listener(listener)
-      listeners << listener
+    def add_listener(*listener)
+      listeners.addAll(listener)
+    ensure
+      log.trace "Listeners: #{listeners}"
+    end
+
+    def remove_listener(*listener)
+      listeners.removeAll(listener)
     end
 
-    def remove_listener(listener)
-      listeners.delete(listener)
+    def replace_listeners(*listener)
+      listeners.clear
+      add_listener(*listener)
     end
 
-    def notify(message, *args)
-      return if listeners.empty?
-      log.trace "Notifying listeners (#{listeners}) of message: #{message}"
+    def notify(event, *args)
       listeners.each do |listener|
-        listener.send(message.to_sym, *args) if listener.respond_to?(message.to_sym)
+        next unless listener.respond_to?(event.to_sym)
+        log.trace "Notifying listener #{listener} of event: #{event}"
+        listener.send(event.to_sym, *args)
       end
     end
   end
+  # module Listenable
 end
+# module WebSocket
 
 # The WebSocket module
 module WebSocket
@@ -424,10 +433,8 @@ module WebSocket
       session
     end
 
-    IdentiferTemplate = '#<%<class>s:0x%<id>s>'.freeze
-
     def to_s
-      format(IdentiferTemplate, class: self.class.name, id: object_id.to_s(16))
+      format('#<%<class>s:0x%<id>s>', class: self.class.name, id: object_id.to_s(16))
     end
     alias inspect to_s
   end
@@ -436,31 +443,69 @@ end
 
 # The WebSocket module
 module WebSocket
-  # rubocop: disable Metrics/AbcSize
-  # rubocop: disable Metrics/MethodLength
-  def parse_arguments(options = ::WebSocket.client_config.dup)
-    parser = OptionParser.new
-    parser.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options]"
-    parser.separator ''
-    parser.separator 'Options:'
-    parser.on_head('-u', '--uri=<uri>', 'Fully qualified connection string') do |v|
-      options[:uri] = java.net.URI.new(v)
-    end
-    parser.on_tail('-v', '--verbose', 'Increase verbosity') { options[:log_level] -= 1 }
-    parser.on_tail('-?', '--help', 'Show this message') do
-      puts parser
-      exit
-    end
-    parser.on_tail('--version', 'Show version') do
-      puts "#{$PROGRAM_NAME} version #{::WebSocket.version}"
-      exit
-    end
-    parser.parse!
-    options
+  # The ArgumentsParser class
+  class ArgumentsParser
+    attr_reader :parser, :options
+
+    def initialize(parser = OptionParser.new, options = ::WebSocket.client_config.dup)
+      @parser = parser
+      @options = options
+      @flags = %i[banner uri log_level help version]
+      @flags.each { |method_name| method(method_name)&.call if respond_to?(method_name) }
+    end
+
+    def banner
+      @parser.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options]"
+      @parser.separator ''
+      @parser.separator 'Options:'
+    end
+
+    def uri
+      @parser.on_head('-u', '--uri=<uri>', 'Fully qualified connection string') do |v|
+        @options[:uri] = java.net.URI.new(v)
+      end
+    end
+
+    def log_level
+      @parser.on_tail('-v', '--verbose', 'Increase verbosity') do
+        @options[:log_level] ||= 0
+        @options[:log_level] -= 1
+      end
+    end
+
+    def help
+      @parser.on_tail('-?', '--help', 'Show this message') do
+        puts @parser
+        exit
+      end
+    end
+
+    def version
+      @parser.on_tail('--version', 'Show version') do
+        puts "#{File.basename($PROGRAM_NAME)} version #{::WebSocket::VERSION}"
+        exit
+      end
+    end
   end
-  # rubocop: enable Metrics/AbcSize
-  # rubocop: enable Metrics/MethodLength
+  # class ArgumentsParser
+
+  def parse_arguments(arguments_parser = ArgumentsParser.new)
+    arguments_parser.parser.parse!(ARGV)
+    arguments_parser.parse_positional_arguments!
+    arguments_parser.options
+  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption,
+         OptionParser::MissingArgument, OptionParser::NeedlessArgument => e
+    puts e.message
+    puts parser
+    exit
+  rescue OptionParser::AmbiguousOption => e
+    abort e.message
+  end
+end
+# module WebSocket
 
+# The WebSocket module
+module WebSocket
   def main(args = parse_arguments)
     Logging.log_level = args[:log_level]
     ::WebSocket::Client.new(args)

data/lib/websocket_server.rb

@@ -19,31 +19,34 @@ require_relative 'websocket/telnet_proxy'
 
 # The WebSocket module
 module WebSocket
-  EchoServerMessageTemplate = "%<message>s\n".freeze
-  InterruptTemplate = "\r%<class>s".freeze
-
   def echo_server(options)
-    WebSocket::Server.new(options: options) do |_ctx, msg|
-      format(EchoServerMessageTemplate, message: msg.upcase)
+    ::WebSocket::Server.new(options) do |_ctx, msg|
+      format("%<message>s\n", message: msg.upcase)
     end.run
   end
 
   def telnet_proxy(options)
-    handler = WebSocket::TelnetProxy.new(options[:telnet_proxy_host], options[:telnet_proxy_port])
-    WebSocket::Server.new(handler: handler, options: options).run
+    handler = ::WebSocket::TelnetProxy.new(options[:telnet_proxy_host], options[:telnet_proxy_port])
+    ::WebSocket::Server.new(options, handler).run
   end
 
+  # rubocop: disable Metrics/AbcSize
+  # rubocop: disable Metrics/MethodLength
   def main(args = parse_arguments)
     Logging.log_level = args[:log_level]
     return telnet_proxy(args) unless args[:telnet_proxy_host].nil?
     echo_server(args)
   rescue Interrupt => e
-    warn format(InterruptTemplate, class: e.class)
+    warn format("\r%<class>s", class: e.class)
     exit
   rescue StandardError => e
-    WebSocket::Server.log.fatal(e.message)
+    puts Logging.log_level
+    ::WebSocket::Server.log.fatal(e.message)
+    e.backtrace.each { |t| WebSocket::Server.log.debug t }
     abort
   end
+  # rubocop: enable Metrics/AbcSize
+  # rubocop: enable Metrics/MethodLength
 end
 # module WebSocket
 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: websocket-server
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: java
 authors:
 - Nels Nelson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
   name: tcp-server
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: