ducts-client 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ed02a6ed450d3495ea4d27af20b735e50959f1d95042dccf7afcca9331e079
-  data.tar.gz: f8a5f500b92af0ff4a6f3fca4f4590b480534976c412c969944919ecb7d5c261
+  metadata.gz: 74c85c4fbbb4e225d647251a22a526545a3f4921b88921fb6fb779705b1fe4f1
+  data.tar.gz: f5396e8363fb5c31159be810b0631d45bfaca068143f136beb8a52e82f54ba93
 SHA512:
-  metadata.gz: e7621536c5e0dafabfa1d6f47eb0d69a6f96188251e2c83ddc33aeb1d58abc8a32d5ff1b88d7c39dad1c0040d063f428457e2fde85aca1be8c3d4af541ed06e9
-  data.tar.gz: 611bd6b7d8bf79eef1abff322f98723e9239a5f63a6f94443baf0a104263eb937d626d06ddaf8cda5884144deb72f4c50c005ff439ce0ce3bd69c64441c919fd
+  metadata.gz: 2627825a0174c77e7070ae62a57bd6a74563fc35fb2882bc53fcee11434cb3341145c4735fc2deb7c2fc88bb5f624a776bff7e3110d0ca273b3fc93784882fb3
+  data.tar.gz: 040e53690914465287f0f59e275f9711454c46994cef7aaa68c9687c9e2d87e6d53bb31500aff28fa73aee1315581738dab025bc80ac06519838b24bdd72217e

data/lib/ducts/client.rb

@@ -6,6 +6,7 @@ require 'timeout'
 require 'uri'
 require 'net/http'
 require 'json'
+require 'stringio'
 require 'faye/websocket'
 require 'faye/websocket/api/event'
 require 'msgpack'
@@ -56,7 +57,7 @@ module Ducts
       end
     end
 
-    DuctEventHandlerReturnValue = Struct.new(:value)
+    DuctEventHandlerReturnValue = Struct.new(:source_rid, :source_eid, :source_data)
 
     class ConnectionEventListener < DuctEventListener
       attr_writer :onopen, :onclose, :onerror, :onmessage
@@ -123,6 +124,7 @@ module Ducts
       @_waiting_message_completion = Hash.new
       @_waiting_closed_completion = Array.new
       @_loop_queues = Hash.new
+      @_divided_buffers = Hash.new
     end
 
     def next_rid
@@ -294,14 +296,20 @@ module Ducts
           @catchall_event_handler.call(rid, eid, data)
           handle = @_event_handler[eid]
           handle ||= @uncaught_event_handler
-          ret = handle.call(rid, eid, data)
-          handled_data = (ret.instance_of? DuctEventHandlerReturnValue)? ret.value : data
+          handle.call(rid, eid, data).tap do |ret|
+            if ret.instance_of? DuctEventHandlerReturnValue
+              rid = ret.source_rid 
+              eid = ret.source_eid
+              data = ret.source_data
+            end
+          end
+          return if rid.nil?
           completion = @_waiting_message_completion.delete(rid)
           if completion
             if eid > 0
-              completion.succeed(handled_data)
+              completion.succeed(data)
             else
-              completion.fail(DuctError.exception(handled_data))
+              completion.fail(DuctError.exception(data))
             end
           end
         rescue => error
@@ -331,11 +339,11 @@ module Ducts
       handle = @_event_handler[source_eid.abs]
       handle ||= @uncaught_event_handler
       ret = handle.call(rid, source_eid, source_data)
-      handled_source_data = (ret.instance_of? DuctEventHandlerReturnValue)? ret.value : source_data
+      handled_source_data = (ret.instance_of? DuctEventHandlerReturnValue)? ret.source_data : source_data
       @_loop_queues[rid] ||= EM::Queue.new
       queue = @_loop_queues[rid]
       queue.push(handled_source_data) if handled_source_data
-      DuctEventHandlerReturnValue.new(queue)
+      DuctEventHandlerReturnValue.new(rid, source_eid, queue)
     end
 
     def _loop_response_end_handler(rid, eid, data)
@@ -349,17 +357,25 @@ module Ducts
       handle.call(rid, source_eid, source_data)
       queue = @_loop_queues.delete(rid)
       queue.push(nil)
-      DuctEventHandlerReturnValue.new(source_eid)
+      DuctEventHandlerReturnValue.new(rid, source_eid, source_eid)
     end
 
     def _divided_response_append_handler(rid, eid, data)
-      raise 'Not implemented.'
-      # TODO
+      @_divided_buffers[rid] ||= StringIO.new('', 'wb').set_encoding(Encoding::ASCII_8BIT)
+      divided_buffer = @_divided_buffers[rid]
+      divided_buffer.write(data)
+      DuctEventHandlerReturnValue.new(nil, eid, nil)
     end
 
     def _divided_response_end_handler(rid, eid, data)
-      raise 'Not implemented.'
-      # TODO
+      divided_buffer = @_divided_buffers.delete(rid)
+      divided_buffer.write(data)
+      source_rid, source_eid, source_data = MessagePack.unpack(divided_buffer.string)
+      @catchall_event_handler.call(source_rid, source_eid, source_data)
+      handle = @_event_handler[source_eid]
+      handle ||= @uncaught_event_handler
+      handle.call(source_rid, source_eid, source_data)
+      DuctEventHandlerReturnValue.new(source_rid, source_eid, source_data)
     end
   end
 end

data/lib/ducts/client/version.rb

@@ -5,7 +5,7 @@ module Ducts
     module Version
       MAJOR = 0
       MINOR = 4
-      PATCH = 4
+      PATCH = 5
     end
 
     VERSION = [ Version::MAJOR, Version::MINOR, Version::PATCH ].map(&:to_s).join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ducts-client
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Kenshiro Ueda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket