async-dns 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe06cb348414e96cabc7ad81a08d8c030d36d4f95cec538a2a1ca457123d6b58
-  data.tar.gz: 76e5664c2582c7ebac250e7ae2c0680864ea85f4896eaca76b1f5050f517c934
+  metadata.gz: d4ffb8685eb3a47dad14219a9ffd0fcd4193c2ab24bb04ae4b213d10513adafc
+  data.tar.gz: 6d644f3e0ffc4654dda0e08d077f0f3bd463a7c6d3de05b2c43405e5f2a008b4
 SHA512:
-  metadata.gz: d5770a6b12241696f5930240913a15740a6950b94d8be0e0b64a83bc8f86da75c6c26d044e754590a1b8915e5f997c134d07653eaa64ee2177147edefa5f33ef
-  data.tar.gz: 34916a1a687ecf6fac55bf52a860529e29642043c5e8a35b44a9931ce37c6fc26edab43b6edc664eae5052649bbf133f92a24597f9b757a14feb81deb493c010
+  metadata.gz: 638a807a5dc8f368bfba9e4ad720625aa037e9432b23faed36f3d31674eecfc6c29a68a6b28f95a728db2cc0dbe11223f6ea7e4bc24e9478aaf9ba590dbb71b4
+  data.tar.gz: e2fd429f878abe021d95b256d1717ea0d6a38204602e1181bf4b63d935c26d935f03936c73c9f7c89586217ca8c352783d07714c17d5eec386f010fb2d6bd831

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
@@ -114,13 +116,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

@@ -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/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.2'
 	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.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: An easy to use DNS client resolver and server for Ruby.