split server into plum/server

5 files changed, 23 insertions, 18 deletions

diff --git a/lib/plum/connection.rb b/lib/plum/connection.rb
index a8b2916..df3d7b3 100644
--- a/lib/plum/connection.rb
+++ b/lib/plum/connection.rb
@@ -36,7 +36,6 @@ module Plum
       @max_odd_stream_id = 0
       @max_even_stream_id = 0
     end
-    private :initialize
 
     # Emits :close event. Doesn't actually close socket.
     def close
@@ -79,18 +78,6 @@ module Plum
       @writer.call(frame.assemble)
     end
 
-    def negotiate!
-      unless CLIENT_CONNECTION_PREFACE.start_with?(@buffer.byteslice(0, 24))
-        raise ConnectionError.new(:protocol_error) # (MAY) send GOAWAY. sending.
-      end
-
-      if @buffer.bytesize >= 24
-        @buffer.byteshift(24)
-        @state = :waiting_settings
-        settings(@local_settings)
-      end
-    end
-
     def new_stream(stream_id, **args)
       if stream_id.even?
         @max_even_stream_id = stream_id
diff --git a/lib/plum/rack/listener.rb b/lib/plum/rack/listener.rb
index 31bbc8c..b479691 100644
--- a/lib/plum/rack/listener.rb
+++ b/lib/plum/rack/listener.rb
@@ -25,7 +25,7 @@ module Plum
       end
 
       def plum(sock)
-        ::Plum::HTTPConnection.new(sock)
+        ::Plum::HTTPServerConnection.new(sock)
       end
     end
 
@@ -56,7 +56,7 @@ module Plum
       end
 
       def plum(sock)
-        ::Plum::HTTPSConnection.new(sock)
+        ::Plum::HTTPSServerConnection.new(sock)
       end
 
       private
@@ -116,7 +116,7 @@ module Plum
       end
 
       def plum(sock)
-        ::Plum::HTTPSConnection.new(sock)
+        ::Plum::HTTPSServerConnection.new(sock)
       end
     end
   end
diff --git a/lib/plum/server/connection.rb b/lib/plum/server/connection.rb
new file mode 100644
index 0000000..a801d92
--- /dev/null
+++ b/lib/plum/server/connection.rb
@@ -0,0 +1,18 @@
+# -*- frozen-string-literal: true -*-
+using Plum::BinaryString
+module Plum
+  class ServerConnection < Connection
+    private
+    def negotiate!
+      unless CLIENT_CONNECTION_PREFACE.start_with?(@buffer.byteslice(0, 24))
+        raise ConnectionError.new(:protocol_error) # (MAY) send GOAWAY. sending.
+      end
+
+      if @buffer.bytesize >= 24
+        @buffer.byteshift(24)
+        settings(@local_settings)
+        @state = :waiting_settings
+      end
+    end
+  end
+end
diff --git a/lib/plum/http_connection.rb b/lib/plum/server/http_connection.rb
index 1c30e6e..f864691 100644
--- a/lib/plum/http_connection.rb
+++ b/lib/plum/server/http_connection.rb
@@ -2,7 +2,7 @@
 using Plum::BinaryString
 
 module Plum
-  class HTTPConnection < Connection
+  class HTTPServerConnection < ServerConnection
     attr_reader :sock
 
     def initialize(sock, local_settings = {})
diff --git a/lib/plum/https_connection.rb b/lib/plum/server/https_connection.rb
index c719c2e..1903bc1 100644
--- a/lib/plum/https_connection.rb
+++ b/lib/plum/server/https_connection.rb
@@ -1,6 +1,6 @@
 # -*- frozen-string-literal: true -*-
 module Plum
-  class HTTPSConnection < Connection
+  class HTTPSServerConnection < ServerConnection
     attr_reader :sock
 
     def initialize(sock, local_settings = {})