ractor_dns 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce870d0f62325886ce1055117b49e081cbd7b5f74ba1d4aa9894e5b16c7f8ad
-  data.tar.gz: e8d04590744cf6458bd5d395457930e38916590568a2f57e261ad20fe47f829a
+  metadata.gz: 43eb0bf1e0c8c1333e58ab9af172c794203ad40184ef1c501b59d21e654295e9
+  data.tar.gz: 9e3385ab39bed221627a4d34b34ab26060cd19862d9e139e1ee727c83fbe8d1b
 SHA512:
-  metadata.gz: 4a5ce6ba4208da2b999f8087f4748eb9090451618f192c726c77f90287c83ac387db2618146e01626040306084f76b1492a2ec5271b79fc46e31f4390e5cf808
-  data.tar.gz: a2caa666683138cb78fb239e856e12383a5ee651fb7fe0e5d86ddb7d042b4f9cdee96117974971c1b1c4f12c828d2ba969e5388fe1a124f968bdcb5ec6eeef1a
+  metadata.gz: c1574d4b92f4334799906f831eeb2c9e96bbb8cf12b96b4f6b3dc2e23c4ae7cb4ac1f94364d6e9ccf0fda855590fb88ded34c6409c662120a3d494157b21a8f1
+  data.tar.gz: a0d547ee9b18754498052a683708024980aed9afc4570c5e3d7573b25abf3abc369ac62525b701efa57af084e16a55150c8aa32b2d4ec55b7ef2ac55c3dc2a12

data/README.md

@@ -1,20 +1,16 @@
 # RactorDNS
 
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ractor_dns`. To experiment with that code, run `bin/console` for an interactive prompt.
+RactorDNS is a work-in-progress concurrent DNS server built with Ruby 3.0 Ractors.
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+    bundle add ractor_dns
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+    gem install ractor_dns
 
 ## Usage
 
@@ -28,4 +24,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ractor_dns.
+Bug reports and pull requests are welcome at https://codeberg.org/oblong/ractor_dns.

data/lib/ractor_dns/active_zone/railtie.rb

@@ -0,0 +1,7 @@
+class RactorDNS::ActiveZone::Railtie < Rails::Railtie
+  server do
+    if ActiveZone.provider.is_a? RactorDNS::ActiveZone
+      ActiveZone.provider.start
+    end
+  end
+end

data/lib/ractor_dns/active_zone.rb

@@ -0,0 +1,15 @@
+class RactorDNS::ActiveZone
+  attr_accessor :server
+  def initialize(name: "ns.ractordns.local", ttl: 300, ip: "0.0.0.0", server: nil, port: 53, cpu_count: 8, zones:)
+   @server = server.presence || RactorDNS::Server.new(
+     port:,
+     authority: [name, ttl, RRs::IN::A.new(ip)], 
+     cpu_count:,
+     zones:
+   )
+  end
+  
+  delegate_missing_to :server
+end
+
+require "ractor_dns/active_zone/railtie" if defined?(Rails::Railtie)

data/lib/ractor_dns/inflector.rb

@@ -8,4 +8,4 @@ module RactorDNS
       end
     end
   end
-end
+end

data/lib/ractor_dns/server.rb

@@ -1,68 +1,87 @@
 module RactorDNS
   class Server
-    attr_reader :authority, :ractor, :zones
+    attr_reader :authority, :ractor, :zones, :cpu_count, :port
 
-    def initialize(authority:, cpu_count:, zones:)
+    def initialize(authority:, cpu_count:, zones:, port: 53)
       @authority = authority
       @cpu_count = cpu_count
       @zones = zones
+      @port = port
     end
 
     def start
-      @ractor = Ractor.new(@authority, @cpu_count, @zones) do |authority, cpu_count, zones|
-        pipe = Ractor.new do
-          loop do
-            Ractor.yield(Ractor.recv)
+      @pipe = Ractor.new do
+        loop do
+          recv = Ractor.recv
+          if recv == :stop
+            Ractor.yield([recv, nil, nil])
+            Ractor.current.close_incoming
+            Ractor.current.close_outgoing
+            break
           end
+          Ractor.yield(recv)
         end
+      end
 
-        # Create socket outside of Ractor context
-        server_socket = UDPSocket.new :INET6
-        server_socket.bind("::", 8080)
-
-        workers = cpu_count.times.map do
-          Ractor.new(pipe, server_socket, authority) do |pipe, server_socket, authority|
-            loop do
-              message, client, zone_h = pipe.take
+      @resolvers = @cpu_count.times.map do
+        Ractor.new(@pipe, @authority) do |pipe, authority|
+          loop do
+            data, zone_h = pipe.take
 
-              decoded = RRs::Message.decode(message)
+            break if data == :stop && zone_h.nil?
 
-              # Extract client information
-              addr_info = Addrinfo.new(client)
+            decoded = RRs::Message.decode(data)
 
-              response = RRs::Message.new(decoded.id)
-              response.add_authority(*authority)
-              response.instance_exec(decoded) do |decoded|
-                @question.concat(decoded.question)
-              end
-              decoded.question.each do |q|
-                (zone_h.search(q[0]) || []).filter { |el| el[:rr].class == q[1]; el[:name] == q[0].to_s }&.each do |ans|
-                  response.add_answer(ans[:name], ans[:ttl], ans[:rr])
-                end
+            response = RRs::Message.new(decoded.id)
+            response.add_authority(*authority)
+            response.instance_exec(decoded) do |decoded|
+              @question.concat(decoded.question)
+            end
+            decoded.question.each do |q|
+              (zone_h.search(q[0]) || []).filter { |el|
+                el[:rr].class
+                q[1]
+                el[:name] == q[0].to_s
+              }&.each do |ans|
+                response.add_answer(ans[:name], ans[:ttl], ans[:rr])
               end
-
-              server_socket.send(response.encode, 0, addr_info.ip_address, addr_info.ip_port)
             end
+
+            Ractor.yield(response.encode)
           end
         end
+      end
 
-        listener = Ractor.new(pipe, server_socket, zones) do |pipe, server_socket, zones|
-          loop do
-            msg, client = server_socket.recvfrom(1024)
-            pipe.send([msg, client, zones.freeze])
+      @endpoint = Async::IO::Endpoint.udp('0.0.0.0', @port)
+      
+      @zones.start
+
+      @thread = Thread.new do
+        Async do
+          @endpoint.bind do |socket|
+            loop do
+              data, address = socket.recvfrom(1024)
+              @pipe.send([data, @zones.freeze])
+              _, encoded = Ractor.select(*@resolvers)
+              socket.send(encoded, 0, address)
+            end
           end
         end
+      end
 
-        loop do
-          Signal.trap('INT') { exit! }
-          ractor, _result = Ractor.select(listener, *workers, pipe)
-          ractor.take
-        end
+      at_exit do
+        stop
       end
     end
 
     def stop
-      @ractor.take
+      begin
+        @thread.kill
+        @pipe.send(:stop)
+        @zones.stop
+      rescue Ractor::ClosedError
+        nil
+      end
     end
   end
 end

data/lib/ractor_dns/transaction.rb

@@ -8,20 +8,18 @@ module RactorDNS
     end
 
     def apply(obj)
-      begin
-        @original_state = obj.dup
-        @new_obj = obj.deep_transform_values { |value| value = value.dup }
-        @block.call(@new_obj)
-        obj.replace(@new_obj)
-      rescue => e
-        puts e
-        rollback(obj)
-        raise e
-      end
+      @original_state = obj.dup
+      @new_obj = obj.deep_transform_values { |value| value.dup }
+      @block.call(@new_obj)
+      obj.replace(@new_obj)
+    rescue => e
+      puts e
+      rollback(obj)
+      raise e
     end
 
     def rollback(obj)
       obj.replace(@original_state) if @original_state
     end
   end
-end
+end

data/lib/ractor_dns/version.rb

@@ -0,0 +1,3 @@
+module RactorDNS
+  VERSION = "0.2.0"
+end

data/lib/ractor_dns/zone_collection.rb

@@ -1,11 +1,16 @@
 module RactorDNS
   class ZoneCollection
     def initialize(obj = {})
-      @queue = Ractor.new(Ractor.make_shareable(obj.freeze)) do |obj|
+      @obj = obj
+      start
+    end
+    
+    def start
+      @queue = Ractor.new(Ractor.make_shareable(@obj.freeze)) do |obj|
         zones = obj.dup
         loop do
           msg, data = Ractor.receive
-          
+
           if msg == :transact
             transaction = data.dup
             begin
@@ -22,16 +27,20 @@ module RactorDNS
             Ractor.yield ZoneCollection.search(zones, data)
           elsif msg == :all
             Ractor.yield zones
+          elsif msg == :stop
+            Ractor.current.close_incoming
+            Ractor.current.close_outgoing
+            break
           end
         end
       end
     end
-    
+
     def search(name)
       @queue.send([:search, name])
       @queue.take
     end
-    
+
     def self.search(obj, name)
       if name.nil?
         return nil
@@ -46,31 +55,35 @@ module RactorDNS
       @queue.send([:get, k])
       @queue.take
     end
-    
+
     def to_h
       @queue.send([:all, nil])
       @queue.take
     end
-    
+
     def transact(transaction)
       @queue.send([:transact, Ractor.make_shareable(transaction)])
       @queue.take
     end
-    
+
     def freeze
-      FrozenZoneCollection.new(self.to_h)
+      FrozenZoneCollection.new(to_h)
+    end
+    
+    def stop
+      @queue.send([:stop, nil])
     end
   end
-  
+
   class FrozenZoneCollection
     def initialize(obj)
       @obj = Ractor.make_shareable(obj.freeze)
     end
-    
+
     def [](k)
       @obj[k]
     end
-    
+
     def search(name)
       if name.nil?
         return nil
@@ -81,4 +94,4 @@ module RactorDNS
       @obj.dig(name.join(".")).presence || search(name.drop(1))
     end
   end
-end
+end

data/lib/ractor_dns.rb

@@ -1,19 +1,28 @@
 # frozen_string_literal: true
+
 require "zeitwerk"
 require_relative "ractor_dns/inflector"
-require 'socket'
+require "socket"
 require "active_support/all"
 require "resolv"
 require "json"
 require "rrs"
+require "async"
+require "async/io"
+require "async/io/udp_socket"
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector = RactorDNS::Inflector.new
+loader.ignore("#{__dir__}/ractor_dns/active_zone.rb")
+loader.ignore("#{__dir__}/ractor_dns/active_zone/**/*")
+loader.ignore("#{__dir__}/ractor_dns/railtie.rb")
+loader.ignore("#{__dir__}/ractor_dns/version.rb")
 loader.setup
 
 module RactorDNS
-  VERSION = "0.1.0"
   class Error < StandardError; end
 end
 
 loader.eager_load
+
+require "ractor_dns/active_zone" if defined?(ActiveZone)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ractor_dns
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - reesericci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.43'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.43'
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 description: A concurrent DNS server built on Ractors with a simple and expressive
   API to integrate into your projects.
 email:
@@ -51,9 +79,12 @@ files:
 - README.md
 - Rakefile
 - lib/ractor_dns.rb
+- lib/ractor_dns/active_zone.rb
+- lib/ractor_dns/active_zone/railtie.rb
 - lib/ractor_dns/inflector.rb
 - lib/ractor_dns/server.rb
 - lib/ractor_dns/transaction.rb
+- lib/ractor_dns/version.rb
 - lib/ractor_dns/zone_collection.rb
 homepage: https://codeberg.org/oblong/ractor_dns
 licenses: []