ducts-client 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba367c428158d0baa377345220b10c67538329d4e0167b1d6dce86a29d732a0
-  data.tar.gz: 72f19f903159044c7f88c04b8a60e45fdc64672c44c7583f82f4d81d3cc4b5e9
+  metadata.gz: 462bf9fef3fa7a84f427eff39582c60f9f8128968ecc1df60e28f9bb21a34d0d
+  data.tar.gz: 21c0f5740793fb1438097cd6305c3d2db620e86870148384b2ad1b2c15ccd8e5
 SHA512:
-  metadata.gz: 6e4e8e33b10ee10c684a9f09b0a0871f2cef598b8f3a80c88cfec56bbcd8a952790ad79079201994ac09f840faebc0cdff6121324d6d753b3c6669da3f6ad1c2
-  data.tar.gz: fa68f8a558a5a95826b0f0bcf3084d90582ccecfd072b4a8669b97645b43704065cf6c25f5d18f48f1712bb603c0d61ba9392950b7cb4688a9f0ea99a8c4d9bd
+  metadata.gz: '008a89071f257fe97c0b368d1a6e6ca2354cfd2735f38c183f4e9481176df7c74d7a7c96d618a2dae4d9587f5ce28db5a6cfdd0499f7b50cb1aa4af5109dbf88'
+  data.tar.gz: d1050d195567a46c6b40f59878c10d58227a49df173d01d3ea5de67e8c3a1d02e07b3043968d0cdc22ad3894c77c356211d8b2e10eb51c98b553f116b1afc419

data/ductsclient.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'faye-websocket', '~> 0.11'
-  spec.add_development_dependency 'msgpack', '~> 1.4'
+  spec.add_dependency 'faye-websocket', '~> 0.11'
+  spec.add_dependency 'msgpack', '~> 1.4'
 end

data/lib/ducts/client.rb

@@ -119,6 +119,7 @@ module Ducts
       @_last_rid = nil
       @_ws = nil
       @_waiting_completion = Hash.new
+      @_loop_queues = Hash.new
     end
 
     def next_rid
@@ -130,19 +131,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 +240,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 +264,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 +282,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)
+          ret ||= data
           completion = @_waiting_completion.delete(rid)
           if completion
             if eid > 0
-              completion.succeed(data)
+              completion.succeed(ret)
             else
-              completion.fail(DuctError.execption(data))
+              completion.fail(DuctError.exception(ret))
             end
           end
         rescue => error
@@ -302,5 +300,57 @@ 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
+      nil
+    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
+      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)
+      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 = 1
+      MINOR = 3
       PATCH = 0
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ducts-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kenshiro Ueda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: