Version 2.0.2.

Author: dnikolovv

ChangeLog.md

@@ -1,12 +1,17 @@
 # Changelog for aws-lambda-haskell-runtime-wai
 
+## 2.0.2
+
+* Make registering multiple wai handlers possible (via `waiHandler`).
+* Use version `4.1.1` of `aws-lambda-haskell-runtime`.
+
 ## 2.0.1
 
-* Using version `4.1.0` of `aws-lambda-haskell-runtime` that fixes [#101](https://github.com/theam/aws-lambda-haskell-runtime/issues/101).
+* Use version `4.1.0` of `aws-lambda-haskell-runtime` that fixes [#101](https://github.com/theam/aws-lambda-haskell-runtime/issues/101).
 
 ## 2.0.0
 
-* Using version [`4.0.0`](https://github.com/theam/aws-lambda-haskell-runtime/pull/97) of `aws-lambda-haskell-runtime`.
+* Use version [`4.0.0`](https://github.com/theam/aws-lambda-haskell-runtime/pull/97) of `aws-lambda-haskell-runtime`.
 * New handler types that allow you to support ALB or even API Gateway + ALB at once.
 
 ## 1.0.3

package.yaml

@@ -1,5 +1,5 @@
 name:                aws-lambda-haskell-runtime-wai
-version:             2.0.1
+version:             2.0.2
 github:              "eir-forsakring/aws-lambda-haskell-runtime-wai"
 license:             BSD3
 author:              "Dobromir Nikolov"

src/Aws/Lambda/Wai.hs

@@ -14,6 +14,7 @@ module Aws.Lambda.Wai
     ALBWaiHandler,
     ignoreALBPathPart,
     ignoreNothing,
+    waiHandler
   )
 where
 
@@ -48,6 +49,8 @@ type ApiGatewayWaiHandler = ApiGatewayRequest Text -> Context Application -> IO
 
 type ALBWaiHandler = ALBRequest Text -> Context Application -> IO (Either (ALBResponse Text) (ALBResponse Text))
 
+type GenericWaiHandler = Value -> Context Application -> IO (Either Value Value)
+
 newtype ALBIgnoredPathPortion = ALBIgnoredPathPortion {unALBIgnoredPathPortion :: Text}
 
 data WaiLambdaProxyType
@@ -62,21 +65,26 @@ runWaiAsProxiedHttpLambda ::
   IO ()
 runWaiAsProxiedHttpLambda options ignoredAlbPath handlerName mkApp =
   runLambdaHaskellRuntime options mkApp id $
-    addStandaloneLambdaHandler handlerName $ \(request :: Value) context ->
-      case parse parseIsAlb request of
-        Success isAlb -> do
-          if isAlb
-            then case fromJSON @(ALBRequest Text) request of
-              Success albRequest ->
-                bimap toJSON toJSON <$> albWaiHandler ignoredAlbPath albRequest context
-              Error err -> error $ "Could not parse the request as a valid ALB request: " <> err
-            else case fromJSON @(ApiGatewayRequest Text) request of
-              Success apiGwRequest ->
-                bimap toJSON toJSON <$> apiGatewayWaiHandler apiGwRequest context
-              Error err -> error $ "Could not parse the request as a valid API Gateway request: " <> err
-        Error err ->
-          error $
-            "Could not parse the request as a valid API Gateway or ALB proxy request: " <> err
+    addStandaloneLambdaHandler handlerName (waiHandler ignoredAlbPath)
+
+waiHandler ::
+  Maybe ALBIgnoredPathPortion ->
+  GenericWaiHandler
+waiHandler ignoredAlbPath request context =
+  case parse parseIsAlb request of
+    Success isAlb -> do
+      if isAlb
+        then case fromJSON @(ALBRequest Text) request of
+          Success albRequest ->
+            bimap toJSON toJSON <$> albWaiHandler ignoredAlbPath albRequest context
+          Error err -> error $ "Could not parse the request as a valid ALB request: " <> err
+        else case fromJSON @(ApiGatewayRequest Text) request of
+          Success apiGwRequest ->
+            bimap toJSON toJSON <$> apiGatewayWaiHandler apiGwRequest context
+          Error err -> error $ "Could not parse the request as a valid API Gateway request: " <> err
+    Error err ->
+      error $
+        "Could not parse the request as a valid API Gateway or ALB proxy request: " <> err
   where
     parseIsAlb :: Value -> Parser Bool
     parseIsAlb = withObject "Request" $ \obj -> do

stack.yaml

@@ -40,7 +40,7 @@ packages:
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
 #
 extra-deps:
-- aws-lambda-haskell-runtime-4.1.0@sha256:4fbf9855326ed0173c3ef27c006412c8da46f84b0566fa92a44ad0e988432d82,2916
+- aws-lambda-haskell-runtime-4.1.1@sha256:c3b3452d3a7f36950c22760fe44b51d49b43624fa3a0253e5bfc3d94809bb8fd,3024
 # Override default flag values for local packages and extra-deps
 # flags: {}
 

stack.yaml.lock

@@ -5,12 +5,12 @@
 
 packages:
 - completed:
-    hackage: aws-lambda-haskell-runtime-4.1.0@sha256:4fbf9855326ed0173c3ef27c006412c8da46f84b0566fa92a44ad0e988432d82,2916
+    hackage: aws-lambda-haskell-runtime-4.1.1@sha256:c3b3452d3a7f36950c22760fe44b51d49b43624fa3a0253e5bfc3d94809bb8fd,3024
     pantry-tree:
       size: 1453
-      sha256: c01167c71d6e25a33b822629d5efc50818589e33e5341ee1bea1bb4e2c59f9c6
+      sha256: b7e8426edb0b5d06713a26362308abbec03379e1f3ad9c6d63973088ad75cf62
   original:
-    hackage: aws-lambda-haskell-runtime-4.1.0@sha256:4fbf9855326ed0173c3ef27c006412c8da46f84b0566fa92a44ad0e988432d82,2916
+    hackage: aws-lambda-haskell-runtime-4.1.1@sha256:c3b3452d3a7f36950c22760fe44b51d49b43624fa3a0253e5bfc3d94809bb8fd,3024
 snapshots:
 - completed:
     size: 532377