@kizunajs/kotlin 2.0.0-beta.20 → 2.0.0-beta.22

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_generator = require("./generator-Bg4HlRb3.cjs");
+const require_generator = require("./generator-DGtAlheu.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 let node_util = require("node:util");

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as generateKotlinClient } from "./generator-D4GvH1-a.mjs";
+import { t as generateKotlinClient } from "./generator-oVr_SgXs.mjs";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { parseArgs } from "node:util";

package/dist/{generator-Bg4HlRb3.cjs → generator-DGtAlheu.cjs}

@@ -551,18 +551,23 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 			successResponses.push({
 				status,
 				type: stream.messageType ?? "Event",
-				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : []
+				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [],
+				isText: false
 			});
 			continue;
 		}
-		const typeExpression = mapType((0, kizunajs_generator.resolveResponseBody)(responseValue), registry, responseHint).expression;
+		const bodySchema = (0, kizunajs_generator.resolveResponseBody)(responseValue);
+		const responseContentType = (0, kizunajs_generator.resolveResponseContentType)(responseValue);
+		const isText = !(0, kizunajs_generator.isBinarySchema)(bodySchema) && responseContentType !== void 0 && !(0, kizunajs_generator.isJsonMediaType)(responseContentType);
+		const typeExpression = mapType(bodySchema, registry, responseHint).expression;
 		if ((0, kizunajs_generator.isSuccessStatus)(status)) {
 			const headersSchema = (0, kizunajs_generator.resolveResponseHeaders)(responseValue);
 			const perStatusHeaderFields = headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [];
 			successResponses.push({
 				status,
 				type: typeExpression,
-				responseHeaders: perStatusHeaderFields
+				responseHeaders: perStatusHeaderFields,
+				isText
 			});
 		} else errorCases.push({
 			caseName: (0, kizunajs_generator.statusToCamelCase)(status),
@@ -700,9 +705,12 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 	"ByteArray"
 ]);
 /**
-* How a response body is read. Raw bytes are the body already.
+* How a response body is read. Raw bytes are the body already, and text is its decoded bytes.
 */
-const decodeBody = (resolved) => resolved === "ByteArray" ? "data" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+const decodeBody = (resolved, isText = false) => {
+	if (resolved === "ByteArray") return "data";
+	return isText ? "data.decodeToString()" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+};
 const resolveType = (typeName, currentOperation, context, scope = "client") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
 	const optional = typeName.endsWith("?");
@@ -1413,7 +1421,7 @@ const emitMethodBody = (writer, method, context) => {
 				writer.indent(() => {
 					const resolved = resolveType(successResponse.type, method.operationName, context);
 					writer.block("try", () => {
-						writer.line(`val payload = ${decodeBody(resolved)}`);
+						writer.line(`val payload = ${decodeBody(resolved, successResponse.isText)}`);
 						const bodyExpr = isMultiSuccess ? `${operationRef}.Success.Status${successResponse.status}(payload)` : "payload";
 						if (hasHeaders) {
 							for (const field of successResponse.responseHeaders) writer.line(`val ${escapeKeyword(field.name)} = httpResponse.header(${stringLiteral(field.wireName)})`);
@@ -1476,6 +1484,35 @@ const emitErrorBranches = (writer, method, context) => {
 	}
 	writer.line(`else -> throw ${failureRef}.Unexpected(statusCode = statusCode, data = data)`);
 };
+const IDEMPOTENT_METHODS = new Set([
+	"GET",
+	"HEAD",
+	"OPTIONS",
+	"PUT",
+	"DELETE"
+]);
+/**
+* Writes the reconnection an event stream reopens through and returns the argument handing it to `Kizuna.events`, or
+* nothing for a method a client may not resend.
+*/
+const emitReopen = (writer, method, operationRef, status) => {
+	if (!IDEMPOTENT_METHODS.has(method.method)) return "";
+	closure(writer, "val reconnection = reconnect?.let { policy ->", () => {
+		closure(writer, "Kizuna.Reconnection(policy) { lastEventId ->", () => {
+			writer.line("val again = requestBuilder.build().newBuilder()");
+			writer.line("if (lastEventId.isNotEmpty()) again.header(\"Last-Event-ID\", lastEventId)");
+			writer.line("requestInterceptor?.invoke(again)");
+			writer.line("val reopened = Kizuna.send(client, again.build(), retry)");
+			writer.line("val eventStream = reopened.header(\"Content-Type\")?.lowercase()?.startsWith(\"text/event-stream\") == true");
+			writer.block("when", () => {
+				writer.line("reopened.code == 204 -> { reopened.close(); null }");
+				writer.line(`reopened.code == ${status} && eventStream -> reopened`);
+				writer.line(`else -> { reopened.close(); throw ${operationRef}.Failure.Unexpected(statusCode = reopened.code, data = ByteArray(0)) }`);
+			});
+		});
+	});
+	return ", reconnection";
+};
 const emitStreamMethodTail = (writer, method, context) => {
 	const operationRef = `${context.clientName}.${method.operationName}`;
 	const stream = method.stream;
@@ -1488,7 +1525,7 @@ const emitStreamMethodTail = (writer, method, context) => {
 		else if (stream.events) {
 			const events = stream.events;
 			const elementType = streamElementType(method, context, "client");
-			closure(writer, `val body = Kizuna.events<${elementType}>(httpResponse) { event ->`, () => {
+			closure(writer, `val body = Kizuna.events<${elementType}>(httpResponse${emitReopen(writer, method, operationRef, stream.status)}) { event ->`, () => {
 				writer.block("when (event.event)", () => {
 					for (const event of events) {
 						const payloadType = resolveType(event.type, method.operationName, context);
@@ -1499,7 +1536,8 @@ const emitStreamMethodTail = (writer, method, context) => {
 			});
 		} else {
 			const elementType = streamElementType(method, context, "client");
-			writer.line(`val body = Kizuna.events<${elementType}>(httpResponse) { event -> json.decodeFromString<${elementType}>(event.data) }`);
+			const reconnection = emitReopen(writer, method, operationRef, stream.status);
+			writer.line(`val body = Kizuna.events<${elementType}>(httpResponse${reconnection}) { event -> json.decodeFromString<${elementType}>(event.data) }`);
 		}
 		if (hasHeaders) {
 			for (const field of successResponse.responseHeaders) writer.line(`val ${escapeKeyword(field.name)} = httpResponse.header(${stringLiteral(field.wireName)})`);
@@ -1545,7 +1583,7 @@ const emitSubClientMethod = (writer, method, context) => {
 };
 const emitSubClientClass = (writer, group, clientName, context) => {
 	writer.blank();
-	writer.block(`class ${group.className}(private val client: OkHttpClient, private val baseUrl: String, private val json: Json, private val requestContextHeaders: Map<String, String>, private val requestInterceptor: (suspend (Request.Builder) -> Unit)?, private val responseInterceptor: (suspend (Request, Response) -> Unit)?, private val retry: ${clientName}.RetryPolicy?)`, () => {
+	writer.block(`class ${group.className}(private val client: OkHttpClient, private val baseUrl: String, private val json: Json, private val requestContextHeaders: Map<String, String>, private val requestInterceptor: (suspend (Request.Builder) -> Unit)?, private val responseInterceptor: (suspend (Request, Response) -> Unit)?, private val retry: ${clientName}.RetryPolicy?, private val reconnect: ${clientName}.ReconnectPolicy?)`, () => {
 		for (const method of group.methods) {
 			writer.blank();
 			emitSubClientMethod(writer, method, context);
@@ -1557,10 +1595,12 @@ const closure = (writer, opener, body) => {
 	writer.indent(body);
 	writer.line("}");
 };
-const emitKizunaStreaming = (writer) => {
+const emitKizunaStreaming = (writer, clientName) => {
 	writer.blank();
 	writer.line("data class ServerSentEvent(val event: String?, val data: String, val id: String?, val retry: Int?)");
 	writer.blank();
+	writer.line(`class Reconnection(val policy: ${clientName}.ReconnectPolicy, val reopen: suspend (String) -> Response?)`);
+	writer.blank();
 	writer.block("private suspend fun readLine(source: okio.BufferedSource): String?", () => {
 		writer.line("return kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { source.readUtf8Line() }");
 	});
@@ -1587,44 +1627,83 @@ const emitKizunaStreaming = (writer) => {
 		});
 	});
 	writer.blank();
-	writer.block("fun serverSentEvents(response: Response): Flow<ServerSentEvent> = flow", () => {
-		closure(writer, "response.use { open ->", () => {
-			writer.line("val source = open.body?.source() ?: return@use");
-			writer.line("var eventType = \"\"");
-			writer.line("val dataLines = mutableListOf<String>()");
-			writer.line("var lastEventId = \"\"");
-			writer.line("var retry: Int? = null");
-			writer.block("while (true)", () => {
-				writer.line("val line = readLine(source) ?: break");
-				writer.block("if (line.isEmpty())", () => {
-					writer.block("if (dataLines.isNotEmpty())", () => {
-						writer.line("emit(ServerSentEvent(eventType.ifEmpty { null }, dataLines.joinToString(\"\\n\"), lastEventId.ifEmpty { null }, retry))");
-						writer.line("dataLines.clear()");
-						writer.line("retry = null");
+	writer.line("private val LINE_ENDINGS = okio.ByteString.of('\\r'.code.toByte(), '\\n'.code.toByte())");
+	writer.blank();
+	writer.block("private suspend fun readEventLine(source: okio.BufferedSource): String?", () => {
+		closure(writer, "return kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {", () => {
+			writer.line("val end = source.indexOfElement(LINE_ENDINGS)");
+			writer.block("if (end == -1L)", () => {
+				writer.line("if (source.exhausted()) null else source.readUtf8()");
+			});
+			writer.block("else", () => {
+				writer.line("val line = source.readUtf8(end)");
+				writer.line("val carriageReturn = source.readByte() == '\\r'.code.toByte()");
+				writer.line("if (carriageReturn && source.request(1) && source.buffer[0] == '\\n'.code.toByte()) source.skip(1)");
+				writer.line("line");
+			});
+		});
+	});
+	writer.blank();
+	writer.block("fun serverSentEvents(response: Response, reconnect: Reconnection?): Flow<ServerSentEvent> = flow", () => {
+		writer.line("var lastEventId = \"\"");
+		writer.line("var reconnectionTime = reconnect?.policy?.reconnectionTime ?: 3.seconds");
+		writer.line("var current: Response? = response");
+		writer.line("var attempts = 0");
+		writer.line("var failure: Throwable? = null");
+		writer.block("while (true)", () => {
+			closure(writer, "current?.use { open ->", () => {
+				writer.line("val source = open.body?.source() ?: return@use");
+				writer.line("var eventType = \"\"");
+				writer.line("val dataLines = mutableListOf<String>()");
+				writer.line("var pendingId = lastEventId");
+				writer.line("var retry: Int? = null");
+				writer.line("var firstLine = true");
+				writer.block("while (true)", () => {
+					writer.line("val received = try { readEventLine(source) } catch (error: java.io.IOException) { failure = error; null } ?: break");
+					writer.line("val line = if (firstLine) received.removePrefix(\"\\uFEFF\") else received");
+					writer.line("firstLine = false");
+					writer.block("if (line.isEmpty())", () => {
+						writer.line("lastEventId = pendingId");
+						writer.block("if (dataLines.isNotEmpty())", () => {
+							writer.line("emit(ServerSentEvent(eventType.ifEmpty { null }, dataLines.joinToString(\"\\n\"), lastEventId.ifEmpty { null }, retry))");
+							writer.line("attempts = 0");
+							writer.line("failure = null");
+							writer.line("dataLines.clear()");
+							writer.line("retry = null");
+						});
+						writer.line("eventType = \"\"");
+						writer.line("continue");
+					});
+					writer.line("if (line.startsWith(\":\")) continue");
+					writer.line("val separator = line.indexOf(':')");
+					writer.line("val field = if (separator == -1) line else line.substring(0, separator)");
+					writer.line("val value = (if (separator == -1) \"\" else line.substring(separator + 1)).removePrefix(\" \")");
+					writer.block("when (field)", () => {
+						writer.line("\"event\" -> eventType = value");
+						writer.line("\"data\" -> dataLines.add(value)");
+						writer.line("\"id\" -> if (!value.contains('\\u0000')) pendingId = value");
+						writer.line("\"retry\" -> if (value.isNotEmpty() && value.all { character -> character in '0'..'9' }) value.toIntOrNull()?.let { milliseconds -> retry = milliseconds; reconnectionTime = minOf(milliseconds.milliseconds, 3_600_000.milliseconds) }");
 					});
-					writer.line("eventType = \"\"");
-					writer.line("continue");
-				});
-				writer.line("if (line.startsWith(\":\")) continue");
-				writer.line("val separator = line.indexOf(':')");
-				writer.line("val field = if (separator == -1) line else line.substring(0, separator)");
-				writer.line("val value = (if (separator == -1) \"\" else line.substring(separator + 1)).removePrefix(\" \")");
-				writer.block("when (field)", () => {
-					writer.line("\"event\" -> eventType = value");
-					writer.line("\"data\" -> dataLines.add(value)");
-					writer.line("\"id\" -> if (!value.contains('\\u0000')) lastEventId = value");
-					writer.line("\"retry\" -> if (value.isNotEmpty() && value.all { it.isDigit() }) retry = value.toIntOrNull()");
 				});
 			});
+			writer.block("if (reconnect == null || attempts >= reconnect.policy.maximumAttempts)", () => {
+				writer.line("failure?.let { throw it }");
+				writer.line("return@flow");
+			});
+			writer.line("attempts += 1");
+			writer.line("val ceiling = minOf(reconnect.policy.maximumDelay, reconnectionTime * Math.pow(2.0, (attempts - 1).toDouble()))");
+			writer.line("val extra = (ceiling - reconnectionTime).coerceAtLeast(kotlin.time.Duration.ZERO)");
+			writer.line("kotlinx.coroutines.delay(reconnectionTime + extra * Math.random())");
+			writer.line("current = try { reconnect.reopen(lastEventId) ?: return@flow } catch (error: java.io.IOException) { failure = error; null }");
 		});
 	});
 	writer.blank();
-	writer.line("fun <Event : Any> events(response: Response, decode: (ServerSentEvent) -> Event?): Flow<Event> = serverSentEvents(response).mapNotNull(decode)");
+	writer.line("fun <Event : Any> events(response: Response, reconnect: Reconnection? = null, decode: (ServerSentEvent) -> Event?): Flow<Event> = serverSentEvents(response, reconnect).mapNotNull(decode)");
 };
 const emitKizunaObject = (writer, options) => {
 	writer.blank();
 	writer.block("private object Kizuna", () => {
-		if (options.streaming) emitKizunaStreaming(writer);
+		if (options.streaming) emitKizunaStreaming(writer, options.clientName);
 		writer.block("fun resolveUrl(baseUrl: String, path: String): HttpUrl.Builder", () => {
 			writer.line("val base = baseUrl.toHttpUrl()");
 			writer.line("val trimmedPath = path.trimStart('/')");
@@ -1721,7 +1800,7 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 	const contextRequired = contextFields.some((field) => !hasDefault(field));
 	const contextParam = contextFields.length > 0 ? `requestContext: RequestContext${contextRequired ? "" : " = RequestContext()"}, ` : "";
 	writer.blank();
-	writer.block(`class ${clientName}(private val baseUrl: String, ${contextParam}private val client: OkHttpClient = OkHttpClient(), private val json: Json = Json { ignoreUnknownKeys = true }, private val requestInterceptor: (suspend (Request.Builder) -> Unit)? = null, private val responseInterceptor: (suspend (Request, Response) -> Unit)? = null, private val retry: RetryPolicy? = null)`, () => {
+	writer.block(`class ${clientName}(private val baseUrl: String, ${contextParam}private val client: OkHttpClient = OkHttpClient(), private val json: Json = Json { ignoreUnknownKeys = true }, private val requestInterceptor: (suspend (Request.Builder) -> Unit)? = null, private val responseInterceptor: (suspend (Request, Response) -> Unit)? = null, private val retry: RetryPolicy? = null, private val reconnect: ReconnectPolicy? = null)`, () => {
 		if (contextFields.length > 0) {
 			writer.blank();
 			writer.line("/** Values sent as headers on every request, from the api's request context. */");
@@ -1746,6 +1825,20 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 			"val initialDelay: kotlin.time.Duration = 500.milliseconds",
 			"val maximumDelay: kotlin.time.Duration = 30.seconds"
 		]);
+		writer.blank();
+		writer.line("/**");
+		writer.line(" * Reconnects an event stream on a GET, HEAD, OPTIONS, PUT or DELETE when its connection drops,");
+		writer.line(" * sending the id of the last event as Last-Event-ID.");
+		writer.line(" *");
+		writer.line(" * @property maximumAttempts Reconnections in a row before the stream fails. An event received resets the count.");
+		writer.line(" * @property reconnectionTime What to wait before reconnecting, until the server sends a retry field.");
+		writer.line(" * @property maximumDelay What the wait may grow to after reconnections in a row that fail.");
+		writer.line(" */");
+		emitConstructorClass(writer, "data class ReconnectPolicy", [
+			"val maximumAttempts: Int = 5",
+			"val reconnectionTime: kotlin.time.Duration = 3.seconds",
+			"val maximumDelay: kotlin.time.Duration = 30.seconds"
+		]);
 		if (usesMultipart) {
 			writer.blank();
 			emitConstructorClass(writer, "data class MultipartFile", [
@@ -1801,7 +1894,7 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 		}
 		if (groups.length > 0) for (const group of groups) {
 			writer.blank();
-			writer.line(`val ${escapeKeyword(group.propertyName)} = ${group.className}(client, baseUrl, json, ${contextFields.length > 0 ? "requestContextHeaders" : "emptyMap()"}, requestInterceptor, responseInterceptor, retry)`);
+			writer.line(`val ${escapeKeyword(group.propertyName)} = ${group.className}(client, baseUrl, json, ${contextFields.length > 0 ? "requestContextHeaders" : "emptyMap()"}, requestInterceptor, responseInterceptor, retry, reconnect)`);
 		}
 		for (const method of flatMethods) {
 			writer.blank();

package/dist/{generator-D4GvH1-a.mjs → generator-oVr_SgXs.mjs}

@@ -1,4 +1,4 @@
-import { isBinarySchema, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaBrand, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers, walkApi } from "kizunajs/generator";
+import { isBinarySchema, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isJsonMediaType, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaBrand, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseContentType, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers, walkApi } from "kizunajs/generator";
 //#region src/emit.ts
 var KotlinWriter = class {
 	lines = [];
@@ -551,18 +551,23 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 			successResponses.push({
 				status,
 				type: stream.messageType ?? "Event",
-				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : []
+				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [],
+				isText: false
 			});
 			continue;
 		}
-		const typeExpression = mapType(resolveResponseBody(responseValue), registry, responseHint).expression;
+		const bodySchema = resolveResponseBody(responseValue);
+		const responseContentType = resolveResponseContentType(responseValue);
+		const isText = !isBinarySchema(bodySchema) && responseContentType !== void 0 && !isJsonMediaType(responseContentType);
+		const typeExpression = mapType(bodySchema, registry, responseHint).expression;
 		if (isSuccessStatus(status)) {
 			const headersSchema = resolveResponseHeaders(responseValue);
 			const perStatusHeaderFields = headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [];
 			successResponses.push({
 				status,
 				type: typeExpression,
-				responseHeaders: perStatusHeaderFields
+				responseHeaders: perStatusHeaderFields,
+				isText
 			});
 		} else errorCases.push({
 			caseName: statusToCamelCase(status),
@@ -700,9 +705,12 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 	"ByteArray"
 ]);
 /**
-* How a response body is read. Raw bytes are the body already.
+* How a response body is read. Raw bytes are the body already, and text is its decoded bytes.
 */
-const decodeBody = (resolved) => resolved === "ByteArray" ? "data" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+const decodeBody = (resolved, isText = false) => {
+	if (resolved === "ByteArray") return "data";
+	return isText ? "data.decodeToString()" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+};
 const resolveType = (typeName, currentOperation, context, scope = "client") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
 	const optional = typeName.endsWith("?");
@@ -1413,7 +1421,7 @@ const emitMethodBody = (writer, method, context) => {
 				writer.indent(() => {
 					const resolved = resolveType(successResponse.type, method.operationName, context);
 					writer.block("try", () => {
-						writer.line(`val payload = ${decodeBody(resolved)}`);
+						writer.line(`val payload = ${decodeBody(resolved, successResponse.isText)}`);
 						const bodyExpr = isMultiSuccess ? `${operationRef}.Success.Status${successResponse.status}(payload)` : "payload";
 						if (hasHeaders) {
 							for (const field of successResponse.responseHeaders) writer.line(`val ${escapeKeyword(field.name)} = httpResponse.header(${stringLiteral(field.wireName)})`);
@@ -1476,6 +1484,35 @@ const emitErrorBranches = (writer, method, context) => {
 	}
 	writer.line(`else -> throw ${failureRef}.Unexpected(statusCode = statusCode, data = data)`);
 };
+const IDEMPOTENT_METHODS = new Set([
+	"GET",
+	"HEAD",
+	"OPTIONS",
+	"PUT",
+	"DELETE"
+]);
+/**
+* Writes the reconnection an event stream reopens through and returns the argument handing it to `Kizuna.events`, or
+* nothing for a method a client may not resend.
+*/
+const emitReopen = (writer, method, operationRef, status) => {
+	if (!IDEMPOTENT_METHODS.has(method.method)) return "";
+	closure(writer, "val reconnection = reconnect?.let { policy ->", () => {
+		closure(writer, "Kizuna.Reconnection(policy) { lastEventId ->", () => {
+			writer.line("val again = requestBuilder.build().newBuilder()");
+			writer.line("if (lastEventId.isNotEmpty()) again.header(\"Last-Event-ID\", lastEventId)");
+			writer.line("requestInterceptor?.invoke(again)");
+			writer.line("val reopened = Kizuna.send(client, again.build(), retry)");
+			writer.line("val eventStream = reopened.header(\"Content-Type\")?.lowercase()?.startsWith(\"text/event-stream\") == true");
+			writer.block("when", () => {
+				writer.line("reopened.code == 204 -> { reopened.close(); null }");
+				writer.line(`reopened.code == ${status} && eventStream -> reopened`);
+				writer.line(`else -> { reopened.close(); throw ${operationRef}.Failure.Unexpected(statusCode = reopened.code, data = ByteArray(0)) }`);
+			});
+		});
+	});
+	return ", reconnection";
+};
 const emitStreamMethodTail = (writer, method, context) => {
 	const operationRef = `${context.clientName}.${method.operationName}`;
 	const stream = method.stream;
@@ -1488,7 +1525,7 @@ const emitStreamMethodTail = (writer, method, context) => {
 		else if (stream.events) {
 			const events = stream.events;
 			const elementType = streamElementType(method, context, "client");
-			closure(writer, `val body = Kizuna.events<${elementType}>(httpResponse) { event ->`, () => {
+			closure(writer, `val body = Kizuna.events<${elementType}>(httpResponse${emitReopen(writer, method, operationRef, stream.status)}) { event ->`, () => {
 				writer.block("when (event.event)", () => {
 					for (const event of events) {
 						const payloadType = resolveType(event.type, method.operationName, context);
@@ -1499,7 +1536,8 @@ const emitStreamMethodTail = (writer, method, context) => {
 			});
 		} else {
 			const elementType = streamElementType(method, context, "client");
-			writer.line(`val body = Kizuna.events<${elementType}>(httpResponse) { event -> json.decodeFromString<${elementType}>(event.data) }`);
+			const reconnection = emitReopen(writer, method, operationRef, stream.status);
+			writer.line(`val body = Kizuna.events<${elementType}>(httpResponse${reconnection}) { event -> json.decodeFromString<${elementType}>(event.data) }`);
 		}
 		if (hasHeaders) {
 			for (const field of successResponse.responseHeaders) writer.line(`val ${escapeKeyword(field.name)} = httpResponse.header(${stringLiteral(field.wireName)})`);
@@ -1545,7 +1583,7 @@ const emitSubClientMethod = (writer, method, context) => {
 };
 const emitSubClientClass = (writer, group, clientName, context) => {
 	writer.blank();
-	writer.block(`class ${group.className}(private val client: OkHttpClient, private val baseUrl: String, private val json: Json, private val requestContextHeaders: Map<String, String>, private val requestInterceptor: (suspend (Request.Builder) -> Unit)?, private val responseInterceptor: (suspend (Request, Response) -> Unit)?, private val retry: ${clientName}.RetryPolicy?)`, () => {
+	writer.block(`class ${group.className}(private val client: OkHttpClient, private val baseUrl: String, private val json: Json, private val requestContextHeaders: Map<String, String>, private val requestInterceptor: (suspend (Request.Builder) -> Unit)?, private val responseInterceptor: (suspend (Request, Response) -> Unit)?, private val retry: ${clientName}.RetryPolicy?, private val reconnect: ${clientName}.ReconnectPolicy?)`, () => {
 		for (const method of group.methods) {
 			writer.blank();
 			emitSubClientMethod(writer, method, context);
@@ -1557,10 +1595,12 @@ const closure = (writer, opener, body) => {
 	writer.indent(body);
 	writer.line("}");
 };
-const emitKizunaStreaming = (writer) => {
+const emitKizunaStreaming = (writer, clientName) => {
 	writer.blank();
 	writer.line("data class ServerSentEvent(val event: String?, val data: String, val id: String?, val retry: Int?)");
 	writer.blank();
+	writer.line(`class Reconnection(val policy: ${clientName}.ReconnectPolicy, val reopen: suspend (String) -> Response?)`);
+	writer.blank();
 	writer.block("private suspend fun readLine(source: okio.BufferedSource): String?", () => {
 		writer.line("return kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { source.readUtf8Line() }");
 	});
@@ -1587,44 +1627,83 @@ const emitKizunaStreaming = (writer) => {
 		});
 	});
 	writer.blank();
-	writer.block("fun serverSentEvents(response: Response): Flow<ServerSentEvent> = flow", () => {
-		closure(writer, "response.use { open ->", () => {
-			writer.line("val source = open.body?.source() ?: return@use");
-			writer.line("var eventType = \"\"");
-			writer.line("val dataLines = mutableListOf<String>()");
-			writer.line("var lastEventId = \"\"");
-			writer.line("var retry: Int? = null");
-			writer.block("while (true)", () => {
-				writer.line("val line = readLine(source) ?: break");
-				writer.block("if (line.isEmpty())", () => {
-					writer.block("if (dataLines.isNotEmpty())", () => {
-						writer.line("emit(ServerSentEvent(eventType.ifEmpty { null }, dataLines.joinToString(\"\\n\"), lastEventId.ifEmpty { null }, retry))");
-						writer.line("dataLines.clear()");
-						writer.line("retry = null");
+	writer.line("private val LINE_ENDINGS = okio.ByteString.of('\\r'.code.toByte(), '\\n'.code.toByte())");
+	writer.blank();
+	writer.block("private suspend fun readEventLine(source: okio.BufferedSource): String?", () => {
+		closure(writer, "return kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {", () => {
+			writer.line("val end = source.indexOfElement(LINE_ENDINGS)");
+			writer.block("if (end == -1L)", () => {
+				writer.line("if (source.exhausted()) null else source.readUtf8()");
+			});
+			writer.block("else", () => {
+				writer.line("val line = source.readUtf8(end)");
+				writer.line("val carriageReturn = source.readByte() == '\\r'.code.toByte()");
+				writer.line("if (carriageReturn && source.request(1) && source.buffer[0] == '\\n'.code.toByte()) source.skip(1)");
+				writer.line("line");
+			});
+		});
+	});
+	writer.blank();
+	writer.block("fun serverSentEvents(response: Response, reconnect: Reconnection?): Flow<ServerSentEvent> = flow", () => {
+		writer.line("var lastEventId = \"\"");
+		writer.line("var reconnectionTime = reconnect?.policy?.reconnectionTime ?: 3.seconds");
+		writer.line("var current: Response? = response");
+		writer.line("var attempts = 0");
+		writer.line("var failure: Throwable? = null");
+		writer.block("while (true)", () => {
+			closure(writer, "current?.use { open ->", () => {
+				writer.line("val source = open.body?.source() ?: return@use");
+				writer.line("var eventType = \"\"");
+				writer.line("val dataLines = mutableListOf<String>()");
+				writer.line("var pendingId = lastEventId");
+				writer.line("var retry: Int? = null");
+				writer.line("var firstLine = true");
+				writer.block("while (true)", () => {
+					writer.line("val received = try { readEventLine(source) } catch (error: java.io.IOException) { failure = error; null } ?: break");
+					writer.line("val line = if (firstLine) received.removePrefix(\"\\uFEFF\") else received");
+					writer.line("firstLine = false");
+					writer.block("if (line.isEmpty())", () => {
+						writer.line("lastEventId = pendingId");
+						writer.block("if (dataLines.isNotEmpty())", () => {
+							writer.line("emit(ServerSentEvent(eventType.ifEmpty { null }, dataLines.joinToString(\"\\n\"), lastEventId.ifEmpty { null }, retry))");
+							writer.line("attempts = 0");
+							writer.line("failure = null");
+							writer.line("dataLines.clear()");
+							writer.line("retry = null");
+						});
+						writer.line("eventType = \"\"");
+						writer.line("continue");
+					});
+					writer.line("if (line.startsWith(\":\")) continue");
+					writer.line("val separator = line.indexOf(':')");
+					writer.line("val field = if (separator == -1) line else line.substring(0, separator)");
+					writer.line("val value = (if (separator == -1) \"\" else line.substring(separator + 1)).removePrefix(\" \")");
+					writer.block("when (field)", () => {
+						writer.line("\"event\" -> eventType = value");
+						writer.line("\"data\" -> dataLines.add(value)");
+						writer.line("\"id\" -> if (!value.contains('\\u0000')) pendingId = value");
+						writer.line("\"retry\" -> if (value.isNotEmpty() && value.all { character -> character in '0'..'9' }) value.toIntOrNull()?.let { milliseconds -> retry = milliseconds; reconnectionTime = minOf(milliseconds.milliseconds, 3_600_000.milliseconds) }");
 					});
-					writer.line("eventType = \"\"");
-					writer.line("continue");
-				});
-				writer.line("if (line.startsWith(\":\")) continue");
-				writer.line("val separator = line.indexOf(':')");
-				writer.line("val field = if (separator == -1) line else line.substring(0, separator)");
-				writer.line("val value = (if (separator == -1) \"\" else line.substring(separator + 1)).removePrefix(\" \")");
-				writer.block("when (field)", () => {
-					writer.line("\"event\" -> eventType = value");
-					writer.line("\"data\" -> dataLines.add(value)");
-					writer.line("\"id\" -> if (!value.contains('\\u0000')) lastEventId = value");
-					writer.line("\"retry\" -> if (value.isNotEmpty() && value.all { it.isDigit() }) retry = value.toIntOrNull()");
 				});
 			});
+			writer.block("if (reconnect == null || attempts >= reconnect.policy.maximumAttempts)", () => {
+				writer.line("failure?.let { throw it }");
+				writer.line("return@flow");
+			});
+			writer.line("attempts += 1");
+			writer.line("val ceiling = minOf(reconnect.policy.maximumDelay, reconnectionTime * Math.pow(2.0, (attempts - 1).toDouble()))");
+			writer.line("val extra = (ceiling - reconnectionTime).coerceAtLeast(kotlin.time.Duration.ZERO)");
+			writer.line("kotlinx.coroutines.delay(reconnectionTime + extra * Math.random())");
+			writer.line("current = try { reconnect.reopen(lastEventId) ?: return@flow } catch (error: java.io.IOException) { failure = error; null }");
 		});
 	});
 	writer.blank();
-	writer.line("fun <Event : Any> events(response: Response, decode: (ServerSentEvent) -> Event?): Flow<Event> = serverSentEvents(response).mapNotNull(decode)");
+	writer.line("fun <Event : Any> events(response: Response, reconnect: Reconnection? = null, decode: (ServerSentEvent) -> Event?): Flow<Event> = serverSentEvents(response, reconnect).mapNotNull(decode)");
 };
 const emitKizunaObject = (writer, options) => {
 	writer.blank();
 	writer.block("private object Kizuna", () => {
-		if (options.streaming) emitKizunaStreaming(writer);
+		if (options.streaming) emitKizunaStreaming(writer, options.clientName);
 		writer.block("fun resolveUrl(baseUrl: String, path: String): HttpUrl.Builder", () => {
 			writer.line("val base = baseUrl.toHttpUrl()");
 			writer.line("val trimmedPath = path.trimStart('/')");
@@ -1721,7 +1800,7 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 	const contextRequired = contextFields.some((field) => !hasDefault(field));
 	const contextParam = contextFields.length > 0 ? `requestContext: RequestContext${contextRequired ? "" : " = RequestContext()"}, ` : "";
 	writer.blank();
-	writer.block(`class ${clientName}(private val baseUrl: String, ${contextParam}private val client: OkHttpClient = OkHttpClient(), private val json: Json = Json { ignoreUnknownKeys = true }, private val requestInterceptor: (suspend (Request.Builder) -> Unit)? = null, private val responseInterceptor: (suspend (Request, Response) -> Unit)? = null, private val retry: RetryPolicy? = null)`, () => {
+	writer.block(`class ${clientName}(private val baseUrl: String, ${contextParam}private val client: OkHttpClient = OkHttpClient(), private val json: Json = Json { ignoreUnknownKeys = true }, private val requestInterceptor: (suspend (Request.Builder) -> Unit)? = null, private val responseInterceptor: (suspend (Request, Response) -> Unit)? = null, private val retry: RetryPolicy? = null, private val reconnect: ReconnectPolicy? = null)`, () => {
 		if (contextFields.length > 0) {
 			writer.blank();
 			writer.line("/** Values sent as headers on every request, from the api's request context. */");
@@ -1746,6 +1825,20 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 			"val initialDelay: kotlin.time.Duration = 500.milliseconds",
 			"val maximumDelay: kotlin.time.Duration = 30.seconds"
 		]);
+		writer.blank();
+		writer.line("/**");
+		writer.line(" * Reconnects an event stream on a GET, HEAD, OPTIONS, PUT or DELETE when its connection drops,");
+		writer.line(" * sending the id of the last event as Last-Event-ID.");
+		writer.line(" *");
+		writer.line(" * @property maximumAttempts Reconnections in a row before the stream fails. An event received resets the count.");
+		writer.line(" * @property reconnectionTime What to wait before reconnecting, until the server sends a retry field.");
+		writer.line(" * @property maximumDelay What the wait may grow to after reconnections in a row that fail.");
+		writer.line(" */");
+		emitConstructorClass(writer, "data class ReconnectPolicy", [
+			"val maximumAttempts: Int = 5",
+			"val reconnectionTime: kotlin.time.Duration = 3.seconds",
+			"val maximumDelay: kotlin.time.Duration = 30.seconds"
+		]);
 		if (usesMultipart) {
 			writer.blank();
 			emitConstructorClass(writer, "data class MultipartFile", [
@@ -1801,7 +1894,7 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 		}
 		if (groups.length > 0) for (const group of groups) {
 			writer.blank();
-			writer.line(`val ${escapeKeyword(group.propertyName)} = ${group.className}(client, baseUrl, json, ${contextFields.length > 0 ? "requestContextHeaders" : "emptyMap()"}, requestInterceptor, responseInterceptor, retry)`);
+			writer.line(`val ${escapeKeyword(group.propertyName)} = ${group.className}(client, baseUrl, json, ${contextFields.length > 0 ? "requestContextHeaders" : "emptyMap()"}, requestInterceptor, responseInterceptor, retry, reconnect)`);
 		}
 		for (const method of flatMethods) {
 			writer.blank();

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-Bg4HlRb3.cjs");
+const require_generator = require("./generator-DGtAlheu.cjs");
 let kizunajs_generator = require("kizunajs/generator");
 let zod = require("zod");
 //#region src/client-target.ts

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-D4GvH1-a.mjs";
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-oVr_SgXs.mjs";
 import { defineClient } from "kizunajs/generator";
 import { z } from "zod";
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/kotlin",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.22",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,14 +60,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.20"
+    "@kizunajs/cli": "2.0.0-beta.22"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.20",
+    "kizunajs": "2.0.0-beta.22",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.20",
+    "kizunajs": "2.0.0-beta.22",
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",