diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for wai-handler-hal +## 0.5.0.1 -- 2026-09-29 + +- Use `defaultRequest` from `wai` to construct wai request to stay compatible + with future request fields that we don't need to care about. + ## 0.5.0.0 -- 2025-12-14 - Breaking change: Replace unsafe `decodeUtf8` with `decodeUtf8Lenient` diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -161,8 +161,8 @@ * `*.hs`: [`ormolu`](https://github.com/tweag/ormolu) * `*.cabal`: - [`cabal-fmt`](https://hackage.haskell.org/package/cabal-fmt) - (`cabal-fmt --inplace wai-handler-hal.cabal`) + [`cabal-gild`](https://hackage.haskell.org/package/cabal-gild) + (`cabal-gild --inplace wai-handler-hal.cabal`) * `*.nix`: [`nixpkgs-fmt`](https://github.com/nix-community/nixpkgs-fmt) (`nixpkgs-fmt *.nix`) diff --git a/src/Network/Wai/Handler/Hal.hs b/src/Network/Wai/Handler/Hal.hs --- a/src/Network/Wai/Handler/Hal.hs +++ b/src/Network/Wai/Handler/Hal.hs @@ -92,7 +92,7 @@ import Network.Socket (PortNumber) import qualified Network.Socket as NS import qualified Network.Wai as Wai -import qualified Network.Wai.Internal as Wai +import qualified Network.Wai.Internal as Wai (Response (..), ResponseReceived (..)) import System.IO ( IOMode (..), SeekMode (..), @@ -268,7 +268,7 @@ pure . NS.SockAddrInet port $ NS.tupleToHostAddress (127, 0, 0, 1) body <- returnChunks $ HalRequest.body req pure - Wai.Request + Wai.defaultRequest { Wai.requestMethod = Text.encodeUtf8 $ HalRequest.httpMethod req, Wai.httpVersion = HttpVersion 1 1, Wai.rawPathInfo = diff --git a/wai-handler-hal.cabal b/wai-handler-hal.cabal --- a/wai-handler-hal.cabal +++ b/wai-handler-hal.cabal @@ -1,7 +1,7 @@ -cabal-version: 2.2 -name: wai-handler-hal -version: 0.5.0.0 -synopsis: Wrap WAI applications to run on AWS Lambda +cabal-version: 2.2 +name: wai-handler-hal +version: 0.5.0.1 +synopsis: Wrap WAI applications to run on AWS Lambda description: This library provides a function 'Network.Wai.Handler.Hal.run' to lift a @wai@ 'Network.Wai.Application' into a function that can be @@ -12,73 +12,77 @@ More details, including deployment advice, are available in the repository's @README.md@. -homepage: http://github.com/bellroy/wai-handler-hal -bug-reports: http://github.com/bellroy/wai-handler-hal/issues -license: BSD-3-Clause -license-file: LICENSE -author: Bellroy Tech Team -maintainer: Bellroy Tech Team -copyright: Copyright (C) 2021, 2024 Bellroy Pty Ltd -category: AWS, Cloud -build-type: Simple -extra-doc-files: CHANGELOG.md +homepage: http://github.com/bellroy/wai-handler-hal +bug-reports: http://github.com/bellroy/wai-handler-hal/issues +license: BSD-3-Clause +license-file: LICENSE +author: Bellroy Tech Team +maintainer: Bellroy Tech Team +copyright: Copyright (C) 2021, 2024 Bellroy Pty Ltd +category: AWS, Cloud +build-type: Simple +extra-doc-files: CHANGELOG.md extra-source-files: README.md test/data/ProxyRequest.json test/golden/WaiRequest.txt -tested-with: - GHC ==9.6.7 - || ==9.8.4 - || ==9.10.3 - || ==9.12.2 +tested-with: ghc ==9.6.7 || ==9.8.4 || ==9.10.3 || ==9.12.2 common opts default-language: Haskell2010 ghc-options: - -Wall -Wcompat -Widentities -Wincomplete-record-updates - -Wincomplete-uni-patterns -Werror=incomplete-patterns - -Wredundant-constraints -Wpartial-fields -Wtabs - -Wmissing-local-signatures -fhelpful-errors - -fprint-expanded-synonyms -fwarn-unused-do-bind + -Wall + -Wcompat + -Widentities + -Wincomplete-record-updates + -Wincomplete-uni-patterns + -Werror=incomplete-patterns + -Wredundant-constraints + -Wpartial-fields + -Wtabs + -Wmissing-local-signatures + -fhelpful-errors + -fprint-expanded-synonyms + -fwarn-unused-do-bind common deps build-depends: - , base >=4.12 && <4.22 - , base64-bytestring >=1.0.0.0 && <1.3 - , bytestring >=0.10.8 && <0.13 - , case-insensitive ^>=1.2.0.0 - , hal >=0.4.7 && <0.4.11 || >=1.0.0 && <1.2 - , http-media ^>=0.8.1.1 - , http-types ^>=0.12.3 - , network >=3.2.3.0 && <3.3 - , text ^>=2.0 || ^>=2.1 - , unordered-containers ^>=0.2.10.0 - , vault ^>=0.3.1.0 - , wai ^>=3.2.2 + base >=4.12 && <4.23, + base64-bytestring >=1.0.0.0 && <1.3, + bytestring >=0.10.8 && <0.13, + case-insensitive ^>=1.2.0.0, + hal >=0.4.7 && <1.2, + http-media ^>=0.8.1.1, + http-types ^>=0.12.3, + network >=3.2.3.0 && <3.3, + text ^>=2.0 || ^>=2.1, + unordered-containers ^>=0.2.10.0, + vault ^>=0.3.1.0, + wai ^>=3.2.2, library - import: opts, deps + import: opts, deps exposed-modules: Network.Wai.Handler.Hal - hs-source-dirs: src + hs-source-dirs: src test-suite wai-handler-hal-tests - import: deps, opts - type: exitcode-stdio-1.0 - hs-source-dirs: test - main-is: Main.hs - ghc-options: -threaded - other-modules: Network.Wai.Handler.HalTest + import: deps, opts + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Main.hs + ghc-options: -threaded + other-modules: Network.Wai.Handler.HalTest build-tool-depends: tasty-discover:tasty-discover ^>=4.2.2 build-depends: - , aeson >=1.5.6.0 && <1.6 || >=2.0 && <2.3 - , pretty-simple ^>=4.1.0.0 - , tasty >=1.3 && <1.6 - , tasty-golden ^>=2.3 - , tasty-hunit >=0.9 && <0.11 - , text - , wai-handler-hal + aeson >=1.5.6.0 && <2.4, + pretty-simple ^>=4.1.0.0, + tasty >=1.3 && <1.6, + tasty-golden ^>=2.3, + tasty-hunit >=0.9 && <0.11, + text, + wai-handler-hal, source-repository head - type: git + type: git location: https://github.com/bellroy/wai-handler-hal.git