nats-pure 2.0.0.pre.rc2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16ee062f4cee20fd50abb3d9f78a2e2aa3c92648717ae4e6906e93255920d89
-  data.tar.gz: d4fa9ee8eb06ca8379493de124d7c125dd15a929550316c943be9bd2ae8d8743
+  metadata.gz: c3aa471703cde005a917e60ee79a8bc0abd87ad12d3548a9ebb8fc0c76aeb9ef
+  data.tar.gz: c7f2954dd2b9dbdbb465faa6efd77183a935a0004ee1158ab8adbd03a68e1580
 SHA512:
-  metadata.gz: ec7aa2c9dd3ce098d7ebdd083ecabe581ebe22302d5cd452feb4e718bebf2b453c455ad6786a0f9bfb7a34f49e348ba9829184521a7f161fbd9ba96df6f39383
-  data.tar.gz: 8667b8373d87a4f905723f881991645c48a731bafd98a6a533316857fa6a6e56e0493edb753a4b9b01be62fa52b6a82c2a32269e337f4f82e105f48ed8602100
+  metadata.gz: 6dc94ad0a6c22fb5b03c5f87c0727d036e97a6efef0c54b395314ccc56e701e7d8d23912eff51e5dca2adfb84f91102b9291e85a574eb3268d18795883983758
+  data.tar.gz: 5ed00644aca202ea00a988d9197bd26fada520761decd055affa572c9979063521f01f0149156e6b14e70c53ca572ded330ed85bdc30eb8452ad480c93730ca5

data/lib/nats/io/js.rb

@@ -507,6 +507,8 @@ module NATS
                 case msg.header["Status"]
                 when JS::Status::NoMsgs
                   msg = nil
+                when JS::Status::RequestTimeout
+                  # Skip
                 else
                   raise JS.from_msg(msg)
                 end
@@ -535,7 +537,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 +554,22 @@ 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
+
+                # 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
@@ -574,11 +597,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.
@@ -607,21 +632,24 @@ module NATS
                 msg = @pending_queue.pop
 
                 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

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.0.0".freeze
 
     # LANG is the lang runtime of the client announced on CONNECT to the server.
     LANG = "#{RUBY_ENGINE}#{RUBY_VERSION}".freeze

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.0.0
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies: []
 description: NATS is an open-source, high-performance, lightweight cloud messaging
   system.
@@ -44,9 +44,9 @@ 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
 signing_key: