ducts-client 0.4.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6d875bf28e0042c19c44dbbffa9fbef3f02baebc6038fb0cdbeab5582e14c3
-  data.tar.gz: c731e1c5f040b2c1615f6515c678f6d2f8736378c04bbeffc6a588346dedeca3
+  metadata.gz: e4ed02a6ed450d3495ea4d27af20b735e50959f1d95042dccf7afcca9331e079
+  data.tar.gz: f8a5f500b92af0ff4a6f3fca4f4590b480534976c412c969944919ecb7d5c261
 SHA512:
-  metadata.gz: 92fedce71a7ba385eb3115fbc38e8a77d360ec06d31ce4079ca177d01f2dfba9c32ffb9a3c1326aed4579820a6cd8772b2ff114bd33e77471ef0234e53be1d0e
-  data.tar.gz: 173051b649d8358550a24bec88437d469f99e3f5e8e086611e0a4b83359144454351a8c60700c66486a02023bfbf9079a12a8f31fe75449cb4389cf5a82ff365
+  metadata.gz: e7621536c5e0dafabfa1d6f47eb0d69a6f96188251e2c83ddc33aeb1d58abc8a32d5ff1b88d7c39dad1c0040d063f428457e2fde85aca1be8c3d4af541ed06e9
+  data.tar.gz: 611bd6b7d8bf79eef1abff322f98723e9239a5f63a6f94443baf0a104263eb937d626d06ddaf8cda5884144deb72f4c50c005ff439ce0ce3bd69c64441c919fd

data/lib/ducts/client.rb

@@ -120,7 +120,8 @@ module Ducts
 
       @_last_rid = nil
       @_ws = nil
-      @_waiting_completion = Hash.new
+      @_waiting_message_completion = Hash.new
+      @_waiting_closed_completion = Array.new
       @_loop_queues = Hash.new
     end
 
@@ -133,29 +134,13 @@ module Ducts
       next_id
     end
 
-    def open(wsd_url, uuid = nil, **params)
-      _open(wsd_url, uuid, **params)
-    end
-
-    def reconnect
-      _reconnect
-    end
-
-    def event_send(rid, eid, data)
-      _send(rid, eid, data)
-    end
-
-    def event_call(eid, data)
-      _call(eid, data)
-    end
-
-    def close
-      _close
-    end
-
     def set_event_handler(event_id, &handler)
       @_event_handler ||= {}
-      @_event_handler[event_id] = handler
+      if handler
+        @_event_handler.store(event_id, handler)
+      else
+        @_event_handler.delete(event_id)
+      end
     end
 
     def state
@@ -166,16 +151,16 @@ module Ducts
       end
     end
 
-    private
-    def _reconnect(wsd)
-      if wsd
-        @WSD = wsd
-        @EVENT = @WSD['EVENT']
+    def reconnect
+      completion = EM::Completion.new
+      if @_ws
+        completion.succeed(self)
+        return completion;
       end
-      return if @_ws
       Faye::WebSocket::Client.new(@WSD['websocket_url_reconnect']).tap do |ws|
         ws.on(:open) do |event|
           @_ws = ws
+          completion.succeed(self)
           connection_event = DuctConnectionEvent.new('onopen', event)
           _onreconnect(connection_event)
           @connection_listener.onopen(connection_event)
@@ -195,10 +180,15 @@ module Ducts
           @connection_listener.onerror(connection_event)
         end
       end
+      completion
     end
 
-    def _open(wsd_url, uuid, **params)
-      return if @_ws
+    def open(wsd_url, uuid = nil, **params)
+      completion = EM::Completion.new
+      if @_ws
+        completion.succeed(self)
+        return completion;
+      end
       begin
         query = '?uuid=' + (uuid || 'dummy') + params.map{ |k, v| "&#{k}=#{v}" }.join
         uri = URI.parse(wsd_url + query)
@@ -213,6 +203,7 @@ module Ducts
         Faye::WebSocket::Client.new(@WSD['websocket_url']).tap do |ws|
           ws.on(:open) do |event|
             @_ws = ws
+            completion.succeed(self)
             connection_event = DuctConnectionEvent.new('onopen', event)
             _onopen(connection_event)
             @connection_listener.onopen(connection_event)
@@ -228,6 +219,19 @@ module Ducts
             @connection_listener.onerror(connection_event)
           end
           ws.on(:close) do |event|
+            @_ws = nil
+            case event.code
+            when 1000
+              @_waiting_closed_completion.each do |waiting_closed_completion|
+                waiting_closed_completion.succeed(event)
+              end
+            else
+              p event.code
+              @_waiting_closed_completion.each do |waiting_closed_completion|
+                waiting_closed_completion.fail(event)
+              end
+            end
+            @_waiting_closed_completion.clear
             connection_event = DuctConnectionEvent.new('onclose', event)
             @connection_listener.onclose(connection_event)
           end
@@ -235,8 +239,34 @@ module Ducts
       rescue => error
         @connection_listener.onerror(DuctConnectionEvent.new('onerror', error))
       end
+      completion
+    end
+
+    def event_send(rid, eid, data)
+      msgpack = [ rid, eid, data ].to_msgpack
+      @_ws.send(msgpack.chars.map(&:ord))
+      rid
+    end
+
+    def event_call(eid, data)
+      rid = next_rid
+      event_send(rid, eid, data)
+      warn Message.construct(Message::Level::WARNING, 'request ID is duplicated.') if @_waiting_message_completion.keys.include? rid
+      EM::Completion.new.tap { |completion| @_waiting_message_completion[rid] = completion }
+    end
+
+    def close
+      completion = EM::Completion.new
+      if @_ws
+        @_ws.close 
+        @_waiting_closed_completion.push(completion)
+      else
+        completion.succeed(nil)
+      end
+      completion
     end
 
+    private
     def _onopen(event)
       @_send_timestamp = Time.now.to_f
       @_time_offset = 0
@@ -251,33 +281,12 @@ module Ducts
       rid = next_rid
       eid = @EVENT['ALIVE_MONITORING']
       value = @_send_timestamp
-      _send(rid, eid, value)
+      event_send(rid, eid, value)
     end
 
     def _onreconnect(connection_event)
     end
 
-    def _send(rid, eid, data)
-      msgpack = [ rid, eid, data ].to_msgpack
-      @_ws.send(msgpack.chars.map(&:ord))
-      rid
-    end
-
-    def _call(eid, data)
-      rid = next_rid
-      _send(rid, eid, data)
-      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
-
-    def _close
-      begin
-        @_ws.close if @_ws
-      ensure
-        @_ws = nil
-      end
-    end
-
     def _onmessage(connection_event)
       begin
         rid, eid, data = %i(rid eid data).map{ |name| connection_event.source.public_send(name) }
@@ -286,13 +295,13 @@ module Ducts
           handle = @_event_handler[eid]
           handle ||= @uncaught_event_handler
           ret = handle.call(rid, eid, data)
-          data = ret.value if ret.instance_of? DuctEventHandlerReturnValue
-          completion = @_waiting_completion.delete(rid)
+          handled_data = (ret.instance_of? DuctEventHandlerReturnValue)? ret.value : data
+          completion = @_waiting_message_completion.delete(rid)
           if completion
             if eid > 0
-              completion.succeed(data)
+              completion.succeed(handled_data)
             else
-              completion.fail(DuctError.exception(data))
+              completion.fail(DuctError.exception(handled_data))
             end
           end
         rescue => error
@@ -321,10 +330,11 @@ module Ducts
       @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)
+      ret = handle.call(rid, source_eid, source_data)
+      handled_source_data = (ret.instance_of? DuctEventHandlerReturnValue)? ret.value : source_data
       @_loop_queues[rid] ||= EM::Queue.new
       queue = @_loop_queues[rid]
-      queue.push(source_data) if source_data
+      queue.push(handled_source_data) if handled_source_data
       DuctEventHandlerReturnValue.new(queue)
     end
 

data/lib/ducts/client/version.rb

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