xconn 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a4f50da44bd4849d8e503de34fcdee9edf558c06244ec43746b81401c09e3a
-  data.tar.gz: 5624eedc589212e83ba1684ab67e06d27bbb14c35dc8cf91245aed67b92475ce
+  metadata.gz: 90143368352302b58d43e59a436f6317842edd21950335b698897af98261ac01
+  data.tar.gz: e7441cba5947a6bc6a1f4424b059b6c0c28626d01f71cc3d55d400da70d1622f
 SHA512:
-  metadata.gz: 2867240ea024fafcd2fbc93da161473a546989fe349bc9be61a3e12c209d2358187957f291b0ee9d58874e524139cbfbd567838a4305bde178bb5c7e2519f253
-  data.tar.gz: 477e4d9640d8da4e555ace59c5b29f76c7b2b799399c4ad76e17ef9402ca2284519299c4b1e931b18d8e788ba60af7c72300f87819969743e51819fcd9bfb403
+  metadata.gz: 5a480c46a42e7e2da07f845645bf802a35a555fc1a49c29b3a6240b26da8d315bc898cd0db7f3efdab7098f5171f231dc097ef6bb631bfe53d34a7313183abe3
+  data.tar.gz: 583bd5880dcd8bd0f0e558a6f14a5de97ed1ae95381c95175bd6905b6b0f9e8bbe8a5c479a51ec1852e9a8b5bc233d033cde69f362cc8e49b30f7f607b1c0849

data/lib/wamp/message_handler/invocation.rb

@@ -16,7 +16,10 @@ module Wamp
       end
 
       def invocation_response
-        Type::Invocation.new(args: message.args, kwargs: message.kwargs, details: message.details)
+        Type::Invocation.new(args: message.args, kwargs: message.kwargs, details: message.details).tap do |invocation|
+          invocation.connection = connection
+          invocation.request_id = message.request_id
+        end
       end
 
       private

data/lib/wamp/message_handler/result.rb

@@ -6,7 +6,11 @@ module Wamp
     class Result < Base
       def handle
         validate_received_message
-        stored_data.fetch(:handler).call(response)
+        if message.details[:progress]
+          store[store_key].fetch(:handler).call(response)
+        else
+          stored_data.fetch(:handler).call(response)
+        end
       end
 
       def response

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/type/invocation.rb

@@ -4,6 +4,7 @@ module Wamp
   module Type
     # Invocation Type
     class Invocation
+      attr_writer :connection, :request_id
       attr_reader :args, :kwargs, :details
 
       def initialize(args: [], kwargs: {}, details: {})
@@ -11,6 +12,14 @@ module Wamp
         @kwargs = kwargs
         @details = details
       end
+
+      def progress(result)
+        @connection.transmit @connection.session.send_message(response(result))
+      end
+
+      def response(result)
+        Wampproto::Message::Yield.new(@request_id, result.details, *result.args, **result.kwargs)
+      end
     end
   end
 end

data/lib/wamp/version.rb

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

data/wamp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ed25519", "~> 1.3"
   spec.add_dependency "msgpack", "~> 1.7.2"
   spec.add_dependency "nio4r", "~> 2.7"
-  spec.add_dependency "wampproto", "~> 0.1.1"
+  spec.add_dependency "wampproto", "~> 0.1.2"
   spec.add_dependency "websocket-driver", "~> 0.7"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xconn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ismail Akram
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor
@@ -71,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +204,7 @@ metadata:
   homepage_uri: https://github.com/xconnio/wamp.rb
   source_code_uri: https://github.com/xconnio/wamp.rb
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,7 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: WAMP(Web Application Messaging Protocol) ruby client
 test_files: []