adelnor 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbe7f5e96936b78536738d717ea5babeb525aec4ecc202774e6564095d21663
-  data.tar.gz: 8da6cf7523a6d8f5d520fe6eb1c8e02320b53e79f631b0e36d0401a29f093f47
+  metadata.gz: 9b8a98417998eb15f466baf73a5943c808ad1efe160bc87b268464b1b9096bdc
+  data.tar.gz: 8edef2ff4470feefa0273c29b03c03da7245ee48de5df6fad9121798bf10d568
 SHA512:
-  metadata.gz: b46502cfb371089998df7cf3d98221224df23ebb77cfd6f368d9d3b21df8ef8244a8cde14207c8b511146011fcd6766498483288ade45f263fdb00b4c7ed3927
-  data.tar.gz: d7fdfbe381e3c56c4c6bfdc7109afdd10ee9bd05c7d95d5da012fe671f3b547763a3bb916e519c2228038a1a6be7c473236c5bb623662e0ff7b8f7672209349b
+  metadata.gz: 1b5dc9aa3a65158ee1b1d7cc988136b852b7125f646e5f90a1b6154a37c6d2d989f6b1523a391e7c97b76a8934b7dd9b84944e586d57a7236f465f05cd152184
+  data.tar.gz: dcd17f72dfe0279174f4d4e10c48c7cdac44e0ccfa073241715be14ed7fa075ef85cccb1fa7ec3df84fcf968a93714928887f8a4b8dfc69fdf87d07c056efbcc

data/Gemfile

@@ -2,5 +2,6 @@
 
 source 'https://rubygems.org'
 
+gem 'async'
 gem 'rack'
 gem 'rubocop', require: false

data/Gemfile.lock

@@ -2,6 +2,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    async (2.6.4)
+      console (~> 1.10)
+      fiber-annotation
+      io-event (~> 1.1)
+      timers (~> 4.1)
+    console (1.23.2)
+      fiber-annotation
+      fiber-local
+    fiber-annotation (0.2.0)
+    fiber-local (1.0.0)
+    io-event (1.3.2)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
@@ -21,12 +32,15 @@ GEM
     rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    timers (4.3.5)
     unicode-display_width (2.1.0)
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
+  async
   rack
   rubocop
 

data/README.md

@@ -57,7 +57,9 @@ $ make bundle.install
 $ make sample.server
 ```
 
-## Using Thread Pool
+## Handling concurrency
+
+Currently Adelnor allows to run the server using different concurrency strategies, one at a time.
 
 ```ruby
 require './lib/adelnor/server'
@@ -66,7 +68,14 @@ app = -> (env) do
   [200, { 'Content-Type' => 'text/html' }, 'Hello world!']
 end
 
+# Threaded mode
 Adelnor::Server.run app, 3000, thread_pool: 5
+
+# Clusterd mode (forking)
+Adelnor::Server.run app, 3000, workers: 2
+
+# Async mode
+Adelnor::Server.run app, 3000, async: true
 ```
 
 Open `http://localhost:3000`

data/adelnor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'adelnor'
-  spec.version     = '0.0.7'
+  spec.version     = '0.0.8'
   spec.summary     = 'Adelnor HTTP server'
   spec.description = 'A dead simple, yet Rack-compatible, HTTP server written in Ruby'
   spec.authors     = ['Leandro Proença']
@@ -11,7 +11,8 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/leandronsp/adelnor'
   spec.license     = 'MIT'
 
-  spec.add_runtime_dependency 'rack'
+  spec.add_runtime_dependency 'async', '~> 2.6'
+  spec.add_runtime_dependency 'rack', '~> 2.2'
 
   spec.required_ruby_version = '~> 3.0'
 end

data/lib/adelnor/async_server.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative './base_server'
+require 'async'
+require 'async/scheduler'
+
+module Adelnor
+  class AsyncServer < BaseServer
+    def initialize(rack_app, port, options = {})
+      super(rack_app, port, options)
+
+      scheduler = Async::Scheduler.new
+      Fiber.set_scheduler(scheduler)
+    end
+
+    def run
+      Async do |task|
+        loop do
+          client, = @socket.accept
+
+          task.async do
+            handle(client)
+            client.close
+          end
+        end
+      end
+    end
+  end
+end

data/lib/adelnor/base_server.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'socket'
+require 'rack'
+require 'stringio'
+
+require_relative './request'
+require_relative './response'
+
+module Adelnor
+  class BaseServer
+    def initialize(rack_app, port, options = {})
+      @rack_app = rack_app
+      @port     = port
+      @options  = options
+      @socket   = Socket.new(:INET, :STREAM)
+      addr      = Socket.sockaddr_in(@port, '0.0.0.0')
+
+      @socket.bind(addr)
+      @socket.listen(2)
+
+      puts welcome_message
+    end
+
+    def self.run(*args)
+      new(*args).run
+    end
+
+    def rack_data(request)
+      {
+        'REQUEST_METHOD' => request.request_method,
+        'PATH_INFO' => request.path_info,
+        'QUERY_STRING' => request.query_string,
+        'SERVER_PORT' => @port,
+        'SERVER_NAME' => request.headers['Host'],
+        'CONTENT_LENGTH' => request.content_length,
+        'HTTP_COOKIE' => request.headers['Cookie'],
+        'rack.input' => StringIO.new(request.body)
+      }.merge(request.headers)
+    end
+
+    def run
+      loop do
+        client, = @socket.accept
+
+        handle(client)
+        client.close
+      end
+    end
+
+    def handle(client)
+      read_request_message(client)
+        .then { |message|  Request.build(message) }
+        .tap  { |request|  request.parse_body!(client) }
+        .then { |request|  rack_data(request) }
+        .then { |data|     @rack_app.call(data) }
+        .then { |result|   Response.build(*result) }
+        .then { |response| client.puts(response) }
+    end
+
+    def read_request_message(client)
+      message = ''
+
+      if (line = client.gets)
+        message += line
+      end
+
+      puts "\n[#{Time.now}] #{message}"
+
+      while (line = client.gets)
+        break if line == "\r\n"
+
+        message += line
+      end
+
+      message
+    end
+
+    def welcome_message
+      thread_pool_message = "Running with thread pool of #{@options[:thread_pool]} threads" if @options[:thread_pool]
+
+      <<~WELCOME
+        |\---/|
+        | o_o |
+         \_^_/
+
+        adelnor HTTP server
+
+        ------------------------------------------------
+
+        Adelnor is running at http://0.0.0.0:#{@port}
+        Listening to HTTP connections
+
+        #{thread_pool_message}
+      WELCOME
+    end
+  end
+end

data/lib/adelnor/clustered_server.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative './base_server'
+
+module Adelnor
+  class ClusteredServer < BaseServer
+    def initialize(rack_app, port, options = {})
+      super(rack_app, port, options)
+
+      @workers = options[:workers]
+    end
+
+    def run
+      @workers.times do
+        fork { handle_worker }
+      end
+
+      Process.waitall
+    end
+
+    def handle_worker
+      pid = Process.pid
+      puts "[#{pid}] Worker started"
+
+      loop do
+        client, = @socket.accept
+
+        handle(client)
+        client.close
+      end
+    end
+  end
+end

data/lib/adelnor/ractor_server.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+# rubocop:disable all
+
+require_relative './base_server'
+
+module Adelnor
+  class RactorServer < BaseServer
+    def initialize(rack_app, port, options = {})
+      @ractors = options[:ractors]
+
+      @rack_app = rack_app
+      @port     = port
+      @options  = options
+
+      @queue = Ractor.new do
+        loop do
+          Ractor.yield(Ractor.receive, move: true)
+        end
+      end
+
+      @listener = Ractor.new(@queue, @port) do |queue, port|
+        socket = Socket.new(:INET, :STREAM)
+        addr = Socket.sockaddr_in(port, '0.0.0.0')
+
+        socket.bind(addr)
+        socket.listen(2)
+
+        loop do
+          client, = socket.accept
+
+          queue.send(client, move: true)
+        end
+      end
+
+      puts welcome_message
+    end
+
+    def run
+      ractors = @ractors.times.map do
+        Ractor.new(@queue, @rack_app, @port) do |queue, rack_app, port|
+          rid = Ractor.current.object_id
+          puts "[#{rid}] Ractor started"
+
+          loop do
+            client = queue.take
+            message = ''
+
+            if (line = client.gets)
+              message += line
+            end
+
+            puts "\n[#{Time.now}] #{message}"
+
+            while (line = client.gets)
+              break if line == "\r\n"
+
+              message += line
+            end
+
+            rack_data = lambda do |request|
+              {
+                'REQUEST_METHOD' => request.request_method,
+                'PATH_INFO' => request.path_info,
+                'QUERY_STRING' => request.query_string,
+                'SERVER_PORT' => port,
+                'SERVER_NAME' => request.headers['Host'],
+                'CONTENT_LENGTH' => request.content_length,
+                'HTTP_COOKIE' => request.headers['Cookie'],
+                'rack.input' => StringIO.new(request.body)
+              }
+            end
+
+            Request.build(message)
+                   .tap  { |request|  request.parse_body!(client) }
+                   .then { |request|  rack_data.call(request).merge(request.headers) }
+                   .then { |data|     rack_app.call(data) }
+                   .then { |result|   Response.build(*result) }
+                   .then { |response| client.puts(response) }
+
+            client.close
+          end
+        end
+      end
+
+      loop do
+        Ractor.select(@listener, *ractors)
+      end
+    end
+  end
+end
+# rubocop:enable all

data/lib/adelnor/server.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require 'socket'
-require 'rack'
-require 'stringio'
-
-require_relative './request'
-require_relative './response'
+require_relative './base_server'
+require_relative './threaded_server'
+require_relative './clustered_server'
+require_relative './ractor_server'
+require_relative './async_server'
 
 module Adelnor
   class Server
@@ -13,117 +12,26 @@ module Adelnor
       @rack_app = rack_app
       @port     = port
       @options  = options
-      @socket   = Socket.new(:INET, :STREAM)
-      addr      = Socket.sockaddr_in(@port, '0.0.0.0')
-
-      @socket.bind(addr)
-      @socket.listen(2)
-
-      @thread_queue = Queue.new if @options[:thread_pool]
-      puts welcome_message
     end
 
     def self.run(*args)
       new(*args).run
     end
 
-    def rack_data(request)
-      {
-        'REQUEST_METHOD' => request.request_method,
-        'PATH_INFO' => request.path_info,
-        'QUERY_STRING' => request.query_string,
-        'SERVER_PORT' => @port,
-        'SERVER_NAME' => request.headers['Host'],
-        'CONTENT_LENGTH' => request.content_length,
-        'HTTP_COOKIE' => request.headers['Cookie'],
-        'rack.input' => StringIO.new(request.body)
-      }.merge(request.headers)
-    end
-
     def run
-      if (pool_size = @options[:thread_pool])
-        return run_with_thread_pool(pool_size)
-      end
-
-      loop do
-        client, = @socket.accept
-
-        handle(client)
-        client.close
-      end
-    end
-
-    def run_with_thread_pool(pool_size)
-      pool_size.times do
-        handle_request_in_thread
-      end
-
-      loop do
-        client, = @socket.accept
-
-        @thread_queue.push(client)
-      end
-    end
-
-    def handle_request_in_thread
-      Thread.new do
-        tid = Thread.current.object_id
-
-        puts "[#{tid}] Thread started"
-        loop do
-          client = @thread_queue.pop
-
-          handle(client)
-          client.close
-        end
-      end
-    end
-
-    def handle(client)
-      read_request_message(client)
-        .then { |message|  Request.build(message) }
-        .tap  { |request|  request.parse_body!(client) }
-        .then { |request|  rack_data(request) }
-        .then { |data|     @rack_app.call(data) }
-        .then { |result|   Response.build(*result) }
-        .then { |response| client.puts(response) }
-    end
-
-    def read_request_message(client)
-      message = ''
-
-      if (line = client.gets)
-        message += line
-      end
-
-      puts "\n[#{Time.now}] #{message}"
-
-      while (line = client.gets)
-        break if line == "\r\n"
-
-        message += line
-      end
-
-      message
-    end
-
-    def welcome_message
-      thread_pool_message = "Running with thread pool of #{@options[:thread_pool]} threads" if @options[:thread_pool]
-
-      <<~WELCOME
-        |\---/|
-        | o_o |
-         \_^_/
-
-        adelnor HTTP server
-
-        ------------------------------------------------
-
-        Adelnor is running at http://0.0.0.0:#{@port}
-        Listening to HTTP connections
-
-        #{thread_pool_message}
-      WELCOME
+      handler_klass = if @options[:thread_pool]
+                        ThreadedServer
+                      elsif @options[:workers]
+                        ClusteredServer
+                      # elsif @options[:ractors]
+                      #  RactorServer
+                      elsif @options[:async]
+                        AsyncServer
+                      else
+                        BaseServer
+                      end
+
+      handler_klass.run(@rack_app, @port, @options)
     end
   end
 end

data/lib/adelnor/threaded_server.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative './base_server'
+
+module Adelnor
+  class ThreadedServer < BaseServer
+    def initialize(rack_app, port, options = {})
+      super(rack_app, port, options)
+
+      @thread_queue = Queue.new
+      @pool_size = options[:thread_pool]
+    end
+
+    def run
+      @pool_size.times do
+        Thread.new { handle_thread }
+      end
+
+      loop do
+        client, = @socket.accept
+
+        @thread_queue.push(client)
+      end
+    end
+
+    def handle_thread
+      tid = Thread.current.object_id
+
+      puts "[#{tid}] Thread started"
+      loop do
+        client = @thread_queue.pop
+
+        handle(client)
+        client.close
+      end
+    end
+  end
+end

data/lib/adelnor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Adelnor
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: adelnor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Leandro Proença
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 description: A dead simple, yet Rack-compatible, HTTP server written in Ruby
 email: leandronsp@gmail.com
 executables: []
@@ -35,9 +49,14 @@ files:
 - README.md
 - adelnor.gemspec
 - lib/adelnor.rb
+- lib/adelnor/async_server.rb
+- lib/adelnor/base_server.rb
+- lib/adelnor/clustered_server.rb
+- lib/adelnor/ractor_server.rb
 - lib/adelnor/request.rb
 - lib/adelnor/response.rb
 - lib/adelnor/server.rb
+- lib/adelnor/threaded_server.rb
 - lib/adelnor/version.rb
 homepage: https://github.com/leandronsp/adelnor
 licenses: