@arrirpc/codegen-kotlin 0.60.3 → 0.61.0

package/README.md

@@ -24,7 +24,7 @@ export default defineConfig({
 | --------------------- | ------------------------------------------------------------- |
 | clientName            | The name of the generated client class (Defaults to "Client") |
 | outputFile (required) | Path to the file that will be created by the generator        |
-| modelPrefix           | Add a prefix to the generated class names                     |
+| typePrefix            | Add a prefix to the generated class names                     |
 
 ### 2) Install dependencies
 
@@ -72,6 +72,77 @@ val service = MyClientUsersService(
     )
 ```
 
+### Calling Procedures
+
+#### Standard HTTP Procedures
+
+```kotlin
+runBlocking {
+    // procedure with no parameters
+    val getUsersResponse = myClient.users.getUsers()
+
+    // procedure with parameters
+    val getUserResponse = myClient.users.getUser(GetUserParams(userId = "12345"))
+}
+```
+
+#### Event Stream Procedures
+
+##### Basic Usage
+
+```kotlin
+runBlocking {
+    myClient.users.watchUserChanges(
+        onData { message ->
+            println("New message: ${message}")
+        },
+        onOpen {
+            println("Connection established")
+        }
+        onRequestError { err ->
+            println("Error connecting to server: ${err}")
+        },
+        onResponseError { err ->
+            println("Server returned an error: ${err.code} ${err.message}")
+        },
+        onClose {
+            println("Connection closed")
+        }
+    )
+}
+```
+
+##### Cancelling Requests
+
+Event stream procedures can be cancelled from inside one of the hooks by throwing a `CancellationException`
+
+```kotlin
+runBlocking {
+    myClient.users.watchUserChanges(
+        onResponseError { err ->
+            println("Server returned an error: ${err.code} ${err.message}")
+            throw CancellationException()
+        }
+    )
+}
+```
+
+You can also spawn a job and cancel that job in order to cancel the Event stream procedure from the outside
+
+```kotlin
+val job = someCoroutineScope.launch {
+    myClient.users.watchUserChanges()
+}
+job.cancel()
+```
+
+##### Other Options
+
+| Option         | Type  | Description                                                                                             |
+| -------------- | ----- | ------------------------------------------------------------------------------------------------------- |
+| bufferCapacity | Int   | Max buffer size that can be allocated towards reading messages received. Default is 1024 \* 1024 (1MB). |
+| maxBackoffTime | Long? | Max wait time between retries in milliseconds. Default is 30000ms                                       |
+
 ### Using Arri Models
 
 All generated models will be data classes. They will have access to the following features:

package/dist/index.cjs

@@ -65,7 +65,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.modelPrefix}${className2}`;
+    return `${context.typePrefix}${className2}`;
   }
   const depth = instanceDepth(context);
   if (depth === 1 && !context.discriminatorKey) {
@@ -74,7 +74,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.modelPrefix}${className2}`;
+    return `${context.typePrefix}${className2}`;
   }
   if (context.discriminatorParentId && context.discriminatorKey && context.discriminatorValue) {
     const className2 = kotlinClassName(
@@ -83,7 +83,7 @@ function getClassName(schema, context) {
         { normalize: true }
       )
     );
-    return `${context.modelPrefix}${className2}`;
+    return `${context.typePrefix}${className2}`;
   }
   const className = kotlinClassName(
     codegenUtils.pascalCase(
@@ -93,7 +93,7 @@ function getClassName(schema, context) {
       }
     )
   );
-  return `${context.modelPrefix}${className}`;
+  return `${context.typePrefix}${className}`;
 }
 function instanceDepth(context) {
   const parts = context.instancePath.split("/");
@@ -172,7 +172,7 @@ function kotlinArrayFromSchema(schema, context) {
   const nullable = isNullable(schema, context);
   const defaultValue = nullable ? "null" : "mutableListOf()";
   const subType = kotlinTypeFromSchema(schema.elements, {
-    modelPrefix: context.modelPrefix,
+    typePrefix: context.typePrefix,
     clientName: context.clientName,
     clientVersion: context.clientVersion,
     instancePath: `${context.instancePath}/[Element]`,
@@ -313,7 +313,7 @@ function kotlinObjectFromSchema(schema, context) {
     kotlinKeys.push(kotlinKey);
     const prop = schema.properties[key];
     const type = kotlinTypeFromSchema(prop, {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: `/${className}/${key}`,
@@ -347,7 +347,7 @@ function kotlinObjectFromSchema(schema, context) {
     const kotlinKey = kotlinIdentifier(key);
     kotlinKeys.push(kotlinKey);
     const type = kotlinTypeFromSchema(schema.optionalProperties[key], {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: `/${className}/${key}`,
@@ -446,7 +446,7 @@ function kotlinDiscriminatorFromSchema(schema, context) {
   for (const key of Object.keys(schema.mapping)) {
     const subSchema = schema.mapping[key];
     const subType = kotlinObjectFromSchema(subSchema, {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: context.instancePath,
@@ -634,7 +634,7 @@ function kotlinEnumFromSchema(schema, context) {
 function kotlinMapFromSchema(schema, context) {
   const nullable = isNullable(schema, context);
   const subType = kotlinTypeFromSchema(schema.values, {
-    modelPrefix: context.modelPrefix,
+    typePrefix: context.typePrefix,
     clientName: context.clientName,
     clientVersion: context.clientVersion,
     instancePath: `${context.instancePath}/[value]`,
@@ -1129,8 +1129,8 @@ function kotlinProcedureFromSchema(schema, context) {
 }
 function kotlinHttpRpcFromSchema(schema, context) {
   const name = getProcedureName(context);
-  const params = schema.params ? kotlinClassName(`${context.modelPrefix}_${schema.params}`) : void 0;
-  const response = schema.response ? kotlinClassName(`${context.modelPrefix}_${schema.response}`) : void 0;
+  const params = schema.params ? kotlinClassName(`${context.typePrefix}_${schema.params}`) : void 0;
+  const response = schema.response ? kotlinClassName(`${context.typePrefix}_${schema.response}`) : void 0;
   const codeComment = getCodeComment(
     {
       description: schema.description,
@@ -1140,40 +1140,36 @@ function kotlinHttpRpcFromSchema(schema, context) {
     "method"
   );
   if (schema.isEventStream) {
-    return `${codeComment}fun ${name}(
-            scope: CoroutineScope,
+    return `${codeComment}suspend fun ${name}(
             ${params ? `params: ${params},` : ""}
             lastEventId: String? = null,
-            bufferCapacity: Int = 1024,
+            bufferCapacity: Int = 1024 * 1024,
             onOpen: ((response: HttpResponse) -> Unit) = {},
             onClose: (() -> Unit) = {},
-            onError: ((error: ${context.clientName}Error) -> Unit) = {},
-            onConnectionError: ((error: ${context.clientName}Error) -> Unit) = {},
+            onRequestError: ((error: Exception) -> Unit) = {},
+            onResponseError: ((error: ${context.clientName}Error) -> Unit) = {},
             onData: ((${response ? `data: ${response}` : ""}) -> Unit) = {},
-        ): Job {
-            val job = scope.launch {
-                __handleSseRequest(
-                    scope = scope,
-                    httpClient = httpClient,
-                    url = "$baseUrl${schema.path}",
-                    method = HttpMethod.${codegenUtils.pascalCase(schema.method, { normalize: true })},
-                    params = ${params ? "params" : "null"},
-                    headers = headers,
-                    backoffTime = 0,
-                    maxBackoffTime = 30000L,
-                    lastEventId = lastEventId,
-                    bufferCapacity = bufferCapacity,
-                    onOpen = onOpen,
-                    onClose = onClose,
-                    onError = onError,
-                    onConnectionError = onConnectionError,
-                    onData = { str ->
-                        ${response ? `val data = ${response}.fromJson(str)` : ""}
-                        onData(${response ? "data" : ""})
-                    }
-                )
-            }
-            return job
+            maxBackoffTime: Long? = null,
+        ): Unit {
+            __handleSseRequest(
+                httpClient = httpClient,
+                url = "$baseUrl${schema.path}",
+                method = HttpMethod.${codegenUtils.pascalCase(schema.method, { normalize: true })},
+                params = ${params ? "params" : "null"},
+                headers = headers,
+                backoffTime = 0,
+                maxBackoffTime = maxBackoffTime ?: 30000L,
+                lastEventId = lastEventId,
+                bufferCapacity = bufferCapacity,
+                onOpen = onOpen,
+                onClose = onClose,
+                onRequestError = onRequestError,
+                onResponseError = onResponseError,
+                onData = { str ->
+                    ${response ? `val data = ${response}.fromJson(str)` : ""}
+                    onData(${response ? "data" : ""})
+                }
+            )
         }`;
   }
   const headingCheck = `if (response.headers["Content-Type"] != "application/json") {
@@ -1301,7 +1297,7 @@ const kotlinClientGenerator = codegenUtils.defineGeneratorPlugin(
 function kotlinClientFromAppDefinition(def, options) {
   const clientName = kotlinClassName(options.clientName ?? "Client");
   const context = {
-    modelPrefix: options.modelPrefix ?? "",
+    typePrefix: options.typePrefix ?? "",
     clientName,
     clientVersion: def.info?.version ?? "",
     instancePath: "",
@@ -1312,7 +1308,7 @@ function kotlinClientFromAppDefinition(def, options) {
   for (const key of Object.keys(def.definitions)) {
     const subSchema = def.definitions[key];
     const model = kotlinTypeFromSchema(subSchema, {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: `/${key}`,
@@ -1644,62 +1640,89 @@ private suspend fun __prepareRequest(
     return client.prepareRequest(builder)
 }
 
-private fun __parseSseEvent(input: String): __SseEvent {
-    val lines = input.split("\\n")
-    var id: String? = null
-    var event: String? = null
-    var data: String = ""
-    for (line in lines) {
-        if (line.startsWith("id: ")) {
-            id = line.substring(3).trim()
-            continue
-        }
-        if (line.startsWith("event: ")) {
-            event = line.substring(6).trim()
-            continue
-        }
-        if (line.startsWith("data: ")) {
-            data = line.substring(5).trim()
-            continue
-        }
+// SSE_FN_START
+private enum class SseEventLineType {
+    Id,
+    Event,
+    Data,
+    Retry,
+    None,
+}
+
+private fun __parseSseEventLine(line: String): Pair<SseEventLineType, String> {
+    if (line.startsWith("id:")) {
+        return Pair(SseEventLineType.Id, line.substring(3).trim())
+    }
+    if (line.startsWith("event:")) {
+        return Pair(SseEventLineType.Event, line.substring(6).trim())
+    }
+    if (line.startsWith("data:")) {
+        return Pair(SseEventLineType.Data, line.substring(5).trim())
+    }
+    if (line.startsWith("retry:")) {
+        return Pair(SseEventLineType.Retry, line.substring(6).trim())
     }
-    return __SseEvent(id, event, data)
+    return Pair(SseEventLineType.None, "")
 }
 
-private class __SseEvent(val id: String? = null, val event: String? = null, val data: String)
+private data class __SseEvent(
+    val id: String? = null,
+    val event: String,
+    val data: String,
+    val retry: Int? = null
+)
 
 private class __SseEventParsingResult(val events: List<__SseEvent>, val leftover: String)
 
 private fun __parseSseEvents(input: String): __SseEventParsingResult {
-    val inputs = input.split("\\n\\n").toMutableList()
-    if (inputs.isEmpty()) {
-        return __SseEventParsingResult(
-            events = listOf(),
-            leftover = "",
-        )
-    }
-    if (inputs.size == 1) {
-        return __SseEventParsingResult(
-            events = listOf(),
-            leftover = inputs.last(),
-        )
-    }
-    val leftover = inputs.last()
-    inputs.removeLast()
     val events = mutableListOf<__SseEvent>()
-    for (item in inputs) {
-        if (item.contains("data: ")) {
-            events.add(__parseSseEvent(item))
+    val lines = input.lines()
+    if (lines.isEmpty()) {
+        return __SseEventParsingResult(events = listOf(), leftover = "")
+    }
+    var id: String? = null
+    var event: String? = null
+    var data: String? = null
+    var retry: Int? = null
+    var lastIndex: Int? = 0
+    lines.forEachIndexed { index, line ->
+        if (line.isNotEmpty()) {
+            val (type, value) = __parseSseEventLine(line)
+            when (type) {
+                SseEventLineType.Id -> id = value
+                SseEventLineType.Event -> event = value
+                SseEventLineType.Data -> data = value
+                SseEventLineType.Retry -> retry = value.toInt()
+                SseEventLineType.None -> {}
+            }
+        }
+        val isEnd = line == ""
+        if (isEnd) {
+            if (data != null) {
+                events.add(
+                    __SseEvent(
+                        id = id,
+                        event = event ?: "message",
+                        data = data!!,
+                        retry = retry,
+                    )
+                )
+            }
+            id = null
+            event = null
+            data = null
+            retry = null
+            lastIndex = if (index + 1 < lines.size) index + 1 else null
         }
     }
     return __SseEventParsingResult(
         events = events,
-        leftover = leftover,
+        leftover = if (lastIndex != null) lines.subList(lastIndex!!, lines.size).joinToString(separator = "\\n") else ""
     )
 }
+// SSE_FN_END
 
 private suspend fun __handleSseRequest(
-    scope: CoroutineScope,
     httpClient: HttpClient,
     url: String,
     method: HttpMethod,
@@ -1710,16 +1733,16 @@ private suspend fun __handleSseRequest(
     lastEventId: String?,
     onOpen: ((response: HttpResponse) -> Unit) = {},
     onClose: (() -> Unit) = {},
-    onError: ((error: ${clientName}Error) -> Unit) = {},
     onData: ((data: String) -> Unit) = {},
-    onConnectionError: ((error: ${clientName}Error) -> Unit) = {},
+    onRequestError: ((error: Exception) -> Unit) = {},
+    onResponseError: ((error: ${clientName}Error) -> Unit) = {},
     bufferCapacity: Int,
 ) {
     val finalHeaders = headers?.invoke() ?: mutableMapOf()
     var lastId = lastEventId
     // exponential backoff maxing out at 32 seconds
     if (backoffTime > 0) {
-        withContext(scope.coroutineContext) {
+        withContext(currentCoroutineContext()) {
             Thread.sleep(backoffTime)
         }
     }
@@ -1741,16 +1764,17 @@ private suspend fun __handleSseRequest(
                 onOpen(httpResponse)
             } catch (e: CancellationException) {
                 onClose()
+                httpResponse.cancel()
                 return@execute
             }
             if (httpResponse.status.value !in 200..299) {
                 try {
                     if (httpResponse.headers["Content-Type"] == "application/json") {
-                        onConnectionError(
+                        onResponseError(
                             ${clientName}Error.fromJson(httpResponse.bodyAsText())
                         )
                     } else {
-                        onConnectionError(
+                        onResponseError(
                             ${clientName}Error(
                                 code = httpResponse.status.value,
                                 errorMessage = httpResponse.status.description,
@@ -1761,10 +1785,10 @@ private suspend fun __handleSseRequest(
                     }
                 } catch (e: CancellationException) {
                     onClose()
+                    httpResponse.cancel()
                     return@execute
                 }
-                __handleSseRequest(
-                    scope = scope,
+                return@execute __handleSseRequest(
                     httpClient = httpClient,
                     url = url,
                     method = method,
@@ -1776,15 +1800,13 @@ private suspend fun __handleSseRequest(
                     bufferCapacity = bufferCapacity,
                     onOpen = onOpen,
                     onClose = onClose,
-                    onError = onError,
                     onData = onData,
-                    onConnectionError = onConnectionError,
+                    onResponseError = onResponseError,
                 )
-                return@execute
             }
             if (httpResponse.headers["Content-Type"] != "text/event-stream") {
                 try {
-                    onConnectionError(
+                    onResponseError(
                         ${clientName}Error(
                             code = 0,
                             errorMessage = "Expected server to return Content-Type \\"text/event-stream\\". Got \\"\${httpResponse.headers["Content-Type"]}\\"",
@@ -1793,10 +1815,10 @@ private suspend fun __handleSseRequest(
                         )
                     )
                 } catch (e: CancellationException) {
+                    httpResponse.cancel()
                     return@execute
                 }
-                __handleSseRequest(
-                    scope = scope,
+                return@execute __handleSseRequest(
                     httpClient = httpClient,
                     url = url,
                     method = method,
@@ -1808,14 +1830,12 @@ private suspend fun __handleSseRequest(
                     bufferCapacity = bufferCapacity,
                     onOpen = onOpen,
                     onClose = onClose,
-                    onError = onError,
                     onData = onData,
-                    onConnectionError = onConnectionError,
+                    onResponseError = onResponseError,
                 )
-                return@execute
             }
             newBackoffTime = 0
-            val channel: ByteReadChannel = httpResponse.bodyAsChannel()
+            val channel: ByteReadChannel = httpResponse.body()
             var pendingData = ""
             while (!channel.isClosedForRead) {
                 val buffer = ByteBuffer.allocateDirect(bufferCapacity)
@@ -1835,6 +1855,7 @@ private suspend fun __handleSseRequest(
                                 onData(event.data)
                             } catch (e: CancellationException) {
                                 onClose()
+                                httpResponse.cancel()
                                 return@execute
                             }
                         }
@@ -1844,22 +1865,11 @@ private suspend fun __handleSseRequest(
                             return@execute
                         }
 
-                        "error" -> {
-                            val error = ${clientName}Error.fromJson(event.data)
-                            try {
-                                onError(error)
-                            } catch (e: CancellationException) {
-                                onClose()
-                                return@execute
-                            }
-                        }
-
                         else -> {}
                     }
                 }
             }
-            __handleSseRequest(
-                scope = scope,
+            return@execute __handleSseRequest(
                 httpClient = httpClient,
                 url = url,
                 method = method,
@@ -1871,22 +1881,13 @@ private suspend fun __handleSseRequest(
                 bufferCapacity = bufferCapacity,
                 onOpen = onOpen,
                 onClose = onClose,
-                onError = onError,
                 onData = onData,
-                onConnectionError = onConnectionError,
+                onResponseError = onResponseError,
             )
         }
     } catch (e: java.net.ConnectException) {
-        onConnectionError(
-            ${clientName}Error(
-                code = 503,
-                errorMessage = if (e.message != null) e.message!! else "Error connecting to $url",
-                data = JsonPrimitive(e.toString()),
-                stack = e.stackTraceToString().split("\\n"),
-            )
-        )
-        __handleSseRequest(
-            scope = scope,
+        onRequestError(e)
+        return __handleSseRequest(
             httpClient = httpClient,
             url = url,
             method = method,
@@ -1898,14 +1899,12 @@ private suspend fun __handleSseRequest(
             bufferCapacity = bufferCapacity,
             onOpen = onOpen,
             onClose = onClose,
-            onError = onError,
             onData = onData,
-            onConnectionError = onConnectionError,
+            onResponseError = onResponseError,
         )
-        return
     } catch (e: Exception) {
-        __handleSseRequest(
-            scope = scope,
+        onRequestError(e)
+        return __handleSseRequest(
             httpClient = httpClient,
             url = url,
             method = method,
@@ -1917,9 +1916,8 @@ private suspend fun __handleSseRequest(
             bufferCapacity = bufferCapacity,
             onOpen = onOpen,
             onClose = onClose,
-            onError = onError,
             onData = onData,
-            onConnectionError = onConnectionError,
+            onResponseError = onResponseError,
         )
     }
 }`;
@@ -1932,14 +1930,14 @@ function getHeader(options) {
 )
 
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.plugins.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.utils.io.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.*

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import * as _arrirpc_codegen_utils from '@arrirpc/codegen-utils';
 import { AppDefinition, Schema } from '@arrirpc/codegen-utils';
 
 interface CodegenContext {
-    modelPrefix: string;
+    typePrefix: string;
     clientName: string;
     clientVersion: string;
     instancePath: string;
@@ -25,12 +25,12 @@ interface KotlinProperty {
 
 interface ServiceContext {
     clientName: string;
-    modelPrefix?: string;
+    typePrefix?: string;
     modelJsonInstances: Record<string, string>;
 }
 interface KotlinClientOptions {
     clientName?: string;
-    modelPrefix?: string;
+    typePrefix?: string;
     outputFile: string;
 }
 declare const kotlinClientGenerator: _arrirpc_codegen_utils.GeneratorPlugin<KotlinClientOptions>;

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import * as _arrirpc_codegen_utils from '@arrirpc/codegen-utils';
 import { AppDefinition, Schema } from '@arrirpc/codegen-utils';
 
 interface CodegenContext {
-    modelPrefix: string;
+    typePrefix: string;
     clientName: string;
     clientVersion: string;
     instancePath: string;
@@ -25,12 +25,12 @@ interface KotlinProperty {
 
 interface ServiceContext {
     clientName: string;
-    modelPrefix?: string;
+    typePrefix?: string;
     modelJsonInstances: Record<string, string>;
 }
 interface KotlinClientOptions {
     clientName?: string;
-    modelPrefix?: string;
+    typePrefix?: string;
     outputFile: string;
 }
 declare const kotlinClientGenerator: _arrirpc_codegen_utils.GeneratorPlugin<KotlinClientOptions>;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as _arrirpc_codegen_utils from '@arrirpc/codegen-utils';
 import { AppDefinition, Schema } from '@arrirpc/codegen-utils';
 
 interface CodegenContext {
-    modelPrefix: string;
+    typePrefix: string;
     clientName: string;
     clientVersion: string;
     instancePath: string;
@@ -25,12 +25,12 @@ interface KotlinProperty {
 
 interface ServiceContext {
     clientName: string;
-    modelPrefix?: string;
+    typePrefix?: string;
     modelJsonInstances: Record<string, string>;
 }
 interface KotlinClientOptions {
     clientName?: string;
-    modelPrefix?: string;
+    typePrefix?: string;
     outputFile: string;
 }
 declare const kotlinClientGenerator: _arrirpc_codegen_utils.GeneratorPlugin<KotlinClientOptions>;

package/dist/index.mjs

@@ -59,7 +59,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.modelPrefix}${className2}`;
+    return `${context.typePrefix}${className2}`;
   }
   const depth = instanceDepth(context);
   if (depth === 1 && !context.discriminatorKey) {
@@ -68,7 +68,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.modelPrefix}${className2}`;
+    return `${context.typePrefix}${className2}`;
   }
   if (context.discriminatorParentId && context.discriminatorKey && context.discriminatorValue) {
     const className2 = kotlinClassName(
@@ -77,7 +77,7 @@ function getClassName(schema, context) {
         { normalize: true }
       )
     );
-    return `${context.modelPrefix}${className2}`;
+    return `${context.typePrefix}${className2}`;
   }
   const className = kotlinClassName(
     pascalCase(
@@ -87,7 +87,7 @@ function getClassName(schema, context) {
       }
     )
   );
-  return `${context.modelPrefix}${className}`;
+  return `${context.typePrefix}${className}`;
 }
 function instanceDepth(context) {
   const parts = context.instancePath.split("/");
@@ -166,7 +166,7 @@ function kotlinArrayFromSchema(schema, context) {
   const nullable = isNullable(schema, context);
   const defaultValue = nullable ? "null" : "mutableListOf()";
   const subType = kotlinTypeFromSchema(schema.elements, {
-    modelPrefix: context.modelPrefix,
+    typePrefix: context.typePrefix,
     clientName: context.clientName,
     clientVersion: context.clientVersion,
     instancePath: `${context.instancePath}/[Element]`,
@@ -307,7 +307,7 @@ function kotlinObjectFromSchema(schema, context) {
     kotlinKeys.push(kotlinKey);
     const prop = schema.properties[key];
     const type = kotlinTypeFromSchema(prop, {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: `/${className}/${key}`,
@@ -341,7 +341,7 @@ function kotlinObjectFromSchema(schema, context) {
     const kotlinKey = kotlinIdentifier(key);
     kotlinKeys.push(kotlinKey);
     const type = kotlinTypeFromSchema(schema.optionalProperties[key], {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: `/${className}/${key}`,
@@ -440,7 +440,7 @@ function kotlinDiscriminatorFromSchema(schema, context) {
   for (const key of Object.keys(schema.mapping)) {
     const subSchema = schema.mapping[key];
     const subType = kotlinObjectFromSchema(subSchema, {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: context.instancePath,
@@ -628,7 +628,7 @@ function kotlinEnumFromSchema(schema, context) {
 function kotlinMapFromSchema(schema, context) {
   const nullable = isNullable(schema, context);
   const subType = kotlinTypeFromSchema(schema.values, {
-    modelPrefix: context.modelPrefix,
+    typePrefix: context.typePrefix,
     clientName: context.clientName,
     clientVersion: context.clientVersion,
     instancePath: `${context.instancePath}/[value]`,
@@ -1123,8 +1123,8 @@ function kotlinProcedureFromSchema(schema, context) {
 }
 function kotlinHttpRpcFromSchema(schema, context) {
   const name = getProcedureName(context);
-  const params = schema.params ? kotlinClassName(`${context.modelPrefix}_${schema.params}`) : void 0;
-  const response = schema.response ? kotlinClassName(`${context.modelPrefix}_${schema.response}`) : void 0;
+  const params = schema.params ? kotlinClassName(`${context.typePrefix}_${schema.params}`) : void 0;
+  const response = schema.response ? kotlinClassName(`${context.typePrefix}_${schema.response}`) : void 0;
   const codeComment = getCodeComment(
     {
       description: schema.description,
@@ -1134,40 +1134,36 @@ function kotlinHttpRpcFromSchema(schema, context) {
     "method"
   );
   if (schema.isEventStream) {
-    return `${codeComment}fun ${name}(
-            scope: CoroutineScope,
+    return `${codeComment}suspend fun ${name}(
             ${params ? `params: ${params},` : ""}
             lastEventId: String? = null,
-            bufferCapacity: Int = 1024,
+            bufferCapacity: Int = 1024 * 1024,
             onOpen: ((response: HttpResponse) -> Unit) = {},
             onClose: (() -> Unit) = {},
-            onError: ((error: ${context.clientName}Error) -> Unit) = {},
-            onConnectionError: ((error: ${context.clientName}Error) -> Unit) = {},
+            onRequestError: ((error: Exception) -> Unit) = {},
+            onResponseError: ((error: ${context.clientName}Error) -> Unit) = {},
             onData: ((${response ? `data: ${response}` : ""}) -> Unit) = {},
-        ): Job {
-            val job = scope.launch {
-                __handleSseRequest(
-                    scope = scope,
-                    httpClient = httpClient,
-                    url = "$baseUrl${schema.path}",
-                    method = HttpMethod.${pascalCase(schema.method, { normalize: true })},
-                    params = ${params ? "params" : "null"},
-                    headers = headers,
-                    backoffTime = 0,
-                    maxBackoffTime = 30000L,
-                    lastEventId = lastEventId,
-                    bufferCapacity = bufferCapacity,
-                    onOpen = onOpen,
-                    onClose = onClose,
-                    onError = onError,
-                    onConnectionError = onConnectionError,
-                    onData = { str ->
-                        ${response ? `val data = ${response}.fromJson(str)` : ""}
-                        onData(${response ? "data" : ""})
-                    }
-                )
-            }
-            return job
+            maxBackoffTime: Long? = null,
+        ): Unit {
+            __handleSseRequest(
+                httpClient = httpClient,
+                url = "$baseUrl${schema.path}",
+                method = HttpMethod.${pascalCase(schema.method, { normalize: true })},
+                params = ${params ? "params" : "null"},
+                headers = headers,
+                backoffTime = 0,
+                maxBackoffTime = maxBackoffTime ?: 30000L,
+                lastEventId = lastEventId,
+                bufferCapacity = bufferCapacity,
+                onOpen = onOpen,
+                onClose = onClose,
+                onRequestError = onRequestError,
+                onResponseError = onResponseError,
+                onData = { str ->
+                    ${response ? `val data = ${response}.fromJson(str)` : ""}
+                    onData(${response ? "data" : ""})
+                }
+            )
         }`;
   }
   const headingCheck = `if (response.headers["Content-Type"] != "application/json") {
@@ -1295,7 +1291,7 @@ const kotlinClientGenerator = defineGeneratorPlugin(
 function kotlinClientFromAppDefinition(def, options) {
   const clientName = kotlinClassName(options.clientName ?? "Client");
   const context = {
-    modelPrefix: options.modelPrefix ?? "",
+    typePrefix: options.typePrefix ?? "",
     clientName,
     clientVersion: def.info?.version ?? "",
     instancePath: "",
@@ -1306,7 +1302,7 @@ function kotlinClientFromAppDefinition(def, options) {
   for (const key of Object.keys(def.definitions)) {
     const subSchema = def.definitions[key];
     const model = kotlinTypeFromSchema(subSchema, {
-      modelPrefix: context.modelPrefix,
+      typePrefix: context.typePrefix,
       clientName: context.clientName,
       clientVersion: context.clientVersion,
       instancePath: `/${key}`,
@@ -1638,62 +1634,89 @@ private suspend fun __prepareRequest(
     return client.prepareRequest(builder)
 }
 
-private fun __parseSseEvent(input: String): __SseEvent {
-    val lines = input.split("\\n")
-    var id: String? = null
-    var event: String? = null
-    var data: String = ""
-    for (line in lines) {
-        if (line.startsWith("id: ")) {
-            id = line.substring(3).trim()
-            continue
-        }
-        if (line.startsWith("event: ")) {
-            event = line.substring(6).trim()
-            continue
-        }
-        if (line.startsWith("data: ")) {
-            data = line.substring(5).trim()
-            continue
-        }
+// SSE_FN_START
+private enum class SseEventLineType {
+    Id,
+    Event,
+    Data,
+    Retry,
+    None,
+}
+
+private fun __parseSseEventLine(line: String): Pair<SseEventLineType, String> {
+    if (line.startsWith("id:")) {
+        return Pair(SseEventLineType.Id, line.substring(3).trim())
+    }
+    if (line.startsWith("event:")) {
+        return Pair(SseEventLineType.Event, line.substring(6).trim())
+    }
+    if (line.startsWith("data:")) {
+        return Pair(SseEventLineType.Data, line.substring(5).trim())
+    }
+    if (line.startsWith("retry:")) {
+        return Pair(SseEventLineType.Retry, line.substring(6).trim())
     }
-    return __SseEvent(id, event, data)
+    return Pair(SseEventLineType.None, "")
 }
 
-private class __SseEvent(val id: String? = null, val event: String? = null, val data: String)
+private data class __SseEvent(
+    val id: String? = null,
+    val event: String,
+    val data: String,
+    val retry: Int? = null
+)
 
 private class __SseEventParsingResult(val events: List<__SseEvent>, val leftover: String)
 
 private fun __parseSseEvents(input: String): __SseEventParsingResult {
-    val inputs = input.split("\\n\\n").toMutableList()
-    if (inputs.isEmpty()) {
-        return __SseEventParsingResult(
-            events = listOf(),
-            leftover = "",
-        )
-    }
-    if (inputs.size == 1) {
-        return __SseEventParsingResult(
-            events = listOf(),
-            leftover = inputs.last(),
-        )
-    }
-    val leftover = inputs.last()
-    inputs.removeLast()
     val events = mutableListOf<__SseEvent>()
-    for (item in inputs) {
-        if (item.contains("data: ")) {
-            events.add(__parseSseEvent(item))
+    val lines = input.lines()
+    if (lines.isEmpty()) {
+        return __SseEventParsingResult(events = listOf(), leftover = "")
+    }
+    var id: String? = null
+    var event: String? = null
+    var data: String? = null
+    var retry: Int? = null
+    var lastIndex: Int? = 0
+    lines.forEachIndexed { index, line ->
+        if (line.isNotEmpty()) {
+            val (type, value) = __parseSseEventLine(line)
+            when (type) {
+                SseEventLineType.Id -> id = value
+                SseEventLineType.Event -> event = value
+                SseEventLineType.Data -> data = value
+                SseEventLineType.Retry -> retry = value.toInt()
+                SseEventLineType.None -> {}
+            }
+        }
+        val isEnd = line == ""
+        if (isEnd) {
+            if (data != null) {
+                events.add(
+                    __SseEvent(
+                        id = id,
+                        event = event ?: "message",
+                        data = data!!,
+                        retry = retry,
+                    )
+                )
+            }
+            id = null
+            event = null
+            data = null
+            retry = null
+            lastIndex = if (index + 1 < lines.size) index + 1 else null
         }
     }
     return __SseEventParsingResult(
         events = events,
-        leftover = leftover,
+        leftover = if (lastIndex != null) lines.subList(lastIndex!!, lines.size).joinToString(separator = "\\n") else ""
     )
 }
+// SSE_FN_END
 
 private suspend fun __handleSseRequest(
-    scope: CoroutineScope,
     httpClient: HttpClient,
     url: String,
     method: HttpMethod,
@@ -1704,16 +1727,16 @@ private suspend fun __handleSseRequest(
     lastEventId: String?,
     onOpen: ((response: HttpResponse) -> Unit) = {},
     onClose: (() -> Unit) = {},
-    onError: ((error: ${clientName}Error) -> Unit) = {},
     onData: ((data: String) -> Unit) = {},
-    onConnectionError: ((error: ${clientName}Error) -> Unit) = {},
+    onRequestError: ((error: Exception) -> Unit) = {},
+    onResponseError: ((error: ${clientName}Error) -> Unit) = {},
     bufferCapacity: Int,
 ) {
     val finalHeaders = headers?.invoke() ?: mutableMapOf()
     var lastId = lastEventId
     // exponential backoff maxing out at 32 seconds
     if (backoffTime > 0) {
-        withContext(scope.coroutineContext) {
+        withContext(currentCoroutineContext()) {
             Thread.sleep(backoffTime)
         }
     }
@@ -1735,16 +1758,17 @@ private suspend fun __handleSseRequest(
                 onOpen(httpResponse)
             } catch (e: CancellationException) {
                 onClose()
+                httpResponse.cancel()
                 return@execute
             }
             if (httpResponse.status.value !in 200..299) {
                 try {
                     if (httpResponse.headers["Content-Type"] == "application/json") {
-                        onConnectionError(
+                        onResponseError(
                             ${clientName}Error.fromJson(httpResponse.bodyAsText())
                         )
                     } else {
-                        onConnectionError(
+                        onResponseError(
                             ${clientName}Error(
                                 code = httpResponse.status.value,
                                 errorMessage = httpResponse.status.description,
@@ -1755,10 +1779,10 @@ private suspend fun __handleSseRequest(
                     }
                 } catch (e: CancellationException) {
                     onClose()
+                    httpResponse.cancel()
                     return@execute
                 }
-                __handleSseRequest(
-                    scope = scope,
+                return@execute __handleSseRequest(
                     httpClient = httpClient,
                     url = url,
                     method = method,
@@ -1770,15 +1794,13 @@ private suspend fun __handleSseRequest(
                     bufferCapacity = bufferCapacity,
                     onOpen = onOpen,
                     onClose = onClose,
-                    onError = onError,
                     onData = onData,
-                    onConnectionError = onConnectionError,
+                    onResponseError = onResponseError,
                 )
-                return@execute
             }
             if (httpResponse.headers["Content-Type"] != "text/event-stream") {
                 try {
-                    onConnectionError(
+                    onResponseError(
                         ${clientName}Error(
                             code = 0,
                             errorMessage = "Expected server to return Content-Type \\"text/event-stream\\". Got \\"\${httpResponse.headers["Content-Type"]}\\"",
@@ -1787,10 +1809,10 @@ private suspend fun __handleSseRequest(
                         )
                     )
                 } catch (e: CancellationException) {
+                    httpResponse.cancel()
                     return@execute
                 }
-                __handleSseRequest(
-                    scope = scope,
+                return@execute __handleSseRequest(
                     httpClient = httpClient,
                     url = url,
                     method = method,
@@ -1802,14 +1824,12 @@ private suspend fun __handleSseRequest(
                     bufferCapacity = bufferCapacity,
                     onOpen = onOpen,
                     onClose = onClose,
-                    onError = onError,
                     onData = onData,
-                    onConnectionError = onConnectionError,
+                    onResponseError = onResponseError,
                 )
-                return@execute
             }
             newBackoffTime = 0
-            val channel: ByteReadChannel = httpResponse.bodyAsChannel()
+            val channel: ByteReadChannel = httpResponse.body()
             var pendingData = ""
             while (!channel.isClosedForRead) {
                 val buffer = ByteBuffer.allocateDirect(bufferCapacity)
@@ -1829,6 +1849,7 @@ private suspend fun __handleSseRequest(
                                 onData(event.data)
                             } catch (e: CancellationException) {
                                 onClose()
+                                httpResponse.cancel()
                                 return@execute
                             }
                         }
@@ -1838,22 +1859,11 @@ private suspend fun __handleSseRequest(
                             return@execute
                         }
 
-                        "error" -> {
-                            val error = ${clientName}Error.fromJson(event.data)
-                            try {
-                                onError(error)
-                            } catch (e: CancellationException) {
-                                onClose()
-                                return@execute
-                            }
-                        }
-
                         else -> {}
                     }
                 }
             }
-            __handleSseRequest(
-                scope = scope,
+            return@execute __handleSseRequest(
                 httpClient = httpClient,
                 url = url,
                 method = method,
@@ -1865,22 +1875,13 @@ private suspend fun __handleSseRequest(
                 bufferCapacity = bufferCapacity,
                 onOpen = onOpen,
                 onClose = onClose,
-                onError = onError,
                 onData = onData,
-                onConnectionError = onConnectionError,
+                onResponseError = onResponseError,
             )
         }
     } catch (e: java.net.ConnectException) {
-        onConnectionError(
-            ${clientName}Error(
-                code = 503,
-                errorMessage = if (e.message != null) e.message!! else "Error connecting to $url",
-                data = JsonPrimitive(e.toString()),
-                stack = e.stackTraceToString().split("\\n"),
-            )
-        )
-        __handleSseRequest(
-            scope = scope,
+        onRequestError(e)
+        return __handleSseRequest(
             httpClient = httpClient,
             url = url,
             method = method,
@@ -1892,14 +1893,12 @@ private suspend fun __handleSseRequest(
             bufferCapacity = bufferCapacity,
             onOpen = onOpen,
             onClose = onClose,
-            onError = onError,
             onData = onData,
-            onConnectionError = onConnectionError,
+            onResponseError = onResponseError,
         )
-        return
     } catch (e: Exception) {
-        __handleSseRequest(
-            scope = scope,
+        onRequestError(e)
+        return __handleSseRequest(
             httpClient = httpClient,
             url = url,
             method = method,
@@ -1911,9 +1910,8 @@ private suspend fun __handleSseRequest(
             bufferCapacity = bufferCapacity,
             onOpen = onOpen,
             onClose = onClose,
-            onError = onError,
             onData = onData,
-            onConnectionError = onConnectionError,
+            onResponseError = onResponseError,
         )
     }
 }`;
@@ -1926,14 +1924,14 @@ function getHeader(options) {
 )
 
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.plugins.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.utils.io.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-kotlin",
-  "version": "0.60.3",
+  "version": "0.61.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -22,6 +22,6 @@
     "dist"
   ],
   "dependencies": {
-    "@arrirpc/codegen-utils": "0.60.3"
+    "@arrirpc/codegen-utils": "0.61.0"
   }
 }