Merge branch 'series/1.x' into merge/0.1-1.x

Author: armanbilge

build.sbt

@@ -16,7 +16,7 @@
 
 name := "feral"
 
-ThisBuild / tlBaseVersion := "0.1"
+ThisBuild / tlBaseVersion := "1.0"
 ThisBuild / startYear := Some(2021)
 
 ThisBuild / developers := List(
@@ -59,7 +59,7 @@ ThisBuild / crossScalaVersions := Seq(Scala212, Scala3, Scala213)
 val catsEffectVersion = "3.3.13"
 val circeVersion = "0.14.2"
 val fs2Version = "3.2.9"
-val http4sVersion = "0.23.13"
+val http4sVersion = "1.0.0-M34"
 val natchezVersion = "0.1.6"
 val munitVersion = "0.7.29"
 val munitCEVersion = "1.0.7"
@@ -181,7 +181,6 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform)
       "org.http4s" %%% "http4s-dsl" % http4sVersion,
       "org.http4s" %%% "http4s-ember-client" % http4sVersion,
       "org.tpolecat" %%% "natchez-xray" % natchezVersion,
-      "org.tpolecat" %%% "natchez-http4s" % "0.3.2",
       "org.tpolecat" %%% "skunk-core" % "0.3.1"
     )
   )

examples/src/main/scala/feral/examples/Http4sLambda.scala

@@ -21,8 +21,6 @@ import cats.effect.std.Random
 import feral.lambda._
 import feral.lambda.events._
 import feral.lambda.http4s._
-import natchez.Trace
-import natchez.http4s.NatchezMiddleware
 import natchez.xray.XRay
 import org.http4s.HttpRoutes
 import org.http4s.client.Client
@@ -60,18 +58,16 @@ object http4sHandler
 
     // a middleware to add tracing to any handler
     // it extracts the kernel from the event and adds tags derived from the context
-    TracedHandler(entrypoint) { implicit trace =>
-      val tracedClient = NatchezMiddleware.client(client)
-
+    TracedHandler(entrypoint) { _ =>
       // a "middleware" that converts an HttpRoutes into a ApiGatewayProxyHandler
-      ApiGatewayProxyHandler(myRoutes[IO](tracedClient))
+      ApiGatewayProxyHandler(myRoutes[IO](client))
     }
   }
 
   /**
    * Nothing special about this method, including its existence, just an example :)
    */
-  def myRoutes[F[_]: Concurrent: Trace](client: Client[F]): HttpRoutes[F] = {
+  def myRoutes[F[_]: Concurrent](client: Client[F]): HttpRoutes[F] = {
     implicit val dsl = Http4sDsl[F]
     import dsl._
 
@@ -80,7 +76,7 @@ object http4sHandler
       case GET -> Root / "joke" => Ok(client.expect[String](uri"icanhazdadjoke.com"))
     }
 
-    NatchezMiddleware.server(routes)
+    routes
   }
 
 }

lambda-http4s/src/main/scala/feral/lambda/http4s/ApiGatewayProxyHandler.scala

@@ -17,20 +17,24 @@
 package feral.lambda
 package http4s
 
+import cats.data.OptionT
 import cats.effect.kernel.Concurrent
 import cats.syntax.all._
 import feral.lambda.events.ApiGatewayProxyEventV2
 import feral.lambda.events.ApiGatewayProxyStructuredResultV2
-import fs2.Stream
+import fs2.Chunk
 import org.http4s.Charset
+import org.http4s.Entity
 import org.http4s.Headers
 import org.http4s.HttpRoutes
+import org.http4s.MalformedMessageBodyFailure
 import org.http4s.Method
 import org.http4s.Request
 import org.http4s.Response
 import org.http4s.Uri
 import org.http4s.headers.Cookie
 import org.http4s.headers.`Set-Cookie`
+import scodec.bits.ByteVector
 
 object ApiGatewayProxyHandler {
 
@@ -39,15 +43,21 @@ object ApiGatewayProxyHandler {
     for {
       event <- LambdaEnv.event
       request <- decodeEvent(event)
-      response <- routes(request).getOrElse(Response.notFound[F])
+      response <- routes(request).getOrElse(Response.notFound)
       isBase64Encoded = !response.charset.contains(Charset.`UTF-8`)
-      responseBody <- response
-        .body
-        .through(
-          if (isBase64Encoded) fs2.text.base64.encode else fs2.text.utf8.decode
-        )
-        .compile
-        .string
+      responseBody <- response.entity match {
+        case Entity.Empty => "".pure
+        case Entity.Strict(chunk) => // TODO
+          if (isBase64Encoded) chunk.toByteVector.toBase64.pure
+          else chunk.toByteVector.decodeUtf8.liftTo
+        case Entity.Default(body, _) =>
+          body
+            .through(
+              if (isBase64Encoded) fs2.text.base64.encode else fs2.text.utf8.decode
+            )
+            .compile
+            .string
+      }
     } yield {
       val headers = response.headers.headers.groupMap(_.name)(_.value)
       Some(
@@ -70,15 +80,22 @@ object ApiGatewayProxyHandler {
     uri <- Uri.fromString(event.rawPath + "?" + event.rawQueryString).liftTo[F]
     cookies = event.cookies.filter(_.nonEmpty).map(Cookie.name.toString -> _.mkString("; "))
     headers = Headers(cookies.toList ::: event.headers.toList)
-    readBody =
-      if (event.isBase64Encoded)
-        fs2.text.base64.decode[F]
-      else
-        fs2.text.utf8.encode[F]
+    body <- OptionT
+      .fromOption(event.body)
+      .semiflatMap { eventBody =>
+        if (event.isBase64Encoded)
+          ByteVector
+            .fromBase64Descriptive(eventBody)
+            .leftMap(MalformedMessageBodyFailure(_))
+            .liftTo
+        else
+          ByteVector.encodeUtf8(eventBody).liftTo
+      }
+      .value
   } yield Request(
     method,
     uri,
     headers = headers,
-    body = Stream.fromOption[F](event.body).through(readBody)
+    entity = body.foldMap(b => Entity.strict(Chunk.byteVector(b)))
   )
 }