nats-pure 2.0.0.pre.rc2 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16ee062f4cee20fd50abb3d9f78a2e2aa3c92648717ae4e6906e93255920d89
-  data.tar.gz: d4fa9ee8eb06ca8379493de124d7c125dd15a929550316c943be9bd2ae8d8743
+  metadata.gz: 154ce22f3fa8a4256d0a0bc45fd3356286956c6f774f8332e5892c0be6af45d8
+  data.tar.gz: de9022e08deff77f48c3ef8dd4e538d307ddc44eea57ac884b862893df354750
 SHA512:
-  metadata.gz: ec7aa2c9dd3ce098d7ebdd083ecabe581ebe22302d5cd452feb4e718bebf2b453c455ad6786a0f9bfb7a34f49e348ba9829184521a7f161fbd9ba96df6f39383
-  data.tar.gz: 8667b8373d87a4f905723f881991645c48a731bafd98a6a533316857fa6a6e56e0493edb753a4b9b01be62fa52b6a82c2a32269e337f4f82e105f48ed8602100
+  metadata.gz: 92f10f12b63062c756a5b041e1e2f604d23f7b372d9c3a22425d91e0cb2e6d0ff09f805722cdbe30eb6599566ec3715006127a144c2e9df92724dd307dc2d8b7
+  data.tar.gz: 3ec16e14c8ecfc15d9d8f00c2af4413c7ca35f372ac5ca38d7577df9629ca0b22a7885b0abd7c9665e9004b8c1592823ce23bb37285b3609a320c086efc98be9

data/lib/nats/io/client.rb

@@ -227,6 +227,7 @@ module NATS
       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[:ignore_discovered_urls] = false if opts[:ignore_discovered_urls].nil?
       opts[:reconnect_time_wait] = NATS::IO::RECONNECT_TIME_WAIT if opts[:reconnect_time_wait].nil?
       opts[:max_reconnect_attempts] = NATS::IO::MAX_RECONNECT_ATTEMPTS if opts[:max_reconnect_attempts].nil?
       opts[:ping_interval] = NATS::IO::DEFAULT_PING_INTERVAL if opts[:ping_interval].nil?
@@ -237,6 +238,7 @@ module NATS
       opts[:pedantic] = ENV['NATS_PEDANTIC'].downcase == 'true' unless ENV['NATS_PEDANTIC'].nil?
       opts[:reconnect] = ENV['NATS_RECONNECT'].downcase == 'true' unless ENV['NATS_RECONNECT'].nil?
       opts[:reconnect_time_wait] = ENV['NATS_RECONNECT_TIME_WAIT'].to_i unless ENV['NATS_RECONNECT_TIME_WAIT'].nil?
+      opts[:ignore_discovered_urls] = ENV['NATS_IGNORE_DISCOVERED_URLS'].downcase == 'true' unless ENV['NATS_IGNORE_DISCOVERED_URLS'].nil?
       opts[:max_reconnect_attempts] = ENV['NATS_MAX_RECONNECT_ATTEMPTS'].to_i unless ENV['NATS_MAX_RECONNECT_ATTEMPTS'].nil?
       opts[:ping_interval] = ENV['NATS_PING_INTERVAL'].to_i unless ENV['NATS_PING_INTERVAL'].nil?
       opts[:max_outstanding_pings] = ENV['NATS_MAX_OUTSTANDING_PINGS'].to_i unless ENV['NATS_MAX_OUTSTANDING_PINGS'].nil?
@@ -256,7 +258,7 @@ module NATS
                    end
         @server_pool << {
           :uri => nats_uri,
-          :hostname => nats_uri.host
+          :hostname => nats_uri.hostname
         }
       end
 
@@ -807,17 +809,17 @@ module NATS
 
         # Detect any announced server that we might not be aware of...
         connect_urls = @server_info[:connect_urls]
-        if connect_urls
+        if !@options[:ignore_discovered_urls] && connect_urls
           srvs = []
           connect_urls.each do |url|
             scheme = client_using_secure_connection? ? "tls" : "nats"
             u = URI.parse("#{scheme}://#{url}")
 
             # Skip in case it is the current server which we already know
-            next if @uri.host == u.host && @uri.port == u.port
+            next if @uri.hostname == u.hostname && @uri.port == u.port
 
             present = server_pool.detect do |srv|
-              srv[:uri].host == u.host && srv[:uri].port == u.port
+              srv[:uri].hostname == u.hostname && srv[:uri].port == u.port
             end
 
             if not present
@@ -832,7 +834,7 @@ module NATS
               end
 
               # NOTE: Auto discovery won't work here when TLS host verification is enabled.
-              srv = { :uri => u, :reconnect_attempts => 0, :discovered => true, :hostname => u.host }
+              srv = { :uri => u, :reconnect_attempts => 0, :discovered => true, :hostname => u.hostname }
               srvs << srv
             end
           end
@@ -1758,34 +1760,20 @@ module NATS
     end
 
     def process_uri(uris)
-      connect_uris = []
-      uris.split(',').each do |uri|
+      uris.split(',').map do |uri|
         opts = {}
 
         # Scheme
-        if uri.include?("://")
-          scheme, uri = uri.split("://")
-          opts[:scheme] = scheme
-        else
-          opts[:scheme] = 'nats'
-        end
+        uri = "nats://#{uri}" if !uri.include?("://")
 
-        # UserInfo
-        if uri.include?("@")
-          userinfo, endpoint = uri.split("@")
-          host, port = endpoint.split(":")
-          opts[:userinfo] = userinfo
-        else
-          host, port = uri.split(":")
-        end
+        uri_object = URI(uri)
 
         # Host and Port
-        opts[:host] = host || "localhost"
-        opts[:port] = port || DEFAULT_PORT
+        uri_object.hostname ||= "localhost"
+        uri_object.port ||= DEFAULT_PORT
 
-        connect_uris << URI::Generic.build(opts)
+        uri_object
       end
-      connect_uris
     end
   end
 
@@ -1834,7 +1822,7 @@ module NATS
       end
 
       def connect
-        addrinfo = ::Socket.getaddrinfo(@uri.host, nil, ::Socket::AF_UNSPEC, ::Socket::SOCK_STREAM)
+        addrinfo = ::Socket.getaddrinfo(@uri.hostname, nil, ::Socket::AF_UNSPEC, ::Socket::SOCK_STREAM)
         addrinfo.each_with_index do |ai, i|
           begin
             @socket = connect_addrinfo(ai, @uri.port, @connect_timeout)

data/lib/nats/io/js.rb

@@ -118,6 +118,7 @@ module NATS
       manual_ack = params[:manual_ack]
       idle_heartbeat = params[:idle_heartbeat]
       flow_control = params[:flow_control]
+      config = params[:config]
 
       if queue
         if durable and durable != queue
@@ -284,6 +285,7 @@ module NATS
                  end
         stream = config[:name]
         raise ArgumentError.new(":name is required to create streams") unless stream
+        raise ArgumentError.new("Spaces, tabs, period (.), greater than (>) or asterisk (*) are prohibited in stream names") if stream =~ /(\s|\.|\>|\*)/
         req_subject = "#{@prefix}.STREAM.CREATE.#{stream}"
         result = api_request(req_subject, config.to_json, params)
         JetStream::API::StreamCreateResponse.new(result)
@@ -345,6 +347,7 @@ module NATS
           stream_name: stream,
           config: config
         }
+
         result = api_request(req_subject, req.to_json, params)
         JetStream::API::ConsumerInfo.new(result).freeze
       end
@@ -502,11 +505,14 @@ module NATS
           synchronize do
             unless @pending_queue.empty?
               msg = @pending_queue.pop
+              @pending_size -= msg.data.size
               # Check for a no msgs response status.
               if JS.is_status_msg(msg)
                 case msg.header["Status"]
                 when JS::Status::NoMsgs
                   msg = nil
+                when JS::Status::RequestTimeout
+                  # Skip
                 else
                   raise JS.from_msg(msg)
                 end
@@ -525,7 +531,12 @@ module NATS
             # Wait for result of fetch or timeout.
             synchronize { wait_for_msgs_cond.wait(timeout) }
 
-            msgs << @pending_queue.pop unless @pending_queue.empty?
+            unless @pending_queue.empty?
+              msg = @pending_queue.pop
+              @pending_size -= msg.data.size
+
+              msgs << msg
+            end
 
             duration = MonotonicTime.since(t)
             if duration > timeout
@@ -535,7 +546,13 @@ module NATS
             # Should have received at least a message at this point,
             # if that is not the case then error already.
             if JS.is_status_msg(msgs.first)
-              raise JS.from_msg(msgs.first)
+              msg = msgs.first
+              case msg.header[JS::Header::Status]
+              when JS::Status::RequestTimeout
+                raise NATS::Timeout.new("nats: fetch request timeout")
+              else
+                raise JS.from_msg(msgs.first)
+              end
             end
           end
         when batch > 1
@@ -546,7 +563,23 @@ module NATS
           # Check if there already enough in the pending buffer.
           synchronize do
             if batch <= @pending_queue.size
-              batch.times { msgs << @pending_queue.pop }
+              batch.times do
+                msg = @pending_queue.pop
+                @pending_size -= msg.data.size
+
+                # Check for a no msgs response status.
+                if JS.is_status_msg(msg)
+                  case msg.header[JS::Header::Status]
+                  when JS::Status::NoMsgs, JS::Status::RequestTimeout
+                    # Skip these
+                    next
+                  else
+                    raise JS.from_msg(msg)
+                  end
+                else
+                  msgs << msg
+                end
+              end
 
               return msgs
             end
@@ -559,10 +592,15 @@ module NATS
           # Not receiving even one is a timeout.
           start_time = MonotonicTime.now
           msg = nil
-          synchronize {
+
+          synchronize do
             wait_for_msgs_cond.wait(timeout)
-            msg = @pending_queue.pop unless @pending_queue.empty?
-          }
+
+            unless @pending_queue.empty?
+              msg = @pending_queue.pop
+              @pending_size -= msg.data.size
+            end
+          end
 
           # Check if the first message was a response saying that
           # there are no messages.
@@ -574,11 +612,13 @@ module NATS
               next_req.delete(:no_wait)
 
               @nc.publish(@jsi.nms, JS.next_req_to_json(next_req), @subject)
+            when JS::Status::RequestTimeout
+              raise NATS::Timeout.new("nats: fetch request timeout")
             else
               raise JS.from_msg(msg)
             end
           else
-            msgs << msg
+            msgs << msg unless msg.nil?
           end
 
           # Check if have not received yet a single message.
@@ -605,23 +645,27 @@ module NATS
                 end
               else
                 msg = @pending_queue.pop
+                @pending_size -= msg.data.size
 
                 if JS.is_status_msg(msg)
-                  case msg.header["Status"]
+                  case msg.header[JS::Header::Status]
                   when JS::Status::NoMsgs, JS::Status::RequestTimeout
                     duration = MonotonicTime.since(start_time)
 
-                    # Do not time out if we received at least some messages.
-                    if msgs.empty? && @pending_queue.empty? and duration > timeout
-                      raise NATS::Timeout.new("nats: fetch timeout")
+                    if duration > timeout
+                      # Only received a subset of the messages.
+                      if !msgs.empty?
+                        return msgs
+                      else
+                        raise NATS::Timeout.new("nats: fetch timeout")
+                      end
                     end
-
-                    # Likely only received a subset of the messages.
-                    return msgs
                   else
                     raise JS.from_msg(msg)
                   end
+
                 else
+                  # Add to the set of messages that will be returned.
                   msgs << msg
                   needed -= 1
                 end
@@ -1092,12 +1136,24 @@ module NATS
       #   @return [Integer]
       # @!attribute max_ack_pending
       #   @return [Integer]
-      ConsumerConfig = Struct.new(:durable_name, :description, :deliver_subject,
-                                  :deliver_group, :deliver_policy, :opt_start_seq,
-                                  :opt_start_time, :ack_policy, :ack_wait, :max_deliver,
+      ConsumerConfig = Struct.new(:durable_name, :description,
+                                  :deliver_policy, :opt_start_seq, :opt_start_time,
+                                  :ack_policy, :ack_wait, :max_deliver, :backoff,
                                   :filter_subject, :replay_policy, :rate_limit_bps,
                                   :sample_freq, :max_waiting, :max_ack_pending,
                                   :flow_control, :idle_heartbeat, :headers_only,
+
+                                  # Pull based options
+                                  :max_batch, :max_expires,
+                                  # Push based consumers
+                                  :deliver_subject, :deliver_group,
+                                  # Ephemeral inactivity threshold
+                                  :inactive_threshold,
+                                  # Generally inherited by parent stream and other markers,
+                                  # now can be configured directly.
+                                  :num_replicas,
+                                  # Force memory storage
+                                  :memory_storage,
                                   keyword_init: true) do
         def initialize(opts={})
           # Filter unrecognized fields just in case.
@@ -1151,10 +1207,11 @@ module NATS
       #   @return [Integer]
       # @!attribute duplicate_window
       #   @return [Integer]
-      StreamConfig = Struct.new(:name, :subjects, :retention, :max_consumers,
-                                :max_msgs, :max_bytes, :max_age,
+      StreamConfig = Struct.new(:name, :description, :subjects, :retention, :max_consumers,
+                                :max_msgs, :max_bytes, :discard, :max_age,
                                 :max_msgs_per_subject, :max_msg_size,
-                                :discard, :storage, :num_replicas, :duplicate_window,
+                                :storage, :num_replicas, :no_ack, :duplicate_window,
+                                :placement, :allow_direct,
                                 keyword_init: true) do
         def initialize(opts={})
           # Filter unrecognized fields just in case.

data/lib/nats/io/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 The NATS Authors
+# Copyright 2016-2022 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
@@ -15,7 +15,7 @@
 module NATS
   module IO
     # VERSION is the version of the client announced on CONNECT to the server.
-    VERSION = "2.0.0-rc2".freeze
+    VERSION = "2.1.2".freeze
 
     # LANG is the lang runtime of the client announced on CONNECT to the server.
     LANG = "#{RUBY_ENGINE}#{RUBY_VERSION}".freeze

data/lib/nats/nuid.rb

@@ -15,7 +15,7 @@ require 'securerandom'
 
 module NATS
   class NUID
-    DIGITS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+    DIGITS        = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
     BASE          = 62
     PREFIX_LENGTH = 12
     SEQ_LENGTH    = 10
@@ -25,6 +25,8 @@ module NATS
     MAX_INC       = 333
     INC = MAX_INC - MIN_INC
 
+    Ractor.make_shareable(DIGITS) if defined?(Ractor)
+
     def initialize
       @prand    = Random.new
       @seq      = @prand.rand(MAX_SEQ)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nats-pure
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc2
+  version: 2.1.2
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies: []
 description: NATS is an open-source, high-performance, lightweight cloud messaging
   system.
@@ -44,11 +44,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: NATS is an open-source, high-performance, lightweight cloud messaging system.