tipi 0.31 → 0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb4db3e433119acc5b10688d6a558de425f8f4b390bbd280055bd9429acde60
-  data.tar.gz: 90f6dfc0ba6b99acb8b3d251845774f146641bbc922cd5b25658a7bf3fc97ef1
+  metadata.gz: b0fd31b18e0c98a8beb780933f7adef48e0e4403a765cc64f37ef02515d94723
+  data.tar.gz: 1cc72a408cd8fe9b4d1528bd7b1200f3e7a71098596f5b18812d2d75b6120936
 SHA512:
-  metadata.gz: 80aa5c2464a8812b79dc6fa15c0230dde2bb839f66737b1fac03f8c7d51fbf1bc6ba3f7f1ad1bc6882f6ad8184ecb614b44dd43cdc67a403ae30dac541137579
-  data.tar.gz: 8e77ba6c910898761ef63f435ad70e8bcd0f3f7ff14f5e86be2ea675c9387affa191a6ccc0c5f44565b6b8d1ea661606eb2e8a5c4cbb0ac4ed9119fa26828e27
+  metadata.gz: d4fb34dbec4798561322546a90f8104f3e91bd806923ba6d73e3267c06ab05499104431bf15f1abb0984d014626a062267305370470d80a7c61776a2f0c0bd8b
+  data.tar.gz: b0b7d9ec9e0536acef6f9675d592d7c48123bf591468326178b96ef673f194c44a43dcd57ed7f860d78acfe27f71192378f328b5531efff73731cd4b3875c3ee

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.32 2020-08-14
+
+* Respond with array of strings instead of concatenating for HTTP 1
+* Use read_loop instead of readpartial
+* Fix http upgrade test
+
 ## 0.31 2020-07-28
 
 * Fix websocket server code

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    tipi (0.31)
+    tipi (0.32)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
-      polyphony (~> 0.44)
+      polyphony (~> 0.45)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
 
@@ -24,7 +24,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    polyphony (0.44.0)
+    polyphony (0.45.2)
     rack (2.2.3)
     rake (12.3.3)
     ruby-progressbar (1.10.1)

data/examples/websocket_client.rb

@@ -26,8 +26,7 @@ class WebsocketClient
   end
 
   def receive
-    loop do
-      data = @socket.readpartial(8192)
+    @socket.read_loop do |data|
       @reader << data
       parsed = @reader.next
       return parsed if parsed

data/examples/websocket_demo.rb

@@ -30,8 +30,10 @@ class WebsocketClient
   end
 
   def receive
-    loop do
-      data = @socket.readpartial(8192)
+    parsed = @reader.next
+    return parsed if parsed
+    
+    @socket.read_loop do |data|
       @reader << data
       parsed = @reader.next
       return parsed if parsed

data/lib/tipi/config_dsl.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+module Tipi
+  module Configuration
+    class Interpreter
+      # make_blank_slate
+      
+      def initialize(assembler)
+        @assembler = assembler
+      end
+      
+      def gzip_response
+        @assembler.emit 'req = Tipi::GZip.wrap(req)'
+      end
+      
+      def log(out)
+        @assembler.wrap_current_frame 'logger.log_request(req) do |req|'
+      end
+        
+      def error(&block)
+        assembler.emit_exception_handler &block
+      end
+        
+      def match(pattern, &block)
+        @assembler.emit_conditional "if req.path =~ #{pattern.inspect}", &block
+      end
+    end
+      
+    class Assembler
+      def self.from_source(code)
+        new.from_source code
+      end
+
+      def from_source(code)
+        @stack = [new_frame]
+        @app_procs = {}
+        @interpreter = Interpreter.new self
+        @interpreter.instance_eval code
+        
+        loop do
+          frame = @stack.pop
+          return assemble_app_proc(frame).join("\n") if @stack.empty?
+
+          @stack.last[:body] << assemble_frame(frame)
+        end
+      end
+
+      def new_frame
+        {
+          prelude: [],
+          body: []
+        }
+      end
+        
+      def add_frame(&block)
+        @stack.push new_frame
+        yield
+      ensure
+        frame = @stack.pop
+        emit assemble(frame)
+      end
+
+      def wrap_current_frame(head)
+        frame = @stack.pop
+        wrapper = new_frame
+        wrapper[:body] << head
+        @stack.push wrapper
+        @stack.push frame
+      end
+        
+      def emit(code)
+        @stack.last[:body] << code
+      end
+      
+      def emit_prelude(code)
+        @stack.last[:prelude] << code
+      end
+      
+      def emit_exception_handler(&block)
+        proc_id = add_app_proc block
+        @stack.last[:rescue_proc_id] = proc_id
+      end
+      
+      def emit_block(conditional, &block)
+        proc_id = add_app_proc block
+        @stack.last[:branched] = true
+        emit conditional
+        add_frame &block
+      end
+
+      def add_app_proc(proc)
+        id = :"proc#{@app_procs.size}"
+        @app_procs[id] = proc
+        id
+      end
+      
+      def assemble_frame(frame)
+        indent = 0
+        lines = []
+        emit_code lines, frame[:prelude], indent
+        if frame[:rescue_proc_id]
+          emit_code lines, 'begin', indent
+          indent += 1
+        end
+        emit_code lines, frame[:body], indent
+        if frame[:rescue_proc_id]
+          emit_code lines, 'rescue => e', indent
+          emit_code lines, "  app_procs[#{frame[:rescue_proc_id].inspect}].call(req, e)", indent
+          emit_code lines, 'end', indent
+          indent -= 1
+        end
+        lines
+      end
+
+      def assemble_app_proc(frame)
+        indent = 0
+        lines = []
+        emit_code lines, frame[:prelude], indent
+        emit_code lines, 'proc do |req|', indent
+        emit_code lines, frame[:body], indent + 1
+        emit_code lines, 'end', indent
+
+        lines
+      end
+
+      def emit_code(lines, code, indent)
+        if code.is_a? Array
+          code.each { |l| emit_code lines, l, indent + 1 }
+        else
+          lines << (indent_line code, indent)
+        end
+      end
+
+      @@indents = Hash.new { |h, k| h[k] =  '  ' * k }
+
+      def indent_line(code, indent)
+        indent == 0 ? code : "#{ @@indents[indent] }#{code}"
+      end
+    end
+  end
+end
+
+
+def assemble(code)
+  Tipi::Configuration::Assembler.from_source(code)
+end
+
+code = assemble <<~RUBY
+gzip_response
+log STDOUT
+RUBY
+
+puts code

data/lib/tipi/http1_adapter.rb

@@ -65,14 +65,9 @@ module Tipi
     # callback
     def consume_request
       request = @requests_head
-      loop do
-        data = @conn.readpartial(8192)
+      @conn.read_loop do |data|
         @parser << data
         return if request.complete?
-        
-        snooze
-      rescue EOFError
-        break
       end
     end
     
@@ -159,24 +154,27 @@ module Tipi
     end
     
     # response API
-    
+
+    CRLF = "\r\n"    
+    CRLF_ZERO_CRLF_CRLF = "\r\n0\r\n\r\n"
+
     # Sends response including headers and body. Waits for the request to complete
     # if not yet completed. The body is sent using chunked transfer encoding.
     # @param body [String] response body
     # @param headers
     def respond(body, headers)
       consume_request if @parsing
-      data = format_headers(headers, body)
+      data = collect_headers(headers, body)
       if body
-        data << if @parser.http_minor == 0
-          body
+        if @parser.http_minor == 0
+          data << body
         else
-          "#{body.bytesize.to_s(16)}\r\n#{body}\r\n0\r\n\r\n"
+          data << body.bytesize.to_s(16) << CRLF << body << CRLF_ZERO_CRLF_CRLF
         end
       end
-      @conn << data
+      @conn.write(*data)
     end
-    
+      
     DEFAULT_HEADERS_OPTS = {
       empty_response:  false,
       consume_request: true
@@ -188,7 +186,8 @@ module Tipi
     # @param empty_response [boolean] whether a response body will be sent
     # @return [void]
     def send_headers(headers, opts = DEFAULT_HEADERS_OPTS)
-      @conn << format_headers(headers, !opts[:empty_response])
+      data = collect_headers(headers, true)
+      @conn.write(*data)
     end
     
     # Sends a response body chunk. If no headers were sent, default headers are
@@ -198,9 +197,10 @@ module Tipi
     # @param done [boolean] whether the response is completed
     # @return [void]
     def send_chunk(chunk, done: false)
-      data = +"#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
+      data = []
+      data << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       data << "0\r\n\r\n" if done
-      @conn << data
+      @conn.write(*data)
     end
     
     # Finishes the response to the current request. If no headers were sent,
@@ -215,30 +215,22 @@ module Tipi
     end
     
     private
-    
-    # Formats response headers. If empty_response is true(thy), the response
-    # status code will default to 204, otherwise to 200.
+
+    # Formats response headers into an array. If empty_response is true(thy),
+    # the response status code will default to 204, otherwise to 200.
     # @param headers [Hash] response headers
     # @param empty_response [boolean] whether a response body will be sent
     # @return [String] formatted response headers
-    def format_headers(headers, body)
+    def collect_headers(headers, body)
       status = headers[':status'] || (body ? 200 : 204)
-      data = format_status_line(body, status)
-      
+      lines = [format_status_line(body, status)]
       headers.each do |k, v|
         next if k =~ /^:/
         
-        data << format_header_lines(k, v)
-      end
-      data << "\r\n"
-    end
-    
-    def format_header_lines(key, value)
-      if value.is_a?(Array)
-        value.inject(+'') { |data, item| data << "#{key}: #{item}\r\n" }
-      else
-        "#{key}: #{value}\r\n"
+        collect_header_lines(lines, k, v)
       end
+      lines << CRLF
+      lines
     end
     
     def format_status_line(body, status)
@@ -264,5 +256,13 @@ module Tipi
         +"HTTP/1.1 #{status}\r\nTransfer-Encoding: chunked\r\n"
       end
     end
+
+    def collect_header_lines(lines, key, value)
+      if value.is_a?(Array)
+        value.inject(lines) { |lines, item| data << "#{key}: #{item}\r\n" }
+      else
+        lines << "#{key}: #{value}\r\n"
+      end
+    end
   end
 end

data/lib/tipi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tipi
-  VERSION = '0.31'
+  VERSION = '0.32'
 end

data/lib/tipi/websocket.rb

@@ -37,15 +37,18 @@ module Tipi
     end
     
     def recv
-      loop do
-        data = @client.readpartial(8192)
-        break nil unless data
-        
+      if (msg = @reader.next)
+        return msg.to_s
+      end
+    
+      @client.read_loop do |data|
         @reader << data
         if (msg = @reader.next)
           break msg.to_s
         end
       end
+      
+      nil
     end
     
     def send(data)

data/tipi.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.44'
+  s.add_runtime_dependency      'polyphony',          '~>0.45'
   
   s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
   s.add_runtime_dependency      'http-2',             '~>0.10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.31'
+  version: '0.32'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - examples/ws_page.html
 - examples/wss_page.html
 - lib/tipi.rb
+- lib/tipi/config_dsl.rb
 - lib/tipi/configuration.rb
 - lib/tipi/handler.rb
 - lib/tipi/http1_adapter.rb