nats-pure 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59129f0c5e0180f95490a2ca5e2acb8cf0c1d630c32e4d4ab6f0cf859242500b
-  data.tar.gz: c23db05317523a59762b9b2e73917165baf8ee3a898aaa74e84a74b0977c1942
+  metadata.gz: 741d87f63f2851dc25639453f9cd5ed68b3e2bfb66f45f1b5fe6caa9b3e352dd
+  data.tar.gz: 1af44d28a31788e37fbb50d14f966ff30805ee42614ae37a7ab3599edd0de4f0
 SHA512:
-  metadata.gz: b82fdc592bea6ddc5ca1e0792b76071dd09db70a86fcaef517207d33c339d1b105076efd2b3d3cc83960a6b470739d01ec9d2f41574f57111935e0245eb02e5d
-  data.tar.gz: 4439c2f2f0c3c6118b5a4b93587a60ecb069f8b85e0907539bec6a497a8394a1f78a9a961aa2565436e7c7ab4ee3bc1bd459310935499da67c1d7e7c11a0d5c7
+  metadata.gz: 432d3b3cf28752ec19c6278763ec5e1ef5992ee9d57796aeadb41b978028b3700c699795134f46297c982d9fc98fc3979d0760842f74fb528977e62b66431c9c
+  data.tar.gz: 758a3b3deb4c2b14198bca42b647d2b11726c08d7150a914a8835a64fa6720d57d28c2207ddcd6ad40995427902ab1afd6705f2ab4c4ea1adbe9e131ccc1ea32

data/lib/nats/io/client.rb

@@ -1,5 +1,20 @@
+# Copyright 2016-2018 The NATS Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'nats/io/parser'
 require 'nats/io/version'
+require 'nats/nuid'
 require 'thread'
 require 'socket'
 require 'json'
@@ -159,13 +174,20 @@ module NATS
         # Hostname of current server; used for when TLS host
         # verification is enabled.
         @hostname = nil
+
+        # New style request/response implementation.
+        @resp_sub = nil
+        @resp_map = nil
+        @resp_sub_prefix = nil
+        @nuid = NATS::NUID.new
       end
 
-      # Establishes connection to NATS
+      # Establishes connection to NATS.
       def connect(opts={})
         opts[:verbose] = false if opts[:verbose].nil?
         opts[:pedantic] = false if opts[:pedantic].nil?
         opts[:reconnect] = true if opts[:reconnect].nil?
+        opts[:old_style_request] = false if opts[:old_style_request].nil?
         opts[:reconnect_time_wait] = RECONNECT_TIME_WAIT if opts[:reconnect_time_wait].nil?
         opts[:max_reconnect_attempts] = MAX_RECONNECT_ATTEMPTS if opts[:max_reconnect_attempts].nil?
         opts[:ping_interval] = DEFAULT_PING_INTERVAL if opts[:ping_interval].nil?
@@ -198,6 +220,12 @@ module NATS
           }
         end
 
+        if @options[:old_style_request]
+          # Replace for this instance the implementation
+          # of request to use the old_request style.
+          class << self; alias_method :request, :old_request; end
+        end
+
         # Check for TLS usage
         @tls = @options[:tls]
 
@@ -344,11 +372,58 @@ module NATS
         sid
       end
 
-      # Sends a request expecting a single response or raises a timeout
-      # in case the request is not retrieved within the specified deadline.
+      # Sends a request using expecting a single response using a
+      # single subscription per connection for receiving the responses.
+      # It times out in case the request is not retrieved within the
+      # specified deadline.
       # If given a callback, then the request happens asynchronously.
       def request(subject, payload, opts={}, &blk)
         return unless subject
+
+        # If a block was given then fallback to method using auto unsubscribe.
+        return old_request(subject, payload, opts, &blk) if blk
+
+        token = nil
+        inbox = nil
+        future = nil
+        response = nil
+        timeout = opts[:timeout] ||= 0.5
+        synchronize do
+          start_resp_mux_sub! unless @resp_sub_prefix
+
+          # Create token for this request.
+          token = @nuid.next
+          inbox = "#{@resp_sub_prefix}.#{token}"
+
+          # Create the a future for the request that will
+          # get signaled when it receives the request.
+          future = @resp_sub.new_cond
+          @resp_map[token][:future] = future
+        end
+
+        # Publish request and wait for reply.
+        publish(subject, payload, inbox)
+        with_nats_timeout(timeout) do
+          @resp_sub.synchronize do
+            future.wait(timeout)
+          end
+        end
+
+        # Check if there is a response already
+        synchronize do
+          result = @resp_map[token]
+          response = result[:response]
+        end
+
+        response
+      end
+
+      # Sends a request creating an ephemeral subscription for the request,
+      # expecting a single response or raising a timeout in case the request
+      # is not retrieved within the specified deadline.
+      # If given a callback, then the request happens asynchronously.
+      def old_request(subject, payload, opts={}, &blk)
+        return unless subject
         inbox = new_inbox
 
         # If a callback was passed, then have it process
@@ -520,7 +595,7 @@ module NATS
             future.signal
 
             return
-          elsif sub.callback
+          elsif sub.pending_queue
             # Async subscribers use a sized queue for processing
             # and should be able to consume messages in parallel.
             if sub.pending_queue.size >= sub.pending_msgs_limit \
@@ -1093,6 +1168,47 @@ module NATS
         @ping_interval_thread.abort_on_exception = true
       end
 
+      # Prepares requests subscription that handles the responses
+      # for the new style request response.
+      def start_resp_mux_sub!
+        @resp_sub_prefix = "_INBOX.#{@nuid.next}"
+        @resp_map = Hash.new { |h,k| h[k] = { }}
+
+        @resp_sub = Subscription.new
+        @resp_sub.subject = "#{@resp_sub_prefix}.*"
+        @resp_sub.received = 0
+
+        # FIXME: Allow setting pending limits for responses mux subscription.
+        @resp_sub.pending_msgs_limit = DEFAULT_SUB_PENDING_MSGS_LIMIT
+        @resp_sub.pending_bytes_limit = DEFAULT_SUB_PENDING_BYTES_LIMIT
+        @resp_sub.pending_queue = SizedQueue.new(@resp_sub.pending_msgs_limit)
+        @resp_sub.wait_for_msgs_t = Thread.new do
+          loop do
+            msg = @resp_sub.pending_queue.pop
+            @resp_sub.pending_size -= msg.data.size
+
+            # Pick the token and signal the request under the mutex
+            # from the subscription itself.
+            token = msg.subject.split('.').last
+            future = nil
+            synchronize do
+              future = @resp_map[token][:future]
+              @resp_map[token][:response] = msg
+            end
+
+            # Signal back that the response has arrived.
+            @resp_sub.synchronize do
+              future.signal
+            end
+          end
+        end
+
+        sid = (@ssid += 1)
+        @subs[sid] = @resp_sub
+        send_command("SUB #{@resp_sub.subject} #{sid}#{CR_LF}")
+        @flush_queue << :sub
+      end
+
       def can_reuse_server?(server)
         return false if server.nil?
 

data/lib/nats/io/parser.rb

@@ -1,3 +1,17 @@
+# Copyright 2016-2018 The NATS Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module NATS
   module Protocol
 

data/lib/nats/io/version.rb

@@ -1,7 +1,21 @@
+# Copyright 2016-2018 The NATS Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module NATS
   module IO
     # NOTE: These are all announced to the server on CONNECT
-    VERSION  = "0.4.0"
+    VERSION  = "0.5.0"
     LANG     = "#{RUBY_ENGINE}2".freeze
     PROTOCOL = 1
   end

data/lib/nats/nuid.rb

@@ -0,0 +1,81 @@
+# Copyright 2016-2018 The NATS Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'securerandom'
+
+module NATS
+  class NUID
+    DIGITS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+    BASE          = 62
+    PREFIX_LENGTH = 12
+    SEQ_LENGTH    = 10
+    TOTAL_LENGTH  = PREFIX_LENGTH + SEQ_LENGTH
+    MAX_SEQ       = BASE**10
+    MIN_INC       = 33
+    MAX_INC       = 333
+    INC = MAX_INC - MIN_INC
+
+    def initialize
+      @prand    = Random.new
+      @seq      = @prand.rand(MAX_SEQ)
+      @inc      = MIN_INC + @prand.rand(INC)
+      @prefix   = ''
+      randomize_prefix!
+    end
+
+    def next
+      @seq += @inc
+      if @seq >= MAX_SEQ
+        randomize_prefix!
+        reset_sequential!
+      end
+      l = @seq
+
+      # Do this inline 10 times to avoid even more extra allocs,
+      # then use string interpolation of everything which works
+      # faster for doing concat.
+      s_10 = DIGITS[l % BASE];
+
+      # Ugly, but parallel assignment is slightly faster here...
+      s_09, s_08, s_07, s_06, s_05, s_04, s_03, s_02, s_01 = \
+      (l /= BASE; DIGITS[l % BASE]), (l /= BASE; DIGITS[l % BASE]), (l /= BASE; DIGITS[l % BASE]),\
+      (l /= BASE; DIGITS[l % BASE]), (l /= BASE; DIGITS[l % BASE]), (l /= BASE; DIGITS[l % BASE]),\
+      (l /= BASE; DIGITS[l % BASE]), (l /= BASE; DIGITS[l % BASE]), (l /= BASE; DIGITS[l % BASE])
+      "#{@prefix}#{s_01}#{s_02}#{s_03}#{s_04}#{s_05}#{s_06}#{s_07}#{s_08}#{s_09}#{s_10}"
+    end
+
+    def randomize_prefix!
+      @prefix = \
+      SecureRandom.random_bytes(PREFIX_LENGTH).each_byte
+        .reduce('') do |prefix, n|
+        prefix << DIGITS[n % BASE]
+      end
+    end
+
+    private
+
+    def reset_sequential!
+      @seq = @prand.rand(MAX_SEQ)
+      @inc = MIN_INC + @prand.rand(INC)
+    end
+
+    class << self
+      @@nuid = NUID.new.extend(MonitorMixin)
+      def next
+        @@nuid.synchronize do
+          @@nuid.next
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: nats-pure
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies: []
 description: NATS is an open-source, high-performance, lightweight cloud messaging
   system.
 email:
-- wally@apcera.com
+- wally@synadia.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -21,9 +21,10 @@ files:
 - lib/nats/io/client.rb
 - lib/nats/io/parser.rb
 - lib/nats/io/version.rb
+- lib/nats/nuid.rb
 homepage: https://nats.io
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []