ducts-client 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462bf9fef3fa7a84f427eff39582c60f9f8128968ecc1df60e28f9bb21a34d0d
-  data.tar.gz: 21c0f5740793fb1438097cd6305c3d2db620e86870148384b2ad1b2c15ccd8e5
+  metadata.gz: de6d875bf28e0042c19c44dbbffa9fbef3f02baebc6038fb0cdbeab5582e14c3
+  data.tar.gz: c731e1c5f040b2c1615f6515c678f6d2f8736378c04bbeffc6a588346dedeca3
 SHA512:
-  metadata.gz: '008a89071f257fe97c0b368d1a6e6ca2354cfd2735f38c183f4e9481176df7c74d7a7c96d618a2dae4d9587f5ce28db5a6cfdd0499f7b50cb1aa4af5109dbf88'
-  data.tar.gz: d1050d195567a46c6b40f59878c10d58227a49df173d01d3ea5de67e8c3a1d02e07b3043968d0cdc22ad3894c77c356211d8b2e10eb51c98b553f116b1afc419
+  metadata.gz: 92fedce71a7ba385eb3115fbc38e8a77d360ec06d31ce4079ca177d01f2dfba9c32ffb9a3c1326aed4579820a6cd8772b2ff114bd33e77471ef0234e53be1d0e
+  data.tar.gz: 173051b649d8358550a24bec88437d469f99e3f5e8e086611e0a4b83359144454351a8c60700c66486a02023bfbf9079a12a8f31fe75449cb4389cf5a82ff365

data/lib/ducts/client.rb

@@ -56,6 +56,8 @@ module Ducts
       end
     end
 
+    DuctEventHandlerReturnValue = Struct.new(:value)
+
     class ConnectionEventListener < DuctEventListener
       attr_writer :onopen, :onclose, :onerror, :onmessage
       def onopen(event)
@@ -284,13 +286,13 @@ module Ducts
           handle = @_event_handler[eid]
           handle ||= @uncaught_event_handler
           ret = handle.call(rid, eid, data)
-          ret ||= data
+          data = ret.value if ret.instance_of? DuctEventHandlerReturnValue
           completion = @_waiting_completion.delete(rid)
           if completion
             if eid > 0
-              completion.succeed(ret)
+              completion.succeed(data)
             else
-              completion.fail(DuctError.exception(ret))
+              completion.fail(DuctError.exception(data))
             end
           end
         rescue => error
@@ -310,7 +312,6 @@ module Ducts
       @_time_offset = (@_time_offset * @_time_count + new_offset) / (@_time_count + 1)
       @_time_latency = (@_time_latency * @_time_count + new_latency) / (@_time_count + 1)
       @_time_count += 1
-      nil
     end
 
     def _loop_response_handler(rid, eid, data)
@@ -324,7 +325,7 @@ module Ducts
       @_loop_queues[rid] ||= EM::Queue.new
       queue = @_loop_queues[rid]
       queue.push(source_data) if source_data
-      queue
+      DuctEventHandlerReturnValue.new(queue)
     end
 
     def _loop_response_end_handler(rid, eid, data)
@@ -338,19 +339,17 @@ module Ducts
       handle.call(rid, source_eid, source_data)
       queue = @_loop_queues.delete(rid)
       queue.push(nil)
-      source_eid
+      DuctEventHandlerReturnValue.new(source_eid)
     end
 
     def _divided_response_append_handler(rid, eid, data)
       raise 'Not implemented.'
       # TODO
-      nil
     end
 
     def _divided_response_end_handler(rid, eid, data)
       raise 'Not implemented.'
       # TODO
-      nil
     end
   end
 end

data/lib/ducts/client/version.rb

@@ -4,7 +4,7 @@ module Ducts
   class Client
     module Version
       MAJOR = 0
-      MINOR = 3
+      MINOR = 4
       PATCH = 0
     end
 

metadata

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