fix lint & remove redundant initialization

lib/wampproto/acceptor.rb

@@ -177,7 +177,8 @@ def handle_cryptosign_authenticate(msg)
     end
 
     def create_session_id
-      rand(100_000..9_007_199_254_740_992)
+      # to_i is added to satisfy RBS else they are not required
+      rand(100_000..9_007_199_254_740_992).to_i
     end
   end
 end

lib/wampproto/id_generator.rb

@@ -7,7 +7,8 @@ class IdGenerator
 
     class << self
       def generate_session_id
-        rand(1..MAX_ID)
+        # to_i is added to satisfy RBS else they are not required
+        rand(1..MAX_ID).to_i
       end
     end
 

lib/wampproto/message.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative "message/util"
+require_relative "message/validation_spec"
+
 require_relative "message/base"
 require_relative "message/hello"
 require_relative "message/welcome"
@@ -30,8 +33,6 @@
 require_relative "message/invocation"
 require_relative "message/yield"
 
-require_relative "message/util"
-
 module Wampproto
   # message root
   module Message

lib/wampproto/message/abort.rb

@@ -11,7 +11,7 @@ class IAbortFields
     class AbortFields < IAbortFields
       attr_reader :details, :reason, :args, :kwargs
 
-      def initialize(details, reason, args, kwargs)
+      def initialize(details, reason, *args, **kwargs)
         super()
         @details = details
         @reason = reason
@@ -25,7 +25,7 @@ class Abort < Base
       attr_reader :details, :reason, :args, :kwargs
 
       TEXT = "ABORT"
-      VALIDATION_SPEC = ValidationSpec.new(
+      VALIDATION_SPEC = Message::ValidationSpec.new(
         3,
         5,
         TEXT,

lib/wampproto/message/util.rb

@@ -10,40 +10,14 @@ class Fields
                     :message_type, :signature, :reason, :topic, :extra,
                     :options, :details, :subscription_id, :publication_id,
                     :registration_id
-
-      def initialize # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        @request_id = nil
-        @uri = nil
-        @args = nil
-        @kwargs = nil
-
-        @session_id = nil
-
-        @realm = nil
-        @authid = nil
-        @authrole = nil
-        @authmethod = nil
-        @authmethods = nil
-        @authextra = nil
-        @roles = nil
-
-        @message_type = nil
-        @signature = nil
-        @reason = nil
-        @topic = nil
-
-        @extra = nil
-        @options = nil
-        @details = nil
-
-        @subscription_id = nil
-        @publication_id = nil
-        @registration_id = nil
-      end
     end
 
     # util module
     module Util # rubocop:disable Metrics/ModuleLength
+      DEFAULT_ROLES = { caller: {}, publisher: {}, subscriber: {}, callee: {} }.freeze
+
+      module_function
+
       def validate_int(value, index, message)
         return nil if value.is_a?(Integer)
 
@@ -151,16 +125,16 @@ def validate_realm(wamp_msg, index, fields, message)
       end
 
       def validate_authid(details, index, fields, message) # rubocop: disable Metrics/MethodLength
-        if details.key?(:authid)
-          authid = details[:authid]
+        if details.key?("authid")
+          authid = details["authid"]
           error = validate_string(authid, index, message)
           new_error = format(
             Exceptions::INVALID_DETAIL_ERROR,
             message:,
             index:,
             key: "authid",
             expected_type: "string",
-            actual_type: value.class
+            actual_type: authid.class
           )
 
           return new_error if error
@@ -172,16 +146,16 @@ def validate_authid(details, index, fields, message) # rubocop: disable Metrics/
       end
 
       def validate_authrole(details, index, fields, message) # rubocop:disable Metrics/MethodLength
-        if details.key?(:authrole)
-          authrole = details[:authrole]
-          error = validate_string(authid, index, message)
+        if details.key?("authrole")
+          authrole = details["authrole"]
+          error = validate_string(authrole, index, message)
           new_error = format(
             Exceptions::INVALID_DETAIL_ERROR,
             message:,
             index:,
             key: "authrole",
             expected_type: "string",
-            actual_type: value.class
+            actual_type: authrole.class
           )
 
           return new_error if error
@@ -202,16 +176,16 @@ def validate_authmethod(wamp_msg, index, fields, message)
       end
 
       def validate_authmethods(details, index, fields, message) # rubocop:disable Metrics/MethodLength
-        if details.key?(:authmethods)
-          authmethods = details[:authmethods]
-          error = validate_list(authid, index, message)
+        if details.key?("authmethods")
+          authmethods = details["authmethods"]
+          error = validate_list(authmethods, index, message)
           new_error = format(
             Exceptions::INVALID_DETAIL_ERROR,
             message:,
             index:,
             key: "authmethods",
             expected_type: "list",
-            actual_type: value.class
+            actual_type: authmethods.class
           )
 
           return new_error if error
@@ -223,16 +197,16 @@ def validate_authmethods(details, index, fields, message) # rubocop:disable Metr
       end
 
       def validate_welcome_authmethod(details, index, fields, message) # rubocop:disable Metrics/MethodLength
-        if details.key?(:authmethod)
-          authmethod = details[:authmethod]
-          error = validate_string(authid, index, message)
+        if details.key?("authmethod")
+          authmethod = details["authmethod"]
+          error = validate_string(authmethod, index, message)
           new_error = format(
             Exceptions::INVALID_DETAIL_ERROR,
             message:,
             index:,
             key: "authmethod",
             expected_type: "string",
-            actual_type: value.class
+            actual_type: authmethod.class
           )
 
           return new_error if error
@@ -244,16 +218,16 @@ def validate_welcome_authmethod(details, index, fields, message) # rubocop:disab
       end
 
       def validate_authextra(details, index, fields, message) # rubocop:disable Metrics/MethodLength
-        if details.key?(:authextra)
-          authextra = details[:authextra]
-          error = validate_hash(authid, index, message)
+        if details.key?("authextra")
+          authextra = details["authextra"]
+          error = validate_hash(authextra, index, message)
           new_error = format(
             Exceptions::INVALID_DETAIL_ERROR,
             message:,
             index:,
             key: "authextra",
             expected_type: "hash",
-            actual_type: value.class
+            actual_type: authextra.class
           )
 
           return new_error if error
@@ -265,22 +239,22 @@ def validate_authextra(details, index, fields, message) # rubocop:disable Metric
       end
 
       def validate_roles(details, index, fields, message) # rubocop:disable Metrics/MethodLength
-        if details.key?(:roles)
-          roles = details[:roles]
-          error = validate_hash(authid, index, message)
+        if details.key?("roles")
+          roles = details["roles"]
+          error = validate_hash(roles, index, message)
           new_error = format(
             Exceptions::INVALID_DETAIL_ERROR,
             message:,
             index:,
             key: "roles",
             expected_type: "hash",
-            actual_type: value.class
+            actual_type: roles.class
           )
 
           return new_error if error
 
-          valid_keys = default_roles.keys
-          invalid_keys = hash.keys - valid_keys
+          valid_keys = DEFAULT_ROLES.keys
+          invalid_keys = roles.keys - valid_keys
 
           if invalid_keys.any?
             return "#{message}: value at index #{index} for roles key must be in #{valid_keys} but was #{invalid_keys}"
@@ -440,7 +414,7 @@ def validate_welcome_details(wamp_msg, index, fields, message) # rubocop: disabl
       end
 
       def sanity_check(wamp_message, min_length, max_length, expected_id, message) # rubocop:disable Metrics/MethodLength
-        unless value.is_a?(Array)
+        unless wamp_message.is_a?(Array)
           raise ArgumentError, "invalid message type #{wamp_message.class} for #{message}, type should be a list"
         end
 
@@ -464,10 +438,10 @@ def validate_message(wamp_msg, type, message, val_spec)
         errors = []
         f = Fields.new
         val_spec.spec.each do |idx, func|
-          error = send(func, message, idx, f, val_spec.message)
+          error = func.call(message, idx, f, val_spec.message)
           errors.append(error) if error
         end
-        raise ArgumentError, *errors unless errors.empty?
+        raise ArgumentError, errors.join(", ") unless errors.empty?
 
         f
       end

sig/wampproto/message/abort.rbs

@@ -20,6 +20,29 @@ module Wampproto
       attr_reader kwargs: Hash[Symbol, untyped]
     end
 
+    class AbortFields
+      @details: Hash[Symbol, untyped]
+
+      @reason: String
+
+      @args: Array[untyped]
+
+      @kwargs: Hash[Symbol, untyped]
+
+      @marshal: Array[untyped]
+
+      attr_reader details: Hash[Symbol, untyped]
+
+      attr_reader reason: String
+
+      attr_reader args: Array[untyped]
+
+      attr_reader kwargs: Hash[Symbol, untyped]
+
+      def initialize: (Hash[Symbol, untyped] details, String reason, *Array[untyped] args, **Hash[Symbol, untyped] kwargs) -> void
+
+    end
+
     # abort message
     class Abort < Base
       TEXT: String

sig/wampproto/message/util.rbs

@@ -33,7 +33,9 @@ module Wampproto
     end
 
     module Util
-      def validate_int: (Integer value, Integer index, String message) -> (String | Integer)
+      DEFAULT_ROLES: Hash[Symbol, Hash[untyped, untyped]]
+
+      def validate_int: (Integer value, Integer index, String message) -> (String | nil)
 
       def validate_string: (String value, Integer index, String message) -> (String | nil)
 
@@ -83,9 +85,9 @@ module Wampproto
 
       def validate_details: (Array[untyped] wamp_msg, Integer index, Fields fields, String message) -> (String | nil)
 
-      def validate_hello_details: (Array[untyped] wamp_msg, Integer index, Fields fields, String message) -> (String | nil)
+      def validate_hello_details: (Array[untyped] wamp_msg, Integer index, Fields fields, String message) -> (String | Array[untyped] | nil)
 
-      def validate_welcome_details: (Array[untyped] wamp_msg, Integer index, Fields fields, String message) -> (String | nil)
+      def validate_welcome_details: (Array[untyped] wamp_msg, Integer index, Fields fields, String message) -> (String | Array[untyped] | nil)
 
       def validate_subscription_id: (Array[untyped] wamp_msg, Integer index, Fields fields, String message) -> (String | nil)