Relocate constants into own modules

Author: JordanMartinez

src/Node/Http2/Constants/NGHTTP2.js src/Node/Http2/ErrorCode.jssrc/Node/Http2/Constants/NGHTTP2.js renamed to src/Node/Http2/ErrorCode.js

@@ -1,6 +1,17 @@
-module Node.Http2.Constants.NGHTTP2 where
+module Node.Http2.ErrorCode where
 
-import Node.Http2.Types (ErrorCode)
+import Prelude
+
+import Data.Generic.Rep (class Generic)
+import Data.Newtype (class Newtype)
+
+newtype ErrorCode = ErrorCode Int
+
+derive instance Eq ErrorCode
+derive instance Ord ErrorCode
+derive instance Newtype ErrorCode _
+derive instance Generic ErrorCode _
+derive newtype instance Show ErrorCode
 
 foreign import noError :: ErrorCode
 foreign import protocolError :: ErrorCode

src/Node/Http2/Constants/NGHTTP2.purs src/Node/Http2/ErrorCode.purssrc/Node/Http2/Constants/NGHTTP2.purs renamed to src/Node/Http2/ErrorCode.purs

@@ -0,0 +1,44 @@
+module Node.Http2.FrameType where
+
+import Prelude
+
+import Data.Generic.Rep (class Generic)
+import Data.Newtype (class Newtype)
+
+newtype FrameType = FrameType Int
+
+derive instance Eq FrameType
+derive instance Ord FrameType
+derive instance Newtype FrameType _
+derive instance Generic FrameType _
+derive newtype instance Show FrameType
+
+frameData :: FrameType
+frameData = FrameType 0x0
+
+frameHeaders :: FrameType
+frameHeaders = FrameType 0x1
+
+framePriority :: FrameType
+framePriority = FrameType 0x2
+
+frameRstStream :: FrameType
+frameRstStream = FrameType 0x3
+
+frameSettings :: FrameType
+frameSettings = FrameType 0x4
+
+framePushPromise :: FrameType
+framePushPromise = FrameType 0x5
+
+framePing :: FrameType
+framePing = FrameType 0x6
+
+frameGoAway :: FrameType
+frameGoAway = FrameType 0x7
+
+frameWindowUpdate :: FrameType
+frameWindowUpdate = FrameType 0x8
+
+frameContinuation :: FrameType
+frameContinuation = FrameType 0x9

src/Node/Http2/FrameType.purs

@@ -1,6 +1,6 @@
 -- | Note: not all padding strategies are listed below.
 -- | I think some were added/removed in major Node versions.
-module Node.Http2.Constants.PaddingStrategy where
+module Node.Http2.PaddingStrategy where
 
 foreign import paddingStrategyNone :: Int
 foreign import paddingStrategyMax :: Int

…/Node/Http2/Constants/PaddingStrategy.js src/Node/Http2/PaddingStrategy.jssrc/Node/Http2/Constants/PaddingStrategy.js renamed to src/Node/Http2/PaddingStrategy.js src/Node/Http2/Constants/PaddingStrategy.js renamed to src/Node/Http2/PaddingStrategy.js

@@ -62,8 +62,10 @@ import Node.Buffer (Buffer)
 import Node.Buffer.Immutable (ImmutableBuffer)
 import Node.EventEmitter (EventEmitter, EventHandle(..))
 import Node.EventEmitter.UtilTypes (EventHandle0, EventHandle1, EventHandle2, EventHandle3, EventHandle4)
+import Node.Http2.ErrorCode (ErrorCode)
+import Node.Http2.FrameType (FrameType)
 import Node.Http2.Flags (BitwiseFlag)
-import Node.Http2.Types (ErrorCode, FrameType, Headers, Http2Session, Http2Stream, Settings, StreamId)
+import Node.Http2.Types (Headers, Http2Session, Http2Stream, Settings, StreamId)
 import Node.Net.Types (Socket, TCP)
 import Node.TLS.Types (Client, Server)
 import Unsafe.Coerce (unsafeCoerce)

…ode/Http2/Constants/PaddingStrategy.purs src/Node/Http2/PaddingStrategy.purssrc/Node/Http2/Constants/PaddingStrategy.purs renamed to src/Node/Http2/PaddingStrategy.purs src/Node/Http2/Constants/PaddingStrategy.purs renamed to src/Node/Http2/PaddingStrategy.purs

@@ -57,7 +57,9 @@ import Node.EventEmitter (EventHandle(..))
 import Node.EventEmitter.UtilTypes (EventHandle0, EventHandle1, EventHandle3, EventHandle2)
 import Node.FS (FileDescriptor)
 import Node.Http2.Flags (BitwiseFlag)
-import Node.Http2.Types (ErrorCode(..), FrameType, Headers, Http2Session, Http2Stream, Settings, StreamId(..))
+import Node.Http2.ErrorCode (ErrorCode(..))
+import Node.Http2.FrameType (FrameType)
+import Node.Http2.Types (Headers, Http2Session, Http2Stream, Settings, StreamId(..))
 import Node.Path (FilePath)
 import Node.Stream (Duplex)
 import Node.TLS.Types (Client, Server)

src/Node/Http2/Session.purs

@@ -16,22 +16,6 @@ foreign import data Http2Stream :: Endpoint -> Type
 
 foreign import data Headers :: Type
 
-newtype FrameType = FrameType Int
-
-derive instance Eq FrameType
-derive instance Ord FrameType
-derive instance Newtype FrameType _
-derive instance Generic FrameType _
-derive newtype instance Show FrameType
-
-newtype ErrorCode = ErrorCode Int
-
-derive instance Eq ErrorCode
-derive instance Ord ErrorCode
-derive instance Newtype ErrorCode _
-derive instance Generic ErrorCode _
-derive newtype instance Show ErrorCode
-
 newtype StreamId = StreamId Int
 
 derive instance Eq StreamId
@@ -40,6 +24,11 @@ derive instance Newtype StreamId _
 derive instance Generic StreamId _
 derive newtype instance Show StreamId
 
+-- | A StreamId of 0, indicating the ID does not refer to a stream
+-- | but to the session's connection as a whole.
+connectionId :: StreamId
+connectionId = StreamId 0
+
 -- | `headerTableSize` <number> Specifies the maximum number of bytes used for header compression. The minimum allowed value is 0. The maximum allowed value is 232-1. Default: 4096.
 -- | `enablePush` <boolean> Specifies true if HTTP/2 Push Streams are to be permitted on the Http2Session instances. Default: true.
 -- | `initialWindowSize` <number> Specifies the sender's initial window size in bytes for stream-level flow control. The minimum allowed value is 0. The maximum allowed value is 232-1. Default: 65535.

src/Node/Http2/Stream.purs

@@ -15,7 +15,7 @@ import Node.Encoding (Encoding(..))
 import Node.EventEmitter (on)
 import Node.FS.Sync as FS
 import Node.Http2.Client as Client
-import Node.Http2.Constants.NGHTTP2 as NGHTTP2
+import Node.Http2.ErrorCode as ErrorCode
 import Node.Http2.Server as Server
 import Node.Http2.Session as Session
 import Node.Http2.Stream (toDuplex)
@@ -68,12 +68,12 @@ main = do
       { endStream: false -- if this is true, then Stream.write/end produces error
       , waitForTrailers: true
       }
-    -- H2Stream.close stream NGHTTP2.noError
+    -- H2Stream.close stream ErrorCode.noError
     Stream.writeStringCb_ duplex UTF8 "hello from server" \err -> do
       log (unsafeCoerce err)
       Stream.end' duplex \_ -> do
         log $ "server - onStream - closing for id: " <> show streamId
-        H2Stream.close stream NGHTTP2.noError
+        H2Stream.close stream ErrorCode.noError
 
   on Server.timeoutHandle server.tls do
     log "onTimeout"
@@ -113,7 +113,7 @@ main = do
         buffer <- Buffer.concat chunks :: Effect Buffer.Buffer
         str <- Buffer.toString UTF8 buffer :: Effect String
         log $ "client - onResponse body: " <> show str
-        H2Stream.close stream NGHTTP2.noError
+        H2Stream.close stream ErrorCode.noError
         Session.destroy session
         NServer.close server.net