From 12e58fe98d1cebb880a193b2ee8f2c72f9a309f8 Mon Sep 17 00:00:00 2001
From: marcus-daily <111281783+marcus-daily@users.noreply.github.com>
Date: Fri, 4 Oct 2024 19:12:32 +0100
Subject: [PATCH 1/3] RTVI 0.2.0

---
 CHANGELOG.md                                  |  25 +++
 gradle/libs.versions.toml                     |   6 +-
 rtvi-client-android/build.gradle.kts          |   2 +-
 .../src/main/java/ai/rtvi/client/Legacy.kt    |  11 ++
 .../client/{VoiceClient.kt => RTVIClient.kt}  | 168 ++++++++++++------
 ...eClientOptions.kt => RTVIClientOptions.kt} |  15 +-
 .../java/ai/rtvi/client/RTVIClientParams.kt   |  36 ++++
 ...ventCallbacks.kt => RTVIEventCallbacks.kt} |  27 ++-
 .../java/ai/rtvi/client/helper/LLMHelper.kt   |  18 +-
 .../main/java/ai/rtvi/client/helper/Legacy.kt |   7 +
 ...iceClientHelper.kt => RTVIClientHelper.kt} |  32 ++--
 .../main/java/ai/rtvi/client/result/Future.kt |   6 +-
 .../java/ai/rtvi/client/result/HttpError.kt   |  20 ++-
 .../main/java/ai/rtvi/client/result/Legacy.kt |   7 +
 .../result/{VoiceError.kt => RTVIError.kt}    |  24 +--
 .../ai/rtvi/client/result/RTVIException.kt    |  12 ++
 .../main/java/ai/rtvi/client/result/Result.kt |   4 +-
 .../ai/rtvi/client/result/VoiceException.kt   |  12 --
 .../client/transport/MsgServerToClient.kt     |  31 +++-
 .../ai/rtvi/client/transport/Transport.kt     |  22 +--
 .../rtvi/client/transport/TransportContext.kt |   8 +-
 .../ai/rtvi/client/types/RTVIURLEndpoints.kt  |   6 +
 .../ai/rtvi/client/types/RegisteredHelper.kt  |   4 +-
 .../ai/rtvi/client/types/TransportState.kt    |   3 +-
 .../ai/rtvi/client/utils/ConnectionBundle.kt  |   3 +-
 .../main/java/ai/rtvi/client/utils/Http.kt    |  52 +++++-
 .../main/java/ai/rtvi/client/utils/Json.kt    |   9 +-
 27 files changed, 416 insertions(+), 154 deletions(-)
 create mode 100644 CHANGELOG.md
 create mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/Legacy.kt
 rename rtvi-client-android/src/main/java/ai/rtvi/client/{VoiceClient.kt => RTVIClient.kt} (70%)
 rename rtvi-client-android/src/main/java/ai/rtvi/client/{VoiceClientOptions.kt => RTVIClientOptions.kt} (71%)
 create mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientParams.kt
 rename rtvi-client-android/src/main/java/ai/rtvi/client/{VoiceEventCallbacks.kt => RTVIEventCallbacks.kt} (88%)
 create mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/helper/Legacy.kt
 rename rtvi-client-android/src/main/java/ai/rtvi/client/helper/{VoiceClientHelper.kt => RTVIClientHelper.kt} (61%)
 create mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/result/Legacy.kt
 rename rtvi-client-android/src/main/java/ai/rtvi/client/result/{VoiceError.kt => RTVIError.kt} (76%)
 create mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIException.kt
 delete mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceException.kt
 create mode 100644 rtvi-client-android/src/main/java/ai/rtvi/client/types/RTVIURLEndpoints.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..85cbbe2
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# 0.2.0
+
+- Renamed:
+  - `VoiceClient` to `RTVIClient`
+  - `VoiceClientOptions` to `RTVIClientOptions`
+  - `VoiceEventCallbacks` to `RTVIEventCallbacks`
+  - `VoiceError` to `RTVIError`
+  - `VoiceException` to `RTVIException`
+  - `VoiceClientHelper` to `RTVIClientHelper`
+  - `RegisteredVoiceClient` to `RegisteredRTVIClient`
+  - `FailedToFetchAuthBundle` to `HttpError`
+- `RTVIClient()` constructor parameter changes
+  - `options` is now mandatory
+  - `baseUrl` has been moved to `options.params.baseUrl`
+  - `baseUrl` and `endpoints` are now separate, and the endpoint names are appended to the `baseUrl`
+- Moved `RTVIClientOptions.config` to `RTVIClientOptions.params.config`
+- Moved `RTVIClientOptions.customHeaders` to `RTVIClientOptions.params.headers`
+- Moved `RTVIClientOptions.customBodyParams` to `RTVIClientOptions.params.requestData`
+- `TransportState` changes
+  - Removed `Idle` state, replaced with `Disconnected`
+  - Added `Disconnecting` state
+- Added callbacks
+  - `onBotLLMText()`
+  - `onBotTTSText()`
+  - `onStorageItemStored()`
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 835b803..3c3063e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-agp = "8.5.1"
-kotlin = "2.0.0"
+agp = "8.5.2"
+kotlin = "2.0.20"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 appcompat = "1.7.0"
 kotlinxSerializationJson = "1.7.1"
-kotlinxSerializationPlugin = "2.0.0"
+kotlinxSerializationPlugin = "2.0.20"
 okhttp = "4.12.0"
 dokka = "1.9.20"
 
diff --git a/rtvi-client-android/build.gradle.kts b/rtvi-client-android/build.gradle.kts
index 6402d85..e352607 100644
--- a/rtvi-client-android/build.gradle.kts
+++ b/rtvi-client-android/build.gradle.kts
@@ -60,7 +60,7 @@ publishing {
         register<MavenPublication>("release") {
             groupId = "ai.rtvi"
             artifactId = "client"
-            version = "0.1.4"
+            version = "0.2.0"
 
             pom {
                 name.set("RTVI Client")
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/Legacy.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/Legacy.kt
new file mode 100644
index 0000000..5d637b9
--- /dev/null
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/Legacy.kt
@@ -0,0 +1,11 @@
+package ai.rtvi.client
+
+
+@Deprecated("VoiceClient is renamed to RTVIClient")
+typealias VoiceClient = RTVIClient
+
+@Deprecated("VoiceClientOptions is renamed to RTVIClientOptions")
+typealias VoiceClientOptions = RTVIClientOptions
+
+@Deprecated("VoiceEventCallbacks is renamed to RTVIEventCallbacks")
+typealias VoiceEventCallbacks = RTVIEventCallbacks
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/VoiceClient.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt
similarity index 70%
rename from rtvi-client-android/src/main/java/ai/rtvi/client/VoiceClient.kt
rename to rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt
index 4a6e4f4..a0b87c6 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/VoiceClient.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt
@@ -1,12 +1,12 @@
 package ai.rtvi.client
 
-import ai.rtvi.client.helper.RegisteredVoiceClient
-import ai.rtvi.client.helper.VoiceClientHelper
+import ai.rtvi.client.helper.RTVIClientHelper
+import ai.rtvi.client.helper.RegisteredRTVIClient
 import ai.rtvi.client.result.Future
 import ai.rtvi.client.result.Promise
+import ai.rtvi.client.result.RTVIError
+import ai.rtvi.client.result.RTVIException
 import ai.rtvi.client.result.Result
-import ai.rtvi.client.result.VoiceError
-import ai.rtvi.client.result.VoiceException
 import ai.rtvi.client.result.resolvedPromiseErr
 import ai.rtvi.client.result.withPromise
 import ai.rtvi.client.result.withTimeout
@@ -29,7 +29,9 @@ import ai.rtvi.client.types.Value
 import ai.rtvi.client.utils.ConnectionBundle
 import ai.rtvi.client.utils.JSON_INSTANCE
 import ai.rtvi.client.utils.ThreadRef
+import ai.rtvi.client.utils.parseServerSentEvents
 import ai.rtvi.client.utils.post
+import ai.rtvi.client.utils.valueFrom
 import android.util.Log
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive
@@ -44,17 +46,15 @@ import okhttp3.RequestBody.Companion.toRequestBody
  *
  * The client must be cleaned up using the [release] method when it is no longer required.
  *
- * @param baseUrl URL of the RTVI backend.
  * @param transport Transport for media streaming.
  * @param callbacks Callbacks invoked when changes occur in the voice session.
  * @param options Additional options for configuring the client and backend.
  */
 @Suppress("unused")
-open class VoiceClient(
-    private val baseUrl: String,
+open class RTVIClient(
     transport: TransportFactory,
-    callbacks: VoiceEventCallbacks,
-    private var options: VoiceClientOptions = VoiceClientOptions()
+    callbacks: RTVIEventCallbacks,
+    private var options: RTVIClientOptions,
 ) {
     companion object {
         private const val TAG = "VoiceClient"
@@ -65,12 +65,12 @@ open class VoiceClient(
      */
     val thread = ThreadRef.forCurrent()
 
-    private val callbacks = CallbackInterceptor(object : VoiceEventCallbacks() {
+    private val callbacks = CallbackInterceptor(object : RTVIEventCallbacks() {
         override fun onBackendError(message: String) {}
 
         override fun onDisconnected() {
             discardWaitingResponses()
-            connection?.ready?.resolveErr(VoiceError.OperationCancelled)
+            connection?.ready?.resolveErr(RTVIError.OperationCancelled)
             connection = null
         }
     }, callbacks)
@@ -78,11 +78,11 @@ open class VoiceClient(
     private val helpers = mutableMapOf<String, RegisteredHelper>()
 
     private val awaitingServerResponse =
-        mutableMapOf<String, (Result<JsonElement, VoiceError>) -> Unit>()
+        mutableMapOf<String, (Result<JsonElement, RTVIError>) -> Unit>()
 
     private inline fun handleResponse(
         msg: MsgServerToClient,
-        action: ((Result<JsonElement, VoiceError>) -> Unit) -> Unit
+        action: ((Result<JsonElement, RTVIError>) -> Unit) -> Unit
     ) {
         val id = msg.id ?: throw Exception("${msg.type} missing ID")
 
@@ -95,17 +95,15 @@ open class VoiceClient(
     private val transportCtx = object : TransportContext {
 
         override val options
-            get() = this@VoiceClient.options
+            get() = this@RTVIClient.options
 
         override val callbacks
-            get() = this@VoiceClient.callbacks
+            get() = this@RTVIClient.callbacks
 
-        override val thread = this@VoiceClient.thread
+        override val thread = this@RTVIClient.thread
 
         override fun onMessage(msg: MsgServerToClient) = thread.runOnThread {
 
-            Log.i(TAG, "onMessage($msg)")
-
             try {
                 when (msg.type) {
                     MsgServerToClient.Type.BotReady -> {
@@ -113,7 +111,7 @@ open class VoiceClient(
                         val data =
                             JSON_INSTANCE.decodeFromJsonElement<MsgServerToClient.Data.BotReady>(msg.data)
 
-                        this@VoiceClient.transport.setState(TransportState.Ready)
+                        this@RTVIClient.transport.setState(TransportState.Ready)
 
                         connection?.ready?.resolveOk(Unit)
 
@@ -138,7 +136,7 @@ open class VoiceClient(
 
                         try {
                             handleResponse(msg) { respondTo ->
-                                respondTo(Result.Err(VoiceError.ErrorResponse(data.error)))
+                                respondTo(Result.Err(RTVIError.ErrorResponse(data.error)))
                             }
                         } catch (e: Exception) {
                             Log.e(TAG, "Got exception handling error response", e)
@@ -160,7 +158,8 @@ open class VoiceClient(
                         callbacks.onUserTranscript(data)
                     }
 
-                    MsgServerToClient.Type.BotTranscription -> {
+                    MsgServerToClient.Type.BotTranscription,
+                    MsgServerToClient.Type.BotTranscriptionLegacy -> {
                         val text = (msg.data.jsonObject.get("text") as JsonPrimitive).content
                         callbacks.onBotTranscript(text)
                     }
@@ -181,6 +180,27 @@ open class VoiceClient(
                         callbacks.onBotStoppedSpeaking()
                     }
 
+                    MsgServerToClient.Type.BotLlmText -> {
+                        val data: MsgServerToClient.Data.BotLLMTextData =
+                            JSON_INSTANCE.decodeFromJsonElement(msg.data)
+
+                        callbacks.onBotLLMText(data)
+                    }
+
+                    MsgServerToClient.Type.BotTtsText -> {
+                        val data: MsgServerToClient.Data.BotTTSTextData =
+                            JSON_INSTANCE.decodeFromJsonElement(msg.data)
+
+                        callbacks.onBotTTSText(data)
+                    }
+
+                    MsgServerToClient.Type.StorageItemStored -> {
+                        val data: MsgServerToClient.Data.StorageItemStoredData =
+                            JSON_INSTANCE.decodeFromJsonElement(msg.data)
+
+                        callbacks.onStorageItemStored(data)
+                    }
+
                     else -> {
 
                         var match = false
@@ -208,7 +228,7 @@ open class VoiceClient(
     private val transport: Transport = transport.createTransport(transportCtx)
 
     private inner class Connection {
-        val ready = Promise<Unit, VoiceError>(thread)
+        val ready = Promise<Unit, RTVIError>(thread)
     }
 
     private var connection: Connection? = null
@@ -218,17 +238,20 @@ open class VoiceClient(
      *
      * @return A Future, representing the asynchronous result of this operation.
      */
-    fun initDevices(): Future<Unit, VoiceError> = transport.initDevices()
+    fun initDevices(): Future<Unit, RTVIError> = transport.initDevices()
+
+    @Deprecated("start() renamed to connect()")
+    fun start() = connect()
 
     /**
      * Initiate an RTVI session, connecting to the backend.
      */
-    fun start(): Future<Unit, VoiceError> = thread.runOnThreadReturningFuture {
+    fun connect(): Future<Unit, RTVIError> = thread.runOnThreadReturningFuture {
 
         if (connection != null) {
             return@runOnThreadReturningFuture resolvedPromiseErr(
                 thread,
-                VoiceError.PreviousConnectionStillActive
+                RTVIError.PreviousConnectionStillActive
             )
         }
 
@@ -237,28 +260,28 @@ open class VoiceClient(
         // Send POST request to the provided base_url to connect and start the bot
 
         val body = ConnectionBundle(
-            services = options.services.associate { it.service to it.value },
-            config = options.config
+            services = options.services?.associate { it.service to it.value },
+            config = options.config + options.params.config
         )
-            .serializeWithCustomParams(options.customBodyParams)
+            .serializeWithCustomParams(options.customBodyParams + options.params.requestData)
             .toRequestBody("application/json".toMediaType())
 
         val currentConnection = Connection().apply { connection = this }
 
         return@runOnThreadReturningFuture post(
             thread = thread,
-            url = baseUrl,
+            url = options.params.baseUrl + options.params.endpoints.connect,
             body = body,
-            customHeaders = options.customHeaders
+            customHeaders = options.customHeaders + options.params.headers
         )
-            .mapError<VoiceError> {
-                VoiceError.FailedToFetchAuthBundle(it)
+            .mapError<RTVIError> {
+                RTVIError.HttpError(it)
             }
             .chain { authBundle ->
                 if (currentConnection == connection) {
                     transport.connect(AuthBundle(authBundle))
                 } else {
-                    resolvedPromiseErr(thread, VoiceError.OperationCancelled)
+                    resolvedPromiseErr(thread, RTVIError.OperationCancelled)
                 }
             }
             .chain { currentConnection.ready }
@@ -273,7 +296,7 @@ open class VoiceClient(
      *
      * @return A Future, representing the asynchronous result of this operation.
      */
-    fun disconnect(): Future<Unit, VoiceError> {
+    fun disconnect(): Future<Unit, RTVIError> {
         return transport.disconnect()
     }
 
@@ -287,7 +310,7 @@ open class VoiceClient(
         thread.assertCurrent()
 
         awaitingServerResponse.values.forEach {
-            it(Result.Err(VoiceError.OperationCancelled))
+            it(Result.Err(RTVIError.OperationCancelled))
         }
 
         awaitingServerResponse.clear()
@@ -299,16 +322,16 @@ open class VoiceClient(
      * @param service Target service for this helper
      * @param helper Helper instance
      */
-    @Throws(VoiceException::class)
-    fun <E : VoiceClientHelper> registerHelper(service: String, helper: E): E {
+    @Throws(RTVIException::class)
+    fun <E : RTVIClientHelper> registerHelper(service: String, helper: E): E {
 
         thread.assertCurrent()
 
         if (helpers.containsKey(service)) {
-            throw VoiceException(VoiceError.OtherError("Helper targeting service '$service' already registered"))
+            throw RTVIException(RTVIError.OtherError("Helper targeting service '$service' already registered"))
         }
 
-        helper.registerVoiceClient(RegisteredVoiceClient(this, service))
+        helper.registerVoiceClient(RegisteredRTVIClient(this, service))
 
         val entry = RegisteredHelper(
             helper = helper,
@@ -323,21 +346,22 @@ open class VoiceClient(
     /**
      * Unregisters a helper from the client.
      */
-    @Throws(VoiceException::class)
+    @Throws(RTVIException::class)
     fun unregisterHelper(service: String) {
 
         thread.assertCurrent()
 
         val entry = helpers.remove(service)
-            ?: throw VoiceException(VoiceError.OtherError("Helper targeting service '$service' not found"))
+            ?: throw RTVIException(RTVIError.OtherError("Helper targeting service '$service' not found"))
 
         entry.helper.unregisterVoiceClient()
     }
 
     private inline fun <reified M, R> sendWithResponse(
         msg: MsgClientToServer,
+        allowSingleTurn: Boolean = false,
         crossinline filter: (M) -> R
-    ): Future<R, VoiceError> = withPromise(thread) { promise ->
+    ) = withPromise(thread) { promise ->
         thread.runOnThread {
 
             awaitingServerResponse[msg.id] = { result ->
@@ -350,12 +374,47 @@ open class VoiceClient(
                 }
             }
 
-            transport.sendMessage(msg).withErrorCallback {
-                awaitingServerResponse.remove(msg.id)
-                promise.resolveErr(it)
+            when (transport.state()) {
+                TransportState.Connected, TransportState.Ready -> {
+                    transport.sendMessage(msg)
+                        .withTimeout(10000)
+                        .withErrorCallback {
+                            awaitingServerResponse.remove(msg.id)
+                            promise.resolveErr(it)
+                        }
+                }
+
+                else -> if (allowSingleTurn) {
+                    post(
+                        thread = thread,
+                        url = options.params.baseUrl + options.params.endpoints.action,
+                        body = JSON_INSTANCE.encodeToString(
+                            Value.serializer(), Value.Object(
+                                (options.customBodyParams + options.params.requestData + listOf(
+                                    "actions" to Value.Array(
+                                        valueFrom(MsgClientToServer.serializer(), msg)
+                                    )
+                                )).toMap()
+                            )
+                        ).toRequestBody("application/json".toMediaType()),
+                        customHeaders = options.customHeaders + options.params.headers,
+                        responseHandler = { inputStream ->
+                            inputStream.parseServerSentEvents { msg ->
+                                transportCtx.onMessage(JSON_INSTANCE.decodeFromString(msg))
+                            }
+                        }
+                    ).withCallback {
+                        promise.resolveErr(
+                            when (it) {
+                                is Result.Err -> RTVIError.HttpError(it.error)
+                                is Result.Ok -> RTVIError.OtherError("Connection ended before result received")
+                            }
+                        )
+                    }
+                }
             }
         }
-    }.withTimeout(10000)
+    }
 
     /**
      * Instruct a backend service to perform an action.
@@ -364,18 +423,19 @@ open class VoiceClient(
         service: String,
         action: String,
         arguments: List<Option> = emptyList()
-    ): Future<Value, VoiceError> = sendWithResponse<MsgServerToClient.Data.ActionResponse, Value>(
-        MsgClientToServer.Action(
+    ): Future<Value, RTVIError> = sendWithResponse<MsgServerToClient.Data.ActionResponse, Value>(
+        msg = MsgClientToServer.Action(
             service = service,
             action = action,
             arguments = arguments
         ),
+        allowSingleTurn = true,
     ) { it.result }
 
     /**
      * Gets the current config from the server.
      */
-    fun getConfig(): Future<Config, VoiceError> =
+    fun getConfig(): Future<Config, RTVIError> =
         sendWithResponse<MsgServerToClient.Data.GetOrUpdateConfigResponse, Config>(
             MsgClientToServer.GetConfig()
         ) { Config(it.config) }
@@ -383,7 +443,7 @@ open class VoiceClient(
     /**
      * Updates the config on the server.
      */
-    fun updateConfig(update: List<ServiceConfig>): Future<Config, VoiceError> =
+    fun updateConfig(update: List<ServiceConfig>): Future<Config, RTVIError> =
         sendWithResponse<MsgServerToClient.Data.GetOrUpdateConfigResponse, Config>(
             MsgClientToServer.UpdateConfig(update)
         ) { Config(it.config) }
@@ -391,7 +451,7 @@ open class VoiceClient(
     /**
      * Returns the expected structure of the server config.
      */
-    fun describeConfig(): Future<List<ServiceConfigDescription>, VoiceError> =
+    fun describeConfig(): Future<List<ServiceConfigDescription>, RTVIError> =
         sendWithResponse<MsgServerToClient.Data.DescribeConfigResponse, List<ServiceConfigDescription>>(
             MsgClientToServer.DescribeConfig()
         ) { it.config }
@@ -399,7 +459,7 @@ open class VoiceClient(
     /**
      * Returns a list of supported actions.
      */
-    fun describeActions(): Future<List<ActionDescription>, VoiceError> =
+    fun describeActions(): Future<List<ActionDescription>, RTVIError> =
         sendWithResponse<MsgServerToClient.Data.DescribeActionsResponse, List<ActionDescription>>(
             MsgClientToServer.DescribeActions()
         ) { it.actions }
@@ -495,7 +555,7 @@ open class VoiceClient(
     }
 
     private inline fun assertReadyOrReturn(
-        returnAction: (Future<Unit, VoiceError>) -> Nothing
+        returnAction: (Future<Unit, RTVIError>) -> Nothing
     ) {
         thread.assertCurrent()
 
@@ -503,7 +563,7 @@ open class VoiceClient(
             returnAction(
                 resolvedPromiseErr(
                     thread,
-                    VoiceError.InvalidState(
+                    RTVIError.InvalidState(
                         expected = TransportState.Ready,
                         actual = state
                     )
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/VoiceClientOptions.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientOptions.kt
similarity index 71%
rename from rtvi-client-android/src/main/java/ai/rtvi/client/VoiceClientOptions.kt
rename to rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientOptions.kt
index 3939748..7f6d842 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/VoiceClientOptions.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientOptions.kt
@@ -5,9 +5,15 @@ import ai.rtvi.client.types.ServiceRegistration
 import ai.rtvi.client.types.Value
 
 /**
- * Configuration options when instantiating a [VoiceClient].
+ * Configuration options when instantiating a [RTVIClient].
  */
-data class VoiceClientOptions(
+data class RTVIClientOptions(
+
+    /**
+     * Connection parameters.
+     */
+    val params: RTVIClientParams,
+
     /**
      * Enable the user mic input.
      *
@@ -25,20 +31,23 @@ data class VoiceClientOptions(
     /**
      * A list of services to use on the backend.
      */
-    val services: List<ServiceRegistration> = emptyList(),
+    val services: List<ServiceRegistration>? = null,
 
     /**
      * Further configuration options for the backend.
      */
+    @Deprecated("Use params.config")
     val config: List<ServiceConfig> = emptyList(),
 
     /**
      * Custom HTTP headers to be sent with the POST request to baseUrl.
      */
+    @Deprecated("Use params.headers")
     val customHeaders: List<Pair<String, String>> = emptyList(),
 
     /**
      * Custom parameters to add to the auth request body.
      */
+    @Deprecated("Use params.requestData")
     val customBodyParams: List<Pair<String, Value>> = emptyList()
 )
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientParams.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientParams.kt
new file mode 100644
index 0000000..1c795b4
--- /dev/null
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClientParams.kt
@@ -0,0 +1,36 @@
+package ai.rtvi.client
+
+import ai.rtvi.client.types.RTVIURLEndpoints
+import ai.rtvi.client.types.ServiceConfig
+import ai.rtvi.client.types.Value
+
+/**
+ * Connection options when instantiating a [RTVIClient].
+ */
+data class RTVIClientParams(
+
+    /**
+     * The base URL for the RTVI POST request.
+     */
+    val baseUrl: String,
+
+    /**
+     * Custom HTTP headers to be sent with the POST request.
+     */
+    val headers: List<Pair<String, String>> = emptyList(),
+
+    /**
+     * API endpoint names for the RTVI POST requests.
+     */
+    val endpoints: RTVIURLEndpoints = RTVIURLEndpoints(),
+
+    /**
+     * Custom parameters to add to the auth request body.
+     */
+    val requestData: List<Pair<String, Value>> = emptyList(),
+
+    /**
+     * Further configuration options for the backend.
+     */
+    val config: List<ServiceConfig> = emptyList(),
+)
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/VoiceEventCallbacks.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIEventCallbacks.kt
similarity index 88%
rename from rtvi-client-android/src/main/java/ai/rtvi/client/VoiceEventCallbacks.kt
rename to rtvi-client-android/src/main/java/ai/rtvi/client/RTVIEventCallbacks.kt
index f0fed77..87dc985 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/VoiceEventCallbacks.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIEventCallbacks.kt
@@ -10,10 +10,10 @@ import ai.rtvi.client.types.Transcript
 import ai.rtvi.client.types.TransportState
 
 /**
- * Callbacks invoked when changes occur in the voice session.
+ * Callbacks invoked when changes occur in the RTVI session.
  */
 @Suppress("unused")
-abstract class VoiceEventCallbacks {
+abstract class RTVIEventCallbacks {
 
     /**
      * Invoked when the underlying transport has connected.
@@ -109,12 +109,12 @@ abstract class VoiceEventCallbacks {
     open fun onPipecatMetrics(data: PipecatMetrics) {}
 
     /**
-     * Invoked when user transcript data is avaiable.
+     * Invoked when user transcript data is available.
      */
     open fun onUserTranscript(data: Transcript) {}
 
     /**
-     * Invoked when bot transcript data is avaiable.
+     * Invoked when bot transcript data is available.
      */
     open fun onBotTranscript(text: String) {}
 
@@ -133,13 +133,28 @@ abstract class VoiceEventCallbacks {
      * Invoked when the set of available cam/mic tracks changes.
      */
     open fun onTracksUpdated(tracks: Tracks) {}
+
+    /**
+     * Invoked when text is generated by the bot LLM.
+     */
+    open fun onBotLLMText(data: MsgServerToClient.Data.BotLLMTextData) {}
+
+    /**
+     * Invoked when text is spoken by the bot.
+     */
+    open fun onBotTTSText(data: MsgServerToClient.Data.BotTTSTextData) {}
+
+    /**
+     * Invoked when data is stored by the bot.
+     */
+    open fun onStorageItemStored(data: MsgServerToClient.Data.StorageItemStoredData) {}
 }
 
-internal class CallbackInterceptor(vararg listeners: VoiceEventCallbacks): VoiceEventCallbacks() {
+internal class CallbackInterceptor(vararg listeners: RTVIEventCallbacks): RTVIEventCallbacks() {
     
     private val callbacks = listeners.toMutableList()
     
-    fun addListener(listener: VoiceEventCallbacks) {
+    fun addListener(listener: RTVIEventCallbacks) {
         callbacks.add(listener)
     }
     
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/helper/LLMHelper.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/helper/LLMHelper.kt
index 45b5dcb..d9958f0 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/helper/LLMHelper.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/helper/LLMHelper.kt
@@ -1,7 +1,7 @@
 package ai.rtvi.client.helper
 
 import ai.rtvi.client.result.Future
-import ai.rtvi.client.result.VoiceError
+import ai.rtvi.client.result.RTVIError
 import ai.rtvi.client.result.resolvedPromiseErr
 import ai.rtvi.client.transport.MsgClientToServer
 import ai.rtvi.client.transport.MsgServerToClient
@@ -23,7 +23,7 @@ import kotlinx.serialization.json.jsonPrimitive
 /**
  * Helper for interacting with an LLM service.
  */
-class LLMHelper(private val callbacks: Callbacks) : VoiceClientHelper() {
+class LLMHelper(private val callbacks: Callbacks) : RTVIClientHelper() {
 
     companion object {
         const val TAG = "LLMHelper"
@@ -80,7 +80,7 @@ class LLMHelper(private val callbacks: Callbacks) : VoiceClientHelper() {
     /**
      * Returns the bot's current LLM context. Bot must be in the ready state.
      */
-    fun getContext(): Future<LLMContext, VoiceError> = withClient {
+    fun getContext(): Future<LLMContext, RTVIError> = withClient {
         it.ensureReady {
             it.action("get_context")
                 .map { result -> JSON_INSTANCE.decodeFromJsonElement<LLMContext>(result.asJsonElement()) }
@@ -96,7 +96,7 @@ class LLMHelper(private val callbacks: Callbacks) : VoiceClientHelper() {
     fun setContext(
         context: LLMContext,
         interrupt: Boolean = false
-    ): Future<Unit, VoiceError> = withClient {
+    ): Future<Unit, RTVIError> = withClient {
         it.ensureReady {
             it.action(
                 "set_context",
@@ -117,7 +117,7 @@ class LLMHelper(private val callbacks: Callbacks) : VoiceClientHelper() {
     fun appendToMessages(
         message: LLMContextMessage,
         runImmediately: Boolean = false
-    ): Future<Unit, VoiceError> = withClient {
+    ): Future<Unit, RTVIError> = withClient {
         it.ensureReady {
             it.action(
                 "append_to_messages",
@@ -138,7 +138,7 @@ class LLMHelper(private val callbacks: Callbacks) : VoiceClientHelper() {
      *
      * @param interrupt boolean - Whether to interrupt the bot, or wait until it has finished speaking
      */
-    fun run(interrupt: Boolean = false): Future<Unit, VoiceError> = withClient {
+    fun run(interrupt: Boolean = false): Future<Unit, RTVIError> = withClient {
         it.ensureReady {
             it.action("run", listOf("interrupt" setTo interrupt)).throwAwayResult()
         }
@@ -205,14 +205,14 @@ private fun Value.asJsonElement(): JsonElement = when (this) {
     Value.Null -> JsonNull
 }
 
-private fun <V> RegisteredVoiceClient.ensureReady(action: () -> Future<V, VoiceError>): Future<V, VoiceError> =
+private fun <V> RegisteredRTVIClient.ensureReady(action: () -> Future<V, RTVIError>): Future<V, RTVIError> =
     if (client.state == TransportState.Ready) {
         action()
     } else {
         resolvedPromiseErr(
             client.thread,
-            VoiceError.InvalidState(expected = TransportState.Ready, actual = client.state)
+            RTVIError.InvalidState(expected = TransportState.Ready, actual = client.state)
         )
     }
 
-private fun Future<Value, VoiceError>.throwAwayResult() = map {}
+private fun Future<Value, RTVIError>.throwAwayResult() = map {}
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/helper/Legacy.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/helper/Legacy.kt
new file mode 100644
index 0000000..f1aa068
--- /dev/null
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/helper/Legacy.kt
@@ -0,0 +1,7 @@
+package ai.rtvi.client.helper
+
+@Deprecated("VoiceClientHelper renamed to RTVIClientHelper")
+typealias VoiceClientHelper = RTVIClientHelper
+
+@Deprecated("RegisteredVoiceClient renamed to RegisteredRTVIClient")
+typealias RegisteredVoiceClient = RegisteredRTVIClient
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/helper/VoiceClientHelper.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/helper/RTVIClientHelper.kt
similarity index 61%
rename from rtvi-client-android/src/main/java/ai/rtvi/client/helper/VoiceClientHelper.kt
rename to rtvi-client-android/src/main/java/ai/rtvi/client/helper/RTVIClientHelper.kt
index b94288f..7c55f19 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/helper/VoiceClientHelper.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/helper/RTVIClientHelper.kt
@@ -1,32 +1,32 @@
 package ai.rtvi.client.helper
 
-import ai.rtvi.client.VoiceClient
+import ai.rtvi.client.RTVIClient
 import ai.rtvi.client.result.Future
-import ai.rtvi.client.result.VoiceError
-import ai.rtvi.client.result.VoiceException
+import ai.rtvi.client.result.RTVIError
+import ai.rtvi.client.result.RTVIException
 import ai.rtvi.client.result.resolvedPromiseErr
 import ai.rtvi.client.transport.MsgServerToClient
 import ai.rtvi.client.types.Option
 import ai.rtvi.client.utils.ThreadRef
 import java.util.concurrent.atomic.AtomicReference
 
-abstract class VoiceClientHelper {
+abstract class RTVIClientHelper {
 
-    private val voiceClient = AtomicReference<RegisteredVoiceClient?>(null)
+    private val voiceClient = AtomicReference<RegisteredRTVIClient?>(null)
 
     protected fun <R> withClient(
-        action: (RegisteredVoiceClient) -> Future<R, VoiceError>
-    ): Future<R, VoiceError> {
+        action: (RegisteredRTVIClient) -> Future<R, RTVIError>
+    ): Future<R, RTVIError> {
 
         val client = voiceClient.get() ?: return resolvedPromiseErr(
             ThreadRef.forMain(),
-            VoiceError.HelperNotRegistered
+            RTVIError.HelperNotRegistered
         )
 
         return client.client.thread.runOnThreadReturningFuture { action(client) }
     }
 
-    protected val client: RegisteredVoiceClient?
+    protected val client: RegisteredRTVIClient?
         get() = voiceClient.get()
 
     /**
@@ -40,23 +40,23 @@ abstract class VoiceClientHelper {
      */
     abstract fun getMessageTypes(): Set<String>
 
-    @Throws(VoiceException::class)
-    internal fun registerVoiceClient(client: RegisteredVoiceClient) {
+    @Throws(RTVIException::class)
+    internal fun registerVoiceClient(client: RegisteredRTVIClient) {
         if (!this.voiceClient.compareAndSet(null, client)) {
-            throw VoiceException(VoiceError.OtherError("Helper is already registered to a client"))
+            throw RTVIException(RTVIError.OtherError("Helper is already registered to a client"))
         }
     }
 
-    @Throws(VoiceException::class)
+    @Throws(RTVIException::class)
     internal fun unregisterVoiceClient() {
         if (voiceClient.getAndSet(null) == null) {
-            throw VoiceException(VoiceError.OtherError("Helper is not registered to a client"))
+            throw RTVIException(RTVIError.OtherError("Helper is not registered to a client"))
         }
     }
 }
 
-class RegisteredVoiceClient(
-    val client: VoiceClient,
+class RegisteredRTVIClient(
+    val client: RTVIClient,
     val service: String,
 ) {
     fun action(action: String, args: List<Option> = emptyList()) =
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/Future.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/Future.kt
index aa1300b..78aec24 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/result/Future.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/result/Future.kt
@@ -85,7 +85,7 @@ interface Future<V, E> {
      * Wait for the Future to complete using Kotlin Coroutines, and throw
      * a VoiceException if the operation failed.
      */
-    @Throws(VoiceException::class)
+    @Throws(RTVIException::class)
     suspend fun await() = awaitNoThrow().throwError()
 
     /**
@@ -101,11 +101,11 @@ interface Future<V, E> {
  *
  * @param durationMs Timeout in milliseconds.
  */
-fun <V> Future<V, VoiceError>.withTimeout(durationMs: Long): Future<V, VoiceError> =
+fun <V> Future<V, RTVIError>.withTimeout(durationMs: Long): Future<V, RTVIError> =
     withPromise(thread) { promise ->
 
         val timeoutEvent = Runnable {
-            promise.resolveErr(VoiceError.Timeout)
+            promise.resolveErr(RTVIError.Timeout)
         }
 
         this.withCallback {
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/HttpError.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/HttpError.kt
index cd22575..355105c 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/result/HttpError.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/result/HttpError.kt
@@ -6,28 +6,38 @@ package ai.rtvi.client.result
 sealed interface HttpError {
 
     /**
-     * A humaan-readable description of the error.
+     * A human-readable description of the error.
      */
     val description: String
 
+    /**
+     * The URL of the failed request.
+     */
+    val url: String
+
     /**
      * The HTTP request returned an invalid status code.
      */
-    data class BadStatusCode(val code: Int, val responseBody: String?) : HttpError {
-        override val description = "Server returned status code $code: response body '$responseBody'"
+    data class BadStatusCode(
+        override val url: String,
+        val code: Int,
+        val responseBody: String?
+    ) : HttpError {
+        override val description =
+            "Server returned status code $code: response body '$responseBody'"
     }
 
     /**
      * An exception was thrown during the HTTP request.
      */
-    data class ExceptionThrown(val e: Exception) : HttpError {
+    data class ExceptionThrown(override val url: String, val e: Exception) : HttpError {
         override val description = "An exception was thrown ($e)"
     }
 
     /**
      * The HTTP response was expected to have a body.
      */
-    data object MissingResponseBody : HttpError {
+    data class MissingResponseBody(override val url: String) : HttpError {
         override val description = "The response had no body data"
     }
 }
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/Legacy.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/Legacy.kt
new file mode 100644
index 0000000..6eb654d
--- /dev/null
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/result/Legacy.kt
@@ -0,0 +1,7 @@
+package ai.rtvi.client.result
+
+@Deprecated("VoiceError renamed to RTVIError")
+typealias VoiceError = RTVIError
+
+@Deprecated("VoiceException renamed to RTVIException")
+typealias VoiceException = RTVIException
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceError.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIError.kt
similarity index 76%
rename from rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceError.kt
rename to rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIError.kt
index 4fa8708..baac94a 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceError.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIError.kt
@@ -5,7 +5,7 @@ import ai.rtvi.client.types.TransportState
 /**
  * An error occurring during an operation.
  */
-abstract class VoiceError {
+abstract class RTVIError {
 
     /**
      * A human-readable description of the error.
@@ -22,28 +22,28 @@ abstract class VoiceError {
     /**
      * Failed to fetch the authentication bundle from the RTVI backend.
      */
-    data class FailedToFetchAuthBundle(val error: HttpError) : VoiceError() {
-        override val description = "Failed to fetch the auth bundle: ${error.description}"
+    data class HttpError(val error: ai.rtvi.client.result.HttpError) : RTVIError() {
+        override val description = error.description
     }
 
     /**
      * An exception was thrown.
      */
-    data class ExceptionThrown(override val exception: Exception) : VoiceError() {
+    data class ExceptionThrown(override val exception: Exception) : RTVIError() {
         override val description = "An exception was thrown ($exception)"
     }
 
     /**
      * An unknown error occurred.
      */
-    data class OtherError(val message: String) : VoiceError() {
+    data class OtherError(val message: String) : RTVIError() {
         override val description = message
     }
 
     /**
      * Operation cannot be performed because the transport is not initialized.
      */
-    data object TransportNotInitialized : VoiceError() {
+    data object TransportNotInitialized : RTVIError() {
         override val description = "Transport not initialized"
     }
 
@@ -53,41 +53,41 @@ abstract class VoiceError {
     data class InvalidState(
         val expected: TransportState,
         val actual: TransportState
-    ) : VoiceError() {
+    ) : RTVIError() {
         override val description = "Invalid state: expected ${expected.name}, actual ${actual.name}"
     }
 
     /**
      * The operation was cancelled before it could complete.
      */
-    data object OperationCancelled : VoiceError() {
+    data object OperationCancelled : RTVIError() {
         override val description = "The operation was cancelled"
     }
 
     data class ErrorResponse(
         val message: String
-    ) : VoiceError() {
+    ) : RTVIError() {
         override val description = "Received error response from backend: $message"
     }
 
     /**
      * The operation timed out before it could complete.
      */
-    data object Timeout : VoiceError() {
+    data object Timeout : RTVIError() {
         override val description = "The operation timed out"
     }
 
     /**
      * The previous connection is still active.
      */
-    data object PreviousConnectionStillActive : VoiceError() {
+    data object PreviousConnectionStillActive : RTVIError() {
         override val description = "The previous connection is still active"
     }
 
     /**
      * This helper is not registered to a VoiceClient.
      */
-    data object HelperNotRegistered : VoiceError() {
+    data object HelperNotRegistered : RTVIError() {
         override val description = "This helper is not registered to a VoiceClient"
     }
 }
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIException.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIException.kt
new file mode 100644
index 0000000..36fd254
--- /dev/null
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/result/RTVIException.kt
@@ -0,0 +1,12 @@
+package ai.rtvi.client.result
+
+class RTVIException(
+    val error: RTVIError
+) : Exception(error.description, error.exception) {
+
+    companion object {
+        internal fun <E> from(e: E) = RTVIException(
+            (e as? RTVIError) ?: RTVIError.OtherError(e.toString())
+        )
+    }
+}
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/Result.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/Result.kt
index 07c1883..3d8e543 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/result/Result.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/result/Result.kt
@@ -44,9 +44,9 @@ sealed interface Result<out V, out E> {
     /**
      * If the operation failed, throw a VoiceException, otherwise return the result.
      */
-    @Throws(VoiceException::class)
+    @Throws(RTVIException::class)
     fun throwError(): V = when(this) {
-        is Err -> throw VoiceException.from(error)
+        is Err -> throw RTVIException.from(error)
         is Ok -> value
     }
 
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceException.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceException.kt
deleted file mode 100644
index 9b14770..0000000
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/result/VoiceException.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package ai.rtvi.client.result
-
-class VoiceException(
-    val error: VoiceError
-) : Exception(error.description, error.exception) {
-
-    companion object {
-        internal fun <E> from(e: E) = VoiceException(
-            (e as? VoiceError) ?: VoiceError.OtherError(e.toString())
-        )
-    }
-}
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/transport/MsgServerToClient.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/transport/MsgServerToClient.kt
index 2d4dd76..57e156d 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/transport/MsgServerToClient.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/transport/MsgServerToClient.kt
@@ -27,11 +27,24 @@ data class MsgServerToClient(
         const val DescribeActionsResponse = "actions-available"
         const val ActionResponse = "action-response"
         const val UserTranscription = "user-transcription"
-        const val BotTranscription = "tts-text"
+        const val BotTranscriptionLegacy = "tts-text"
+        const val BotTranscription = "bot-transcription"
         const val UserStartedSpeaking = "user-started-speaking"
         const val UserStoppedSpeaking = "user-stopped-speaking"
         const val BotStartedSpeaking = "bot-started-speaking"
         const val BotStoppedSpeaking = "bot-stopped-speaking"
+        const val Config = "config"
+
+        // Service-specific
+        const val BotLlmText = "bot-llm-text" // Streaming chunk/word, directly after LLM
+        const val BotLlmStarted = "bot-llm-started" // Unused
+        const val BotLlmStopped = "bot-llm-stopped" // Unused
+        const val BotTtsText = "bot-tts-text" // Unused
+        const val BotTtsStarted = "bot-tts-started" // Unused
+        const val BotTtsStopped = "bot-tts-stopped" // Unused
+
+        // Storage
+        const val StorageItemStored = "storage-item-stored" // Item was stored
     }
 
     object Data {
@@ -66,5 +79,21 @@ data class MsgServerToClient(
         data class ActionResponse(
             val result: Value
         )
+
+        @Serializable
+        data class BotLLMTextData(
+            val text: String
+        )
+
+        @Serializable
+        data class BotTTSTextData(
+            val text: String
+        )
+
+        @Serializable
+        data class StorageItemStoredData(
+            val action: String,
+            val items: Value
+        )
     }
 }
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/transport/Transport.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/transport/Transport.kt
index 904bd79..848daa4 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/transport/Transport.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/transport/Transport.kt
@@ -1,7 +1,7 @@
 package ai.rtvi.client.transport
 
 import ai.rtvi.client.result.Future
-import ai.rtvi.client.result.VoiceError
+import ai.rtvi.client.result.RTVIError
 import ai.rtvi.client.types.MediaDeviceId
 import ai.rtvi.client.types.MediaDeviceInfo
 import ai.rtvi.client.types.Tracks
@@ -12,24 +12,24 @@ import ai.rtvi.client.types.TransportState
  */
 abstract class Transport {
 
-    abstract fun initDevices(): Future<Unit, VoiceError>
+    abstract fun initDevices(): Future<Unit, RTVIError>
     abstract fun release()
 
-    abstract fun connect(authBundle: AuthBundle): Future<Unit, VoiceError>
+    abstract fun connect(authBundle: AuthBundle): Future<Unit, RTVIError>
 
-    abstract fun disconnect(): Future<Unit, VoiceError>
+    abstract fun disconnect(): Future<Unit, RTVIError>
 
-    abstract fun getAllMics(): Future<List<MediaDeviceInfo>, VoiceError>
-    abstract fun getAllCams(): Future<List<MediaDeviceInfo>, VoiceError>
+    abstract fun getAllMics(): Future<List<MediaDeviceInfo>, RTVIError>
+    abstract fun getAllCams(): Future<List<MediaDeviceInfo>, RTVIError>
 
-    abstract fun updateMic(micId: MediaDeviceId): Future<Unit, VoiceError>
-    abstract fun updateCam(camId: MediaDeviceId): Future<Unit, VoiceError>
+    abstract fun updateMic(micId: MediaDeviceId): Future<Unit, RTVIError>
+    abstract fun updateCam(camId: MediaDeviceId): Future<Unit, RTVIError>
 
     abstract fun selectedMic(): MediaDeviceInfo?
     abstract fun selectedCam(): MediaDeviceInfo?
 
-    abstract fun enableMic(enable: Boolean): Future<Unit, VoiceError>
-    abstract fun enableCam(enable: Boolean): Future<Unit, VoiceError>
+    abstract fun enableMic(enable: Boolean): Future<Unit, RTVIError>
+    abstract fun enableCam(enable: Boolean): Future<Unit, RTVIError>
 
     abstract fun isCamEnabled(): Boolean
     abstract fun isMicEnabled(): Boolean
@@ -40,7 +40,7 @@ abstract class Transport {
      */
     abstract fun expiry(): Long?
 
-    abstract fun sendMessage(message: MsgClientToServer): Future<Unit, VoiceError>
+    abstract fun sendMessage(message: MsgClientToServer): Future<Unit, RTVIError>
 
     abstract fun state(): TransportState
     abstract fun setState(state: TransportState)
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/transport/TransportContext.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/transport/TransportContext.kt
index c5abdb8..a55575c 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/transport/TransportContext.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/transport/TransportContext.kt
@@ -1,7 +1,7 @@
 package ai.rtvi.client.transport
 
-import ai.rtvi.client.VoiceClientOptions
-import ai.rtvi.client.VoiceEventCallbacks
+import ai.rtvi.client.RTVIClientOptions
+import ai.rtvi.client.RTVIEventCallbacks
 import ai.rtvi.client.utils.ThreadRef
 
 /**
@@ -9,8 +9,8 @@ import ai.rtvi.client.utils.ThreadRef
  */
 interface TransportContext {
 
-    val options: VoiceClientOptions
-    val callbacks: VoiceEventCallbacks
+    val options: RTVIClientOptions
+    val callbacks: RTVIEventCallbacks
     val thread: ThreadRef
 
     /**
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/types/RTVIURLEndpoints.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/types/RTVIURLEndpoints.kt
new file mode 100644
index 0000000..ce07bd5
--- /dev/null
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/types/RTVIURLEndpoints.kt
@@ -0,0 +1,6 @@
+package ai.rtvi.client.types
+
+data class RTVIURLEndpoints(
+    val connect: String = "/connect",
+    val action: String = "/action"
+)
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/types/RegisteredHelper.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/types/RegisteredHelper.kt
index 02a142b..76be9db 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/types/RegisteredHelper.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/types/RegisteredHelper.kt
@@ -1,8 +1,8 @@
 package ai.rtvi.client.types
 
-import ai.rtvi.client.helper.VoiceClientHelper
+import ai.rtvi.client.helper.RTVIClientHelper
 
 internal class RegisteredHelper(
-    val helper: VoiceClientHelper,
+    val helper: RTVIClientHelper,
     val supportedMessages: Set<String>
 )
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/types/TransportState.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/types/TransportState.kt
index 89879e2..494c10e 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/types/TransportState.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/types/TransportState.kt
@@ -4,13 +4,12 @@ package ai.rtvi.client.types
  * The current state of the session transport.
  */
 enum class TransportState {
-    Idle,
+    Disconnected,
     Initializing,
     Initialized,
     Authorizing,
     Connecting,
     Connected,
     Ready,
-    Disconnected,
     Error
 }
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/utils/ConnectionBundle.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/utils/ConnectionBundle.kt
index 886a351..2f6145e 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/utils/ConnectionBundle.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/utils/ConnectionBundle.kt
@@ -3,14 +3,13 @@ package ai.rtvi.client.utils
 import ai.rtvi.client.types.ServiceConfig
 import ai.rtvi.client.types.Value
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
 
 @Serializable
 internal data class ConnectionBundle(
-    val services: Map<String, String>,
+    val services: Map<String, String>?,
     val config: List<ServiceConfig>
 ) {
 
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Http.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Http.kt
index b2e7318..00897f1 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Http.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Http.kt
@@ -3,9 +3,13 @@ package ai.rtvi.client.utils
 import ai.rtvi.client.result.Future
 import ai.rtvi.client.result.HttpError
 import ai.rtvi.client.result.withPromise
+import android.util.Base64
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import java.io.BufferedReader
+import java.io.InputStream
+import java.io.InputStreamReader
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
 
@@ -19,7 +23,8 @@ internal fun post(
     thread: ThreadRef,
     url: String,
     body: RequestBody,
-    customHeaders: List<Pair<String, String>>
+    customHeaders: List<Pair<String, String>>,
+    responseHandler: ((InputStream) -> Unit)? = null
 ): Future<String, HttpError> {
 
     return withPromise(thread) { promise ->
@@ -34,28 +39,65 @@ internal fun post(
                 httpClient.newCall(request).execute()
 
             } catch (e: Exception) {
-                promise.resolveErr(HttpError.ExceptionThrown(e))
+                promise.resolveErr(HttpError.ExceptionThrown(url, e))
+                return@thread
+            }
+
+            if (result.isSuccessful && responseHandler != null) {
+
+                val resultBody = result.body
+
+                if (resultBody == null) {
+                    promise.resolveErr(HttpError.MissingResponseBody(url))
+                    return@thread
+                }
+
+                try {
+                    responseHandler(resultBody.byteStream())
+                    promise.resolveOk("")
+                } catch (e: Exception) {
+                    promise.resolveErr(HttpError.ExceptionThrown(url, e))
+                }
+
                 return@thread
             }
 
             val resultBody = try {
                 result.body?.string()
             } catch (e: Exception) {
-                promise.resolveErr(HttpError.ExceptionThrown(e))
+                promise.resolveErr(HttpError.ExceptionThrown(url, e))
                 return@thread
             }
 
             if (result.code != 200) {
-                promise.resolveErr(HttpError.BadStatusCode(result.code, resultBody))
+                promise.resolveErr(HttpError.BadStatusCode(url, result.code, resultBody))
                 return@thread
             }
 
             if (resultBody == null) {
-                promise.resolveErr(HttpError.MissingResponseBody)
+                promise.resolveErr(HttpError.MissingResponseBody(url))
                 return@thread
             }
 
             promise.resolveOk(resultBody)
         }
     }
+}
+
+// Incomplete implementation of SSE which handles messages sent by an RTVI backend
+fun InputStream.parseServerSentEvents(action: (String) -> Unit) {
+
+    val reader = BufferedReader(InputStreamReader(this))
+
+    while (true) {
+        val nextLine = reader.readLine() ?: return
+
+        if (nextLine.isBlank()) {
+            continue
+        }
+
+        if (nextLine.startsWith("data:")) {
+            action(Base64.decode(nextLine.substring(5).trim(), Base64.DEFAULT).decodeToString())
+        }
+    }
 }
\ No newline at end of file
diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Json.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Json.kt
index ce9a9a9..3eaa13c 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Json.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/utils/Json.kt
@@ -1,5 +1,12 @@
 package ai.rtvi.client.utils
 
+import ai.rtvi.client.types.Value
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromJsonElement
 
-internal val JSON_INSTANCE = Json { ignoreUnknownKeys = true }
\ No newline at end of file
+internal val JSON_INSTANCE = Json { ignoreUnknownKeys = true }
+
+internal fun <E> valueFrom(serializer: KSerializer<E>, value: E): Value {
+    return JSON_INSTANCE.decodeFromJsonElement(JSON_INSTANCE.encodeToJsonElement(serializer, value))
+}
\ No newline at end of file

From 712670278dbd9455c4930d35f79901b9f7d5fc64 Mon Sep 17 00:00:00 2001
From: marcus-daily <111281783+marcus-daily@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:00:01 +0100
Subject: [PATCH 2/3] Updating README version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e291177..369f06f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ packages.) The base `VoiceClient` has no transport included.
 Add the following dependency to your `build.gradle` file:
 
 ```
-implementation "ai.rtvi:client:0.1.4"
+implementation "ai.rtvi:client:0.2.0"
 ```
 
 Then instantiate the `VoiceClient` from your code, specifying the backend `baseUrl` and transport.

From 1704342ddbfa2f67fce7b00d6362a03f2ac39d31 Mon Sep 17 00:00:00 2001
From: marcus-daily <111281783+marcus-daily@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:18:02 +0100
Subject: [PATCH 3/3] Send version number with requests

---
 .../main/java/ai/rtvi/client/RTVIClient.kt    | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt
index a0b87c6..638a829 100644
--- a/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt
+++ b/rtvi-client-android/src/main/java/ai/rtvi/client/RTVIClient.kt
@@ -40,6 +40,8 @@ import kotlinx.serialization.json.jsonObject
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 
+private const val RTVI_PROTOCOL_VERSION = "0.2.0"
+
 /**
  * An RTVI client. Connects to an RTVI backend and handles bidirectional audio and video
  * streaming.
@@ -86,6 +88,10 @@ open class RTVIClient(
     ) {
         val id = msg.id ?: throw Exception("${msg.type} missing ID")
 
+        if (id == "END") {
+            return
+        }
+
         val respondTo = awaitingServerResponse.remove(id)
             ?: throw Exception("${msg.type}: no responder for $id")
 
@@ -259,11 +265,13 @@ open class RTVIClient(
 
         // Send POST request to the provided base_url to connect and start the bot
 
+        val connectionData = ConnectionData.from(options)
+
         val body = ConnectionBundle(
             services = options.services?.associate { it.service to it.value },
-            config = options.config + options.params.config
+            config = connectionData.config
         )
-            .serializeWithCustomParams(options.customBodyParams + options.params.requestData)
+            .serializeWithCustomParams(connectionData.requestData)
             .toRequestBody("application/json".toMediaType())
 
         val currentConnection = Connection().apply { connection = this }
@@ -272,7 +280,7 @@ open class RTVIClient(
             thread = thread,
             url = options.params.baseUrl + options.params.endpoints.connect,
             body = body,
-            customHeaders = options.customHeaders + options.params.headers
+            customHeaders = connectionData.headers
         )
             .mapError<RTVIError> {
                 RTVIError.HttpError(it)
@@ -385,19 +393,22 @@ open class RTVIClient(
                 }
 
                 else -> if (allowSingleTurn) {
+
+                    val connectionData = ConnectionData.from(options)
+
                     post(
                         thread = thread,
                         url = options.params.baseUrl + options.params.endpoints.action,
                         body = JSON_INSTANCE.encodeToString(
                             Value.serializer(), Value.Object(
-                                (options.customBodyParams + options.params.requestData + listOf(
+                                (connectionData.requestData + listOf(
                                     "actions" to Value.Array(
                                         valueFrom(MsgClientToServer.serializer(), msg)
                                     )
                                 )).toMap()
                             )
                         ).toRequestBody("application/json".toMediaType()),
-                        customHeaders = options.customHeaders + options.params.headers,
+                        customHeaders = connectionData.headers,
                         responseHandler = { inputStream ->
                             inputStream.parseServerSentEvents { msg ->
                                 transportCtx.onMessage(JSON_INSTANCE.decodeFromString(msg))
@@ -571,4 +582,20 @@ open class RTVIClient(
             )
         }
     }
+}
+
+private class ConnectionData(
+    val headers: List<Pair<String, String>>,
+    val requestData: List<Pair<String, Value>>,
+    val config: List<ServiceConfig>,
+) {
+    companion object {
+        fun from(value: RTVIClientOptions) = ConnectionData(
+            headers = value.customHeaders + value.params.headers,
+            requestData = listOf("rtvi_client_version" to Value.Str(RTVI_PROTOCOL_VERSION))
+                    + value.customBodyParams
+                    + value.params.requestData,
+            config = value.config + value.params.config
+        )
+    }
 }
\ No newline at end of file