Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: sbt -v scalafmtCheckAll
- name: Compile
run: sbt -v compile
# TODO bring this step back after first release with new project structure (client + server)
# TODO uncomment after release
# - name: Verify that examples compile using Scala CLI
# run: sbt -v "project examples" verifyExamplesCompileUsingScalaCli
- name: Compile documentation
Expand Down
31 changes: 28 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ val sttpClientV = "4.0.25"
val zioV = "2.1.26"
val zioProcessV = "0.8.0"
val zioHttpV = "3.8.0"
val oxV = "1.0.5"
val testcontainersScalaV = "0.41.8"

lazy val verifyExamplesCompileUsingScalaCli = taskKey[Unit]("Verify that each example compiles using Scala CLI")
Expand All @@ -36,7 +37,7 @@ val scalaTest = "org.scalatest" %% "scalatest" % scalaTestV % Test
lazy val root = (project in file("."))
.settings(commonSettings: _*)
.settings(publishArtifact := false, name := "chimp")
.aggregate(core, server, serverZio, client, clientZio, examples, serverConformance, clientConformance)
.aggregate(core, server, serverZio, serverOx, client, clientZio, clientOx, examples, serverConformance, clientConformance)

val conformance = inputKey[Unit]("Run the MCP conformance harness via npx, extra args are passed through")

Expand Down Expand Up @@ -85,6 +86,18 @@ lazy val serverZio: Project = (project in file("server-streaming/server-zio"))
)
.dependsOn(server % "compile->compile;test->test", clientZio % "test->compile")

lazy val serverOx: Project = (project in file("server-streaming/server-ox"))
.settings(commonSettings: _*)
.settings(
name := "chimp-server-ox",
libraryDependencies ++= Seq(
scalaTest,
"com.softwaremill.sttp.tapir" %% "tapir-netty-server-sync" % tapirV,
"com.softwaremill.ox" %% "core" % oxV
)
)
.dependsOn(server % "compile->compile;test->test", clientOx % "test->compile")

lazy val client: Project = (project in file("client"))
.settings(commonSettings: _*)
.settings(
Expand Down Expand Up @@ -113,6 +126,18 @@ lazy val clientZio: Project = (project in file("client-streaming/client-zio"))
)
.dependsOn(client % "compile->compile;test->test")

lazy val clientOx: Project = (project in file("client-streaming/client-ox"))
.settings(commonSettings: _*)
.settings(
name := "chimp-client-ox",
libraryDependencies ++= Seq(
scalaTest,
"com.softwaremill.sttp.client4" %% "core" % sttpClientV,
"com.softwaremill.ox" %% "core" % oxV
)
)
.dependsOn(client % "compile->compile;test->test")

lazy val examples = (project in file("examples"))
.settings(commonSettings: _*)
.settings(
Expand All @@ -126,7 +151,7 @@ lazy val examples = (project in file("examples"))
),
verifyExamplesCompileUsingScalaCli := VerifyExamplesCompileUsingScalaCli(sLog.value, sourceDirectory.value)
)
.dependsOn(server, client)
.dependsOn(server, serverOx, client, clientOx)

import sbtassembly.AssemblyPlugin.autoImport.*

Expand Down Expand Up @@ -266,4 +291,4 @@ lazy val docs: Project = (project in file("generated-docs"))
publishArtifact := false,
name := "docs"
)
.dependsOn(core, server, serverZio, client, clientZio)
.dependsOn(core, server, serverZio, serverOx, client, clientZio, clientOx)
Original file line number Diff line number Diff line change
@@ -0,0 +1,249 @@
package chimp.client.transport.ox

import chimp.client.internal.SyncPendingRequests
import chimp.client.transport.ClientHttpTransport.HttpOutcome
import chimp.client.transport.{ClientBidirectionalTransport, ClientHttpTransport, ClientTransport}
import chimp.client.{McpProtocolException, McpSessionNotFoundException, McpTransportException}
import chimp.protocol.{JSONRPCErrorCodes, JSONRPCErrorObject, JSONRPCMessage, ProtocolVersion, RequestId}
import org.slf4j.LoggerFactory
import ox.*
import sttp.client4.{asInputStreamUnsafe, basicRequest, Response, SyncBackend}
import sttp.model.sse.ServerSentEvent
import sttp.model.{MediaType, StatusCode, Uri}
import sttp.monad.{IdentityMonad, MonadError}
import sttp.shared.Identity

import java.io.{BufferedReader, InputStream, InputStreamReader}
import java.nio.charset.StandardCharsets
import java.util.concurrent.atomic.{AtomicBoolean, AtomicReference}
import java.util.concurrent.{ConcurrentHashMap, CountDownLatch}
import scala.concurrent.duration.{FiniteDuration, *}

final class OxClientHttpTransport private (
backend: SyncBackend,
uri: Uri,
protocolVersion: ProtocolVersion,
timeout: FiniteDuration,
scope: Ox,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this looks fishy. If this needs to be run within a scope, use using Ox. But maybe it doesn't need to run any forks in the parent scope (perferred ;) )

sessionId: AtomicReference[Option[String]],

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

there's a lot of atomics here. Maybe they could be somehow extract to an actor?

pending: SyncPendingRequests,
incoming: AtomicReference[JSONRPCMessage => Unit],
lastEventId: AtomicReference[Option[String]],
closing: AtomicBoolean,
sessionReady: CountDownLatch,
openStreams: java.util.Set[InputStream]
) extends ClientBidirectionalTransport[Identity]:

private val log = LoggerFactory.getLogger(classOf[OxClientHttpTransport])
private given Ox = scope

given monad: MonadError[Identity] = IdentityMonad

override def send(msg: JSONRPCMessage): Identity[Option[JSONRPCMessage]] =
if closing.get() then throw McpTransportException("HTTP transport is closed")
msg match
case request: JSONRPCMessage.Request =>
val await = pending.register(request.id, timeout)
try sendRequest(request, await)
finally { val _ = pending.complete(request.id, cancelled(request.id)) }
case other => sendNonRequest(other)

override def onIncoming(handler: JSONRPCMessage => Identity[Unit]): Identity[Unit] = incoming.set(handler)

override def close(): Identity[Unit] =
if closing.compareAndSet(false, true) then
sessionReady.countDown()
openStreams.forEach(closeQuietly)
sessionId.getAndSet(None) match
case Some(id) =>
try drainBody(ClientHttpTransport.baseDeleteRequest(uri, protocolVersion, id).response(asInputStreamUnsafe).send(backend))
catch case _: Exception => ()
case None => ()
pending.closeAll("Transport closed")

private def sendRequest(request: JSONRPCMessage.Request, await: () => JSONRPCMessage): Option[JSONRPCMessage] =
val response = post(request)
captureSession(response)
ClientHttpTransport.resolveResponse(response, sessionId.get()) match
case Left(err: McpSessionNotFoundException) => sessionId.set(None); throw err
case Left(err) => throw err
case Right(HttpOutcome.NoBody) =>
drainBody(response)
throw McpProtocolException("Server returned 202 Accepted for a Request")
case Right(HttpOutcome.JsonBody) =>
val message = decode(collectBody(response))
routeMessage(message)
Some(await())
case Right(HttpOutcome.SseBody) =>
response.body match
case Right(stream) => forkSseDrain(stream, Some(request.id)); Some(await())
case Left(err) => throw McpProtocolException(s"Expected SSE stream, got: $err")

private def sendNonRequest(msg: JSONRPCMessage): Option[JSONRPCMessage] =
val response = post(msg)
captureSession(response)
ClientHttpTransport.resolveResponse(response, sessionId.get()) match
case Left(err: McpSessionNotFoundException) => sessionId.set(None); throw err
case Left(err) => throw err
case Right(HttpOutcome.NoBody) => drainBody(response); None
case Right(HttpOutcome.JsonBody) => drainBody(response); None
case Right(HttpOutcome.SseBody) =>
response.body match
case Right(stream) => forkSseDrain(stream, None); None
case Left(_) => None

private def post(msg: JSONRPCMessage): Response[Either[String, InputStream]] =
ClientHttpTransport
.basePostRequest(uri, protocolVersion, sessionId.get(), ClientTransport.encode(msg))
.response(asInputStreamUnsafe)
.send(backend)

private def captureSession(response: Response[?]): Unit =
response.header("Mcp-Session-Id").foreach(id => sessionId.set(Some(id)))
sessionReady.countDown()

private def collectBody(response: Response[Either[String, InputStream]]): String =
response.body match
case Right(stream) =>
try String(stream.readAllBytes(), StandardCharsets.UTF_8)
finally closeQuietly(stream)
case Left(err) => throw McpProtocolException(s"HTTP 200 with non-stream body: $err")

private def drainBody(response: Response[Either[String, InputStream]]): Unit =
response.body match
case Right(stream) =>
try { val _ = stream.readAllBytes() }
catch case _: Exception => ()
finally closeQuietly(stream)
case Left(_) => ()

private def decode(body: String): JSONRPCMessage =
ClientTransport.decode(body) match
case Right(message) => message
case Left(err) => throw McpProtocolException(s"Failed to decode response body: ${err.getMessage}, payload $body")

private def forkSseDrain(stream: InputStream, requestId: Option[RequestId]): Unit =
track(stream)
forkDiscard:
try drainSse(stream, _ => ())
catch case e: Exception => if !closing.get() then log.warn(s"SSE drain error: ${e.getMessage}")
finally
requestId.foreach { id =>
val _ = pending.complete(id, sseEnded(id))
}
untrack(stream)

private def routeMessage(msg: JSONRPCMessage): Unit = msg match
case response: JSONRPCMessage.Response => val _ = pending.complete(response.id, response)
case err: JSONRPCMessage.Error => val _ = pending.complete(err.id, err)
case other => incoming.get()(other)

private[ox] def startGetListener(): Unit = forkDiscard(getListenerLoop())

private def getListenerLoop(): Unit =
sessionReady.await()
var attempt = 0
var continue = !closing.get()
while continue do
openGetSseStream(lastEventId.get()) match
case None => continue = false
case Some(stream) =>
attempt = 0
try drainSse(stream, id => lastEventId.set(Some(id)))
catch case e: Exception => if !closing.get() then log.warn(s"GET SSE listener error: ${e.getMessage}")
finally untrack(stream)
if closing.get() then continue = false
else
attempt += 1
sleep(reconnectDelay(attempt))

private def openGetSseStream(lastEvent: Option[String]): Option[InputStream] =
val base = basicRequest
.get(uri)
.header("Accept", MediaType.TextEventStream.toString)
.header("MCP-Protocol-Version", protocolVersion.name)
.response(asInputStreamUnsafe)
val withSession = sessionId.get().fold(base)(s => base.header("Mcp-Session-Id", s))
val withLastEvent = lastEvent.fold(withSession)(id => withSession.header("Last-Event-ID", id))
val response = withLastEvent.send(backend)
response.code match
case StatusCode.Ok =>
response.body match
case Right(stream) => track(stream); Some(stream)
case Left(err) => log.warn(s"GET SSE stream returned non-stream body: $err"); None
case StatusCode.MethodNotAllowed =>
drainBody(response)
log.info("Server does not support GET SSE stream")
None
case other =>
drainBody(response)
log.warn(s"GET SSE stream returned HTTP ${other.code}; not reconnecting")
None

private def drainSse(stream: InputStream, onEventId: String => Unit): Unit =
val reader = BufferedReader(InputStreamReader(stream, StandardCharsets.UTF_8))
var buffered = List.empty[String]
var line = reader.readLine()
while line != null do
if line.isEmpty then
if buffered.nonEmpty then
dispatchEvent(ServerSentEvent.parse(buffered.reverse), onEventId)
buffered = Nil
else buffered = line :: buffered
line = reader.readLine()
if buffered.nonEmpty then dispatchEvent(ServerSentEvent.parse(buffered.reverse), onEventId)

private def dispatchEvent(event: ServerSentEvent, onEventId: String => Unit): Unit =
event.id.filter(_.nonEmpty).foreach(onEventId)
event.data
.filter(_.nonEmpty)
.foreach: data =>
ClientTransport.decode(data) match
case Right(message) => routeMessage(message)
case Left(_) => ()

private def track(stream: InputStream): Unit = { val _ = openStreams.add(stream) }

private def untrack(stream: InputStream): Unit =
if openStreams.remove(stream) then closeQuietly(stream)

private def closeQuietly(stream: InputStream): Unit =
try stream.close()
catch case _: Exception => ()

private def reconnectDelay(attempt: Int): FiniteDuration =
math.min(100L * (1L << math.min(attempt - 1, 8)), 30000L).millis

private def cancelled(id: RequestId): JSONRPCMessage.Error =
JSONRPCMessage.Error(id = id, error = JSONRPCErrorObject(code = JSONRPCErrorCodes.InvocationError.code, message = "Request cancelled"))

private def sseEnded(id: RequestId): JSONRPCMessage.Error =
JSONRPCMessage.Error(
id = id,
error = JSONRPCErrorObject(code = JSONRPCErrorCodes.InvocationError.code, message = "SSE stream ended before response")
)

object OxClientHttpTransport:

def apply(
backend: SyncBackend,
uri: Uri,
protocolVersion: ProtocolVersion = ProtocolVersion.Latest,
timeout: FiniteDuration = ClientTransport.defaultTimeout
)(using Ox): OxClientHttpTransport =
val transport = new OxClientHttpTransport(
backend,
uri,
protocolVersion,
timeout,
summon[Ox],
AtomicReference[Option[String]](None),
SyncPendingRequests(),
AtomicReference[JSONRPCMessage => Unit](_ => ()),
AtomicReference[Option[String]](None),
AtomicBoolean(false),
CountDownLatch(1),
ConcurrentHashMap.newKeySet[InputStream]()
)
transport.startGetListener()
transport
Loading
Loading