astro-em-dns 0.0.2 → 0.1.0

data/Rakefile

@@ -11,7 +11,7 @@ Jeweler::Tasks.new do |s|
   s.homepage = "http://github.com/astro/em-dns"
   s.description = "DNS::Resolv made ready for EventMachine"
   s.authors = ["Aman Gupta", "Stephan Maka"]
-  s.files =  FileList["[A-Z]*", "{lib,test}/**/*"]
+  s.files =  FileList["[A-Z]*", "{lib,test,examples}/**/*"]
   s.add_dependency 'eventmachine'
 end
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 0
-:patch: 2
+:minor: 1
+:patch: 0

data/examples/lookup_many.rb

@@ -3,7 +3,7 @@
 require 'uri'
 require 'eventmachine'
 $: << File.dirname(__FILE__) + '/../lib'
-require 'em/dns_cache'
+require 'em/dns_resolver'
 
 if ARGV.size == 0
   puts "Usage: #{$0} <url-files>"
@@ -21,35 +21,35 @@ ARGV.each do |fn|
     end
   end
 end
+hosts.uniq!
 puts "Will resolve #{hosts.size} hosts"
 
-EM::DnsCache.add_nameservers_from_file
-EM::DnsCache.verbose
-
+BATCH_SIZE = 10
+successes = 0
+failures = 0
+t1 = Time.now
 EM.run {
   pending = 0
-  hosts.each do |host|
-    df = EM::DnsCache.resolve(host)
-    df.callback { |*a|
-      if a.size == 1
-        if a.kind_of?(Array)
-          # Good!
-        else
-          p host => a[0]
-        end
-      else
-        p host => {:args => a}
-      end
-      pending -= 1
-      EM.stop if pending < 1
-    }
-    df.errback { |*a|
-      puts "Cannot resolve #{host}: #{a.inspect}"
-      pending -= 1
-      EM.stop if pending < 1
-    }
-    pending += 1
+  EM.add_periodic_timer(0.1) do
+    batch, hosts = hosts[0..(BATCH_SIZE-1)], (hosts[BATCH_SIZE..-1] || [])
+    batch.each do |host|
+      df = EM::DnsResolver.resolve(host)
+      df.callback { |a|
+        p host => a
+        successes += 1
+        pending -= 1
+        EM.stop if pending < 1 && hosts.empty?
+      }
+      df.errback { |*a|
+        puts "Cannot resolve #{host}: #{a.inspect}"
+        failures += 1
+        pending -= 1
+        EM.stop if pending < 1 && hosts.empty?
+      }
+      pending += 1
+    end
     puts "#{pending} pending"
   end
-  puts "Started all: #{pending} pending"
 }
+t2 = Time.now
+puts "#{successes} successful, #{failures} failures in #{t2 - t1} s"

data/lib/em/dns_resolver.rb

@@ -0,0 +1,156 @@
+require 'eventmachine'
+require 'resolv'
+
+module EventMachine
+  module DnsResolver
+    ##
+    # Global interface
+    ##
+
+    def self.resolve(hostname)
+      Request.new(socket, hostname)
+    end
+
+    def self.socket
+      unless defined?(@socket)
+        @socket = DnsSocket.open
+      end
+      @socket
+    end
+
+    def self.nameserver=(ns)
+      @nameserver = ns
+    end
+    def self.nameserver
+      unless defined?(@nameserver)
+        IO::readlines('/etc/resolv.conf').each do |line|
+          if line =~ /^nameserver (.+)$/
+            @nameserver = $1.split(/\s+/).first
+          end
+        end
+      end
+      @nameserver
+    end
+
+    ##
+    # Socket stuff
+    ##
+
+    class RequestIdAlreadyUsed < RuntimeError
+    end
+
+    class DnsSocket < EM::Connection
+      def self.open
+        EM::open_datagram_socket('0.0.0.0', 0, self)
+      end
+      def post_init
+        @requests = {}
+        EM.add_periodic_timer(0.1, &method(:tick))
+      end
+      # Periodically called each second to fire request retries
+      def tick
+        @requests.each do |id,req|
+          req.tick
+        end
+      end
+      def register_request(id, req)
+        if @requests.has_key?(id)
+          raise RequestIdAlreadyUsed
+        else
+          @requests[id] = req
+        end
+      end
+      def send_packet(pkt)
+        send_datagram(pkt, nameserver, 53)
+      end
+      def nameserver=(ns)
+        @nameserver = ns
+      end
+      def nameserver
+        @nameserver ||= DnsResolver.nameserver
+      end
+      # Decodes the packet, looks for the request and passes the
+      # response over to the requester
+      def receive_data(data)
+        msg = nil
+        begin
+          msg = Resolv::DNS::Message.decode data
+        rescue
+        else
+          req = @requests[msg.id]
+          if req
+            @requests.delete(msg.id)
+            req.receive_answer(msg)
+          end
+        end
+      end
+    end
+
+    ##
+    # Request
+    ##
+
+    class Request
+      include Deferrable
+      attr_accessor :retry_interval
+      attr_accessor :max_tries
+      def initialize(socket, hostname)
+        @socket = socket
+        @hostname = hostname
+        @tries = 0
+        @last_send = Time.at(0)
+        @retry_interval = 3
+        @max_tries = 5
+        make_id
+        make_packet
+        EM.next_tick { tick }
+      end
+      def tick
+        # Break early if nothing to do
+        return if @last_send + @retry_interval > Time.now
+
+        if @tries < @max_tries
+          send
+        else
+          fail 'retries exceeded'
+        end
+      end
+      # Called by DnsSocket#receive_data
+      def receive_answer(msg)
+        addrs = []
+        msg.each_answer do |name,ttl,data|
+          if data.kind_of?(Resolv::DNS::Resource::IN::A) ||
+              data.kind_of?(Resolv::DNS::Resource::IN::AAAA)
+            addrs << data.address.to_s
+          end
+        end
+        if addrs.empty?
+          fail "rcode=#{msg.rcode}"
+        else
+          succeed addrs
+        end
+      end
+      private
+      def send
+        @socket.send_packet(@pkt.encode)
+        @tries += 1
+        @last_send = Time.now
+      end
+      def make_id
+        begin
+          @id = rand(65535)
+          @socket.register_request(@id, self)
+        rescue RequestIdAlreadyUsed
+          retry
+        end
+      end
+      def make_packet
+        msg = Resolv::DNS::Message.new
+        msg.id = @id
+        msg.rd = 1
+        msg.add_question @hostname, Resolv::DNS::Resource::IN::A
+        @pkt = msg
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-dns
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Aman Gupta
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -07:00
+date: 2009-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,9 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - VERSION.yml
+- examples/lookup_many.rb
 - lib/em/dns_cache.rb
+- lib/em/dns_resolver.rb
 - test/test_basic.rb
 has_rdoc: false
 homepage: http://github.com/astro/em-dns