polyphony-http 0.26 → 0.27

data/lib/polyphony/http/server/http2.rb

@@ -1,78 +1,81 @@
 # frozen_string_literal: true
 
-export_default :Protocol
-
 require 'http/2'
+require_relative './http2_stream'
 
-Stream = import './http2_stream'
+module Polyphony
+  module HTTP
+    module Server
+      # HTTP2 server adapter
+      class HTTP2Adapter
+        def self.upgrade_each(socket, opts, headers, &block)
+          adapter = new(socket, opts, headers)
+          adapter.each(&block)
+        end
 
-# HTTP2 API
-class Protocol
-  def self.upgrade_each(socket, opts, headers, &block)
-    adapter = new(socket, opts, headers)
-    adapter.each(&block)
-  end
+        def initialize(conn, opts, upgrade_headers = nil)
+          @conn = conn
+          @opts = opts
+          @upgrade_headers = upgrade_headers
 
-  def initialize(conn, opts, upgrade_headers = nil)
-    @conn = conn
-    @opts = opts
-    @upgrade_headers = upgrade_headers
+          @interface = ::HTTP2::Server.new
+          @connection_fiber = Fiber.current
+          @interface.on(:frame, &method(:send_frame))
+          @streams = {}
+        end
 
-    @interface = ::HTTP2::Server.new
-    @connection_fiber = Fiber.current
-    @interface.on(:frame, &method(:send_frame))
-    @streams = {}
-  end
+        def send_frame(data)
+          @conn << data
+        rescue Exception => e
+          @connection_fiber.transfer e
+        end
 
-  def send_frame(data)
-    @conn << data
-  rescue Exception => e
-    @connection_fiber.transfer e
-  end
+        UPGRADE_MESSAGE = <<~HTTP.gsub("\n", "\r\n")
+          HTTP/1.1 101 Switching Protocols
+          Connection: Upgrade
+          Upgrade: h2c
 
-  UPGRADE_MESSAGE = <<~HTTP.gsub("\n", "\r\n")
-    HTTP/1.1 101 Switching Protocols
-    Connection: Upgrade
-    Upgrade: h2c
+        HTTP
 
-  HTTP
+        def upgrade
+          @conn << UPGRADE_MESSAGE
+          settings = @upgrade_headers['HTTP2-Settings']
+          Fiber.current.schedule(nil)
+          @interface.upgrade(settings, @upgrade_headers, '')
+        ensure
+          @upgrade_headers = nil
+        end
 
-  def upgrade
-    @conn << UPGRADE_MESSAGE
-    settings = @upgrade_headers['HTTP2-Settings']
-    Fiber.current.schedule(nil)
-    @interface.upgrade(settings, @upgrade_headers, '')
-  ensure
-    @upgrade_headers = nil
-  end
+        # Iterates over incoming requests
+        def each(&block)
+          @interface.on(:stream) { |stream| start_stream(stream, &block) }
+          upgrade if @upgrade_headers
 
-  # Iterates over incoming requests
-  def each(&block)
-    @interface.on(:stream) { |stream| start_stream(stream, &block) }
-    upgrade if @upgrade_headers
+          while (data = @conn.readpartial(8192))
+            @interface << data
+            snooze
+          end
+        rescue SystemCallError, IOError
+          # ignore
+        ensure
+          finalize_client_loop
+        end
 
-    while (data = @conn.readpartial(8192))
-      @interface << data
-      snooze
-    end
-  rescue SystemCallError, IOError
-    # ignore
-  ensure
-    finalize_client_loop
-  end
+        def start_stream(stream, &block)
+          stream = Stream.new(stream, &block)
+          @streams[stream] = true
+        end
 
-  def start_stream(stream, &block)
-    stream = Stream.new(stream, &block)
-    @streams[stream] = true
-  end
+        def finalize_client_loop
+          @interface = nil
+          @streams.each_key(&:stop)
+          @conn.close
+        end
 
-  def finalize_client_loop
-    @interface = nil
-    @streams.each_key(&:stop)
-    @conn.close
-  end
-
-  def close
-    @conn.close
+        def close
+          @conn.close
+        end
+      end
+    end
   end
 end

data/lib/polyphony/http/server/http2_stream.rb

@@ -1,135 +1,138 @@
 # frozen_string_literal: true
 
-export_default :StreamHandler
-
 require 'http/2'
-
-Request = import './request'
-
-# Manages an HTTP 2 stream
-class StreamHandler
-  attr_accessor :__next__
-
-  def initialize(stream, &block)
-    @stream = stream
-    @calling_fiber = Fiber.current
-    @stream_fiber = Fiber.new { |req| handle_request(req, &block) }
-
-    # Stream callbacks occur on the connection fiber (see HTTP2::Protocol#each).
-    # The request handler is run on a separate fiber for each stream, allowing
-    # concurrent handling of incoming requests on the same HTTP/2 connection.
-    #
-    # The different stream adapter APIs suspend the stream fiber, waiting for
-    # stream callbacks to be called. The callbacks, in turn, transfer control to
-    # the stream fiber, effectively causing the return of the adapter API calls.
-    #
-    # Note: the request handler is run once headers are received. Reading the
-    # request body, if present, is at the discretion of the request handler.
-    # This mirrors the behaviour of the HTTP/1 adapter.
-    stream.on(:headers, &method(:on_headers))
-    stream.on(:data, &method(:on_data))
-    stream.on(:half_close, &method(:on_half_close))
-  end
-
-  def handle_request(request, &block)
-    error = nil
-    block.(request)
-    @calling_fiber.transfer
-  rescue Polyphony::MoveOn
-    # ignore
-  rescue Exception => e
-    error = e
-  ensure
-    @done = true
-    @calling_fiber.transfer error
-  end
-
-  def on_headers(headers)
-    @request = Request.new(headers.to_h, self)
-    @stream_fiber.transfer(@request)
-  end
-
-  def on_data(data)
-    if @waiting_for_body_chunk
-      @waiting_for_body_chunk = nil
-      @stream_fiber.transfer(data)
-    else
-      @request.buffer_body_chunk(data)
-    end
-  end
-
-  def on_half_close
-    if @waiting_for_body_chunk
-      @waiting_for_body_chunk = nil
-      @stream_fiber.transfer(nil)
-    elsif @waiting_for_half_close
-      @waiting_for_half_close = nil
-      @stream_fiber.transfer(nil)
-    else
-      @request.complete!
-    end
-  end
-
-  def protocol
-    'h2'
-  end
-
-  def get_body_chunk
-    # called in the context of the stream fiber
-    return nil if @request.complete?
-
-    @waiting_for_body_chunk = true
-    # the chunk (or an exception) will be returned once the stream fiber is
-    # resumed
-    suspend
-  ensure
-    @waiting_for_body_chunk = nil
-  end
-
-  # Wait for request to finish
-  def consume_request
-    return if @request.complete?
-
-    @waiting_for_half_close = true
-    suspend
-  ensure
-    @waiting_for_half_close = nil
-  end
-
-  # response API
-  def respond(chunk, headers)
-    headers[':status'] ||= '200'
-    @stream.headers(headers, end_stream: false)
-    @stream.data(chunk, end_stream: true)
-    @headers_sent = true
-  end
-
-  def send_headers(headers, empty_response = false)
-    return if @headers_sent
-
-    headers[':status'] ||= (empty_response ? 204 : 200).to_s
-    @stream.headers(headers, end_stream: false)
-    @headers_sent = true
-  end
-
-  def send_chunk(chunk, done: false)
-    send_headers({}, false) unless @headers_sent
-    @stream.data(chunk, end_stream: done)
-  end
-
-  def finish
-    if @headers_sent
-      @stream.close
-    else
-      headers[':status'] ||= '204'
-      @stream.headers(headers, end_stream: true)
+require_relative './request'
+
+module Polyphony
+  module HTTP
+    module Server
+      # Manages an HTTP 2 stream
+      class HTTP2StreamHandler
+        attr_accessor :__next__
+
+        def initialize(stream, &block)
+          @stream = stream
+          @calling_fiber = Fiber.current
+          @stream_fiber = Fiber.new { |req| handle_request(req, &block) }
+
+          # Stream callbacks occur on the connection fiber (see HTTP2::Protocol#each).
+          # The request handler is run on a separate fiber for each stream, allowing
+          # concurrent handling of incoming requests on the same HTTP/2 connection.
+          #
+          # The different stream adapter APIs suspend the stream fiber, waiting for
+          # stream callbacks to be called. The callbacks, in turn, transfer control to
+          # the stream fiber, effectively causing the return of the adapter API calls.
+          #
+          # Note: the request handler is run once headers are received. Reading the
+          # request body, if present, is at the discretion of the request handler.
+          # This mirrors the behaviour of the HTTP/1 adapter.
+          stream.on(:headers, &method(:on_headers))
+          stream.on(:data, &method(:on_data))
+          stream.on(:half_close, &method(:on_half_close))
+        end
+
+        def handle_request(request, &block)
+          error = nil
+          block.(request)
+          @calling_fiber.transfer
+        rescue Polyphony::MoveOn
+          # ignore
+        rescue Exception => e
+          error = e
+        ensure
+          @done = true
+          @calling_fiber.transfer error
+        end
+
+        def on_headers(headers)
+          @request = Request.new(headers.to_h, self)
+          @stream_fiber.transfer(@request)
+        end
+
+        def on_data(data)
+          if @waiting_for_body_chunk
+            @waiting_for_body_chunk = nil
+            @stream_fiber.transfer(data)
+          else
+            @request.buffer_body_chunk(data)
+          end
+        end
+
+        def on_half_close
+          if @waiting_for_body_chunk
+            @waiting_for_body_chunk = nil
+            @stream_fiber.transfer(nil)
+          elsif @waiting_for_half_close
+            @waiting_for_half_close = nil
+            @stream_fiber.transfer(nil)
+          else
+            @request.complete!
+          end
+        end
+
+        def protocol
+          'h2'
+        end
+
+        def get_body_chunk
+          # called in the context of the stream fiber
+          return nil if @request.complete?
+
+          @waiting_for_body_chunk = true
+          # the chunk (or an exception) will be returned once the stream fiber is
+          # resumed
+          suspend
+        ensure
+          @waiting_for_body_chunk = nil
+        end
+
+        # Wait for request to finish
+        def consume_request
+          return if @request.complete?
+
+          @waiting_for_half_close = true
+          suspend
+        ensure
+          @waiting_for_half_close = nil
+        end
+
+        # response API
+        def respond(chunk, headers)
+          headers[':status'] ||= '200'
+          @stream.headers(headers, end_stream: false)
+          @stream.data(chunk, end_stream: true)
+          @headers_sent = true
+        end
+
+        def send_headers(headers, empty_response = false)
+          return if @headers_sent
+
+          headers[':status'] ||= (empty_response ? 204 : 200).to_s
+          @stream.headers(headers, end_stream: false)
+          @headers_sent = true
+        end
+
+        def send_chunk(chunk, done: false)
+          send_headers({}, false) unless @headers_sent
+          @stream.data(chunk, end_stream: done)
+        end
+
+        def finish
+          if @headers_sent
+            @stream.close
+          else
+            headers[':status'] ||= '204'
+            @stream.headers(headers, end_stream: true)
+          end
+        end
+
+        def stop
+          return if @done
+
+          @stream.close
+          @stream_fiber.schedule(Polyphony::MoveOn.new)
+        end
+      end
     end
   end
-
-  def stop
-    return if @done
-
-    @stream.close
-    @stream_fiber.schedule(Polyphony::MoveOn.new)
-  end
 end

data/lib/polyphony/http/server/request.rb

@@ -1,118 +1,122 @@
 # frozen_string_literal: true
 
-export_default :Request
-
 require 'uri'
 
-# HTTP request
-class Request
-  attr_reader :headers, :adapter
-  attr_accessor :__next__
-
-  def initialize(headers, adapter)
-    @headers  = headers
-    @adapter  = adapter
-  end
-
-  def protocol
-    @protocol = @adapter.protocol
-  end
-
-  def method
-    @method ||= @headers[':method']
-  end
-
-  def scheme
-    @scheme ||= @headers[':scheme']
-  end
-
-  def uri
-    @uri ||= URI.parse(@headers[':path'] || '')
-  end
-
-  def path
-    @path ||= uri.path
-  end
-
-  def query_string
-    @query_string ||= uri.query
-  end
-
-  def query
-    return @query if @query
-
-    @query = (q = uri.query) ? split_query_string(q) : {}
-  end
-
-  def split_query_string(query)
-    query.split('&').each_with_object({}) do |kv, h|
-      k, v = kv.split('=')
-      h[k.to_sym] = URI.decode_www_form_component(v)
-    end
-  end
-
-  def buffer_body_chunk(chunk)
-    @buffered_body_chunks ||= []
-    @buffered_body_chunks << chunk
-  end
-
-  def each_chunk(&block)
-    if @buffered_body_chunks
-      @buffered_body_chunks.each(&block)
-      @buffered_body_chunks = nil
+module Polyphony
+  module HTTP
+    module Server
+      # HTTP request
+      class Request
+        attr_reader :headers, :adapter
+        attr_accessor :__next__
+
+        def initialize(headers, adapter)
+          @headers  = headers
+          @adapter  = adapter
+        end
+
+        def protocol
+          @protocol = @adapter.protocol
+        end
+
+        def method
+          @method ||= @headers[':method']
+        end
+
+        def scheme
+          @scheme ||= @headers[':scheme']
+        end
+
+        def uri
+          @uri ||= URI.parse(@headers[':path'] || '')
+        end
+
+        def path
+          @path ||= uri.path
+        end
+
+        def query_string
+          @query_string ||= uri.query
+        end
+
+        def query
+          return @query if @query
+
+          @query = (q = uri.query) ? split_query_string(q) : {}
+        end
+
+        def split_query_string(query)
+          query.split('&').each_with_object({}) do |kv, h|
+            k, v = kv.split('=')
+            h[k.to_sym] = URI.decode_www_form_component(v)
+          end
+        end
+
+        def buffer_body_chunk(chunk)
+          @buffered_body_chunks ||= []
+          @buffered_body_chunks << chunk
+        end
+
+        def each_chunk(&block)
+          if @buffered_body_chunks
+            @buffered_body_chunks.each(&block)
+            @buffered_body_chunks = nil
+          end
+          while !@message_complete && (chunk = @adapter.get_body_chunk)
+            yield chunk
+          end
+        end
+
+        def complete!(keep_alive = nil)
+          @message_complete = true
+          @keep_alive = keep_alive
+        end
+
+        def complete?
+          @message_complete
+        end
+
+        def consume
+          @adapter.consume_request
+        end
+
+        def keep_alive?
+          @keep_alive
+        end
+
+        def read
+          buf = @buffered_body_chunks ? @buffered_body_chunks.join : +''
+          while (chunk = @adapter.get_body_chunk)
+            buf << chunk
+          end
+          buf
+        end
+
+        def respond(body, headers = {})
+          @adapter.respond(body, headers)
+          @headers_sent = true
+        end
+
+        def send_headers(headers = {}, empty_response = false)
+          return if @headers_sent
+
+          @headers_sent = true
+          @adapter.send_headers(headers, empty_response: empty_response)
+        end
+
+        def send_chunk(body, done: false)
+          send_headers({}) unless @headers_sent
+
+          @adapter.send_chunk(body, done: done)
+        end
+        alias_method :<<, :send_chunk
+
+        def finish
+          send_headers({}) unless @headers_sent
+
+          @adapter.finish
+        end
+      end
     end
-    while !@message_complete && (chunk = @adapter.get_body_chunk)
-      yield chunk
-    end
-  end
-
-  def complete!(keep_alive = nil)
-    @message_complete = true
-    @keep_alive = keep_alive
-  end
-
-  def complete?
-    @message_complete
-  end
-
-  def consume
-    @adapter.consume_request
-  end
-
-  def keep_alive?
-    @keep_alive
-  end
-
-  def read
-    buf = @buffered_body_chunks ? @buffered_body_chunks.join : +''
-    while (chunk = @adapter.get_body_chunk)
-      buf << chunk
-    end
-    buf
-  end
-
-  def respond(body, headers = {})
-    @adapter.respond(body, headers)
-    @headers_sent = true
-  end
-
-  def send_headers(headers = {}, empty_response = false)
-    return if @headers_sent
-
-    @headers_sent = true
-    @adapter.send_headers(headers, empty_response: empty_response)
-  end
-
-  def send_chunk(body, done: false)
-    send_headers({}) unless @headers_sent
-
-    @adapter.send_chunk(body, done: done)
-  end
-  alias_method :<<, :send_chunk
-
-  def finish
-    send_headers({}) unless @headers_sent
-
-    @adapter.finish
   end
-end
+end