wampproto 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d767efae20a706cae98c3ded62404ff67b4d36cd949232a86874939f9009d8
-  data.tar.gz: e29a02be8412a67f77bc1c03419ce0166b856987407286d909ae7c710b7d4b5e
+  metadata.gz: f63bc10a2b52f090c1d8bf9b76b688c1c2501169b4cb7aca4e71d07314e26247
+  data.tar.gz: 617f88f1242ac8369ea2f8bc2b3a6ad7bbf63f47c64de91108e932af2954de62
 SHA512:
-  metadata.gz: 8ed18913724993b58517dddd405c3b292216929aa4d44ef02160edb67e4c4da03e935202a9830010fbf232b865df4890d71bbbd74018849e52225ef369e0139b
-  data.tar.gz: 89bdcf2351cc252ca100f40ce2b4117b21ab9ca63cb85013e95e8212ca4eb522001f0e6b7266eca2336f1dd3d4da4a0b4123bb700a9e9b963de312b5fb44debd
+  metadata.gz: b1520e1c65e7a61af12622b9826a0d26e27e0d794d16a35225b9a7e7936c534c364c1e4c4bad0605571d80672c573c071b5ef3369de161866e76ea2d60736461
+  data.tar.gz: 29a3cf9dd9cbfe57d1b1a283df2781311d6888dad3cf66aee1ceca8f0a4e8ecbd03d7f5d6eb0c14e6774ff4e02df7382d7297b1d3a50ebdad4a6acf562c46742

data/lib/wampproto/dealer.rb

@@ -2,15 +2,16 @@
 
 module Wampproto
   # Wamprpoto Dealer handler
-  class Dealer
-    attr_reader :registrations_by_procedure, :registrations_by_session, :pending_calls, :pending_invocations, :id_gen,
+  class Dealer # rubocop:disable Metrics/ClassLength
+    PendingInvocation = Struct.new(:caller_id, :callee_id, :call_id, :invocation_id, :receive_progress, :progress)
+
+    attr_reader :registrations_by_procedure, :registrations_by_session, :pending_calls, :id_gen,
                 :sessions
 
     def initialize(id_gen = IdGenerator.new)
       @registrations_by_session = {}
       @registrations_by_procedure = Hash.new { |h, k| h[k] = {} }
       @pending_calls = {}
-      @pending_invocations = {}
       @id_gen = id_gen
       @sessions = {}
     end
@@ -63,23 +64,18 @@ module Wampproto
 
       registration_id, callee_id = registrations.first
 
-      pending_calls[callee_id] = {} unless pending_calls.include?(callee_id)
-      pending_invocations[callee_id] = {} unless pending_invocations.include?(callee_id)
-
-      # we received call from the "caller" lets call that request_id "1"
-      # we need to send invocation message to "callee" let call that request_id "10"
-      # we need "caller" id after we have received yield so that request_id will be "10"
-      # we need to send request to "caller" to the original request_id 1
       request_id = id_gen.next
 
-      pending_invocations[callee_id][request_id] = session_id
+      details = invocation_details_for(session_id, message)
 
-      pending_calls[callee_id][session_id] = message.request_id
+      pending_calls[[callee_id, request_id]] = PendingInvocation.new(
+        session_id, callee_id, message.request_id, request_id, details[:receive_progress]
+      )
 
       invocation = Message::Invocation.new(
         request_id,
         registration_id,
-        invocation_details_for(session_id, message),
+        details,
         *message.args,
         **message.kwargs
       )
@@ -88,26 +84,42 @@ module Wampproto
     end
 
     def invocation_details_for(session_id, message)
-      return {} unless message.options.include?(:disclose_me)
+      options = {}
+      return options if message.options.empty?
+
+      receive_progress = message.options[:receive_progress]
+      options.merge!(receive_progress: true) if receive_progress
+
+      return options unless message.options.include?(:disclose_me)
 
       session = sessions[session_id]
-      { caller: session_id, caller_authid: session.authid, caller_authrole: session.authrole }
+      options.merge({ caller: session_id, caller_authid: session.authid, caller_authrole: session.authrole })
     end
 
-    def handle_yield(session_id, message)
-      calls = pending_calls.fetch(session_id, {})
+    def handle_yield(session_id, message) # rubocop:disable Metrics/AbcSize
+      pending_invocation = pending_calls[[session_id, message.request_id]]
       error_message = "no pending calls for session #{session_id}"
-      raise ValueError, error_message if calls.empty?
+      raise ValueError, error_message if pending_invocation.nil?
 
-      invocations = pending_invocations[session_id]
-      caller_id = invocations.delete(message.request_id).to_i # make steep happy
+      caller_id   = pending_invocation.caller_id
+      request_id  = pending_invocation.call_id
+      pending_calls.delete([session_id, message.request_id]) unless message.options[:progress]
 
-      request_id = calls.delete(caller_id)
-
-      result = Message::Result.new(request_id, {}, *message.args, **message.kwargs)
+      result = Message::Result.new(request_id, result_details_for(session_id, message), *message.args, **message.kwargs)
       MessageWithRecipient.new(result, caller_id)
     end
 
+    def result_details_for(session_id, message)
+      options = {}
+      return options if message.options.empty?
+
+      pending_invocation = pending_calls[[session_id, message.request_id]]
+
+      progress = message.options[:progress] && pending_invocation.receive_progress
+      options.merge!(progress:) if progress
+      options
+    end
+
     def handle_register(session_id, message)
       error_message = "cannot register, session #{session_id} doesn't exist"
       raise ValueError, error_message unless registrations_by_session.include?(session_id)

data/lib/wampproto/session.rb

@@ -36,7 +36,7 @@ module Wampproto
           raise ValueError, "cannot yield for unknown invocation request"
         end
 
-        invocation_requests.delete(msg.request_id)
+        invocation_requests.delete(msg.request_id) unless msg.options[:progress]
       when Message::Publish
         publish_requests[msg.request_id] = msg.request_id if msg.options.fetch(:acknowledge, false)
       when Message::Subscribe
@@ -62,7 +62,8 @@ module Wampproto
       case msg
       when Message::Result
         error_message = "received RESULT for invalid request_id"
-        raise ValueError, error_message unless call_requests.delete(msg.request_id)
+        request_id = msg.details[:progress] ? call_requests.fetch(msg.request_id) : call_requests.delete(msg.request_id)
+        raise ValueError, error_message unless request_id
       when Message::Registered
         error_message = "received REGISTERED for invalid request_id"
         raise ValueError, error_message unless register_requests.delete(msg.request_id)
@@ -77,7 +78,7 @@ module Wampproto
         raise ValueError, error_message unless registrations.delete(registration_id)
       when Message::Invocation
         error_message = "received INVOCATION for invalid registration_id"
-        raise ValueError, error_message unless registrations.delete(msg.registration_id)
+        raise ValueError, error_message unless registrations.include?(msg.registration_id)
 
         invocation_requests[msg.request_id] = msg.request_id
       when Message::Published

data/lib/wampproto/version.rb

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

data/sig/wampproto/dealer.rbs

@@ -7,9 +7,9 @@ module Wampproto
 
     @sessions: Hash[Integer, SessionDetails]
 
-    @pending_calls: Hash[Integer, Hash[Integer, Integer]]
+    PendingInvocation: untyped
 
-    @pending_invocations: Hash[Integer, Hash[Integer, Integer]]
+    @pending_calls: Hash[[Integer, Integer], untyped]
 
     @id_gen: IdGenerator
 
@@ -19,9 +19,7 @@ module Wampproto
 
     attr_reader sessions: Hash[Integer, SessionDetails]
 
-    attr_reader pending_calls: Hash[Integer, Hash[Integer, Integer]]
-
-    attr_reader pending_invocations: Hash[Integer, Hash[Integer, Integer]]
+    attr_reader pending_calls: Hash[[Integer, Integer], untyped]
 
     attr_reader id_gen: IdGenerator
 
@@ -44,6 +42,8 @@ module Wampproto
     def handle_unregister: (Integer session_id, Message::Unregister message) -> (nil | MessageWithRecipient)
 
     def invocation_details_for: (Integer session_id, untyped message) -> Hash[Symbol, untyped]
+
+    def result_details_for: (Integer _session_id, untyped message) -> Hash[Symbol, untyped]
   end
 end
 

data/wampproto.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "base64", "~> 0.2.0"
   spec.add_dependency "cbor", "~> 0.5.9.8"
   spec.add_dependency "ed25519", "~> 1.3"
   spec.add_dependency "msgpack", "~> 1.7.2"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: wampproto
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ismail Akram
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-19 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: cbor
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Sans-IO WAMP protocol implementation in Ruby