spyder 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8fbffd16e4740ebf51ca1e51cb49c5a2f665408580340786ac36ba484f045c4
-  data.tar.gz: 6a0c26ce6168805cf1e1636835bd3aa4e376b022be5d4f2874bdfbc80682523e
+  metadata.gz: 3417dd82aa219dd2526c0fb01be1f6e9c58723651bac784b2f082a4c8d3b5f20
+  data.tar.gz: eca6629c49c0048f7304da5c71f8701d38b1a24ef4a160f923bf5267d0cea628
 SHA512:
-  metadata.gz: 4cac8464742015ecba92eb7d0ff9ca0d3c7bde3ca14ea274200344de1b1fd92aa424aede419ceab17afe6e60693f54ed6077c27ab233459496e03a780026b9b2
-  data.tar.gz: 37b4244fc29821e8efa337d7ffd0cf6e490bf1e94f526933bfafa1dea08b87c30b5312bfd8c6bf8209794108fab82bb0fc9debf9f2c72cc758cc16d9152104fd
+  metadata.gz: d97926b4bc3a3064d7e6224c0bbb61ec2a225207f766802be5821db8d9b092eba60e92aec37b5012843e073999aa057c79e946551503e680dcf7c2e327013f32
+  data.tar.gz: 51a1d5d5a6b4e8d7ba2598ddcf674e1acb224e35fa77a2c53f90a97f936709bc52274f9f92cef492d93f96ef3095758a7e946e63cc2db7720859a4c654096509

data/lib/spyder/server.rb

@@ -4,8 +4,9 @@ module Spyder
   class Server
     attr_accessor :router
 
-    def initialize(bind, port, router: Router.new, max_threads: 4)
+    def initialize(bind, port, router: Router.new, max_threads: 4, tcp_backlog: 10)
       @server = TCPServer.new(bind, port)
+      @tcp_backlog = tcp_backlog
       @max_threads = max_threads
       @middleware = []
       @threads = []
@@ -18,44 +19,45 @@ module Spyder
     end
 
     def start
-      @server.listen(10)
-      loop do
-        client = @server.accept
+      busy_threads = 0
+      @server.listen(@tcp_backlog)
 
-        app_thread = Thread.new do
-          error = nil
-          begin
-            process_new_client(client)
-          rescue Exception => e
-            error = e
+      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
+          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)}"
+            sleep 0.2
           end
+        end
 
-          if error
-            puts error.full_message
+        client = @server.accept
+        @tp_sync.synchronize { busy_threads += 1 }
 
-            response = Response.make_generic :internal_server_error
-            dispatch_response(client, response)
-          end
+        Thread.new do
+          begin
+            error = nil
+            begin
+              process_new_client(client)
+            rescue Exception => e
+              error = e
+            end
 
-          client.close rescue nil
-        end
+            if error
+              puts error.full_message
 
-        over_capacity = true
-        added_thread_to_list = false
-        while over_capacity
-          @tp_sync.synchronize do
-            unless added_thread_to_list
-              @threads << app_thread
-              added_thread_to_list = true
+              response = Response.make_generic :internal_server_error
+              dispatch_response(client, response)
             end
-            over_capacity = (@threads.length >= @max_threads)
-            # puts("#{@threads.length} of #{@max_threads}")
 
-            @threads.delete_if { |t| !t.alive? }
+            client.close rescue nil
+          ensure
+            @tp_sync.synchronize { busy_threads -= 1 }
           end
-
-          # puts("XXX OVER CAPACITY!") if over_capacity
-          sleep 0 if over_capacity
         end
       end
     end
@@ -99,19 +101,24 @@ module Spyder
         content_length = response.body.length
       end
 
-      socket.write("HTTP/1.1 #{response.code} #{response.reason_sentence.b}\r\n")
-      response.headers.ordered.each do |name, value|
-        socket.write("#{name.b}: #{value.b}\r\n")
-      end
-      socket.write("connection: close\r\n") # FIXME:
-      socket.write("content-length: #{content_length}\r\n") if content_length
-      socket.write("\r\n")
-
-      if response.body
-        Array(response.body).each do |part|
-          content = part.respond_to?(:call) ? part.call : part
-          socket.write(content.b)
+      begin
+        socket.write("HTTP/1.1 #{response.code} #{response.reason_sentence.b}\r\n")
+        response.headers.ordered.each do |name, value|
+          socket.write("#{name.b}: #{value.b}\r\n")
+        end
+        socket.write("connection: close\r\n") # FIXME:
+        socket.write("content-length: #{content_length}\r\n") if content_length
+        socket.write("\r\n")
+
+        if response.body
+          Array(response.body).each do |part|
+            content = part.respond_to?(:call) ? part.call : part
+            socket.write(content.b)
+          end
         end
+      rescue Errno::EPIPE
+        # socket closed. So what?
+        socket.close rescue nil
       end
     end
 

data/lib/spyder/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 module Spyder
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - André D. Piske
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustermann