WIP JS errors and purs-tidy

Author: jamesdbrock

bower.json

@@ -1,33 +1,45 @@
 {
-  "name": "purescript-node-http",
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "output"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/purescript-node/purescript-node-http.git"
-  },
-  "devDependencies": {
-    "purescript-console": "^6.0.0"
-  },
-  "dependencies": {
-    "purescript-arraybuffer-types": "^3.0.2",
-    "purescript-contravariant": "^6.0.0",
-    "purescript-effect": "^4.0.0",
-    "purescript-foreign": "^7.0.0",
-    "purescript-foreign-object": "^4.0.0",
-    "purescript-maybe": "^6.0.0",
-    "purescript-node-buffer": "^8.0.0",
-    "purescript-node-net": "^4.0.0",
-    "purescript-node-streams": "^7.0.0",
-    "purescript-node-url": "^6.0.0",
-    "purescript-nullable": "^6.0.0",
-    "purescript-options": "^7.0.0",
-    "purescript-prelude": "^6.0.0",
-    "purescript-unsafe-coerce": "^6.0.0"
-  }
+    "name": "purescript-node-http",
+    "license": [
+        "MIT"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/purescript-node/purescript-node-http"
+    },
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "output"
+    ],
+    "dependencies": {
+        "purescript-aff": "^v7.1.0",
+        "purescript-arraybuffer-types": "^v3.0.2",
+        "purescript-console": "^v6.0.0",
+        "purescript-contravariant": "^v6.0.0",
+        "purescript-control": "^v6.0.0",
+        "purescript-effect": "^v4.0.0",
+        "purescript-either": "^v6.1.0",
+        "purescript-exceptions": "^v6.0.0",
+        "purescript-foldable-traversable": "^v6.0.0",
+        "purescript-foreign": "^v7.0.0",
+        "purescript-foreign-object": "^v4.1.0",
+        "purescript-maybe": "^v6.0.0",
+        "purescript-node-buffer": "^v8.0.0",
+        "purescript-node-net": "^v4.0.0",
+        "purescript-node-streams": "^v7.0.0",
+        "purescript-node-streams-aff": "https://github.com/purescript-node/purescript-node-streams-aff.git#v4.0.0",
+        "purescript-node-url": "^v6.0.0",
+        "purescript-nullable": "^v6.0.0",
+        "purescript-options": "^v7.0.0",
+        "purescript-partial": "^v4.0.0",
+        "purescript-prelude": "^v6.0.1",
+        "purescript-st": "^v6.2.0",
+        "purescript-strings": "^v6.0.1",
+        "purescript-transformers": "^v6.0.0",
+        "purescript-tuples": "^v7.0.0",
+        "purescript-unsafe-coerce": "^v6.0.0",
+        "purescript-web-fetch": "https://github.com/purescript-web/purescript-web-fetch.git#v3.0.0"
+    }
 }

spago.dhall

@@ -14,7 +14,6 @@ to generate this file without the comments in this block.
 , dependencies =
   [ "aff"
   , "arraybuffer-types"
-  , "arrays"
   , "console"
   , "contravariant"
   , "control"
@@ -34,7 +33,6 @@ to generate this file without the comments in this block.
   , "options"
   , "partial"
   , "prelude"
-  , "record"
   , "st"
   , "strings"
   , "transformers"
@@ -44,4 +42,6 @@ to generate this file without the comments in this block.
   ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs", "test/**/*.purs" ]
+, license = "MIT"
+, repository = "https://github.com/purescript-node/purescript-node-http"
 }

src/Node/HTTP/Secure.purs

@@ -90,16 +90,17 @@ import Unsafe.Coerce (unsafeCoerce)
 
 -- | Create an HTTPS server, given the SSL options and a function to be executed
 -- | when a request is received.
-foreign import createServerImpl ::
-  Foreign ->
-  (Request -> Response -> Effect Unit) ->
-  Effect Server
+foreign import createServerImpl
+  :: Foreign
+  -> (Request -> Response -> Effect Unit)
+  -> Effect Server
 
 -- | Create an HTTPS server, given the SSL options and a function to be executed
 -- | when a request is received.
-createServer :: Options SSLOptions ->
-                (Request -> Response -> Effect Unit) ->
-                Effect Server
+createServer
+  :: Options SSLOptions
+  -> (Request -> Response -> Effect Unit)
+  -> Effect Server
 createServer = createServerImpl <<< options
 
 -- | The type of HTTPS server options
@@ -120,16 +121,22 @@ rejectUnauthorized = opt "rejectUnauthorized"
 -- | The npnProtocols option can be a String, a Buffer, a Uint8Array, or an
 -- | array of any of those types.
 data NPNProtocols
+
 npnProtocolsString :: String -> NPNProtocols
 npnProtocolsString = unsafeCoerce
+
 npnProtocolsBuffer :: Buffer -> NPNProtocols
 npnProtocolsBuffer = unsafeCoerce
+
 npnProtocolsUint8Array :: Uint8Array -> NPNProtocols
 npnProtocolsUint8Array = unsafeCoerce
+
 npnProtocolsStringArray :: Array String -> NPNProtocols
 npnProtocolsStringArray = unsafeCoerce
+
 npnProtocolsBufferArray :: Array Buffer -> NPNProtocols
 npnProtocolsBufferArray = unsafeCoerce
+
 npnProtocolsUint8ArrayArray :: Array Uint8Array -> NPNProtocols
 npnProtocolsUint8ArrayArray = unsafeCoerce
 
@@ -140,16 +147,22 @@ npnProtocols = opt "NPNProtocols"
 -- | The alpnProtocols option can be a String, a Buffer, a Uint8Array, or an
 -- | array of any of those types.
 data ALPNProtocols
+
 alpnProtocolsString :: String -> ALPNProtocols
 alpnProtocolsString = unsafeCoerce
+
 alpnProtocolsBuffer :: Buffer -> ALPNProtocols
 alpnProtocolsBuffer = unsafeCoerce
+
 alpnProtocolsUint8Array :: Uint8Array -> ALPNProtocols
 alpnProtocolsUint8Array = unsafeCoerce
+
 alpnProtocolsStringArray :: Array String -> ALPNProtocols
 alpnProtocolsStringArray = unsafeCoerce
+
 alpnProtocolsBufferArray :: Array Buffer -> ALPNProtocols
 alpnProtocolsBufferArray = unsafeCoerce
+
 alpnProtocolsUint8ArrayArray :: Array Uint8Array -> ALPNProtocols
 alpnProtocolsUint8ArrayArray = unsafeCoerce
 
@@ -167,8 +180,10 @@ ticketKeys = opt "ticketKeys"
 
 -- | The PFX option can take either a String or a Buffer
 data PFX
+
 pfxString :: String -> PFX
 pfxString = unsafeCoerce
+
 pfxBuffer :: Buffer -> PFX
 pfxBuffer = unsafeCoerce
 
@@ -179,12 +194,16 @@ pfx = opt "pfx"
 -- | The key option can be a String, a Buffer, an array of strings, or an array
 -- | of buffers.
 data Key
+
 keyString :: String -> Key
 keyString = unsafeCoerce
+
 keyBuffer :: Buffer -> Key
 keyBuffer = unsafeCoerce
+
 keyStringArray :: Array String -> Key
 keyStringArray = unsafeCoerce
+
 keyBufferArray :: Array Buffer -> Key
 keyBufferArray = unsafeCoerce
 
@@ -199,12 +218,16 @@ passphrase = opt "passphrase"
 -- | The cert option can be a String, a Buffer, an array of strings, or an array
 -- | of buffers.
 data Cert
+
 certString :: String -> Cert
 certString = unsafeCoerce
+
 certBuffer :: Buffer -> Cert
 certBuffer = unsafeCoerce
+
 certStringArray :: Array String -> Cert
 certStringArray = unsafeCoerce
+
 certBufferArray :: Array Buffer -> Cert
 certBufferArray = unsafeCoerce
 
@@ -215,12 +238,16 @@ cert = opt "cert"
 -- | The CA option can be a String, a Buffer, an array of strings, or an array
 -- | of buffers.
 data CA
+
 caString :: String -> CA
 caString = unsafeCoerce
+
 caBuffer :: Buffer -> CA
 caBuffer = unsafeCoerce
+
 caStringArray :: Array String -> CA
 caStringArray = unsafeCoerce
+
 caBufferArray :: Array Buffer -> CA
 caBufferArray = unsafeCoerce
 
@@ -231,12 +258,16 @@ ca = opt "ca"
 -- | The CRL option can be a String, a Buffer, an array of strings, or an array
 -- | of buffers.
 data CRL
+
 crlString :: String -> CRL
 crlString = unsafeCoerce
+
 crlBuffer :: Buffer -> CRL
 crlBuffer = unsafeCoerce
+
 crlStringArray :: Array String -> CRL
 crlStringArray = unsafeCoerce
+
 crlBufferArray :: Array Buffer -> CRL
 crlBufferArray = unsafeCoerce
 
@@ -258,8 +289,10 @@ ecdhCurve = opt "ecdhCurve"
 
 -- | The DHParam option can take either a String or a Buffer
 data DHParam
+
 dhparamString :: String -> DHParam
 dhparamString = unsafeCoerce
+
 dhparamBuffer :: Buffer -> DHParam
 dhparamBuffer = unsafeCoerce
 

src/Node/HTTP2.purs

@@ -19,8 +19,7 @@ module Node.HTTP2
   , Options
   , toOptions
   , Flags
-  )
-  where
+  ) where
 
 import Prelude
 
@@ -47,8 +46,6 @@ instance Semigroup Headers where
 instance Monoid Headers where
   mempty = unsafeCoerce {}
 
-
-
 -- | https://nodejs.org/docs/latest/api/http2.html#headers-object
 -- |
 -- | Use this function to construct a `Headers` object. Rules for `Headers`:

src/Node/HTTP2/Client.Aff.purs

@@ -89,19 +89,19 @@ close session = makeAff \complete -> do
 -- | [`Node.Stream.Aff.readAll`](https://pursuit.purescript.org/packages/purescript-node-streams-aff/docs/Node.Stream.Aff#v:readAll).
 request :: ClientHttp2Session -> Options -> Headers -> Aff ClientHttp2Stream
 request session options headers = makeAff \complete -> do
-    -- how do we get errors out of the request?
-    -- by catching exceptions? this is just a guess.
-    -- or maybe like this?
-    --
-    --     onceErrorCancel <- Client.onceErrorSession session \err -> complete (Left err)
-    --
-    abortcontroller <- Web.Fetch.AbortController.new
-    let abortsignal = Web.Fetch.AbortController.signal abortcontroller
-    stream <- catchException (pure <<< Left) do
-      Right <$> Client.request session headers (toOptions {"signal":abortsignal} <> options)
-    complete stream
-    pure $ effectCanceler do
-      Web.Fetch.AbortController.abort abortcontroller
+  -- how do we get errors out of the request?
+  -- by catching exceptions? this is just a guess.
+  -- or maybe like this?
+  --
+  --     onceErrorCancel <- Client.onceErrorSession session \err -> complete (Left err)
+  --
+  abortcontroller <- Web.Fetch.AbortController.new
+  let abortsignal = Web.Fetch.AbortController.signal abortcontroller
+  stream <- catchException (pure <<< Left) do
+    Right <$> Client.request session headers (toOptions { "signal": abortsignal } <> options)
+  complete stream
+  pure $ effectCanceler do
+    Web.Fetch.AbortController.abort abortcontroller
 
 -- | Wait to receive response headers from the server.
 waitResponse :: ClientHttp2Stream -> Aff Headers
@@ -122,11 +122,11 @@ waitResponse stream = makeAff \complete -> do
 -- | [`Node.Stream.Aff.readAll`](https://pursuit.purescript.org/packages/purescript-node-streams-aff/docs/Node.Stream.Aff#v:readAll).
 waitPush
   :: ClientHttp2Session
-  -> Aff {headersRequest :: Headers, headersResponse :: Headers, streamPushed :: ClientHttp2Stream}
+  -> Aff { headersRequest :: Headers, headersResponse :: Headers, streamPushed :: ClientHttp2Stream }
 waitPush session = makeAff \complete -> do
   onceStreamCancel <- Client.onceStream session \streamPushed headersRequest _ -> do
     _oncePushCancel <- Client.oncePush streamPushed \headersResponse _ ->
-      complete (Right {headersRequest, headersResponse, streamPushed})
+      complete (Right { headersRequest, headersResponse, streamPushed })
     pure unit
   pure $ effectCanceler do
     -- I'm not sure how to _oncePushCancel.

src/Node/HTTP2/Client.js

@@ -1,39 +1,39 @@
-import http2 from 'http2';
+import http2 from "http2";
 
 // https://nodejs.org/docs/latest/api/http2.html#http2connectauthority-options-listener
 // https://nodejs.org/docs/latest/api/http2.html#event-connect
 export const connect = authority => options => listener => () => {
   return http2.connect(authority, options,
     (session,socket) => listener(session)(socket)()
   );
-}
+};
 
 // https://nodejs.org/docs/latest/api/http2.html#clienthttp2sessionrequestheaders-options
 export const request = clienthttp2session => headers => options => () => {
   return clienthttp2session.request(headers, options);
-}
+};
 
 export const destroy = clienthttp2stream => () => {
   clienthttp2stream.destroy();
-}
+};
 
 // https://nodejs.org/docs/latest/api/http2.html#event-response
 export const onceResponse = clienthttp2stream => callback => () => {
   const cb = (headers,flags) => callback(headers)(flags)();
-  clienthttp2stream.once('response', cb);
-  return () => clienthttp2stream.removeEventListener('response', cb);
-}
+  clienthttp2stream.once("response", cb);
+  return () => clienthttp2stream.removeEventListener("response", cb);
+};
 
 // https://nodejs.org/docs/latest/api/http2.html#event-headers
 export const onceHeaders = clienthttp2stream => callback => () => {
   const cb = (headers,flags) => callback(headers)(flags)();
-  clienthttp2stream.once('headers', cb);
-  return () => clienthttp2stream.removeEventListener('headers', cb);
-}
+  clienthttp2stream.once("headers", cb);
+  return () => clienthttp2stream.removeEventListener("headers", cb);
+};
 
 // https://nodejs.org/docs/latest/api/http2.html#event-push
 export const oncePush = clienthttp2stream => callback => () => {
   const cb = (headers,flags) => callback(headers)(flags)();
-  clienthttp2stream.once('push', cb);
-  return () => clienthttp2stream.removeEventListener('push', cb);
-}
+  clienthttp2stream.once("push", cb);
+  return () => clienthttp2stream.removeEventListener("push", cb);
+};