ZIO 2 support (#809)

* upgrade to zio 2.0.0-RC1 * bump timeout for failing test * other fixes * increase timeout * rejigger broken test * try, try again * get compiling & tests passing Co-authored-by: Kit Langton <kit.langton@gmail.com>
zio · Feb 9, 2022 · 7660b9c · 7660b9c
1 parent 4b760b4
commit 7660b9c
Show file tree

Hide file tree

Showing 77 changed files with 458 additions and 420 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@
 *.ipr
 *.iws
 .idea
+.bloop/
+.metals/
+null
 out
 .cache/
 .history/
@@ -28,3 +31,6 @@ node_modules/
 .bsp/
 .DS_Store
 web/.DS_Store
+
+.vscode
+project/metals.sbt
diff --git a/README.md b/README.md
@@ -32,13 +32,13 @@ import zio._
 import zhttp.http._
 import zhttp.service.Server
 
-object HelloWorld extends App {
+object HelloWorld extends ZIOAppDefault {
   val app = Http.collect[Request] {
     case Method.GET -> !! / "text" => Response.text("Hello World!")
   }
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val run =
+    Server.start(8090, app)
 }
 ```
 #### Examples

diff --git a/docs/index.md b/docs/index.md
@@ -89,7 +89,7 @@ object Spec extends DefaultRunnableSpec {
   }
 
   def spec = suite("http") (
-    testM("should be ok") {
+    test("should be ok") {
       val req         = ???
       val expectedRes = resp => resp.status.toJHttpStatus.code() == Status.OK
       assertM(app(req))(expectedRes) // an apply method is added via `zhttp.test` package
@@ -135,11 +135,11 @@ import zhttp.http._
 import zhttp.service.Server
 import zio._
 
-object HelloWorld extends App {
+object HelloWorld extends ZIOAppDefault {
   val app = Http.ok
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val run =
+    Server.start(8090, app)
 }
 ```
 

diff --git a/docs/website/docs/advanced-examples/cors.md b/docs/website/docs/advanced-examples/cors.md
@@ -0,0 +1,22 @@
+# CORS Handling
+
+```scala
+import zhttp.http._
+import zhttp.service.Server
+import zio._
+
+object HelloWorldWithCORS extends ZIOAppDefault {
+  // Create HTTP route with CORS enabled
+  val app: HttpApp[Any, Nothing] = CORS(
+    Http.collect[Request] {
+      case Method.GET -> !! / "text" => Response.text("Hello World!")
+      case Method.GET -> !! / "json" => Response.jsonString("""{"greetings": "Hello World!"}""")
+    },
+    config = CORSConfig(anyOrigin = true),
+  )
+
+  // Run it like any simple app
+  val run =
+    Server.start(8090, app.silent)
+}
+```
diff --git a/docs/website/docs/advanced-examples/sticky-threads.md b/docs/website/docs/advanced-examples/sticky-threads.md
diff --git a/docs/website/docs/advanced-examples/stream-file.md b/docs/website/docs/advanced-examples/stream-file.md
diff --git a/docs/website/docs/index.md b/docs/website/docs/index.md
diff --git a/docs/website/docs/v1.x/examples/advanced-examples/authentication.md b/docs/website/docs/v1.x/examples/advanced-examples/authentication.md
@@ -8,7 +8,7 @@ import zio._
 
 import java.time.Clock
 
-object Authentication extends App {
+object Authentication extends ZIOAppDefault {
   // Secret Authentication key
   val SECRET_KEY = "secretKey"
 
@@ -56,8 +56,8 @@ object Authentication extends App {
   val app: UHttpApp = login ++ authenticate(Http.forbidden("Not allowed!"), user)
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val run =
+    Server.start(8090, app)
 }
 
 ```
diff --git a/docs/website/docs/v1.x/examples/advanced-examples/concrete-entity.md b/docs/website/docs/v1.x/examples/advanced-examples/concrete-entity.md
@@ -7,26 +7,27 @@ import zio._
 /**
  * Example to build app on concrete entity
  */
-object ConcreteEntity extends App {
-  // Request
+object ConcreteEntity extends ZIOAppDefault {
+  //Request
   case class CreateUser(name: String)
 
-  // Response
+  //Response
   case class UserCreated(id: Long)
 
   val user: Http[Any, Nothing, CreateUser, UserCreated] =
     Http.collect[CreateUser] { case CreateUser(_) =>
       UserCreated(2)
     }
 
-  val app: HttpApp[Any, Nothing] =
-    user
-      .contramap[Request](req => CreateUser(req.path.toString))   // Http[Any, Nothing, Request, UserCreated]
-      .map(userCreated => Response.text(userCreated.id.toString)) // Http[Any, Nothing, Request, Response]
+  val app: Http[Any, Nothing, Request, Response[Any, Nothing]] = user
+    .contramap[Request](req => CreateUser(req.endpoint._2.toString)) 
+        //Http[Any, Nothing, Request, UserCreated]
+    .map(userCreated => Response.text(userCreated.id.toString))
+        //Http[Any, Nothing, Request, Response]
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val run =
+    Server.start(8090, app)
 }
 
 ```
diff --git a/docs/website/docs/v1.x/examples/advanced-examples/hello-world-advanced.md b/docs/website/docs/v1.x/examples/advanced-examples/hello-world-advanced.md
@@ -8,7 +8,7 @@ import zio._
 
 import scala.util.Try
 
-object HelloWorldAdvanced extends App {
+object HelloWorldAdvanced extends ZIOAppDefault {
   // Set a port
   private val PORT = 0
 
@@ -27,7 +27,7 @@ object HelloWorldAdvanced extends App {
       Server.paranoidLeakDetection ++ // Paranoid leak detection (affects performance)
       Server.app(fooBar ++ app)       // Setup the Http app
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override val run = {
     // Configure thread count using CLI
     val nThreads: Int = args.headOption.flatMap(x => Try(x.toInt).toOption).getOrElse(0)
 
@@ -41,7 +41,6 @@ object HelloWorldAdvanced extends App {
           *> ZIO.never,
       )
       .provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
-      .exitCode
   }
 }
 

diff --git a/docs/website/docs/v1.x/examples/advanced-examples/stream-response.md b/docs/website/docs/v1.x/examples/advanced-examples/stream-response.md
@@ -9,13 +9,12 @@ import zio._
 /**
  * Example to encode content using a ZStream
  */
-object StreamingResponse extends App {
+object StreamingResponse extends ZIOAppDefault {
   override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
 
     // Starting the server (for more advanced startup configuration checkout `HelloWorldAdvanced`)
     Server.start(8090, app.silent).exitCode
   }
-
   // Create a message as a Chunk[Byte]
   val message                    = Chunk.fromArray("Hello world !\r\n".getBytes(HTTP_CHARSET))
   // Use `Http.collect` to match on route
@@ -32,5 +31,11 @@ object StreamingResponse extends App {
         data = HttpData.fromStream(ZStream.fromChunk(message)), // Encoding content using a ZStream
       )
   }
+  val run = {
+
+    // Starting the server (for more advanced startup 
+    // configuration checkout `HelloWorldAdvanced`)
+    Server.start(8090, app.silent)
+  }
 }
 ```
diff --git a/docs/website/docs/v1.x/examples/advanced-examples/web-socket-advanced.md b/docs/website/docs/v1.x/examples/advanced-examples/web-socket-advanced.md
@@ -7,7 +7,7 @@ import zio._
 import zio.duration._
 import zio.stream.ZStream
 
-object WebSocketAdvanced extends App {
+object WebSocketAdvanced extends ZIOAppDefault {
   // Message Handlers
   private val open = Socket.succeed(WebSocketFrame.text("Greetings!"))
 
@@ -53,8 +53,8 @@ object WebSocketAdvanced extends App {
       case Method.GET -> !! / "subscriptions" => socketApp.toResponse
     }
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val run =
+    Server.start(8090, app)
 }
 
 ```
diff --git a/docs/website/docs/v1.x/examples/zio-http-basic-examples/hello-world.md b/docs/website/docs/v1.x/examples/zio-http-basic-examples/hello-world.md
@@ -5,7 +5,7 @@ import zhttp.http._
 import zhttp.service.Server
 import zio._
 
-object HelloWorld extends App {
+object HelloWorld extends ZIOAppDefault {
 
   // Create HTTP route
   val app: HttpApp[Any, Nothing] = Http.collect[Request] {
@@ -14,7 +14,7 @@ object HelloWorld extends App {
   }
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app.silent).exitCode
+  val run =
+    Server.start(8090, app.silent)
 }
 ```
diff --git a/docs/website/docs/v1.x/examples/zio-http-basic-examples/https-client.md b/docs/website/docs/v1.x/examples/zio-http-basic-examples/https-client.md
@@ -11,7 +11,7 @@ import java.io.InputStream
 import java.security.KeyStore
 import javax.net.ssl.TrustManagerFactory
 
-object HttpsClient extends App {
+object HttpsClient extends ZIOAppDefault {
   val env     = ChannelFactory.auto ++ EventLoopGroup.auto()
   val url     = "https://sports.api.decathlon.com/groups/water-aerobics"
   val headers = Headers.host("sports.api.decathlon.com")
@@ -35,8 +35,8 @@ object HttpsClient extends App {
     _    <- console.putStrLn { data }
   } yield ()
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] 
-    = program.exitCode.provideCustomLayer(env)
+  override val run =
+    program.provideCustom(env)
 
 }
 ```
diff --git a/docs/website/docs/v1.x/examples/zio-http-basic-examples/simple-client.md b/docs/website/docs/v1.x/examples/zio-http-basic-examples/simple-client.md
@@ -1,22 +1,27 @@
 # Simple HTTP Client
 ```scala
-import zhttp.http.Headers
+import zhttp.http.{Header, HttpData}
 import zhttp.service.{ChannelFactory, Client, EventLoopGroup}
 import zio._
 
-object SimpleClient extends App {
+object SimpleClient extends ZIOAppDefault {
   val env     = ChannelFactory.auto ++ EventLoopGroup.auto()
   val url     = "http://sports.api.decathlon.com/groups/water-aerobics"
-  val headers = Headers.host("sports.api.decathlon.com")
+  val headers = List(Header.host("sports.api.decathlon.com"))
 
   val program = for {
-    res  <- Client.request(url, headers)
-    data <- res.getBodyAsString
-    _    <- console.putStrLn { data }
+    res <- Client.request(url, headers)
+    _   <- console.putStrLn {
+      res.content match {
+        case HttpData.CompleteData(data) => data.map(_.toChar).mkString
+        case HttpData.StreamData(_)      => "<Chunked>"
+        case HttpData.Empty              => ""
+      }
+    }
   } yield ()
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    program.exitCode.provideCustomLayer(env)
+  override val run = 
+    program.provide(env)
 
 }
 ```
diff --git a/docs/website/docs/v1.x/examples/zio-http-basic-examples/web-socket.md b/docs/website/docs/v1.x/examples/zio-http-basic-examples/web-socket.md
@@ -8,7 +8,7 @@ import zio._
 import zio.duration._
 import zio.stream.ZStream
 
-object WebSocketEcho extends App {
+object WebSocketEcho extends ZIOAppDefault {
   private val socket =
     Socket.collect[WebSocketFrame] {
       case WebSocketFrame.Text("FOO")  => ZStream.succeed(WebSocketFrame.text("BAR"))
@@ -24,8 +24,8 @@ object WebSocketEcho extends App {
       case Method.GET -> !! / "subscriptions" => socket.toResponse
     }
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  override val run =
+    Server.start(8090, app)
 }
 
 ```
diff --git a/docs/website/docs/zio-http-basic-examples/https-server.md b/docs/website/docs/zio-http-basic-examples/https-server.md
diff --git a/example/src/main/scala/example/Authentication.scala b/example/src/main/scala/example/Authentication.scala
@@ -3,11 +3,11 @@ package example
 import pdi.jwt.{Jwt, JwtAlgorithm, JwtClaim}
 import zhttp.http._
 import zhttp.service.Server
-import zio.{App, ExitCode, URIO}
+import zio._
 
 import java.time.Clock
 
-object Authentication extends App {
+object Authentication extends ZIOAppDefault {
   // Secret Authentication key
   val SECRET_KEY = "secretKey"
 
@@ -55,6 +55,6 @@ object Authentication extends App {
   val app: UHttpApp = login ++ authenticate(Http.forbidden("Not allowed!"), user)
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  override val run =
+    Server.start(8090, app)
 }
diff --git a/example/src/main/scala/example/BasicAuth.scala b/example/src/main/scala/example/BasicAuth.scala
@@ -3,9 +3,9 @@ package example
 import zhttp.http.Middleware.basicAuth
 import zhttp.http._
 import zhttp.service.Server
-import zio.{App, ExitCode, URIO}
+import zio._
 
-object BasicAuth extends App {
+object BasicAuth extends ZIOAppDefault {
 
   // Http app that requires a JWT claim
   val user: UHttpApp = Http.collect[Request] { case Method.GET -> !! / "user" / name / "greet" =>
@@ -16,6 +16,6 @@ object BasicAuth extends App {
   val app: UHttpApp = user @@ basicAuth("admin", "admin")
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val run =
+    Server.start(8090, app)
 }
diff --git a/example/src/main/scala/example/CSRF.scala b/example/src/main/scala/example/CSRF.scala
@@ -5,7 +5,7 @@ import zhttp.http._
 import zhttp.service.Server
 import zio._
 
-object CSRF extends App {
+object CSRF extends ZIOAppDefault {
   val privateApp = Http.collect[Request] { case Method.GET -> !! / "unsafeEndpoint" =>
     Response.text("secure info")
   } @@ csrfValidate() // Check for matching csrf header and cookie
@@ -14,7 +14,7 @@ object CSRF extends App {
     Response.text("hello")
   } @@ csrfGenerate() // set x-csrf token cookie
 
-  val app                                                        = publicApp ++ privateApp
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    Server.start(8090, app).exitCode
+  val app = publicApp ++ privateApp
+
+  def run = Server.start(8090, app)
 }