low_loop 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abe38442f905fd127290f9a3720dea3fedd6c472499c8b3117d872d39ccbdb63
-  data.tar.gz: b7cc6eaf3b18760c48ccf745d83cb65845af373a8bb7645a703bf02f4944655f
+  metadata.gz: 17df935b57f5de96e6888dd4342ade7c60ec4639f441d0ab7f517c858b269a80
+  data.tar.gz: e1934e74675858f24231771c81cf05751c06582b251b80075d4177e8d47154b2
 SHA512:
-  metadata.gz: 0add75ff01e10dce385277d7e74fbccf6ace5b0f215273e7cac0944ed9201a14fcda73865b56f821b30a361d668bf2092ac5ab261291a367d16f9c7c3dca8e36
-  data.tar.gz: bd98bcc28d8b08c1501fa1bc44fb1a0834506f49b4c3726bde43b82852622f5108850f7ca3bd68a0937b865e1f58fbf92d40fb23103ac8d75d025587d7d061b4
+  metadata.gz: 48d2c4a1c581f14f0eb5e9255de93354f76e1638e52a1d2157cfd958f752eec9207ce71e91e9eddbf2032990f052deae91b422793cb27ce48f362929a565a145
+  data.tar.gz: 6f45681e3d0d17d800ab9c21ad543005016c9b6c779e48f45afe3c6380f98056f151e41a19ee19f71e128d47baea9fb1990f1e48dfeed1008a95e29bb7ad96f4

data/lib/connections/connection_manager.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'io/wait'
+
+require_relative 'request_parser'
+require_relative '../responses/response_builder'
+
+module Low
+  class ConnectionManager
+    DEFAULT_KEEP_ALIVE_TIMEOUT = 30
+    DEFAULT_REQUEST_TIMEOUT = 10
+
+    def initialize(config:)
+      @config = config
+    end
+
+    def handle_connection(socket:)
+      stream = RequestParser.create_stream(socket:)
+      keep_alive = true
+      version = nil
+
+      while keep_alive
+        break unless socket.wait_readable(keep_alive_timeout)
+
+        socket.timeout = request_timeout
+        begin
+          request = RequestParser.parse(stream:, host: config.host, port: config.port, version:)
+        rescue IO::TimeoutError
+          break
+        ensure
+          socket.timeout = nil
+        end
+        break if request.nil?
+
+        version ||= request.version
+        keep_alive = keep_alive?(request)
+
+        response_event = Events::RequestEvent.take(request:)
+        response = response_event.response
+
+        ResponseBuilder.respond(config:, socket:, response:, keep_alive:)
+      end
+    end
+
+    def keep_alive?(request)
+      tokens = (request.headers['connection'] || []).flat_map do |value|
+        value.split(',').map { |token| token.strip.downcase }
+      end
+
+      if request.version.to_s.downcase.include?('1.0')
+        tokens.include?('keep-alive')
+      else
+        !tokens.include?('close')
+      end
+    end
+
+    def keep_alive_timeout
+      config.keep_alive_timeout || DEFAULT_KEEP_ALIVE_TIMEOUT
+    end
+
+    def request_timeout
+      config.request_timeout || DEFAULT_REQUEST_TIMEOUT
+    end
+
+    private
+
+    attr_reader :config
+  end
+end

data/lib/events/file_event.rb

@@ -9,7 +9,7 @@ module Low
 
       # TODO: For RouteEvent/FileEvent parse and provide query params as attributes on the event.
       def initialize(file:, request: nil)
-        super(key: self.class)
+        super(key: self.class, action: :request)
 
         @file = file
         @request = request

data/lib/low_loop.rb

@@ -1,29 +1,25 @@
 # frozen_string_literal: true
 
 require 'async'
-require 'io/wait'
 require 'paint'
 require 'socket'
 require 'low_type'
 require 'low_event'
 require 'observers'
 
-require_relative 'factories/response_factory'
-require_relative 'requests/request_parser'
-require_relative 'responses/response_builder'
+require_relative 'responses/response_factory'
+require_relative 'connections/connection_manager'
 require_relative 'servers/file_server'
 require_relative 'support/low_frame'
 
 class LowLoop
   include Observers
 
-  DEFAULT_KEEP_ALIVE_TIMEOUT = 30
-  DEFAULT_REQUEST_TIMEOUT = 10
-
   attr_reader :config
 
   def initialize(config:, router: nil, renderer: nil, show_output: true)
     @config = config
+    @connection_manager = Low::ConnectionManager.new(config:)
     @frame = LowFrame.new(renderer:, fps: 10, show_output:)
 
     Low::Events::RequestEvent.define do |observers|
@@ -37,20 +33,13 @@ class LowLoop
     server = start_server
 
     Async do |task|
-      # Background task.
-      task.async do
-        loop do
-          @frame.render if @frame.renderer
-          sleep 0.1 # 10fps
-        end
-      end
+      render_frame(task)
 
-      # Request handler.
       loop do
         socket = server.accept
 
         task.async do
-          handle_connection(socket)
+          @connection_manager.handle_connection(socket:)
         rescue StandardError => e
           render_error(e)
         ensure
@@ -60,6 +49,20 @@ class LowLoop
     end
   end
 
+  # Fallback mode for when there's no dependencies and you want to know that the server is still working.
+  def mirror(event:)
+    request = event.request
+    response = tories::ResponseFactory.html(body: "Thank you for visiting #{request.path} with body: '#{request.body}'")
+    Low::Events::ResponseEvent.new(response:)
+  end
+
+  # Consider LowLoop a value object in the context of Observers (there can only be one).
+  def ==(other) = other.class == self.class
+  def eql?(other) = self == other
+  def hash = [self.class].hash
+
+  private
+
   def start_server
     puts "Starting server @ #{config.host}:#{config.port}" unless config.matrix_mode
 
@@ -68,28 +71,17 @@ class LowLoop
     server
   end
 
-  def render
-    Async do
+  def render_frame(task)
+    return unless @frame.renderer
+
+    task.async do
       loop do
         @frame.render
+        sleep 0.1 # 10fps
       end
     end
   end
 
-  # Fallback mode for when there's no dependencies and you want to know that the server is still working.
-  def mirror(event:)
-    request = event.request
-    response = Low::Factories::ResponseFactory.html(body: "Thank you for visiting #{request.path} with body: '#{request.body}'")
-    Low::Events::ResponseEvent.new(response:)
-  end
-
-  # Consider LowLoop a value object in the context of Observers (there can only be one).
-  def ==(other) = other.class == self.class
-  def eql?(other) = self == other
-  def hash = [self.class].hash
-
-  private
-
   def render_error(error)
     puts "\nException:"
     puts Paint[error.message, :red]
@@ -104,53 +96,4 @@ class LowLoop
       gets
     end
   end
-
-  def handle_connection(socket)
-    stream = Low::RequestParser.create_stream(socket:)
-    keep_alive = true
-    version = nil
-
-    while keep_alive
-      break unless socket.wait_readable(keep_alive_timeout)
-
-      socket.timeout = request_timeout
-      begin
-        request = Low::RequestParser.parse(stream:, host: config.host, port: config.port, version:)
-      rescue IO::TimeoutError
-        break
-      ensure
-        socket.timeout = nil
-      end
-      break if request.nil?
-
-      version ||= request.version
-      keep_alive = keep_alive?(request)
-
-      # TODO: Handle nil return value; create 500 status code response.
-      response_event = Low::Events::RequestEvent.take(request:)
-      response = response_event.response
-
-      Low::ResponseBuilder.respond(config:, socket:, response:, keep_alive:)
-    end
-  end
-
-  def keep_alive?(request)
-    tokens = (request.headers['connection'] || []).flat_map do |value|
-      value.split(',').map { |token| token.strip.downcase }
-    end
-
-    if request.version.to_s.downcase.include?('1.0')
-      tokens.include?('keep-alive')
-    else
-      !tokens.include?('close')
-    end
-  end
-
-  def keep_alive_timeout
-    config.keep_alive_timeout || DEFAULT_KEEP_ALIVE_TIMEOUT
-  end
-
-  def request_timeout
-    config.request_timeout || DEFAULT_REQUEST_TIMEOUT
-  end
 end

data/lib/responses/file_response.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative '../factories/response_factory'
+require_relative '../responses/response_factory'
 
 module Low
   class FileResponse
     class << self
-      def handle(event:)
+      def request(event:)
         file = event.file
 
         if File.exist?(file.path)
-          response = Factories::ResponseFactory.file(path: file.path, content_type: file.content_type)
+          response = ResponseFactory.file(path: file.path, content_type: file.content_type)
           return Events::ResponseEvent.new(response:).tap(&:branch)
         end
 

data/lib/responses/response_factory.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'protocol/http'
+require 'protocol/http/body/file'
+
+module Low
+  class ResponseFactory
+    class << self
+      def html(body:)
+        headers = Protocol::HTTP::Headers.new([['content-type', 'text/html']])
+        body = Protocol::HTTP::Body::Buffered.wrap(body.strip)
+
+        Protocol::HTTP::Response.new('HTTP/1.1', 200, headers, body)
+      end
+
+      def file(path:, content_type:)
+        headers = Protocol::HTTP::Headers.new([['content-type', content_type]])
+        file = File.open(path, 'rb')
+        body = Protocol::HTTP::Body::File.new(file)
+
+        Protocol::HTTP::Response.new('HTTP/1.1', 200, headers, body)
+      end
+
+      def status(code:)
+        headers = Protocol::HTTP::Headers.new([['content-type', 'text/html']])
+
+        Protocol::HTTP::Response.new('HTTP/1.1', code, headers, nil)
+      end
+    end
+  end
+end

data/lib/servers/file_server.rb

@@ -18,8 +18,8 @@ module Low
       observers(Events::FileEvent) << FileResponse
     end
 
-    def extension(filepath:)
-      extension = File.extname(filepath).delete_prefix('.')
+    def extension(file_path:)
+      extension = File.extname(file_path).delete_prefix('.')
 
       return nil if extension == ''
       return nil unless @content_types.key?(extension)
@@ -27,23 +27,19 @@ module Low
       extension
     end
 
-    # TODO: Define type: Events::RequestEvent
-    def handle(event:)
-      filepath = Protocol::URL::Path.to_local_path(Protocol::URL[event.request.path].path)
+    def request(event: Events::RequestEvent)
+      file_path = event.request.path
 
-      extension = extension(filepath:)
-      return nil if extension.nil?
-
-      file = States::FileState.new(path: safe_path(filepath), content_type: @content_types[extension])
+      return nil unless file_path.include?('.')
 
-      Events::FileEvent.trigger(file:, request: event.request)
-    end
+      url = Protocol::URL[file_path]
+      extension = extension(file_path: url.path.to_s)
+      return nil if extension.nil?
 
-    private
+      file_path = url.local_path(@web_root)
+      file = States::FileState.new(path: file_path, content_type: @content_types[extension])
 
-    def safe_path(path)
-      safe_path = path.split('/').reject { |segment| ['.', '..'].include?(segment) }.join('/')
-      File.join(@web_root, safe_path)
+      Events::FileEvent.take(file:, request: event.request)
     end
   end
 end

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Low
   module Loop
-    VERSION = '0.7.1'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low_loop
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - maedi
@@ -129,12 +129,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/connections/connection_manager.rb
+- lib/connections/request_parser.rb
 - lib/events/file_event.rb
-- lib/factories/response_factory.rb
 - lib/low_loop.rb
-- lib/requests/request_parser.rb
 - lib/responses/file_response.rb
 - lib/responses/response_builder.rb
+- lib/responses/response_factory.rb
 - lib/servers/file_server.rb
 - lib/states/file_state.rb
 - lib/support/config_loader.rb

data/lib/factories/response_factory.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'protocol/http'
-require 'protocol/http/body/file'
-
-module Low
-  module Factories
-    class ResponseFactory
-      class << self
-        def html(body:)
-          headers = Protocol::HTTP::Headers.new([['content-type', 'text/html']])
-          body = Protocol::HTTP::Body::Buffered.wrap(body.strip)
-
-          Protocol::HTTP::Response.new('HTTP/1.1', 200, headers, body)
-        end
-
-        def file(path:, content_type:)
-          headers = Protocol::HTTP::Headers.new([['content-type', content_type]])
-          file = File.open(path, 'rb')
-          body = Protocol::HTTP::Body::File.new(file)
-
-          Protocol::HTTP::Response.new('HTTP/1.1', 200, headers, body)
-        end
-      end
-    end
-  end
-end