Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
34 changed files
with
887 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ language: scala | |
|
||
scala: | ||
- 2.11.8 | ||
- 2.12.0 | ||
- 2.12.1 | ||
|
||
script: | ||
- sbt ++$TRAVIS_SCALA_VERSION test | ||
|
158 changes: 158 additions & 0 deletions
158
akka-http/src/main/scala/gigahorse/support/akkahttp/AkkaHttpClient.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,158 @@ | ||
/* | ||
* Copyright 2016 by Eugene Yokota | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package gigahorse | ||
package support.akkahttp | ||
|
||
import scala.collection.JavaConverters._ | ||
import java.io.{ File, UnsupportedEncodingException } | ||
import java.nio.charset.{ Charset, StandardCharsets } | ||
import scala.concurrent.{ Future, Promise, ExecutionContext } | ||
import akka.actor.{ Actor, ActorSystem, Props } | ||
import akka.stream.{ OverflowStrategy, Materializer } | ||
import akka.stream.scaladsl.{ FileIO, SourceQueueWithComplete } | ||
import akka.http.scaladsl.{ Http => AkkaHttp } | ||
import akka.http.scaladsl.model.{ HttpRequest, HttpResponse, ResponseEntity, HttpEntity, Uri, | ||
StatusCodes, HttpMethod, HttpMethods, HttpHeader } | ||
import akka.http.scaladsl.model.ws.WebSocketRequest | ||
|
||
class AkkaHttpClient(config: Config, system: ActorSystem)(implicit fm: Materializer) extends HttpClient { | ||
private val akkaHttp = AkkaHttp(system) | ||
|
||
def underlying[A]: A = akkaHttp.asInstanceOf[A] | ||
|
||
/** Closes this client, and releases underlying resources. */ | ||
def close(): Unit = () | ||
|
||
/** Runs the request and return a Future of FullResponse. Errors on non-OK response. */ | ||
def run(request: Request): Future[FullResponse] = run(request, identity) | ||
|
||
/** Runs the request and return a Future of A. Errors on non-OK response. */ | ||
def run[A](request: Request, f: FullResponse => A): Future[A] = process(request, OkHandler(f)) | ||
|
||
/** Runs the request and return a Future of Either a FullResponse or a Throwable. Errors on non-OK response. */ | ||
def run[A](request: Request, lifter: FutureLifter[A])(implicit ec: ExecutionContext): Future[Either[Throwable, A]] = | ||
lifter.run(run(request)) | ||
|
||
/** Downloads the request to the file. Errors on non-OK response. */ | ||
def download(request: Request, file: File): Future[File] = | ||
process(request, AkkaHttpDownloadHandler(file)) | ||
|
||
/** Executes the request and return a Future of FullResponse. Does not error on non-OK response. */ | ||
def process(request: Request): Future[FullResponse] = process(request, identity[FullResponse] _) | ||
|
||
/** Executes the request and return a Future of A. Does not error on non-OK response. */ | ||
def process[A](request: Request, f: FullResponse => A): Future[A] = | ||
process(request, FunctionHandler(f)) | ||
|
||
/** Executes the request and return a Future of Either a FullResponse or a Throwable. Does not error on non-OK response. */ | ||
def process[A](request: Request, lifter: FutureLifter[A])(implicit ec: ExecutionContext): Future[Either[Throwable, A]] = | ||
lifter.run(process(request)) | ||
|
||
/** Executes the request. Does not error on non-OK response. */ | ||
def process[A](request: Request, handler: AkkaHttpCompletionHandler[A]): Future[A] = | ||
{ | ||
implicit val ec = system.dispatcher | ||
def processInitialResponse(response: HttpResponse): Future[Unit] = | ||
{ | ||
val p = Promise[Unit]() | ||
val s1 = handler.onStatusReceived(response.status) | ||
if (s1 == State.Abort) { | ||
response.entity.discardBytes(fm) | ||
p.failure { StatusError(response.status.intValue) } | ||
} | ||
else p.success() | ||
p.future | ||
} | ||
for { | ||
response <- akkaHttp.singleRequest(buildRequest(request)) | ||
_ <- processInitialResponse(response) | ||
result <- handler.onPartialResponse(response, config) | ||
} yield result | ||
} | ||
|
||
def buildRequest(request: Request): HttpRequest = | ||
HttpRequest(method = buildMethod(request), | ||
uri = buildUri(request), | ||
headers = buildHeaders(request)) | ||
|
||
def buildWsRequest(request: Request): WebSocketRequest = | ||
WebSocketRequest(uri = buildUri(request), | ||
extraHeaders = buildHeaders(request)) | ||
|
||
private def buildMethod(request: Request): HttpMethod = | ||
request.method match { | ||
case HttpVerbs.GET => HttpMethods.GET | ||
case HttpVerbs.POST => HttpMethods.POST | ||
case HttpVerbs.PUT => HttpMethods.PUT | ||
case HttpVerbs.PATCH => HttpMethods.PATCH | ||
case HttpVerbs.DELETE => HttpMethods.DELETE | ||
case HttpVerbs.HEAD => HttpMethods.HEAD | ||
case HttpVerbs.OPTIONS => HttpMethods.OPTIONS | ||
} | ||
|
||
private def buildHeaders(request: Request): List[HttpHeader] = | ||
for { | ||
(k, vs) <- request.headers.toList | ||
v <- vs.toList | ||
x <- HttpHeader.parse(k, v) match { | ||
case HttpHeader.ParsingResult.Ok(header, _) => List(header) | ||
case _ => Nil | ||
} | ||
} yield x | ||
|
||
private def buildUri(request: Request): Uri = | ||
{ | ||
import request._ | ||
// queries | ||
val qs = for { | ||
(key, values) <- queryString | ||
value <- values | ||
} yield (key, value) | ||
Uri(url).withQuery(Uri.Query(qs)) | ||
} | ||
|
||
/** Open a websocket connection. */ | ||
def websocket(request: Request)(handler: PartialFunction[WebSocketEvent, Unit]): Future[WebSocket] = | ||
{ | ||
implicit val ec = system.dispatcher | ||
// http://doc.akka.io/docs/akka-http/current/scala/http/client-side/websocket-support.html | ||
val xrequest = buildWsRequest(request) | ||
import akka.stream.scaladsl._ | ||
import akka.Done | ||
import akka.http.scaladsl.model.ws.Message | ||
val listener = new WebSocketListener(handler, system) | ||
val wsSink: Sink[Message, Future[Done]] = listener.sink | ||
val wsSource = listener.source | ||
val flow: Flow[Message, Message, Future[Done]] = | ||
Flow.fromSinkAndSourceMat(wsSink, wsSource)(Keep.left) | ||
// upgradeResponse is a Future[WebSocketUpgradeResponse] that | ||
// completes or fails when the connection succeeds or fails | ||
// and closed is a Future[Done] representing the stream completion from above | ||
val (upgradeResponse, closed) = akkaHttp.singleWebSocketRequest(xrequest, flow) | ||
val connected = upgradeResponse.map { upgrade => | ||
// just like a regular http request we can access response status which is available via upgrade.response.status | ||
// status code 101 (Switching Protocols) indicates that server support WebSockets | ||
if (upgrade.response.status == StatusCodes.SwitchingProtocols) { | ||
Done | ||
} else { | ||
throw new RuntimeException(s"Connection failed: ${upgrade.response.status}") | ||
} | ||
} | ||
val result = listener.result | ||
result.future | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
akka-http/src/main/scala/gigahorse/support/akkahttp/AkkaHttpCompletionHandler.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/* | ||
* Copyright 2016 by Eugene Yokota | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package gigahorse | ||
package support.akkahttp | ||
|
||
import scala.concurrent.{ Future, ExecutionContext } | ||
import akka.http.scaladsl.model.{ HttpResponse, StatusCode, HttpHeader } | ||
import akka.stream.Materializer | ||
|
||
abstract class AkkaHttpCompletionHandler[A] extends CompletionHandler[A] { | ||
def onStatusReceived(status: StatusCode): State = State.Continue | ||
def onHeadersReceived(headers: Seq[HttpHeader]): State = State.Continue | ||
def onCompleted(response: FullResponse): A | ||
def onPartialResponse(httpResponse: HttpResponse, config: Config)(implicit fm: Materializer, ec: ExecutionContext): Future[A] = | ||
for { | ||
entity <- httpResponse.entity.toStrict(config.requestTimeout) | ||
} yield onCompleted(new AkkaHttpFullResponse(httpResponse, entity)) | ||
} |
41 changes: 41 additions & 0 deletions
41
akka-http/src/main/scala/gigahorse/support/akkahttp/AkkaHttpDownloadHandler.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* | ||
* Copyright 2016 by Eugene Yokota | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package gigahorse | ||
package support.akkahttp | ||
|
||
import java.io.File | ||
import scala.concurrent.{ Future, ExecutionContext } | ||
import akka.stream.Materializer | ||
import akka.http.scaladsl.model.HttpResponse | ||
import akka.stream.scaladsl.FileIO | ||
|
||
abstract class AkkaHttpDownloadHandler(file: File) extends OkHandler[File](_ => file) { | ||
// This will not be called | ||
override def onCompleted(response: FullResponse): File = sys.error("Unexpected call to onCompleted") | ||
override def onPartialResponse(httpResponse: HttpResponse, config: Config)(implicit fm: Materializer, ec: ExecutionContext): Future[File] = | ||
{ | ||
val source = httpResponse.entity.dataBytes | ||
for { | ||
_ <- source.runWith(FileIO.toPath(file.toPath)) | ||
} yield file | ||
} | ||
} | ||
|
||
object AkkaHttpDownloadHandler { | ||
def apply(file: File): AkkaHttpDownloadHandler = | ||
new AkkaHttpDownloadHandler(file) {} | ||
} |
80 changes: 80 additions & 0 deletions
80
akka-http/src/main/scala/gigahorse/support/akkahttp/AkkaHttpFullResponse.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* Copyright 2016 by Eugene Yokota | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package gigahorse | ||
package support.akkahttp | ||
|
||
import scala.collection.JavaConverters._ | ||
import java.nio.charset.Charset | ||
import java.nio.ByteBuffer | ||
import scala.collection.immutable.TreeMap | ||
import akka.http.scaladsl.model._ | ||
import akka.http.scaladsl.unmarshalling.{ Unmarshal, FromResponseUnmarshaller } | ||
import scala.concurrent.{ Future, ExecutionContext, Await } | ||
import scala.concurrent.duration._ | ||
import akka.stream.Materializer | ||
|
||
class AkkaHttpFullResponse(akkaHttpResponse: HttpResponse, entity: HttpEntity.Strict)(implicit val fm: Materializer) extends FullResponse { | ||
/** | ||
* @return The underlying entity object. | ||
*/ | ||
def underlying[A] = entity.asInstanceOf[A] | ||
|
||
/** | ||
* @return The underlying response object. | ||
*/ | ||
def underlyingResponse[A] = akkaHttpResponse.asInstanceOf[A] | ||
|
||
/** | ||
* The response body as a `ByteBuffer`. | ||
*/ | ||
def bodyAsByteBuffer: ByteBuffer = entity.data.asByteBuffer | ||
|
||
/** | ||
* The response body as String. | ||
*/ | ||
lazy val bodyAsString: String = { | ||
// RFC-2616#3.7.1 states that any text/* mime type should default to ISO-8859-1 charset if not | ||
// explicitly set, while Plays default encoding is UTF-8. So, use UTF-8 if charset is not explicitly | ||
// set and content type is not text/*, otherwise default to ISO-8859-1 | ||
val contentType = entity.contentType | ||
val charset = contentType.charsetOption getOrElse HttpCharsets.`UTF-8` | ||
entity.data.decodeString(charset.value) | ||
} | ||
|
||
/** | ||
* Return the headers of the response as a case-insensitive map | ||
*/ | ||
lazy val allHeaders: Map[String, List[String]] = | ||
TreeMap[String, List[String]]() ++ | ||
akkaHttpResponse.headers.groupBy(_.name).mapValues(vs => vs.toList map { _.value }) | ||
|
||
/** | ||
* The response status code. | ||
*/ | ||
def status: Int = akkaHttpResponse.status.intValue | ||
|
||
/** | ||
* The response status message. | ||
*/ | ||
def statusText: String = akkaHttpResponse.status.reason | ||
|
||
/** | ||
* Get a response header. | ||
*/ | ||
def header(key: String): Option[String] = | ||
akkaHttpResponse.headers.find(_.name == key) map { _.value } | ||
} |
30 changes: 30 additions & 0 deletions
30
akka-http/src/main/scala/gigahorse/support/akkahttp/FunctionHandler.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/* | ||
* Copyright 2016 by Eugene Yokota | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package gigahorse | ||
package support.akkahttp | ||
|
||
import scala.concurrent.Future | ||
import akka.http.scaladsl.model.HttpResponse | ||
|
||
abstract class FunctionHandler[A](f: FullResponse => A) extends AkkaHttpCompletionHandler[A] { | ||
override def onCompleted(response: FullResponse): A = f(response) | ||
} | ||
|
||
object FunctionHandler { | ||
def apply[A](f: FullResponse => A): FunctionHandler[A] = | ||
new FunctionHandler[A](f) {} | ||
} |
Oops, something went wrong.