spyder 0.2.0 → 0.3.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ee9dba2fca697adc1456d6473a6a1f7e011108ce4d8baf0f7659c9886b85c0
-  data.tar.gz: 719a5fe8d53574d442ddec5cbb666db6018526901be76ebf7ac665451da3c512
+  metadata.gz: 2e1ade7f9c9ee1b99448fc6a0fb8addcbbca80a2696581b1bb4fa05c27ea534a
+  data.tar.gz: 075d91b41bdd5a7264bfadd3e014ef67b7c311545417b1503c9a245935f12860
 SHA512:
-  metadata.gz: 90c3f303a6d4c12abf9250ad13caba9cdf06632cfc4a68a317c7a8ccac47b2aa4c568c315581a03a353d9d0b15317a4dbe1e245ad9a1e70335a2406cb9f30ba3
-  data.tar.gz: 471ab8a863891a2b27f236bb0cea65028e37e62ac12a387daa81a302d58adf5cf7f81c236b8d4953e9e15815a3b56c86a15bf497f7c207a1ac4c8fecfe2a1447
+  metadata.gz: f0cc009cdbf9d1ab3bf184be0214c6d1e0366b6d0823dc6df8c2b548db4e2b631d972f8e7a2dd2ec9fabfdcb2b6135e4ba1c79d3276d6bc5864005df73f32750
+  data.tar.gz: ba21a6413f6cf9ffe290806cd7ee7b96c877b592243d3549caaa374dd455a40037e2f240f41743c83fcc753f0cf97ad682892f2c0cfe4f96d3f99ad50f77bf5c

data/lib/spyder/basic_server.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Spyder
+  class BasicServer
+    attr_accessor :router
+
+    def initialize(router)
+      @router = router
+      @middleware = []
+    end
+
+    def process_request(request)
+      mids = @middleware + [[RouterApp, @router]]
+      app = nil
+
+      loop do
+        klass, args = mids.pop
+        break unless klass
+        app = klass.new(args, app)
+      end
+
+      app.call({}, request)
+    end
+
+    def add_middleware(callable, args=[])
+      @middleware << [callable, args]
+    end
+  end
+end

data/lib/spyder/rack_adapter.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require 'spyder'
+
+module Spyder
+  class RackServer < BasicServer
+    attr_accessor :router
+
+    def initialize(router: Router.new)
+      super(router)
+    end
+
+    def call(env)
+      qs = env[Rack::QUERY_STRING]
+
+      request = Request.new
+      request.path = (!qs || qs.empty? ? env[Rack::PATH_INFO] : "#{env[Rack::PATH_INFO]}?#{qs}")
+      request.verb = env[Rack::REQUEST_METHOD]
+      request.http_version = env['HTTP_VERSION']
+      request.io = env['rack.input']
+
+      env.each do |key, value|
+        next unless key.start_with?('HTTP_') && key != 'HTTP_VERSION'
+
+        header_name = key[5..].downcase.tr('_', '-')
+        request.add_header(header_name, value)
+      end
+
+      response = process_request(request)
+
+      [
+        response.code,
+        # response.headers.ordered.map { |k, v| ["HTTP_#{k.tr('-', '_').upcase}", v] },
+        response.headers.ordered,
+        [response.body]
+      ]
+    end
+  end
+end

data/lib/spyder/request.rb

@@ -7,7 +7,7 @@ module Spyder
     attr_accessor :verb
     attr_accessor :path
     attr_accessor :headers
-    attr_accessor :protocol, :remote_address
+    attr_accessor :http_version, :remote_address
     attr_accessor :io
 
     def_delegators :@headers, :ordered, :dict, :add_header
@@ -73,6 +73,16 @@ module Spyder
       len ? io.read(Integer(len)) : io.read # FIXME:
     end
 
+    def debug_dump(include_body: false)
+      lines = ["verb=#{@verb}\npath=#{@path}\nhttp_version=#{@http_version}"]
+      lines << "has #{@headers.dict.length} headers"
+      @headers.dict.each do |name, value|
+        lines << "\t#{name} = #{value}"
+      end
+      lines << "has body: #{has_body? ? 'yes' : 'no'}"
+      lines.join("\n")
+    end
+
     def has_body?
       dict['transfer-encoding'] != nil || dict['content-length'] != nil
     end

data/lib/spyder/router.rb

@@ -9,6 +9,14 @@ module Spyder
       @fallback_stack = []
     end
 
+    def add_route_method(verb, matcher, obj, method_name)
+      h = proc do |req, rq|
+        obj.public_send(method_name, req, rq)
+      end
+      
+      add_route(verb, matcher, &h)
+    end
+
     def add_route(verb, matcher, &handler)
       matcher = Mustermann.new(matcher) if matcher.is_a?(String)
 

data/lib/spyder/server.rb

@@ -1,88 +1,100 @@
 # frozen_string_literal: true
 
 module Spyder
-  class Server
+  class Server < BasicServer
     attr_accessor :router
 
     def initialize(bind, port, router: Router.new, max_threads: 4, tcp_backlog: 10)
+      super(router)
+
       @server = TCPServer.new(bind, port)
       @tcp_backlog = tcp_backlog
       @max_threads = max_threads
-      @middleware = []
-      @threads = []
+      @max_queue_size = max_threads * tcp_backlog
+      @tp_read, @tp_write = IO.pipe
       @tp_sync = Mutex.new
-      @router = router
+      @waiting_clients = []
+      @threads = max_threads.times.map { create_request_handler_thread }
     end
 
-    def add_middleware(callable, args=[])
-      @middleware << [callable, args]
+    def create_request_handler_thread
+      Thread.new do
+        loop do
+          @tp_read.read(1)
+          client = nil
+
+          @tp_sync.synchronize do
+            client = @waiting_clients.shift
+          end
+
+          handle_new_client(client)
+        end
+      end
+    end
+
+    def handle_new_client(client)
+      error, response = nil
+
+      request = read_client_request(client)
+
+      begin
+        response = process_request(request)
+      rescue Exception => e
+        error = e
+      end
+
+      if error
+        puts "Request errored in spyder. Error dump:"
+        puts error.full_message
+        puts "Request dump:\n#{request.debug_dump}"
+
+        response = Response.make_generic :internal_server_error
+      end
+
+      dispatch_response(client, response)
+
+      if !error && response&.hijack
+        response.hijack.call(client)
+      else
+        client.close rescue nil
+      end
     end
 
     def start
-      busy_threads = 0
       @server.listen(@tcp_backlog)
 
       loop do
         time_start = Process.clock_gettime(:CLOCK_MONOTONIC, :float_second)
         loop do
-          current_busy = @tp_sync.synchronize { busy_threads }
-          break if current_busy < @max_threads
+          queue_size = nil
+          @tp_sync.synchronize do
+            queue_size = @waiting_clients.length
+          end
+
+          break if queue_size < @max_queue_size #  current_busy < @max_threads
           sleep(0)
           current_time = Process.clock_gettime(:CLOCK_MONOTONIC, :float_second)
           if (current_time - time_start) > 1.0
-            # puts "Waiting a long time: #{(current_time - time_start)}"
+            puts "Waiting a long time: #{(current_time - time_start)}"
             sleep 0.2
           end
         end
 
-        client = @server.accept
-        @tp_sync.synchronize { busy_threads += 1 }
-
-        Thread.new do
-          begin
-            error, response = nil
-            begin
-              response = process_new_client(client)
-            rescue Exception => e
-              error = e
-            end
-
-            if error
-              puts error.full_message
-
-              response = Response.make_generic :internal_server_error
-              dispatch_response(client, response)
-            end
-
-            if response&.hijack
-              response.hijack.call(client)
-            else
-              client.close rescue nil
-            end
-          ensure
-            @tp_sync.synchronize { busy_threads -= 1 }
-          end
+        client_socket = @server.accept
+        @tp_sync.synchronize do
+          @waiting_clients << client_socket
         end
-      end
-    end
 
-    def process_request(request)
-      mids = @middleware + [[RouterApp, @router]]
-      app = nil
-      loop do
-        klass, args = mids.pop
-        break unless klass
-        app = klass.new(args, app)
+        @tp_write.write(1)
       end
-
-      app.call({}, request)
     end
 
-    def process_new_client(socket)
-      verb, path, protocol = read_line(socket).split(' ')
+    def read_client_request(socket)
+      verb, path, http_version = read_line(socket).split(' ', 3)
       request = Request.new
       request.path = path
       request.verb = verb
+      request.http_version = http_version
       request.io = socket
 
       loop do
@@ -94,9 +106,7 @@ module Spyder
         request.add_header(name, value)
       end
 
-      response = process_request(request)
-
-      dispatch_response(socket, response)
+      request
     end
 
     def dispatch_response(socket, response)
@@ -104,6 +114,8 @@ module Spyder
       if !content_length && response.body && response.body.is_a?(String)
         content_length = response.body.length
         response.set_header 'content-length', content_length.to_s
+      elsif !content_length && (200..203) === response.code
+        response.set_header 'content-length', '0'
       end
 
       response.set_header('connection', 'close') unless response.headers.dict['connection']

data/lib/spyder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spyder
-  VERSION = '0.2.0'
+  VERSION = '0.3.0-beta1'
 end

data/lib/spyder/web/file_server.rb

@@ -9,14 +9,18 @@ module Spyder
       def initialize(paths, index: nil)
         @default_index = index
         @base_paths = Array(paths).map do |path|
-          File.expand_path(File.join(Dir.pwd, path))
+          if path[0] == '/'
+            path
+          else
+            File.expand_path(File.join(Dir.pwd, path))
+          end
         end
       end
 
       def call(request)
         return unless request.verb == 'GET'
 
-        input_path = request.path
+        input_path = request.path_info
         input_path = @default_index if request.path == '/' && @default_index
 
         req_path = safe_request_path(input_path)

data/lib/spyder.rb

@@ -12,6 +12,7 @@ require 'spyder/header_store'
 require 'spyder/request'
 require 'spyder/response'
 require 'spyder/router'
+require 'spyder/basic_server'
 require 'spyder/server'
 require 'spyder/web_socket_streaming_buffer'
 require 'spyder/web_socket'

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: spyder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.pre.beta1
 platform: ruby
 authors:
 - André D. Piske
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-06-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -46,8 +59,10 @@ extra_rdoc_files: []
 files:
 - lib/examples/simplest_server/server.rb
 - lib/spyder.rb
+- lib/spyder/basic_server.rb
 - lib/spyder/error.rb
 - lib/spyder/header_store.rb
+- lib/spyder/rack_adapter.rb
 - lib/spyder/request.rb
 - lib/spyder/response.rb
 - lib/spyder/router.rb
@@ -60,7 +75,6 @@ homepage: https://github.com/andrepiske/spyder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -75,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Spyder
 test_files: []