async-dns 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe06cb348414e96cabc7ad81a08d8c030d36d4f95cec538a2a1ca457123d6b58
-  data.tar.gz: 76e5664c2582c7ebac250e7ae2c0680864ea85f4896eaca76b1f5050f517c934
+  metadata.gz: ea5c9c51849ba12863030e14261a5475bfa1d1ab52e39a2c845dafdf277683d7
+  data.tar.gz: ac45a456ef1cc82a2bd01046a549e37cb72908c42d5429bc6d6818b02ae63845
 SHA512:
-  metadata.gz: d5770a6b12241696f5930240913a15740a6950b94d8be0e0b64a83bc8f86da75c6c26d044e754590a1b8915e5f997c134d07653eaa64ee2177147edefa5f33ef
-  data.tar.gz: 34916a1a687ecf6fac55bf52a860529e29642043c5e8a35b44a9931ce37c6fc26edab43b6edc664eae5052649bbf133f92a24597f9b757a14feb81deb493c010
+  metadata.gz: b673b004c18bd79e2cea44fe66e3236e0843d3ad46ed68cec7db26302f6baa34593ae62f7f0eb826be87abe518bdb0c21035098881224aa4132239cc66091e4d
+  data.tar.gz: 46a55367035e353d9494cba6433bbd063c01d96675de811af4f5f6fa98d499b1e0e3cb3f0edf7773af34742c799308d5767abcd53a4002658e4f8de11eda04eb

data/lib/async/dns/extensions/resolv.rb

@@ -26,7 +26,7 @@ class Resolv
 			# Merge the given message with this message. A number of heuristics are applied in order to ensure that the result makes sense. For example, If the current message is not recursive but is being merged with a message that was recursive, this bit is maintained. If either message is authoritive, then the result is also authoritive.
 			#
 			# Modifies the current message in place.
-			def merge! (other)
+			def merge!(other)
 				# Authoritive Answer
 				@aa = @aa && other.aa
 
@@ -67,7 +67,6 @@ class Resolv
 				return self.class.new(@labels + origin, absolute)
 			end
 			
-			
 			# Return the name, typically relative, without the specified origin suffix. If the origin is nil, don't change the name, but change it to absolute (as specified).
 			def without_origin(origin, absolute = false)
 				return self.class.new(@labels, absolute) if origin == nil

data/lib/async/dns/handler.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'async/io/stream'
+
 require_relative 'transport'
 
 module Async::DNS
@@ -26,7 +28,7 @@ module Async::DNS
 			@server = server
 			@socket = socket
 			
-			@logger = @server.logger || Async.logger
+			@logger = @server.logger || Console.logger
 		end
 		
 		attr :server
@@ -57,8 +59,7 @@ module Async::DNS
 				
 				return @server.process_query(query, options)
 			rescue StandardError => error
-				@logger.error "<> Error processing request: #{error.inspect}!"
-				Async::DNS::log_exception(@logger, error)
+				@logger.error(self, error)
 				
 				return error_response(query)
 			end
@@ -114,13 +115,14 @@ module Async::DNS
 		end
 		
 		def handle_connection(socket)
-			input_data = StreamTransport.read_chunk(socket)
-			
-			response = process_query(input_data, remote_address: socket.remote_address)
-			
-			length = StreamTransport.write_message(socket, response)
+			transport = Transport.new(socket)
 			
-			@logger.debug "<#{response.id}> Wrote #{length} bytes via TCP..."
+			while input_data = transport.read_chunk
+				response = process_query(input_data, remote_address: socket.remote_address)
+				length = transport.write_message(response)
+				
+				@logger.debug "<#{response.id}> Wrote #{length} bytes via TCP..."
+			end
 		rescue EOFError => error
 			@logger.warn "<> Error: TCP session ended prematurely!"
 		rescue Errno::ECONNRESET => error

data/lib/async/dns/resolver.rb

@@ -46,7 +46,7 @@ module Async::DNS
 		# Servers are specified in the same manor as options[:listen], e.g.
 		#   [:tcp/:udp, address, port]
 		# In the case of multiple servers, they will be checked in sequence.
-		def initialize(endpoints, origin: nil, logger: Async.logger, timeout: DEFAULT_TIMEOUT)
+		def initialize(endpoints, origin: nil, logger: Console.logger, timeout: DEFAULT_TIMEOUT)
 			@endpoints = endpoints
 			
 			@origin = origin
@@ -203,7 +203,7 @@ module Async::DNS
 			elsif response.id != message.id
 				@logger.warn "[#{message.id}] Received response with incorrect message id: #{response.id}!" if @logger
 			else
-				@logger.debug "[#{message.id}] Received valid response with #{response.answer.count} answer(s)." if @logger
+				@logger.debug "[#{message.id}] Received valid response with #{response.answer.size} answer(s)." if @logger
 				
 				return true
 			end
@@ -220,9 +220,11 @@ module Async::DNS
 		end
 		
 		def try_stream_server(request, socket)
-			StreamTransport.write_chunk(socket, request.packet)
+			transport = Transport.new(socket)
 			
-			input_data = StreamTransport.read_chunk(socket)
+			transport.write_chunk(request.packet)
+			
+			input_data = transport.read_chunk
 			
 			return Async::DNS::decode_message(input_data)
 		end

data/lib/async/dns/server.rb

@@ -36,7 +36,7 @@ module Async::DNS
 		#		end
 		#	end
 		#
-		def initialize(endpoints = DEFAULT_ENDPOINTS, origin: '.', logger: Async.logger)
+		def initialize(endpoints = DEFAULT_ENDPOINTS, origin: '.', logger: Console.logger)
 			@endpoints = endpoints
 			@origin = origin
 			@logger = logger

data/lib/async/dns/transport.rb

@@ -23,64 +23,40 @@ require 'ipaddr'
 
 require_relative 'message'
 
-module Async::DNS
-	def self.address_family(host)
-		return IPAddr.new(host).family
-	end
-	
-	# A helper class for processing incoming network data.
-	class BinaryStringIO < StringIO
-		def initialize
-			super
-		
-			set_encoding("BINARY")
+module Async
+	module DNS
+		def self.address_family(host)
+			return IPAddr.new(host).family
 		end
-	end
-	
-	module StreamTransport
-		def self.read_chunk(socket)
-			# The data buffer:
-			buffer = BinaryStringIO.new
-			
-			# First we need to read in the length of the packet
-			while buffer.size < 2
-				if data = socket.read(1)
-					buffer.write data
-				else
-					raise EOFError, "Could not read message size!"
-				end
+		
+		class Transport
+			def initialize(socket)
+				@stream = IO::Stream.new(socket)
 			end
 			
-			# Read in the length, the first two bytes:
-			length = buffer.string.byteslice(0, 2).unpack('n')[0]
+			def write_message(message)
+				write_chunk(message.encode)
+			end
 			
-			# Read data until we have the amount specified:
-			while (buffer.size - 2) < length
-				required = (2 + length) - buffer.size
-				
-				# Read precisely the required amount:
-				if data = socket.read(required)
-					buffer.write data
-				else
-					raise EOFError, "Could not read message data!"
+			def read_chunk
+				if size_data = @stream.read(2)
+					# Read in the length, the first two bytes:
+					size = size_data.unpack('n')[0]
+					
+					return @stream.read(size)
 				end
 			end
 			
-			return buffer.string.byteslice(2, length)
-		end
-		
-		def self.write_message(socket, message)
-			write_chunk(socket, message.encode)
-		end
-		
-		def self.write_chunk(socket, output_data)
-			size_data = [output_data.bytesize].pack('n')
-			
-			# TODO: Validate/check for data written correctly
-			count = socket.write(size_data)
-			count = socket.write(output_data)
-			
-			return output_data.bytesize
+			def write_chunk(output_data)
+				size_data = [output_data.bytesize].pack('n')
+				
+				@stream.write(size_data)
+				@stream.write(output_data)
+				
+				@stream.flush
+				
+				return output_data.bytesize
+			end
 		end
 	end
 end

data/lib/async/dns/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module DNS
-		VERSION = '1.2.1'
+		VERSION = '1.2.6'
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-dns
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.6
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: process-daemon
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,51 +66,68 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: process-daemon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: "\t\tAsync::DNS provides a high-performance DNS client resolver and server\n\t\twhich
-  can be easily integrated into other projects or used as a stand-alone\n\t\tdaemon.\n"
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-memory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
-- async-dns.gemspec
-- examples/cloudflare.rb
 - lib/async/dns.rb
 - lib/async/dns/chunked.rb
 - lib/async/dns/extensions/resolv.rb
@@ -124,32 +141,11 @@ files:
 - lib/async/dns/transaction.rb
 - lib/async/dns/transport.rb
 - lib/async/dns/version.rb
-- spec/async/dns/handler_spec.rb
-- spec/async/dns/hosts.txt
-- spec/async/dns/ipv6_spec.rb
-- spec/async/dns/junk_server_context.rb
-- spec/async/dns/message_spec.rb
-- spec/async/dns/origin_spec.rb
-- spec/async/dns/replace_spec.rb
-- spec/async/dns/resolver_performance_spec.rb
-- spec/async/dns/resolver_spec.rb
-- spec/async/dns/server/bind9/generate-local.rb
-- spec/async/dns/server/bind9/local.zone
-- spec/async/dns/server/bind9/named.conf
-- spec/async/dns/server/bind9/named.run
-- spec/async/dns/server/million.rb
-- spec/async/dns/server_performance_spec.rb
-- spec/async/dns/slow_server_spec.rb
-- spec/async/dns/socket_spec.rb
-- spec/async/dns/system_spec.rb
-- spec/async/dns/transaction_spec.rb
-- spec/async/dns/truncation_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/async/async-dns
+homepage: https://github.com/socketry/async-dns
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,29 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: An easy to use DNS client resolver and server for Ruby.
-test_files:
-- spec/async/dns/handler_spec.rb
-- spec/async/dns/hosts.txt
-- spec/async/dns/ipv6_spec.rb
-- spec/async/dns/junk_server_context.rb
-- spec/async/dns/message_spec.rb
-- spec/async/dns/origin_spec.rb
-- spec/async/dns/replace_spec.rb
-- spec/async/dns/resolver_performance_spec.rb
-- spec/async/dns/resolver_spec.rb
-- spec/async/dns/server/bind9/generate-local.rb
-- spec/async/dns/server/bind9/local.zone
-- spec/async/dns/server/bind9/named.conf
-- spec/async/dns/server/bind9/named.run
-- spec/async/dns/server/million.rb
-- spec/async/dns/server_performance_spec.rb
-- spec/async/dns/slow_server_spec.rb
-- spec/async/dns/socket_spec.rb
-- spec/async/dns/system_spec.rb
-- spec/async/dns/transaction_spec.rb
-- spec/async/dns/truncation_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.editorconfig

@@ -1,6 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 2
-

data/.gitignore

@@ -1,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-/spec/**/log/
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---warnings
---require spec_helper