xconn 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa95a83a4b98a6e32e84360154cc33074f10eee9a66d1e398f911d8d8cdc9637
-  data.tar.gz: 532b8006427a1ec13ff42d78b9a58f4350599d01954236573ef0eddf245cc4b2
+  metadata.gz: 90143368352302b58d43e59a436f6317842edd21950335b698897af98261ac01
+  data.tar.gz: e7441cba5947a6bc6a1f4424b059b6c0c28626d01f71cc3d55d400da70d1622f
 SHA512:
-  metadata.gz: ed1ac17f25849a81b5e3119937430a8531ee060fb70217f87c52e2da081903eaf133f05343456e871ac8ab1dee20dc7cf8860cb1a36f1ccf56b6c32c4827901f
-  data.tar.gz: a2e1031c54b7518cb772b4599ba3ddd64d4136f2783aaade92917a615c003fffee0a31772d5c00c7ac6f6c7c9b8524ded4bc871d8cdfafb76b3496fb14c54eed
+  metadata.gz: 5a480c46a42e7e2da07f845645bf802a35a555fc1a49c29b3a6240b26da8d315bc898cd0db7f3efdab7098f5171f231dc097ef6bb631bfe53d34a7313183abe3
+  data.tar.gz: 583bd5880dcd8bd0f0e558a6f14a5de97ed1ae95381c95175bd6905b6b0f9e8bbe8a5c479a51ec1852e9a8b5bc233d033cde69f362cc8e49b30f7f607b1c0849

data/lib/wamp/router/connection.rb

@@ -18,14 +18,15 @@ module Wamp
       OPEN       = 1
       CLOSING    = 2
       CLOSED     = 3
+      SUPPORTED_PROTOCOLS = ["wamp.2.msgpack", "wamp.2.cbor", "wamp.2.json"].freeze
 
       attr_reader :socket, :session, :acceptor
 
-      def initialize(socket, &cleanup)
-        super()
+      def initialize(socket, &cleanup) # rubocop:disable Lint/MissingSuper
+        # super() # on_connect() does what super() does
         @cleanup = cleanup
         @socket = socket
-        @driver = WebSocket::Driver.server(self)
+        @driver = WebSocket::Driver.server(self, protocols: SUPPORTED_PROTOCOLS)
         @driver.on(:open) { on_open(_1) }
         @driver.on(:message) { on_message(_1.data) }
         @driver.on(:close) { |evt| begin_close(evt.reason, evt.code) }
@@ -57,7 +58,7 @@ module Wamp
         return if @ready_state == CLOSED
 
         @ready_state = CLOSED
-        @driver.close
+        @driver.close(*@close_params)
         socket.close
       end
 
@@ -128,21 +129,28 @@ module Wamp
         @driver.close(message.code, message.reason)
       end
 
-      def close(_code, _reason)
-        @driver.close
+      def close(code, reason)
+        @driver.close(reason, code)
       end
 
       attr_reader :serializer
 
-      def choose_serializer_from(protocols)
-        @serializer = if protocols.include?("wamp.2.msgpack")
+      def choose_serializer_from(protocols) # rubocop:disable Metrics/MethodLength
+        common_protocols = protocols.to_s.split(",") & SUPPORTED_PROTOCOLS
+        protocol = common_protocols[0].to_s
+
+        @serializer = if protocol.include?("wamp.2.msgpack")
           Wampproto::Serializer::Msgpack
         elsif protocols.include?("wamp.2.cbor")
           Wampproto::Serializer::Cbor
         elsif protocols.include?("wamp.2.json")
           Wampproto::Serializer::JSON
         else
-          close
+          reason = "on_connect: protocols not supported '#{protocols}'."
+          code = 1006
+          puts reason
+          @close_params = [reason, code]
+          finalize_close
         end
       end
     end

data/lib/wamp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wamp
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xconn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ismail Akram
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor