volcano-sdk 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee82d4e1a777fcbca79d4ac464ae7ad87d8f0374fb6955cd1e61167a9c82641c
-  data.tar.gz: fd76dca669566978d588a0c0eb01c38b17166a621ae43f1a0f44862884083fb8
+  metadata.gz: 59e652b75cb01f8a353cca787d8e97ecce893091202389d6eb05d16898553fe4
+  data.tar.gz: 1aaab53a45bb753db900c0dbb5fe0d95d27c17f36a0bc4487e396a37f10e0a7c
 SHA512:
-  metadata.gz: 4ce4ffb6d72500cfaae2736bede0a7438a1bf079a3c5c2e540ebf3bd737eb2157c46c8e08011b4d93a15deb900daf616fe076c64f3e29c3dfc0c08ba2e80acce
-  data.tar.gz: 8486d6ae8e2fb766e918610389ca94eb98d08446d01a5beebb7002b5a44448508a31681da6100a59ab5f62d4d5b0894fca9072ae09a33914d0c45f9d24f32f03
+  metadata.gz: f1c408840aeabf36d2880bb13f8fa9ef602ecb1fa5de7e0b3db936ca48f02ce8b8dc667c6dcf52ec4637f4418f6c9b45bbf157081cbc167406752980d1c56bc2
+  data.tar.gz: 641095882ee98d37672f0c7c9a59a2051d98f4a392682df91753b999fffd2aae91a65a62e9c299569f5e1d3c96f73b4095247e168954ae7c75f6e36f5a71fed2

data/lib/volcano/realtime/protocol.rb

@@ -35,7 +35,7 @@ module Volcano
       include ProtocolRecoveryPosition
 
       Failure = Data.define(:error)
-      Pending = Data.define(:queue, :on_reply)
+      Pending = Data.define(:queue, :on_reply, :reply_key)
       private_constant :Pending
       Events = Data.define(:on_close, :on_error, :on_failure)
       DEFAULT_REQUEST_TIMEOUT = 10
@@ -81,7 +81,7 @@ module Volcano
       end
 
       def connect(token:)
-        result = request { |id| self.class.connect(id: id, token: token) }
+        result = request('connect') { |id| self.class.connect(id: id, token: token) }
         ensure_open!
         @connected = true
         result
@@ -99,20 +99,22 @@ module Volcano
         end
       end
 
-      def publish(channel:, data:) = request { |id| self.class.publish(id: id, channel: channel, data: data) }
+      def publish(channel:, data:)
+        request('publish') { |id| self.class.publish(id: id, channel: channel, data: data) }
+      end
 
       def unsubscribe(channel:)
         @subscription_lock.acquire do
           ensure_open!
           next {} unless @subscriptions.include?(channel)
 
-          result = request { |id| self.class.unsubscribe(id: id, channel: channel) }
+          result = request('unsubscribe') { |id| self.class.unsubscribe(id: id, channel: channel) }
           @subscriptions.delete(channel)
           result
         end
       end
 
-      def presence(channel:) = request { |id| self.class.presence(id: id, channel: channel) }
+      def presence(channel:) = request('presence') { |id| self.class.presence(id: id, channel: channel) }
 
       def close
         return nil if @closed

data/lib/volcano/realtime/protocol_dispatch.rb

@@ -30,7 +30,7 @@ module Volcano
         pending = @pending[frame.fetch('id')]
         return unless pending
 
-        reply = reply_value(frame)
+        reply = reply_value(frame, pending.reply_key)
         pending.queue.enqueue(apply_reply_hook(pending, reply))
       end
 
@@ -43,9 +43,9 @@ module Volcano
         Protocol::Failure.new(error: e)
       end
 
-      def reply_value(frame)
+      def reply_value(frame, reply_key)
         error = frame['error']
-        return frame['result'] || frame.except('id') unless error
+        return frame.fetch(reply_key) { frame.fetch('result') { frame.except('id') } } unless error
 
         message = error['message'] || 'realtime command failed'
         Protocol::Failure.new(error: ServerError.new(message, code: error['code']))

data/lib/volcano/realtime/protocol_io.rb

@@ -8,9 +8,9 @@ module Volcano
       module IO
         private
 
-        def request(on_reply: nil)
+        def request(reply_key, on_reply: nil)
           ensure_open!
-          id, reply_queue = register_request(on_reply)
+          id, reply_queue = register_request(reply_key, on_reply)
           write_frame(yield(id))
           reply = await_reply(reply_queue)
           raise reply.error if reply.is_a?(Failure)
@@ -22,14 +22,14 @@ module Volcano
           @pending.delete(id) if defined?(id)
         end
 
-        def register_request(on_reply)
+        def register_request(reply_key, on_reply)
           if @pending.length >= @max_pending
             raise PendingLimitError, "realtime pending command limit #{@max_pending} reached"
           end
 
           @next_id += 1
           queue = Async::Queue.new
-          @pending[@next_id] = Pending.new(queue: queue, on_reply: on_reply)
+          @pending[@next_id] = Pending.new(queue: queue, on_reply: on_reply, reply_key: reply_key)
           [@next_id, queue]
         end
 

data/lib/volcano/realtime/protocol_recovery.rb

@@ -15,7 +15,7 @@ module Volcano
           end
         end
 
-        request(on_reply:) do |id|
+        request('subscribe', on_reply:) do |id|
           self.class.subscribe(
             id: id,
             channel: channel,

data/lib/volcano/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Volcano
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volcano-sdk
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Kong