Add version option

Author: daviddenton

.gitignore

@@ -13,3 +13,4 @@ intellij-settings/
 **/*.actual
 **/generated/**
 jte-classes
+**/versions.properties

build.gradle.kts

@@ -32,12 +32,19 @@ sourceSets {
     }
 }
 
+val VERSION: String? by project
+
+version = (VERSION ?: "LOCAL")
+
+
+val mainMcpDesktopClass = "org.http4k.mcp.Http4kMcpDesktop"
+
 graalvmNative {
     toolchainDetection.set(true)
     binaries {
         named("main") {
             imageName.set("http4k-mcp-desktop")
-            mainClass.set("org.http4k.mcp.Http4kMcpDesktop")
+            mainClass.set(mainMcpDesktopClass)
             useFatJar.set(true)
             sharedLibrary.set(false)
 
@@ -48,6 +55,20 @@ graalvmNative {
 }
 
 tasks {
+
+    register("generateVersionProperties" ) {
+        doLast {
+            file("src/main/resources/version.properties").apply {
+                parentFile.mkdirs()
+                writeText("version=${project.version}")
+            }
+        }
+    }
+
+    named("processResources") {
+        dependsOn("generateVersionProperties")
+    }
+
     withType<KotlinJvmCompile>().configureEach {
         compilerOptions {
             allWarningsAsErrors = false
@@ -70,14 +91,19 @@ dependencies {
     implementation(platform("org.http4k:http4k-bom:$http4kVersion"))
 
     implementation("dev.forkhandles:bunting4k:_")
+
+    runtimeOnly("org.slf4j:slf4j-nop:_")
+
+    implementation("com.jcabi:jcabi-manifests:_")
+
     implementation(Http4k.securityOauth)
     implementation(Http4k.client.websocket)
-    implementation(platform("org.http4k:http4k-realtime-core"))
+    implementation(platform(Http4k.realtimeCore))
 
-    testImplementation(platform("org.junit:junit-bom:_"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.http4k:http4k-testing-hamkrest")
+    testImplementation(platform(Testing.junit.bom))
+    testImplementation(Testing.junit.jupiter.api)
+    testImplementation(Testing.junit.jupiter.engine)
+    testImplementation(Http4k.testing.hamkrest)
 
 //    testImplementation(project(":http4k-mcp-sdk"))
     testImplementation("org.http4k:http4k-server-helidon:_")

src/main/kotlin/org/http4k/mcp/Http4kMcpDesktop.kt

@@ -15,38 +15,50 @@ import org.http4k.mcp.internal.pipeJsonRpcTraffic
 import org.http4k.mcp.internal.pipeSseTraffic
 import org.http4k.mcp.internal.pipeWebsocketTraffic
 import java.time.Clock
+import java.util.Properties
 
 object Http4kMcpDesktop {
     @JvmStatic
     fun main(vararg args: String) = McpOptions(args.toList().toTypedArray())
         .use {
-            val clock = Clock.systemUTC()
+            when {
+                version -> println("http4k MCP Desktop v${getVersion()}")
 
-            val security = McpClientSecurity.from(this, clock, JavaHttpClient())
-            when (transport) {
-                sse -> pipeSseTraffic(
-                    System.`in`.reader(),
-                    System.out.writer(),
-                    Request(GET, url),
-                    McpDesktopHttpClient(clock, security),
-                    if (reconnectDelay.isZero) Immediate else Delayed(reconnectDelay),
-                )
+                else -> {
+                    val clock = Clock.systemUTC()
 
-                jsonrpc -> pipeJsonRpcTraffic(
-                    System.`in`.reader(),
-                    System.out.writer(),
-                    Request(GET, url),
-                    McpDesktopHttpClient(clock, security),
-                )
+                    val security = McpClientSecurity.from(this, clock, JavaHttpClient())
+                    when (transport) {
+                        sse -> pipeSseTraffic(
+                            System.`in`.reader(),
+                            System.out.writer(),
+                            Request(GET, url),
+                            McpDesktopHttpClient(clock, security),
+                            if (reconnectDelay.isZero) Immediate else Delayed(reconnectDelay),
+                        )
 
-                websocket -> pipeWebsocketTraffic(
-                    System.`in`.reader(),
-                    System.out.writer(),
-                    url,
-                    security,
-                    if (reconnectDelay.isZero) Immediate else Delayed(reconnectDelay),
-                )
+                        jsonrpc -> pipeJsonRpcTraffic(
+                            System.`in`.reader(),
+                            System.out.writer(),
+                            Request(GET, url),
+                            McpDesktopHttpClient(clock, security),
+                        )
+
+                        websocket -> pipeWebsocketTraffic(
+                            System.`in`.reader(),
+                            System.out.writer(),
+                            url,
+                            security,
+                            if (reconnectDelay.isZero) Immediate else Delayed(reconnectDelay),
+                        )
+                    }
+                }
             }
         }
 }
 
+private fun getVersion() = runCatching {
+    Properties().apply {
+        Http4kMcpDesktop::class.java.getResourceAsStream("/version.properties")?.use(::load)
+    }.getProperty("version", "LOCAL")
+}.getOrDefault("-")

src/main/kotlin/org/http4k/mcp/McpOptions.kt

@@ -13,11 +13,17 @@ import java.time.Duration.ZERO
 
 class McpOptions(args: Array<String>) :
     Bunting(
-        args, "MCP proxy to pipe StdIO to a remote server. Command line options can be found at: https://github.com/http4k/mcp-desktop", "http4k-mcp-desktop",
+        args,
+        "MCP proxy to pipe StdIO to a remote server. Command line options can be found at: https://github.com/http4k/mcp-desktop",
+        "http4k-mcp-desktop",
         config = InMemoryConfig()
     ) {
 
-    val transport by option("MCP transport. Choose between 'jsonrpc' (non-streaming) and 'sse' (streaming)").map { valueOf(it) }
+    val transport by option("MCP transport. Choose between 'jsonrpc' (non-streaming) and 'sse' (streaming)").map {
+        valueOf(
+            it
+        )
+    }
         .defaultsTo(sse)
 
     val url by option("Base URL of the MCP server to connect to: eg. http://localhost:3001/sse")
@@ -36,7 +42,7 @@ class McpOptions(args: Array<String>) :
         .map { Credentials(it.substringBefore(":"), it.substringAfter(":")) }
         .secret()
 
-    val version by option().int().defaultsTo(0)
+    val version by switch("Get the version information for the app")
 
     val reconnectDelay by option("Reconnect delay (in seconds) in case of disconnection. Defaults to 0").int()
         .map { Duration.ofSeconds(it.toLong()) }

versions.properties

@@ -9,6 +9,8 @@
 ####
 #### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.
 
+version.com.jcabi..jcabi-manifests=2.1.0
+
 version.dev.forkhandles..bunting4k=2.22.2.1
 
 ## unused
@@ -23,3 +25,7 @@ plugin.de.fayard.buildSrcLibs=0.60.5
 version.http4k=6.1.0.1
 
 version.junit=5.12.1
+
+version.org.slf4j..slf4j-nop=2.0.17
+##               # available=2.1.0-alpha0
+##               # available=2.1.0-alpha1