Basic http api

11 files changed, 107 insertions, 77 deletions

diff --git a/build b/build
new file mode 100755
index 0000000..d080658
--- /dev/null
+++ b/build
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+curl -X POST -H "Content-Type: application/json" http://localhost:9000/api/submit \
+     -d "{\"url\": \"$1\"}"
diff --git a/crashbox-http/build.sbt b/crashbox-http/build.sbt
deleted file mode 100644
index 2597b79..0000000
--- a/crashbox-http/build.sbt
+++ /dev/null
@@ -1,7 +0,0 @@
-import crashbox.Dependencies
-
-libraryDependencies ++= Seq(
-  Dependencies.akkaActor,
-  Dependencies.akkaHttp,
-  Dependencies.akkaHttpCore
-)
diff --git a/crashbox-http/src/main/resources/reference.conf b/crashbox-http/src/main/resources/reference.conf
deleted file mode 100644
index 5d50143..0000000
--- a/crashbox-http/src/main/resources/reference.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-crashbox {
-  host="[::]"
-  port=9000
-}
\ No newline at end of file
diff --git a/crashbox-http/src/main/scala/io/crashbox/ci/Main.scala b/crashbox-http/src/main/scala/io/crashbox/ci/Main.scala
deleted file mode 100644
index 6a61e51..0000000
--- a/crashbox-http/src/main/scala/io/crashbox/ci/Main.scala
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.crashbox.ci
-
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.server.directives.Credentials
-import akka.stream.ActorMaterializer
-import java.text.SimpleDateFormat
-import java.util.Date
-import scala.util.{Failure, Success}
-
-object Main {
-
-  implicit val system = ActorSystem("crashbox")
-  implicit val materializer = ActorMaterializer()
-  implicit val executionContext = system.dispatcher
-
-  def main(args: Array[String]): Unit = {
-    val host = system.settings.config.getString("crashbox.host")
-    val port = system.settings.config.getInt("crashbox.port")
-
-    Http(system).bindAndHandle(Route.route, host, port) onComplete {
-      case Success(_) =>
-        system.log.info(s"Listening on $host:$port")
-      case Failure(ex) =>
-        system.log.error(ex, s"Failed to bind to $host:$port")
-        system.terminate()
-    }
-  }
-
-}
-
-object Route {
-  import akka.http.scaladsl.server._
-  import Directives._
-
-  private val formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-
-  def route: Route = {
-    pathEndOrSingleSlash {
-      complete(s"Served at ${formatter.format(new Date)}")
-    } ~ path("secure") {
-      authenticateBasic(realm = "secure site", myUserPassAuthenticator) {
-        userName =>
-          complete(s"The user is '$userName'")
-      }
-    }
-  }
-
-  def myUserPassAuthenticator(credentials: Credentials): Option[String] = {
-    credentials match {
-      case p @ Credentials.Provided(id) if p.verify("guest") => Some(id)
-      case _ => None
-    }
-  }
-}
diff --git a/crashbox-server/build.sbt b/crashbox-server/build.sbt
index 4b37caf..3de6438 100644
--- a/crashbox-server/build.sbt
+++ b/crashbox-server/build.sbt
@@ -2,6 +2,9 @@ import crashbox.Dependencies
 
 libraryDependencies ++= Seq(
   Dependencies.akkaActor,
+  Dependencies.akkaHttp,
+  Dependencies.akkaHttpCore,
+  Dependencies.akkaHttpSpray,
   Dependencies.akkaStream,
   Dependencies.jgitArchive,
   Dependencies.jgitServer,
diff --git a/crashbox-server/src/main/resources/reference.conf b/crashbox-server/src/main/resources/reference.conf
index a156b88..bfcd645 100644
--- a/crashbox-server/src/main/resources/reference.conf
+++ b/crashbox-server/src/main/resources/reference.conf
@@ -1,5 +1,8 @@
 crashbox {
 
+  host = "[::]"
+  port = 9000
+
   blocking-dispatcher {
     type = Dispatcher
     executor = "thread-pool-executor"
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala
index 5a30df0..ed9ff14 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala
@@ -1,12 +1,14 @@
 package io.crashbox.ci
 
 import akka.actor.ActorSystem
+import akka.stream.ActorMaterializer
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, ExecutionContext}
 
 trait Core {
 
   implicit val system: ActorSystem = ActorSystem("crashbox")
+  implicit val materializer = ActorMaterializer()
   implicit val executionContext: ExecutionContext = system.dispatcher
   val blockingDispatcher: ExecutionContext =
     system.dispatchers.lookup("crashbox.blocking-dispatcher")
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala b/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala
new file mode 100644
index 0000000..22feba5
--- /dev/null
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala
@@ -0,0 +1,76 @@
+package io.crashbox.ci
+
+import akka.actor.ActorSystem
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.marshalling.Marshaller
+import akka.http.scaladsl.marshalling.ToResponseMarshaller
+import akka.http.scaladsl.model.{
+  ContentType,
+  ContentTypes,
+  HttpEntity,
+  MediaTypes
+}
+import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import akka.http.scaladsl.model.HttpResponse
+import akka.http.scaladsl.model.ws.TextMessage
+import akka.http.scaladsl.server.directives.Credentials
+import akka.stream.scaladsl.{Flow, Keep, Sink}
+import akka.stream.{ActorMaterializer, OverflowStrategy}
+import akka.stream.scaladsl.{Source => Src}
+import java.net.URL
+import java.security.MessageDigest
+import java.text.SimpleDateFormat
+import java.util.Date
+import scala.util.{Failure, Success}
+import akka.http.scaladsl.server._
+import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import Directives._
+import SprayJsonSupport._
+import spray.json.{DefaultJsonProtocol, JsObject, JsString, JsValue}
+
+trait HttpApi { self: Core with Schedulers with StreamStore =>
+
+  val endpoint = "api"
+
+  case class Request(url: String) {
+    def buildId: String = {
+      val bytes = MessageDigest.getInstance("SHA-256").digest(url.getBytes)
+      bytes.map { byte =>
+        Integer.toString((byte & 0xff) + 0x100, 16)
+      }.mkString
+    }
+  }
+
+  object Protocol extends DefaultJsonProtocol {
+    implicit val request = jsonFormat1(Request)
+  }
+  import Protocol._
+
+  implicit val toResponseMarshaller: ToResponseMarshaller[Src[BuildState, Any]] =
+    Marshaller.opaque { items =>
+      val data = items.map(item => ChunkStreamPart(item.toString + "\n"))
+      HttpResponse(
+        entity = HttpEntity.Chunked(ContentTypes.`text/plain(UTF-8)`, data))
+    }
+
+  def httpApi: Route = pathPrefix(endpoint) {
+    path("submit") {
+      entity(as[Request]) { req =>
+        val source = Src
+          .queue[BuildState](100, OverflowStrategy.fail)
+          .mapMaterializedValue { q =>
+            start(
+              req.buildId,
+              new URL(req.url),
+              () => saveStream(req.buildId),
+              state => q.offer(state)
+            )
+          }
+
+        complete(source)
+      }
+
+    }
+  }
+
+}
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala
index 0187751..d2e886b 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala
@@ -1,6 +1,9 @@
 package io.crashbox.ci
 
+import akka.http.scaladsl.Http
+import akka.stream.ActorMaterializer
 import java.net.URL
+import scala.util.{Failure, Success}
 
 object Main
     extends Core
@@ -8,19 +11,22 @@ object Main
     with Builders
     with Parsers
     with Source
-    with StreamStore {
+    with StreamStore
+    with HttpApi {
 
   def main(args: Array[String]): Unit = {
     reapDeadBuilds()
 
-    start(
-      "random_build",
-      new URL("file:///home/jodersky/tmp/dummy"),
-      () => saveStream("random_build"),
-      state => println(state)
-    )
-    Thread.sleep(15000)
-    System.exit(0)
+    val host = system.settings.config.getString("crashbox.host")
+    val port = system.settings.config.getInt("crashbox.port")
+
+    Http(system).bindAndHandle(httpApi, host, port) onComplete {
+      case Success(_) =>
+        system.log.info(s"Listening on $host:$port")
+      case Failure(ex) =>
+        system.log.error(ex, s"Failed to bind to $host:$port")
+        system.terminate()
+    }
   }
 
 }
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala
index e9f2a82..01c278d 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala
@@ -52,10 +52,11 @@ trait Schedulers extends { self: Core with Source with Builders with Parsers =>
       containerId foreach { cancelBuild(_) }
       out foreach { _.close() }
       buildDir foreach { _.delete() }
+      log.info(s"Stopped build of $url")
     }
 
     override def preStart() = {
-      log.info(s"Started build manager for $url")
+      log.info(s"Started build of $url")
       self ! Cloning(url)
     }
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 3d1de67..2d768d7 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,8 +5,9 @@ import sbt._
 object Dependencies {
 
   val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.17"
-  val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % "10.0.4"
   val akkaHttp = "com.typesafe.akka" %% "akka-http" % "10.0.4"
+  val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % "10.0.4"
+  val akkaHttpSpray = "com.typesafe.akka" %% "akka-http-spray-json" % "10.0.0"
   val akkaStream = "com.typesafe.akka" %% "akka-stream" % "2.4.17"
 
   val jgitServer = "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.6.0.201612231935-r"