Skip to content

Commit

Permalink
readjusted ServerConfigSpec
Browse files Browse the repository at this point in the history
  • Loading branch information
Sumant Awasthi authored and Sumant Awasthi committed Jan 9, 2022
1 parent 5165f88 commit cb56c07
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 54 deletions.
113 changes: 60 additions & 53 deletions zio-http/src/test/scala/zhttp/internal/HttpRunnableSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package zhttp.internal

import io.netty.handler.codec.http.HttpVersion
import sttp.client3.asynchttpclient.zio.{SttpClient, send}
import sttp.client3.{UriContext, asWebSocketUnsafe, basicRequest, Response => SResponse}
import sttp.client3.{Response => SResponse, UriContext, asWebSocketUnsafe, basicRequest}
import sttp.model.{Header => SHeader}
import sttp.ws.WebSocket
import zhttp.http.URL.Location
Expand All @@ -21,35 +21,42 @@ import zio.{Chunk, Has, Task, ZIO, ZManaged}
*/
abstract class HttpRunnableSpec extends DefaultRunnableSpec { self =>
def serve[R <: Has[_]](
app: HttpApp[R, Throwable],
): ZManaged[R with EventLoopGroup with ServerChannelFactory with DynamicServer, Nothing, Unit] =
app: HttpApp[R, Throwable],
): ZManaged[R with EventLoopGroup with ServerChannelFactory with DynamicServer, Nothing, Unit] =
for {
start <- Server.make(Server.app(app) ++ Server.port(0) ++ Server.paranoidLeakDetection).orDie
_ <- DynamicServer.setStart(start).toManaged_
} yield ()

def configurableServe[R <: Has[_]](
app: HttpApp[R, Throwable],
serverConf: Server[R, Throwable],
): ZManaged[R with EventLoopGroup with ServerChannelFactory with DynamicServer, Nothing, Unit] =
app: HttpApp[R, Throwable],
serverConf: Server[R, Throwable],
): ZManaged[R with EventLoopGroup with ServerChannelFactory with DynamicServer, Nothing, Unit] =
for {
defaultConf <- ZManaged.fromEffect(ZIO.succeed(Server.app(app) ++ Server.port(0) ++ Server.paranoidLeakDetection))
start <- Server.make(defaultConf ++ serverConf).orDie
_ <- DynamicServer.setStart(start).toManaged_
start <- Server.make(defaultConf ++ serverConf).orDie
_ <- DynamicServer.setStart(start).toManaged_
} yield ()

def request(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
httpVersion: HttpVersion = HttpVersion.HTTP_1_1,
): HttpIO[Any, Client.ClientResponse] = {
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
httpVersion: HttpVersion = HttpVersion.HTTP_1_1,
): HttpIO[Any, Client.ClientResponse] = {
for {
port <- DynamicServer.getPort
data = HttpData.fromString(content)
response <- Client.request(
Client.ClientParams(method, URL(path, Location.Absolute(Scheme.HTTP, "localhost", port)), headers, data, null, httpVersion),
Client.ClientParams(
method,
URL(path, Location.Absolute(Scheme.HTTP, "localhost", port)),
headers,
data,
null,
httpVersion,
),
ClientSSLOptions.DefaultSSL,
)
} yield response
Expand All @@ -69,9 +76,9 @@ abstract class HttpRunnableSpec extends DefaultRunnableSpec { self =>
}

def webSocketRequest(
path: Path = !!,
headers: Headers = Headers.empty,
): HttpIO[SttpClient, SResponse[Either[String, WebSocket[Task]]]] = {
path: Path = !!,
headers: Headers = Headers.empty,
): HttpIO[SttpClient, SResponse[Either[String, WebSocket[Task]]]] = {
// todo: uri should be created by using URL().asString but currently support for ws Scheme is missing
for {
port <- DynamicServer.getPort
Expand All @@ -85,67 +92,67 @@ abstract class HttpRunnableSpec extends DefaultRunnableSpec { self =>
def deploy: ZIO[DynamicServer, Nothing, String] = DynamicServer.deploy(app)

def request(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
httpVersion: HttpVersion = HttpVersion.HTTP_1_1,
): HttpIO[Any, Client.ClientResponse] = for {
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
httpVersion: HttpVersion = HttpVersion.HTTP_1_1,
): HttpIO[Any, Client.ClientResponse] = for {
id <- deploy
response <- self.request(path, method, content, Headers(DynamicServer.APP_ID, id) ++ headers, httpVersion)
} yield response

def requestBodyAsString(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, String] =
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, String] =
request(path, method, content, headers).flatMap(_.getBodyAsString)

def requestHeaderValueByName(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
)(name: CharSequence): HttpIO[Any, Option[String]] =
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
)(name: CharSequence): HttpIO[Any, Option[String]] =
request(path, method, content, headers).map(_.getHeaderValue(name))

def requestStatus(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, Status] =
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, Status] =
request(path, method, content, headers).map(_.status)

def webSocketStatusCode(
path: Path = !!,
headers: Headers = Headers.empty,
): HttpIO[SttpClient, Int] = for {
path: Path = !!,
headers: Headers = Headers.empty,
): HttpIO[SttpClient, Int] = for {
id <- deploy
res <- self.webSocketRequest(path, Headers(DynamicServer.APP_ID, id) ++ headers)
} yield res.code.code

def requestBody(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, Chunk[Byte]] =
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, Chunk[Byte]] =
request(path, method, content, headers).flatMap(_.getBody)

def requestContentLength(
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, Option[Long]] =
path: Path = !!,
method: Method = Method.GET,
content: String = "",
headers: Headers = Headers.empty,
): HttpIO[Any, Option[Long]] =
request(path, method, content, headers).map(_.getContentLength)
}
}

object HttpRunnableSpec {
type HttpIO[-R, +A] =
ZIO[R with EventLoopGroup with ChannelFactory with DynamicServer with ServerChannelFactory, Throwable, A]
}
}
2 changes: 1 addition & 1 deletion zio-http/src/test/scala/zhttp/service/ServerConfigSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ object ServerConfigSpec extends HttpRunnableSpec {
private val appKeepAliveEnabled = configurableServe(DynamicServer.app, keepAliveServerConf)

// uncomment below for testing without enabling keep alive explicitly.
//private val appKeepAliveEnabled = serve(DynamicServer.app)
// private val appKeepAliveEnabled = serve(DynamicServer.app)

override def spec = {
suiteM("ServerConfig KeepAlive Enabled Server") {
Expand Down

1 comment on commit cb56c07

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 Performance Benchmark:

Concurrency: 256
Requests/sec: 810098.68

Please sign in to comment.