ducts-client 0.1.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3344b83d9bc5c7da3cbfcc870dfe4a1dbefffd041e38e911d04bb58e59018c00
-  data.tar.gz: 891fe145f30a3ba1bd7eb989a80fb464025f2dc84e79cb4b2c4111008454b36e
+  metadata.gz: de6d875bf28e0042c19c44dbbffa9fbef3f02baebc6038fb0cdbeab5582e14c3
+  data.tar.gz: c731e1c5f040b2c1615f6515c678f6d2f8736378c04bbeffc6a588346dedeca3
 SHA512:
-  metadata.gz: 2e29a2e545614cd0131e7213148e51da1f6588849a401ef242030591bb445bf9cded5a3cf9746710b41e79ff473251cd22efab64c6accfc7502d30aef134c697
-  data.tar.gz: f5147cc164268cd0d544e9a98261719665ff6d9b41b93f202489ec90746f7c77fe0b2286dad2c0046b1546b449c0ac106783433cc3691ffbe23b503d86f7671f
+  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)
@@ -119,6 +121,7 @@ module Ducts
       @_last_rid = nil
       @_ws = nil
       @_waiting_completion = Hash.new
+      @_loop_queues = Hash.new
     end
 
     def next_rid
@@ -130,19 +133,19 @@ module Ducts
       next_id
     end
 
-    def open(wsd_url, uuid = nil, **params, &proc)
-      _open(wsd_url, uuid, **params, &proc)
+    def open(wsd_url, uuid = nil, **params)
+      _open(wsd_url, uuid, **params)
     end
 
     def reconnect
       _reconnect
     end
 
-    def send(rid, eid, data)
+    def event_send(rid, eid, data)
       _send(rid, eid, data)
     end
 
-    def call(eid, data)
+    def event_call(eid, data)
       _call(eid, data)
     end
 
@@ -239,20 +242,16 @@ module Ducts
       @_time_offset = 0
       @_time_latency = 0
       @_time_count = 0
-      set_event_handler(@EVENT['ALIVE_MONITORING']) do |rid, eid, data|
-        client_received = Time.now.to_f
-        server_sent, server_received = data
-        client_sent = @_send_timestamp
-        new_offset = ((server_received - client_sent) - (client_received - server_sent)) / 2
-        new_latency = ((client_received - client_sent) - (server_sent - server_received)) / 2
-        @_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
-      end
+      set_event_handler(@EVENT['ALIVE_MONITORING'], &method(:_alive_monitoring_handler))
+      set_event_handler(@EVENT['LOOP_RESPONSE_START'], &method(:_loop_response_handler))
+      set_event_handler(@EVENT['LOOP_RESPONSE_NEXT'], &method(:_loop_response_handler))
+      set_event_handler(@EVENT['LOOP_RESPONSE_END'], &method(:_loop_response_end_handler))
+      set_event_handler(@EVENT['DIVIDED_RESPONSE_APPEND'], &method(:_divided_response_append_handler))
+      set_event_handler(@EVENT['DIVIDED_RESPONSE_END'], &method(:_divided_response_end_handler))
       rid = next_rid
       eid = @EVENT['ALIVE_MONITORING']
       value = @_send_timestamp
-      send(rid, eid, value)
+      _send(rid, eid, value)
     end
 
     def _onreconnect(connection_event)
@@ -267,7 +266,7 @@ module Ducts
     def _call(eid, data)
       rid = next_rid
       _send(rid, eid, data)
-      raise if @_waiting_completion.keys.include? rid
+      warn Message.construct(Message::Level::WARNING, 'request ID is duplicated.') if @_waiting_completion.keys.include? rid
       EM::Completion.new.tap { |completion| @_waiting_completion[rid] = completion }
     end
 
@@ -285,14 +284,15 @@ module Ducts
         begin
           @catchall_event_handler.call(rid, eid, data)
           handle = @_event_handler[eid]
-          handle = @uncaught_event_handler unless handle
-          handle.call(rid, eid, data)
+          handle ||= @uncaught_event_handler
+          ret = handle.call(rid, eid, data)
+          data = ret.value if ret.instance_of? DuctEventHandlerReturnValue
           completion = @_waiting_completion.delete(rid)
           if completion
             if eid > 0
               completion.succeed(data)
             else
-              completion.fail(DuctError.execption(data))
+              completion.fail(DuctError.exception(data))
             end
           end
         rescue => error
@@ -302,5 +302,54 @@ module Ducts
         @event_error_handler.call(-1, -1, nil, error)
       end
     end
+
+    def _alive_monitoring_handler(rid, eid, data)
+      client_received = Time.now.to_f
+      server_sent, server_received = data
+      client_sent = @_send_timestamp
+      new_offset = ((server_received - client_sent) - (client_received - server_sent)) / 2
+      new_latency = ((client_received - client_sent) - (server_sent - server_received)) / 2
+      @_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
+    end
+
+    def _loop_response_handler(rid, eid, data)
+      warn Message.construct(Message::Level::WARNING, 'loop response has error.') if eid.negative?
+      source_eid = data[1]
+      source_data = data[2]
+      @catchall_event_handler.call(rid, source_eid, source_data)
+      handle = @_event_handler[source_eid.abs]
+      handle ||= @uncaught_event_handler
+      handle.call(rid, source_eid, source_data)
+      @_loop_queues[rid] ||= EM::Queue.new
+      queue = @_loop_queues[rid]
+      queue.push(source_data) if source_data
+      DuctEventHandlerReturnValue.new(queue)
+    end
+
+    def _loop_response_end_handler(rid, eid, data)
+      warn Message.construct(Message::Level::WARNING, 'loop response end has error.') if eid.negative?
+      source_eid = data[1]
+      source_data = data[2]
+      warn Message.construct(Message::Level::WARNING, "loop response end has data: #{source_data}.") if source_data
+      @catchall_event_handler.call(rid, source_eid, source_data)
+      handle = @_event_handler[source_eid.abs]
+      handle ||= @uncaught_event_handler
+      handle.call(rid, source_eid, source_data)
+      queue = @_loop_queues.delete(rid)
+      queue.push(nil)
+      DuctEventHandlerReturnValue.new(source_eid)
+    end
+
+    def _divided_response_append_handler(rid, eid, data)
+      raise 'Not implemented.'
+      # TODO
+    end
+
+    def _divided_response_end_handler(rid, eid, data)
+      raise 'Not implemented.'
+      # TODO
+    end
   end
 end

data/lib/ducts/client/version.rb

@@ -4,8 +4,8 @@ module Ducts
   class Client
     module Version
       MAJOR = 0
-      MINOR = 1
-      PATCH = 1
+      MINOR = 4
+      PATCH = 0
     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.1.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenshiro Ueda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket