ds9 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01fed28540c96e99ddb6513b914d305459d44518385ae18449a718089bf206ff
-  data.tar.gz: adee017da6138cbe133f12d33ce01b2d1e9dbd73f1fbb5b694b4f7ef02e377be
+  metadata.gz: 9ddb3bec07f20bfb55e016cdcd831e56f9a94b70f7db63862d7951019e989567
+  data.tar.gz: 36d9dee001423093b24bea5fff33e46d06ac52247f971e23a4e97ede9fb36fcc
 SHA512:
-  metadata.gz: 3bba90e6ae993d0f9fa1654482760da4696cbd8858e2a609b4e45ac206e812ddd8ad09835d04e3be61ffc7c28e1b8e4876e3b8752309fb735826269af04af6c2
-  data.tar.gz: 455f543137a742a2c0b9f10408ee02b9aaf7f1546e6fec7a18815928c3d184abcaf54d4f8299356e10578df0f5cb9b2e4a05d76feaa1b9d60f6bdf98a7f2bed2
+  metadata.gz: 5200c393ba44667a62181c95d4943373dff514ed50ac70ab9459b8ad5d156f8be24743ad0c182985ddd77c8cbc41339215881c3d29cc56857118c7346444e590
+  data.tar.gz: d765ceb6ed1cadc9e090a42706d66858419af65c5f079b9a132ad32d6aba3fdd0bf9a95e7f2d249c5119bd336546b301f4778117dc7a033129d7dae21afcaba6

data/ext/ds9/ds9.c

@@ -277,6 +277,12 @@ static ssize_t rb_data_read_callback(nghttp2_session *session,
 	return 0;
     }
 
+    if (ret == Qfalse) {
+	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+	*data_flags |= NGHTTP2_DATA_FLAG_NO_END_STREAM;
+	return 0;
+    }
+
     Check_Type(ret, T_STRING);
     len = RSTRING_LEN(ret);
     memcpy(buf, StringValuePtr(ret), len);
@@ -448,6 +454,48 @@ static VALUE session_submit_settings(VALUE self, VALUE settings)
     return self;
 }
 
+static VALUE session_submit_trailer(VALUE self, VALUE stream_id, VALUE trailers)
+{
+    size_t niv;
+    nghttp2_nv *nva;
+    nghttp2_session *session;
+    int rv;
+    int32_t s_id;
+    copy_header_func_t copy_func;
+
+    TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
+    CheckSelf(session);
+
+    s_id = NUM2INT(stream_id);
+
+    switch(TYPE(trailers))
+    {
+	case T_ARRAY:
+	    niv = RARRAY_LEN(trailers);
+	    copy_func = copy_list_to_nv;
+	    break;
+	case T_HASH:
+	    niv = RHASH_SIZE(trailers);
+	    copy_func = copy_hash_to_nv;
+	    break;
+	default:
+	    Check_Type(trailers, T_ARRAY);
+    }
+
+    nva = xcalloc(niv, sizeof(nghttp2_nv));
+    copy_func(trailers, nva, niv);
+
+    rv = nghttp2_submit_trailer(session, s_id, nva, niv);
+
+    xfree(nva);
+
+    if (0 != rv) {
+	explode(rv);
+    }
+
+    return self;
+}
+
 static VALUE session_send(VALUE self)
 {
     int rv;
@@ -536,6 +584,8 @@ ruby_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t leng
     VALUE ret = rb_funcall(source->ptr, rb_intern("read"), 1, INT2NUM(length));
 
     if (NIL_P(ret)) {
+	VALUE self = (VALUE)user_data;
+	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
 	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
 	return 0;
     } else {
@@ -562,6 +612,8 @@ file_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t leng
 
     if (nread == 0) {
 	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+	VALUE self = (VALUE)user_data;
+	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
     }
     return nread;
 }
@@ -619,6 +671,10 @@ static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 	explode(rv);
     }
 
+    if(!NIL_P(body)) {
+	rb_funcall(self, rb_intern("save_post_buffer"), 2, INT2NUM(rv), body);
+    }
+
     return INT2NUM(rv);
 }
 
@@ -928,6 +984,7 @@ void Init_ds9(void)
     rb_define_method(cDS9Server, "submit_response", server_submit_response, 2);
     rb_define_method(cDS9Server, "submit_push_promise", server_submit_push_promise, 2);
     rb_define_method(cDS9Server, "submit_shutdown", session_submit_shutdown, 0);
+    rb_define_method(cDS9Server, "submit_trailer", session_submit_trailer, 2);
 
     rb_define_singleton_method(eDS9Exception, "to_string", errors_to_string, 1);
 

data/lib/ds9.rb

@@ -2,7 +2,7 @@ require 'ds9.so'
 require 'stringio'
 
 module DS9
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   module Frames
     class Frame
@@ -73,12 +73,21 @@ module DS9
 
   class Session
     def initialize
+      @post_buffers = {}
       cbs = make_callbacks
       init_internals cbs
     end
 
     private
 
+    def save_post_buffer id, stream
+      @post_buffers[id] = stream
+    end
+
+    def remove_post_buffer id
+      @post_buffers.delete id
+    end
+
     def send_event string
       raise NotImplementedError
     end

data/test/helper.rb

@@ -78,16 +78,28 @@ module DS9
       include IOEvents
 
       class Response
-        attr_reader :stream_id, :body, :headers
+        attr_reader :stream_id, :body
 
         def initialize stream_id
           @stream_id = stream_id
-          @headers   = {}
+          @headers   = [{}]
           @body      = StringIO.new
         end
 
-        def [] k; @headers[k]; end
-        def []= k, v; @headers[k] = v; end
+        def headers
+          @headers[0]
+        end
+
+        def trailers
+          @headers[1]
+        end
+
+        def [] k; @headers.last[k]; end
+        def []= k, v; @headers.last[k] = v; end
+
+        def bump
+          @headers << {}
+        end
       end
 
       attr_reader :responses, :response_queue, :frames
@@ -104,7 +116,11 @@ module DS9
       end
 
       def on_begin_headers frame
-        @response_streams[frame.stream_id] = Response.new(frame.stream_id)
+        if @response_streams[frame.stream_id]
+          @response_streams[frame.stream_id].bump
+        else
+          @response_streams[frame.stream_id] = Response.new(frame.stream_id)
+        end
       end
 
       def on_header name, value, frame, flags
@@ -144,7 +160,13 @@ module DS9
       end
 
       def on_data_source_read stream_id, length
-        @write_streams[stream_id].body.shift
+        chunk = @write_streams[stream_id].body.shift
+        if chunk.nil? && @write_streams[stream_id].trailers
+          submit_trailer stream_id, @write_streams[stream_id].trailers
+          false
+        else
+          chunk
+        end
       end
 
       def on_stream_close id, error_code
@@ -172,7 +194,7 @@ module DS9
         end
       end
 
-      class Response < Struct.new :stream, :stream_id, :body
+      class Response < Struct.new :stream, :stream_id, :body, :trailers
         def push headers
           stream.submit_push_promise stream_id, headers
         end

data/test/test_client.rb

@@ -287,4 +287,53 @@ class TestClient < DS9::TestCase
     assert_equal res_hash, responses.first.headers
     assert_equal ["omglolwut"], responses.map(&:body).map(&:string)
   end
+
+  def test_trailers
+    body = 'omglolwut'
+
+    req_hash = {
+      ':method'    => 'GET',
+      ':path'      => '/',
+      ':scheme'    => 'https',
+      ':authority' => ['localhost', '8080'].join(':'),
+      'accept'     => '*/*',
+      'user-agent' => 'test',
+    }
+
+    res_hash = {
+      ":status"    => '200',
+      "server"     => 'test server',
+      "date"       => 'Sat, 27 Jun 2015 17:29:21 GMT',
+      "x-whatever" => "blah"
+    }
+
+    trailers = { 'x-foo' => 'bar' }
+
+    server, client = pipe do |req, res|
+      assert_equal req_hash, req.headers
+
+      res.submit_response res_hash
+      res.trailers = trailers
+      res.finish body
+    end
+
+    client.submit_request req_hash
+
+    s = Thread.new { server.run }
+    c = Thread.new { client.run }
+
+    responses = []
+    while response = client.responses.pop
+      responses << response
+      if responses.length == 1
+        client.terminate_session DS9::NO_ERROR
+      end
+    end
+
+    s.join
+    c.join
+    assert_equal res_hash, responses.first.headers
+    assert_equal trailers, responses.first.trailers
+    assert_equal ["omglolwut"], responses.map(&:body).map(&:string)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest