ds9 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e93c72e4d28af98ab22cfddbbf23d63464058b22f918bdcd1e8c8757de1446d4
-  data.tar.gz: 46ba03fb497b1402225e240fd480630dc8a0446b59fef942a6948dbb52878e76
+SHA1:
+  metadata.gz: 42d51fe49ecbc5b632752422632d97684cf61174
+  data.tar.gz: c5858839be9feb5000e2faba3ea307e17ab3bdc1
 SHA512:
-  metadata.gz: e1e6f2f41597ffb538ece6d682bd958e852823b614bfa9cced6d34765df773038262a24eddee98df33378b857d756597cda325a3fb630622e724f1987c145dc4
-  data.tar.gz: ed37cb22eb7fdd60d8ccb36cacee5b7635a7e790a1258f7eefcb60778495ac35238b72419be134d9faae27a82a72109adbef7848080c6831ec72b1491e3b5972
+  metadata.gz: 1be38862c11864eacb2a172822401fdcb6276af652608c1b8223681bdf374461e74c50e220dee1afba6aabbe491798e7238a157b4be28fcb0feb1bb877b05d12
+  data.tar.gz: 0320c3c379461605ecd04697798a483d0029b86800ed8167949b550ace6c39f249408884109be357707a146f458c25b2ded16cc6d18ae36a211272b2da89a72e

data/ext/ds9/ds9.c

@@ -696,6 +696,19 @@ static VALUE session_submit_shutdown(VALUE self)
     return explode(rv);
 }
 
+static VALUE session_get_last_proc_stream_id(VALUE self)
+{
+    int rv;
+    nghttp2_session *session;
+
+    TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
+    CheckSelf(session);
+
+    rv = nghttp2_session_get_last_proc_stream_id(session);
+
+    return INT2NUM(rv);
+}
+
 static VALUE session_submit_goaway(VALUE self, VALUE last_stream_id, VALUE err)
 {
     int rv;
@@ -996,6 +1009,7 @@ void Init_ds9(void)
     rb_define_method(cDS9Session, "stream_local_closed?", session_stream_local_closed_p, 1);
     rb_define_method(cDS9Session, "stream_remote_closed?", session_stream_remote_closed_p, 1);
     rb_define_method(cDS9Session, "resume_data", session_resume_data, 1);
+    rb_define_method(cDS9Session, "last_proc_stream_id", session_get_last_proc_stream_id, 0);
 
     rb_define_private_method(cDS9Session, "submit_request", session_submit_request, 2);
     rb_define_private_method(cDS9Session, "make_callbacks", make_callbacks, 0);

data/ext/ds9/ds9_frames.c

@@ -108,6 +108,22 @@ static VALUE header_category(VALUE self)
     return INT2NUM(frame->headers.cat);
 }
 
+static VALUE goaway_last_stream_id(VALUE self)
+{
+    nghttp2_frame *frame;
+    TypedData_Get_Struct(self, nghttp2_frame, &ds9_frame_type, frame);
+
+    return INT2NUM(frame->goaway.last_stream_id);
+}
+
+static VALUE goaway_error_code(VALUE self)
+{
+    nghttp2_frame *frame;
+    TypedData_Get_Struct(self, nghttp2_frame, &ds9_frame_type, frame);
+
+    return INT2NUM(frame->goaway.error_code);
+}
+
 void Init_ds9_frames(VALUE mDS9)
 {
     mDS9Frames = rb_define_module_under(mDS9, "Frames");
@@ -140,6 +156,8 @@ void Init_ds9_frames(VALUE mDS9)
     rb_define_const(mDS9FramesFlags, "PADDED", INT2NUM(NGHTTP2_FLAG_PADDED));
     rb_define_const(mDS9FramesFlags, "PRIORITY", INT2NUM(NGHTTP2_FLAG_PRIORITY));
 
+    rb_define_method(cDS9FramesGoaway, "last_stream_id", goaway_last_stream_id, 0);
+    rb_define_method(cDS9FramesGoaway, "error_code", goaway_error_code, 0);
     rb_define_const(cDS9FramesGoaway, "NO_ERROR", INT2NUM(NGHTTP2_NO_ERROR));
     rb_define_const(cDS9FramesGoaway, "PROTOCOL_ERROR", INT2NUM(NGHTTP2_PROTOCOL_ERROR));
     rb_define_const(cDS9FramesGoaway, "INTERNAL_ERROR", INT2NUM(NGHTTP2_INTERNAL_ERROR));

data/lib/ds9.rb

@@ -2,7 +2,7 @@ require 'ds9.so'
 require 'stringio'
 
 module DS9
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   module Frames
     class Frame
@@ -41,6 +41,10 @@ module DS9
 
     class Ping
       def ping?; true; end
+
+      def ping_ack?
+        (flags & Flags::ACK) > 0
+      end
     end
 
     class Priority

data/test/helper.rb

@@ -143,12 +143,14 @@ module DS9
 
     class Server < DS9::Server
       include IOEvents
+      attr_reader :frames
 
       def initialize read, write, app
         @app           = app
         @read_streams  = {}
         @read_post_streams  = {}
         @write_streams = {}
+        @frames        = []
         super(read, write)
       end
 
@@ -214,6 +216,7 @@ module DS9
       end
 
       def on_frame_recv frame
+        @frames << frame
         return unless (frame.data? || frame.headers?) && frame.end_stream?
 
         req_headers = @read_streams[frame.stream_id]

data/test/test_client.rb

@@ -78,6 +78,10 @@ class TestClient < DS9::TestCase
     server.send
     client.receive
     assert_predicate client.frames.last, :ping?
+    client.send
+    server.receive
+    assert_predicate server.frames.last, :ping?
+    assert_predicate server.frames.last, :ping_ack?
   end
 
   def test_push

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -47,7 +47,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: This library allows you to write HTTP/2 clients and servers