ractor_dns 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f04318c7ff68a828b56c907c840838eaf2db6bc713af5954d200a490a1fba78
-  data.tar.gz: 3d63843ff098ab3de850f6a382b8b751045587c1e73001e939ccdb8abac09fdf
+  metadata.gz: f0b9397d08074bb1438ea182c5ff2087b56718ebd9cbe18b65005c524a392e06
+  data.tar.gz: 4da6a40911f678aefd63ba7619fac3039a69ec320433a3a7c3ead4876974fe68
 SHA512:
-  metadata.gz: 5890c21087d4bfb40e99f6aad33b8e86bb3074ca2db3fd9eec968e7e6930b1dd60d96bad037a9c96a95a1faeb42e8e76b95f7231613bb3783254485c5d2241fc
-  data.tar.gz: 9c0536c6a6910ac3ad69b56bda6740cbf372e186abf86b8164d832aa9314443f1afc0f9c18f196ae9712bd05a42983e58c962534fdd31aa85592fc13e8e7849d
+  metadata.gz: 071aaf6b4cf3fee5a7c1270cce98e96f4bbaa781cd8da1c1d4cb9ddc6e006116938e9637ecc452b6f5e95ff19f4b25b9cda805ad482091234cc6cef28373bf5b
+  data.tar.gz: a35e0277b777380d862f45d3d9b9e21745d751c4b7af1828b3cbcb079708e423e1efcd5d45eed2c00af2b9ca4919ab2d415d9982fd652e7559d476f31ee4baf8

data/lib/ractor_dns/active_zone/railtie.rb

@@ -1,7 +1,5 @@
 class RactorDNS::ActiveZone::Railtie < Rails::Railtie
-  server do
-    if ActiveZone.provider.is_a? RactorDNS::ActiveZone
-      ActiveZone.provider.start(here: true)
-    end
+  config.to_prepare do
+    ActiveZone.provider.start if ActiveZone.provider.is_a? RactorDNS::ActiveZone
   end
 end

data/lib/ractor_dns/active_zone/zone.rb

@@ -0,0 +1,25 @@
+class RactorDNS::ActiveZone::Zone < ActiveZone::Provider::Zone  
+  def persist!
+    t = RactorDNS::Transaction.new do |zc|
+      zc[name] = resources.map(&:to_h)
+    end
+    
+    provider.zones.transact t
+
+    @persisted = true
+    changes_applied
+  end
+  
+  def delete!
+    t = RactorDNS::Transaction.new do |zc|
+      zc.delete(name)
+    end
+    provider.zones.transact t
+    @persisted = false
+    freeze
+  end
+  
+  def provider
+    @@provider
+  end
+end

data/lib/ractor_dns/active_zone/zone_collection.rb

@@ -0,0 +1,38 @@
+class RactorDNS::ActiveZone::ZoneCollection < ActiveZone::Provider::ZoneCollection
+  def find(name)
+    RactorDNS::ActiveZone::Zone.new(resources: provider.zones[name], name: name, persisted: true) if provider.zones[name]
+  end
+  
+  def each(&block)
+    if block_given?
+      provider.zones.to_h.keys.filter { |el| @set ? @set.include?(el.name) : true }.each do |zk|
+        block.call(RactorDNS::ActiveZone::Zone.new(resources: provider.zones[zk], name: zk, persisted: true))
+      end
+    else
+      to_enum(:each)
+    end
+  end
+  
+  def destroy_all
+    each do |z|
+      z.destroy
+    end
+  end
+  
+  def find_by(attributes = {})
+    each do |z|
+      broken = false
+      attributes.each do |k, v|
+        if v != z[k]
+          broken = true
+          break
+        end
+      end
+      return z if !broken
+    end
+  end
+  
+  def [](n)
+    RactorDNS::ActiveZone::Zone.new(resources: provider.zones.to_h.values[n], persisted: true, name: provider.zones.to_h.keys[n])
+  end
+end

data/lib/ractor_dns/active_zone.rb

@@ -1,4 +1,4 @@
-class RactorDNS::ActiveZone
+class RactorDNS::ActiveZone < ActiveZone::Provider
   attr_accessor :server
   def initialize(name: "ns.ractordns.local", ttl: 300, ip: "0.0.0.0", server: nil, port: 8053, cpu_count: 8, zones:)
    @server = server.presence || RactorDNS::Server.new(
@@ -12,4 +12,7 @@ class RactorDNS::ActiveZone
   delegate_missing_to :server
 end
 
-require "ractor_dns/active_zone/railtie" if defined?(Rails::Railtie)
+require "ractor_dns/active_zone/railtie" if defined?(Rails::Railtie)
+
+require_relative "active_zone/zone" if defined?(ActiveZone::Provider)
+require_relative "active_zone/zone_collection" if defined?(ActiveZone::Provider)

data/lib/ractor_dns/server.rb

@@ -1,15 +1,18 @@
 module RactorDNS
   class Server
-    attr_reader :authority, :ractor, :zones, :cpu_count, :port
+    attr_reader :authority, :ractor, :zones, :cpu_count, :port, :started
 
     def initialize(authority:, cpu_count:, zones:, port: 8053)
       @authority = authority
       @cpu_count = cpu_count
       @zones = ZoneCollection.new(zones)
       @port = port
+      @started = false
+      @threads = []
     end
 
     def start(here = false)
+      return if @started
       @pipe = Ractor.new do
         loop do
           recv = Ractor.recv
@@ -23,10 +26,10 @@ module RactorDNS
         end
       end
 
-      @resolvers = @cpu_count.times.map do
+      @resolvers = (@cpu_count ^ 2).times.map do
         Ractor.new(@pipe, @authority) do |pipe, authority|
           loop do
-            data, zone_h = pipe.take
+            data, zone_h = Ractor.recv
 
             break if data == :stop && zone_h.nil?
 
@@ -49,42 +52,49 @@ module RactorDNS
           end
         end
       end
-
-      @endpoint = Async::IO::Endpoint.udp('0.0.0.0', @port)
       
       @zones.start
-
+      
       if here
+        
         start_main_loop
       else
-        @thread = Thread.new do
-          start_main_loop
+        @threads = @cpu_count.times.map do |i|
+          Thread.new do
+            start_main_loop
+          end
         end
       end
 
       at_exit do
         stop
       end
+      
+      @started = true
     end
 
     def stop
       begin
-        @thread.kill
-        @pipe.send(:stop)
-        @zones.stop
+        @threads.each do |t|
+          t.kill
+        end
+        @pipe&.send(:stop)
+        @zones&.stop
       rescue Ractor::ClosedError
         nil
       end
     end
     
-    def start_main_loop
+    def start_main_loop(i = rand(0...@resolvers.length))
       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)
+        @cpu_count.times do
+          Async::IO::Endpoint.udp('0.0.0.0', @port).bind do |socket|
+            loop do
+              data, address = socket.recvfrom(1024)
+              @resolvers[i].send([data, @zones.freeze])
+              encoded = @resolvers[i].take
+              socket.send(encoded, 0, address)
+            end
           end
         end
       end

data/lib/ractor_dns/transaction.rb

@@ -15,10 +15,10 @@ module RactorDNS
     rescue => e
       puts e
       rollback(obj)
-      raise e
     end
 
     def rollback(obj)
+      puts "rolling back!"
       obj.replace(@original_state) if @original_state
     end
   end

data/lib/ractor_dns/version.rb

@@ -1,3 +1,3 @@
 module RactorDNS
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/ractor_dns/zone_collection.rb

@@ -2,7 +2,6 @@ module RactorDNS
   class ZoneCollection
     def initialize(obj = {})
       @obj = obj
-      start
     end
     
     def start
@@ -62,6 +61,9 @@ module RactorDNS
     end
 
     def transact(transaction)
+      if !transaction.is_a? RactorDNS::Transaction
+        raise "#{transaction.to_s} is not a transaction"
+      end
       @queue.send([:transact, Ractor.make_shareable(transaction)])
       @queue.take
     end
@@ -73,6 +75,16 @@ module RactorDNS
     def stop
       @queue.send([:stop, nil])
     end
+    
+    def inspect
+      begin
+        to_h.inspect
+      rescue
+        "Unable to inspect, try starting the server"
+      end
+    end
+    
+    alias_method :to_s, :inspect
   end
 
   class FrozenZoneCollection
@@ -88,10 +100,16 @@ module RactorDNS
       if name.nil?
         return nil
       end
+      
       if name.is_a? RRs::Name
         name = name.to_a
       end
-      @obj.dig(name.join(".")).presence || search(name.drop(1))
+      
+      if name.length > 1
+        @obj.dig(name.join(".")).presence || search(name.drop(1))
+      else
+        @obj.dig(name)
+      end
     end
   end
 end

data/lib/ractor_dns.rb

@@ -13,8 +13,9 @@ 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/active_zone.rb") if !defined?(ActiveZone)
+loader.ignore("#{__dir__}/ractor_dns/active_zone/**/*") if !defined?(ActiveZone)
+loader.ignore("#{__dir__}/ractor_dns/active_zone/railtie.rb") if !defined?(Rails::Railtie)
 loader.ignore("#{__dir__}/ractor_dns/railtie.rb")
 loader.ignore("#{__dir__}/ractor_dns/version.rb")
 loader.setup
@@ -23,6 +24,3 @@ module RactorDNS
   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.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - reesericci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,6 +81,8 @@ files:
 - lib/ractor_dns.rb
 - lib/ractor_dns/active_zone.rb
 - lib/ractor_dns/active_zone/railtie.rb
+- lib/ractor_dns/active_zone/zone.rb
+- lib/ractor_dns/active_zone/zone_collection.rb
 - lib/ractor_dns/inflector.rb
 - lib/ractor_dns/server.rb
 - lib/ractor_dns/transaction.rb