diamant 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a987ba57250c314c052adfa5f913be3312999154e64aa346df39e7c318c41f39
-  data.tar.gz: 052f61456c18fdfe8241f3333e81a1c8ab85d7a8fcd8fb4f671179793e5ce1ee
+  metadata.gz: 72a20983fb5689076b1da91f753515fb251f96c73917628ba5d2e975d34c526c
+  data.tar.gz: efed078e4f3f0f2a556da98b2308fdc2d6d2af927b4e7ef61901b08490e4ef55
 SHA512:
-  metadata.gz: 32ba003a7ce3c3f40f498ad51c7de1a4a292d1f0f13a89855c288ea08555cdfcf5d0bf6ecd39cc08d98097662675af96aa4f74c102f667e7edd19e984b7561e8
-  data.tar.gz: 3521229067830e6f91cca8bb0732ae70a2ac9a7cc04072a11b2513b0e1e5b9494300e5f722c4bbdba25c8e651401f068ce30f240acb2b6b161b30ae1a215ea95
+  metadata.gz: c15a92708e8b9bf8ebc746dd850e4f500affbac1fe32e29c0ee2b73efd998b12865ba2e6f68dd130bf42f3f042eed267852ed9a545bcc15797264ccbd39edc3f
+  data.tar.gz: '084cca645aa707d1140a787a35a8a548a2385bb9dfc4aa25110df0f8b75875238595accf4feb21bcc4f7cc9ec5d5e431ec75ace67943f0d48d3abae14f8674c7'

data/lib/diamant.rb

@@ -39,20 +39,41 @@ module Diamant
 
     private
 
-    def handle_client(client)
-      begin
-        r = Net::GeminiRequest.read_new(client)
-      rescue Net::GeminiBadRequest
-        client.puts "59\r\n"
-        return
+    def reject_request?(sock, current_load)
+      # Accept only 10 thread with no restriction
+      return false if current_load < 11
+      # Seppuku
+      raise 'Server is under heavy load' if current_load > 1965
+      if current_load > 42
+        @logger.warn '41 - Too much threads...'
+        sock.puts "41 See you soon...\r\n"
+        return true
       end
-      answer = route(r.path)
-      @logger.info "#{answer[0]} - #{r.uri}"
+      # Please wait a little
+      @logger.warn '44 5 - Too much threads...'
+      sock.puts "44 5\r\n"
+      true
+    end
+
+    def handle_client(client)
+      current_load = Thread.list.length - 1
+      return if reject_request?(client, current_load)
+      uri, answer = read_file(client)
+      log_line = [current_load, client.peeraddr[3], answer[0]]
+      log_line << uri if uri
+      @logger.info log_line.join(' - ')
       answer.each do |line|
         client.puts "#{line}\r\n"
       end
     end
 
+    def read_file(client)
+      r = Net::GeminiRequest.read_new(client)
+      [r.uri, route(r.path)]
+    rescue Net::GeminiBadRequest
+      [nil, ["59\r\n"]]
+    end
+
     def build_response(route)
       info = Diamant::MimeType.new(route)
       answer = IO.readlines route, chomp: true

data/lib/diamant/mimetype.rb

@@ -8,10 +8,12 @@ module Diamant
     attr_reader :extension, :content_type
 
     MIMETYPES = {
+      '.gemini' => 'text/gemini',
       '.gmi' => 'text/gemini',
       '.txt' => 'text/plain',
       '.md' => 'text/markdown',
       '.org' => 'text/org',
+      '.xml' => 'application/xml',
       '.png' => 'image/png',
       '.jpg' => 'image/jpeg',
       '.jpeg' => 'image/jpeg',
@@ -24,7 +26,7 @@ module Diamant
     end
 
     def supported?
-      @extension == '' || MIMETYPES.has_key?(@extension)
+      @extension != '' && MIMETYPES.has_key?(@extension)
     end
 
     private
@@ -32,13 +34,8 @@ module Diamant
     def extract_info
       @extension = File.extname @path
       raise MimeError, "#{@path} format is not supported!" unless supported?
-      if @extension == ''
-        # Weird... but we'll try the simple way
-        @content_type = 'text/plain'
-      else
-        # Any other supported extension
-        @content_type = MIMETYPES[@extension]
-      end
+      # Any other supported extension
+      @content_type = MIMETYPES[@extension]
     end
   end
 end

data/lib/diamant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diamant
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamant
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-net-text