h2 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b78f8a3e3aeed1884179c684adaa31e16cb377bdaa123d0af10f4cb174ff86f
-  data.tar.gz: 9beec3d11d01b4848118b17e1572275e231f580a48c62f0db28f52c059801c80
+  metadata.gz: 49b62827cc586f06022739232d3d7ea24a1b0744e1feb157ba24e0c65a0e9ba2
+  data.tar.gz: 90f546cf67e7502a0c64c6df96c3cf1b10c059efa1ab88e134cde4a34225e76e
 SHA512:
-  metadata.gz: 0ce8d9218b3cf9fc848ba56563ccdb8760cf63e30c312825ada05652e30dbcc60405109785b29c9466effcc9a3713ba8c57ccdf73c4a2f2b7984772e9a5f8f5a
-  data.tar.gz: ec1413ce8638d7aa6db8ec4e75f8032581e72dd391c5124e410ad3f9896feaf0f9580ae97895d846407d10e1b8a4a82ff381b57d14929d1d76240655ee55df53
+  metadata.gz: 2639436d0e0aa98250f097bca6e6250c9e6f30cf732f58bd8a18fa1accb81d026db7e34af9e2d98fc5cebc2487d503eb3b3c8f27f226c82a3f0356ac1bee40a2
+  data.tar.gz: 0aeae299e9d56b22962a344cf463ed9940bb93e58e82d00fdf2da052c768a508a53937136c71efc81ad82aa83e205e216726b1bf25d88cf5fe6cab9fbd7521e2

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 h2 changelog
 ============
 
+### 0.8.2 22 aug 2018
+
+* add gzip/deflate content-encoding support
+* add SSE '-s' option and other CLI improvments
+
 ### 0.8.1 11 aug 2018
 
 * update rake / bundler dep versions

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
-# gem 'http-2', path: '../http-2'
+gem 'http-2', path: '../http-2'
 
 group :concurrent_ruby do
   gem 'concurrent-ruby'

data/examples/server/push_promise.rb

@@ -18,8 +18,9 @@ require File.expand_path '../../../test/support/create_certs', __FILE__
 # crank up the logger level for testing/example purposes
 #
 H2::Logger.level = ::Logger::DEBUG
+H2::Server::Connection.include H2::FrameDebugger
 
-port = 1234
+port = 4430#1234
 addr = Socket.getaddrinfo('localhost', port).first[3]
 puts "*** Starting server on https://localhost:#{port}"
 
@@ -69,6 +70,11 @@ sni = {
     :cert => certs_dir + '/example.com.crt',
     :key  => certs_dir + '/example.com.key',
     :extra_chain_cert => certs_dir + '/example.com-chain.pem'
+  },
+  'vux.nakamura.io' => {
+    cert: certs_dir + '/nakamuraio.crt',
+    key:  certs_dir + '/nakamuraio.key',
+    extra_chain_cert: certs_dir + '/nakamuraio-chain.pem'
   }
 }
 
@@ -87,7 +93,7 @@ s = H2::Server::HTTPS.new host: addr, port: port, sni: sni do |connection|
     #
     # see +H2::Server::Stream#request+
     #
-    if stream.request.path == '/favicon.ico'
+    if stream.request.path != '/'
 
       # since this is a TLS-enabled server, we could actually test it with a
       # real browser, which will undoubtedly request /favicon.ico.
@@ -133,9 +139,9 @@ s = H2::Server::HTTPS.new host: addr, port: port, sni: sni do |connection|
       # have this +H2::Server::PushPromise+ initiate the sub-stream on this
       # stream by sending initial headers.
       #
-      # see +H2::Server::PushPromise#make_on+
+      # see +H2::Server::Stream::#make_promise+
       #
-      js_promise.make_on stream
+      stream.make_promise js_promise
 
       # respond with 200 and HTML body
       #
@@ -150,8 +156,8 @@ s = H2::Server::HTTPS.new host: addr, port: port, sni: sni do |connection|
       # but for `js_promise`, we must keep it ourselves. in this case, we keep
       # it "synchronously", but we may also call `#keep_async` to queue it.
       #
-      # see +H2::Server::PushPromise#keep+
-      # see +H2::Server::PushPromise#keep_async+
+      # see +H2::Server::Stream::PushPromise#keep+
+      # see +H2::Server::Stream::PushPromise#keep_async+
       #
       js_promise.keep
 

data/examples/server/sse.rb

@@ -18,8 +18,9 @@ require File.expand_path '../../../test/support/create_certs', __FILE__
 # crank up the logger level for testing/example purposes
 #
 H2::Logger.level = ::Logger::DEBUG
+H2::Server::Connection.include H2::FrameDebugger
 
-port = 1234
+port = 4430#1234
 addr = Socket.getaddrinfo('localhost', port).first[3]
 puts "*** Starting server on https://localhost:#{port}"
 
@@ -32,9 +33,14 @@ puts "*** Starting server on https://localhost:#{port}"
 certs_dir    = File.expand_path '../../../tmp/certs', __FILE__
 sni = {
   'localhost' => {
-    :cert => certs_dir + '/server.crt',
-    :key  => certs_dir + '/server.key',
-    # :extra_chain_cert => certs_dir + '/chain.pem'
+    cert: certs_dir + '/server.crt',
+    key:  certs_dir + '/server.key',
+    # extra_chain_cert: certs_dir + '/chain.pem'
+  },
+  'vux.nakamura.io' => {
+    cert: certs_dir + '/nakamuraio.crt',
+    key:  certs_dir + '/nakamuraio.key',
+    extra_chain_cert: certs_dir + '/nakamuraio-chain.pem'
   }
 }
 
@@ -147,7 +153,7 @@ s = H2::Server::HTTPS.new host: addr, port: port, sni: sni do |connection|
       stream.respond status: 404,
                      body: "should have been pushed..."
 
-    else
+    when '/'
 
       # initiate a push promise sub-stream, and queue the "keep" handler.
       # since a push promise may be canceled, we queue the handler on the server reactor,
@@ -166,6 +172,9 @@ s = H2::Server::HTTPS.new host: addr, port: port, sni: sni do |connection|
       #
       stream.respond status: 200, body: data[:html]
 
+    else
+      stream.respond status: 404
+
     end
   end
 end

data/exe/h2

@@ -19,10 +19,13 @@ end # }}}
 options = {
   body: nil,
   block: false,
-  debug: false,
+  celluloid: false,
+  concurrent: false,
+  deflate: false,
   headers: {},
   goaway: false,
-  method: :get,
+  gzip: false,
+  method: nil,
   tls: {},
   verbose: false
 }
@@ -43,23 +46,31 @@ OptionParser.new do |o|
   end
 
   o.on '--celluloid', 'use celluloid actor pool' do
+    raise ArgumentError, '--celluloid and --concurrent are mutually exclusive' if options[:concurrent]
     require 'h2/client/celluloid'
+    options[:celluloid] = true
   end
 
   o.on '--concurrent', 'use concurrent-ruby thread pool' do
+    raise ArgumentError, '--celluloid and --concurrent are mutually exclusive' if options[:celluloid]
     require 'h2/client/concurrent'
+    options[:concurrent] = true
   end
 
-  o.on '-d', '--data [DATA]', String, 'post body data' do |d|
-    options[:method] = :post if options[:method].nil?
+  o.on '-d', '--data [DATA]', String, 'post body data (implies POST, override with -X)' do |d|
+    options[:method] ||= :post
     options[:body] = d
   end
 
   o.on '--debug', 'debug output' do
-    options[:debug] = true
+    H2::Client.include H2::FrameDebugger
   end
 
-  o.on '-sse', '--eventsource', 'send event-stream headers and print messages as they arrive' do
+  o.on '--deflate', 'request "deflate" content-encoding' do
+    options[:deflate] = true
+  end
+
+  o.on '-s', '--sse', 'send event-stream headers and print messages as they arrive' do
     options[:headers]['accept'] = H2::EVENT_SOURCE_CONTENT_TYPE
   end
 
@@ -67,15 +78,19 @@ OptionParser.new do |o|
     options[:goaway] = true
   end
 
+  o.on '--gzip', 'request "gzip" content-encoding' do
+    options[:gzip] = true
+  end
+
   o.on '-h', '--help', 'show this help/usage' do
     puts o
     exit
   end
 
   o.on '-H [VALUE]', '--header [VALUE]', String, 'include header in request (format: "key: value")' do |h|
-    warn "psuedo-headers not supported via CLI" if h[0] == ':'
+    raise ArgumentError, "psuedo-headers not supported via CLI" if h[0] == ':'
     kv = h.split(':').map &:strip
-    options[:headers][kv[0]] = kv[1]
+    options[:headers][kv[0].downcase] = kv[1]
   end
 
   o.on '-v', '--verbose', 'turn on verbosity' do
@@ -98,6 +113,9 @@ OptionParser.new do |o|
 
 end.parse!
 
+# start with nil, allow -d and/or -X to set, but default to get
+options[:method] ||= :get
+
 # }}}
 
 # --- parse URL {{{
@@ -116,17 +134,18 @@ client = {
 
 client[:tls] = options[:tls] unless options[:tls].empty?
 
-c = H2::Client.new **client do |c|
-  if options[:debug]
-    c.client.on(:frame_received) {|f| puts "<< #{f.inspect}" }
-    c.client.on(:frame_sent)     {|f| puts ">> #{f.inspect}" }
-  end
-end
+c = H2::Client.new **client
 
 # }}}
 
 # --- build & send request {{{
 
+ce = []
+ce << :gzip if options[:gzip]
+ce << :deflate if options[:deflate]
+ce = ce.join ','
+options[:headers][H2::ACCEPT_ENCODING_KEY] = ce unless ce.empty?
+
 request = {
   body: options[:body],
   headers: options[:headers],
@@ -138,7 +157,7 @@ if options[:verbose]
     method: options[:method],
     path: url.request_uri,
     headers: request[:headers]
-  ).each {|k,v| puts ">> #{k}: #{v}".green}
+  ).each {|k,v| STDERR.puts ">> #{k}: #{v}" }
 end
 
 s = c.__send__ options[:method], **request
@@ -148,7 +167,7 @@ s = c.__send__ options[:method], **request
 # --- print response & close {{{
 
 if options[:verbose]
-  s.headers.each {|k,v| puts "<< #{k}: #{v}".yellow}
+  s.headers.each {|k,v| STDERR.puts "<< #{k}: #{v}" }
 end
 
 if s.eventsource?
@@ -159,7 +178,7 @@ end
 
 c.block! if options[:block] or !s.pushes.empty?
 s.pushes.each do |p|
-  puts "push promise: #{p.headers[':path']}"
+  STDERR.puts "push promise: #{p.headers[':path']}"
 end
 
 c.goaway if options[:goaway]

data/lib/h2.rb

@@ -3,6 +3,8 @@
 require 'http/2'
 require 'logger'
 require 'uri'
+require 'zlib'
+
 require 'h2/version'
 
 module H2
@@ -29,8 +31,13 @@ module H2
     :put
   ]
 
+  ACCEPT_ENCODING_KEY       = 'accept-encoding'
+  CONTENT_ENCODING_KEY      = 'content-encoding'
   CONTENT_TYPE_KEY          = 'content-type'
+
   EVENT_SOURCE_CONTENT_TYPE = 'text/event-stream'
+  GZIP_ENCODING             = 'gzip'
+  DEFLATE_ENCODING          = 'deflate'
 
   Logger = ::Logger.new STDOUT
 
@@ -172,3 +179,26 @@ end
 
 require 'h2/client'
 require 'h2/stream'
+
+if RUBY_VERSION < '2.4.0'
+  module Zlib
+    class << self
+      def gunzip string
+        sio = StringIO.new string
+        gz = Zlib::GzipReader.new sio, encoding: Encoding::ASCII_8BIT
+        gz.read
+      ensure
+        gz && gz.close
+      end
+
+      def gzip string, level: nil, strategy: nil
+        sio = StringIO.new
+        sio.binmode
+        gz = Zlib::GzipWriter.new sio, level, strategy
+        gz.write string
+        gz.close
+        sio.string
+      end
+    end
+  end
+end

data/lib/h2/client.rb

@@ -5,6 +5,7 @@ require 'h2/client/tcp_socket'
 module H2
   class Client
     include Blockable
+    include HeaderStringifier
     include On
 
     PARSER_EVENTS = [
@@ -152,18 +153,6 @@ module H2
       stream
     end
 
-    # mutates the given hash into +String+ keys and values
-    #
-    # @param [Hash] hash the headers +Hash+ to stringify
-    #
-    def stringify_headers hash
-      hash.keys.each do |key|
-        hash[key] = hash[key].to_s unless String === hash[key]
-        hash[key.to_s] = hash.delete key unless String === key
-      end
-      hash
-    end
-
     # builds headers +Hash+ with appropriate ordering
     #
     # @see https://http2.github.io/http2-spec/#rfc.section.8.1.2.1

data/lib/h2/server.rb

@@ -11,18 +11,23 @@ module H2
   class Server
     include Celluloid::IO
 
-    TCP_DEFAULT_BACKLOG = 100
+    DEFAULT_OPTIONS = {
+      backlog: 100,
+      deflate: true,
+      gzip: true
+    }
 
     execute_block_on_receiver :initialize
     finalizer :shutdown
 
+    attr_reader :options
+
     def initialize server, **options, &on_connection
       @server        = server
-      @options       = options
+      @options       = DEFAULT_OPTIONS.merge options
       @on_connection = on_connection
 
-      backlog = options.fetch :backlog, TCP_DEFAULT_BACKLOG
-      @server.listen backlog
+      @server.listen @options[:backlog]
       async.run
     end
 

data/lib/h2/server/stream.rb

@@ -1,8 +1,3 @@
-require 'h2/server/stream/event_source'
-require 'h2/server/stream/request'
-require 'h2/server/stream/response'
-require 'h2/server/push_promise'
-
 module H2
   class Server
     class Stream
@@ -187,6 +182,43 @@ module H2
 
     end
 
+    module ContentEncoder
+
+      # checks the request for accept-encoding headers and processes body
+      # accordingly
+      #
+      def check_accept_encoding
+        if accept = @stream.request.headers[ACCEPT_ENCODING_KEY]
+          accept.split(',').map(&:strip).each do |encoding|
+            case encoding
+            when GZIP_ENCODING
+              if @stream.connection.server.options[:gzip]
+                @body = ::Zlib.gzip @body
+                @headers[CONTENT_ENCODING_KEY] = GZIP_ENCODING
+                break
+              end
+
+            # "deflate" has issues: https://zlib.net/zlib_faq.html#faq39
+            #
+            when DEFLATE_ENCODING
+              if @stream.connection.server.options[:deflate]
+                @body = ::Zlib.deflate @body
+                @headers[CONTENT_ENCODING_KEY] = DEFLATE_ENCODING
+                break
+              end
+
+            end
+          end
+        end
+      end
+
+    end
+
     class StreamError < StandardError; end
   end
 end
+
+require 'h2/server/stream/event_source'
+require 'h2/server/stream/request'
+require 'h2/server/stream/response'
+require 'h2/server/stream/push_promise'

data/lib/h2/server/stream/event_source.rb

@@ -25,8 +25,11 @@ module H2
           @stream  = stream
           @parser  = @stream.stream
           @headers = headers
+          @gzip    = false
+          @deflate = false
 
           check_accept_header
+          check_accept_encoding
           init_response
         end
 
@@ -40,6 +43,34 @@ module H2
           end
         end
 
+        # checks the request for accept-encoding headers and processes data &
+        # events accordingly
+        #
+        def check_accept_encoding
+          if accept = @stream.request.headers[ACCEPT_ENCODING_KEY]
+            accept.split(',').map(&:strip).each do |encoding|
+              case encoding
+              when GZIP_ENCODING
+                if @stream.connection.server.options[:gzip]
+                  @gzip = true
+                  @headers[CONTENT_ENCODING_KEY] = GZIP_ENCODING
+                  break
+                end
+
+              # "deflate" has issues: https://zlib.net/zlib_faq.html#faq39
+              #
+              when DEFLATE_ENCODING
+                if @stream.connection.server.options[:deflate]
+                  @deflate = true
+                  @headers[CONTENT_ENCODING_KEY] = DEFLATE_ENCODING
+                  break
+                end
+
+              end
+            end
+          end
+        end
+
         # responds with SSE headers on this stream
         #
         def init_response
@@ -57,7 +88,7 @@ module H2
         # @param [String] data: data associated with this event
         #
         def event name:, data:
-          e = EVENT_TEMPL % [name, data]
+          e = encode_content(EVENT_TEMPL % [name, data])
           @parser.data e, end_stream: false
         end
 
@@ -68,7 +99,7 @@ module H2
         # @param [String] data associated with this event
         #
         def data str
-          d = DATA_TEMPL % str
+          d = encode_content(DATA_TEMPL % str)
           @parser.data d, end_stream: false
         end
 
@@ -85,6 +116,16 @@ module H2
           @closed
         end
 
+        private
+
+        # content-encoding helper for #event and #data methods
+        #
+        def encode_content str
+          str = ::Zlib.gzip str if @gzip
+          str = ::Zlib.deflate str if @deflate
+          str
+        end
+
       end
     end
   end

data/lib/h2/server/stream/push_promise.rb

@@ -0,0 +1,123 @@
+module H2
+  class Server
+    class Stream
+      class PushPromise
+        include ContentEncoder
+        include HeaderStringifier
+
+        GET    = 'GET'
+        STATUS = '200'
+
+        attr_reader :content_length, :path, :push_stream
+
+        # build a new +PushPromise+ for the path, with the headers and body given
+        #
+        def initialize path:, headers: {}, body: nil
+          @path = path
+          @body = body
+          @headers = headers
+
+          @promise_headers = {
+            METHOD_KEY    => GET,
+            AUTHORITY_KEY => headers.delete(AUTHORITY_KEY),
+            PATH_KEY      => @path,
+            SCHEME_KEY    => headers.delete(SCHEME_KEY)
+          }
+
+          @fsm = FSM.new
+        end
+
+        # create a new promise stream from +stream+, send the headers and set
+        # +@push_stream+ from the callback
+        #
+        def make_on stream
+          return unless @fsm.state == :init
+          @stream  = stream
+          @headers = {STATUS_KEY => STATUS}.merge stringify_headers(@headers)
+
+          check_accept_encoding
+          @content_length = @body.bytesize.to_s
+          @headers.merge! CONTENT_LENGTH_KEY => @content_length
+
+          @stream.stream.promise(@promise_headers, end_headers: false) do |push|
+            push.headers @headers
+            @push_stream = push
+            @push_stream.on(:close){|err| cancel! if err == :cancel}
+          end
+          @fsm.transition :made
+          self
+        end
+
+        def keep_async
+          @stream.connection.server.async.handle_push_promise self
+        end
+
+        # deliver the body for this promise, optionally splicing into +size+ chunks
+        #
+        def keep size = nil
+          return false unless @fsm.state == :made
+
+          if size.nil?
+            @push_stream.data @body
+          else
+            body = @body
+
+            if body.bytesize > size
+              body = @body.dup
+              while body.bytesize > size
+                @push_stream.data body.slice!(0, size), end_stream: false
+                yield if block_given?
+              end
+            else
+              yield if block_given?
+            end
+
+            @push_stream.data body
+          end
+
+          @fsm.transition :kept
+          log :info, self
+          @stream.on_complete
+        end
+
+        def kept?
+          @fsm.state == :kept
+        end
+
+        def canceled?
+          @fsm.state == :canceled
+        end
+
+        # cancel this promise, most likely due to a RST_STREAM frame from the
+        # client (already in cache, etc...)
+        #
+        def cancel!
+          @fsm.transition :canceled
+          @stream.on_complete
+        end
+
+        def log level, msg
+          Logger.__send__ level, "[stream #{@push_stream.id}] #{msg}"
+        end
+
+        def to_s
+          request = @stream.request
+          %{#{request.addr} "push #{@path} HTTP/2" #{STATUS} #{@content_length}}
+        end
+        alias to_str to_s
+
+        # simple state machine to guarantee promise process
+        #
+        class FSM
+          include Celluloid::FSM
+          default_state :init
+          state :init, to: [:canceled, :made]
+          state :made, to: [:canceled, :kept]
+          state :kept
+          state :canceled
+        end
+
+      end
+    end
+  end
+end

data/lib/h2/server/stream/response.rb

@@ -2,6 +2,7 @@ module H2
   class Server
     class Stream
       class Response
+        include ContentEncoder
         include HeaderStringifier
 
         attr_reader :body, :content_length, :headers, :status, :stream
@@ -23,6 +24,7 @@ module H2
           @body    = body
           @status  = status
 
+          check_accept_encoding
           init_content_length
         end
 

data/lib/h2/stream.rb

@@ -33,6 +33,8 @@ module H2
       @stream  = stream
 
       @eventsource = false
+      @gzip        = false
+      @deflate     = false
 
       init_blocking
       yield self if block_given?
@@ -104,6 +106,10 @@ module H2
         loop do
           event = @body.pop
           break if event == :close
+
+          event = ::Zlib.gunzip event if @gzip
+          event = ::Zlib.inflate event if @deflate
+
           yield event
         end
       else
@@ -119,7 +125,14 @@ module H2
         @parent.add_push self if @parent && push?
         @client.last_stream = self
         @closed = true
-        @body << :close if @eventsource
+
+        if @eventsource
+          @body << :close
+        else
+          @body = Zlib.gunzip @body if @gzip
+          @body = Zlib.inflate @body if @deflate
+        end
+
         unblock!
         on :close
       end
@@ -130,7 +143,6 @@ module H2
 
       @stream.on(:data) do |d|
         on :data, d
-        unblock! if @eventsource
         @body << d
       end
     end
@@ -139,6 +151,7 @@ module H2
     #
     def add_headers h
       check_event_source h
+      check_content_encoding h
       h = Hash[h]
       on :headers, h
       @headers.merge! h
@@ -151,6 +164,19 @@ module H2
       if h.any? {|e| e[0] == CONTENT_TYPE_KEY && e[1] == EVENT_SOURCE_CONTENT_TYPE }
         @eventsource = true
         @body = Queue.new
+        unblock!
+      end
+    end
+
+    # checks for content encoding headers and sets flags
+    #
+    def check_content_encoding h
+      return if @gzip or @deflate
+      h.each do |e|
+        if e[0] == CONTENT_ENCODING_KEY
+          @gzip = true if e[1] == GZIP_ENCODING
+          @deflate = true if e[1] == DEFLATE_ENCODING
+        end
       end
     end
 

data/lib/h2/version.rb

@@ -1,5 +1,5 @@
 module H2
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 
   class << self
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -104,9 +104,9 @@ files:
 - lib/h2/server.rb
 - lib/h2/server/connection.rb
 - lib/h2/server/https.rb
-- lib/h2/server/push_promise.rb
 - lib/h2/server/stream.rb
 - lib/h2/server/stream/event_source.rb
+- lib/h2/server/stream/push_promise.rb
 - lib/h2/server/stream/request.rb
 - lib/h2/server/stream/response.rb
 - lib/h2/stream.rb

data/lib/h2/server/push_promise.rb

@@ -1,119 +0,0 @@
-module H2
-  class Server
-    class PushPromise
-
-      GET    = 'GET'
-      STATUS = '200'
-
-      attr_reader :content_length, :path, :push_stream
-
-      # build a new +PushPromise+ for the path, with the headers and body given
-      #
-      def initialize path:, headers: {}, body: nil
-        @path = path
-        @body = body
-
-        @promise_headers = {
-          METHOD_KEY    => GET,
-          AUTHORITY_KEY => headers.delete(AUTHORITY_KEY),
-          PATH_KEY      => @path,
-          SCHEME_KEY    => headers.delete(SCHEME_KEY)
-        }
-
-        @content_length = @body.bytesize.to_s
-
-        @push_headers = {
-          STATUS_KEY         => STATUS,
-          CONTENT_LENGTH_KEY => @content_length
-        }.merge headers
-
-        @fsm = FSM.new
-      end
-
-      # create a new promise stream from +stream+, send the headers and set
-      # +@push_stream+ from the callback
-      #
-      def make_on stream
-        return unless @fsm.state == :init
-        @stream = stream
-        @stream.stream.promise(@promise_headers, end_headers: false) do |push|
-          push.headers @push_headers
-          @push_stream = push
-          @push_stream.on(:close){|err| cancel! if err == :cancel}
-        end
-        @fsm.transition :made
-        self
-      end
-
-      def keep_async
-        @stream.connection.server.async.handle_push_promise self
-      end
-
-      # deliver the body for this promise, optionally splicing into +size+ chunks
-      #
-      def keep size = nil
-        return false unless @fsm.state == :made
-
-        if size.nil?
-          @push_stream.data @body
-        else
-          body = @body
-
-          if body.bytesize > size
-            body = @body.dup
-            while body.bytesize > size
-              @push_stream.data body.slice!(0, size), end_stream: false
-              yield if block_given?
-            end
-          else
-            yield if block_given?
-          end
-
-          @push_stream.data body
-        end
-
-        @fsm.transition :kept
-        log :info, self
-        @stream.on_complete
-      end
-
-      def kept?
-        @fsm.state == :kept
-      end
-
-      def canceled?
-        @fsm.state == :canceled
-      end
-
-      # cancel this promise, most likely due to a RST_STREAM frame from the
-      # client (already in cache, etc...)
-      #
-      def cancel!
-        @fsm.transition :canceled
-        @stream.on_complete
-      end
-
-      def log level, msg
-        Logger.__send__ level, "[stream #{@push_stream.id}] #{msg}"
-      end
-
-      def to_s
-        request = @stream.request
-        %{#{request.addr} "push #{@path} HTTP/2" #{STATUS} #{@content_length}}
-      end
-      alias to_str to_s
-
-      # simple state machine to guarantee promise process
-      #
-      class FSM
-        include Celluloid::FSM
-        default_state :init
-        state :init, to: [:canceled, :made]
-        state :made, to: [:canceled, :kept]
-        state :kept
-        state :canceled
-      end
-
-    end
-  end
-end