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

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_generator = require("./generator-D4SnsG2Q.cjs");
+const require_generator = require("./generator-Bg4HlRb3.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-DT7c2Vo3.mjs";
+import { t as generateKotlinClient } from "./generator-D4GvH1-a.mjs";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { parseArgs } from "node:util";

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

@@ -1393,7 +1393,7 @@ const emitMethodBody = (writer, method, context) => {
 		else setHeader(accessor);
 	}
 	writer.line("requestInterceptor?.invoke(requestBuilder)");
-	writer.line("val httpResponse = Kizuna.execute(client, requestBuilder.build())");
+	writer.line("val httpResponse = Kizuna.send(client, requestBuilder.build(), retry)");
 	if (method.stream) {
 		emitStreamMethodTail(writer, method, context);
 		return;
@@ -1545,7 +1545,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)?)`, () => {
+	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?)`, () => {
 		for (const method of group.methods) {
 			writer.blank();
 			emitSubClientMethod(writer, method, context);
@@ -1650,6 +1650,47 @@ const emitKizunaObject = (writer, options) => {
 			writer.line("}");
 		});
 		writer.blank();
+		writer.block(`suspend fun send(client: OkHttpClient, request: Request, retry: ${options.clientName}.RetryPolicy?): Response`, () => {
+			writer.line("val idempotent = request.method in setOf(\"GET\", \"HEAD\", \"OPTIONS\", \"PUT\", \"DELETE\")");
+			writer.line("val policy = retry?.takeIf { idempotent && request.body?.isOneShot() != true }");
+			writer.line("var attempt = 1");
+			writer.block("while (true)", () => {
+				writer.line("val response = try {");
+				writer.line("    execute(client, request)");
+				writer.line("} catch (error: java.io.IOException) {");
+				writer.line("    val delay = policy?.let { retryDelay(it, attempt, null) } ?: throw error");
+				writer.line("    kotlinx.coroutines.delay(delay)");
+				writer.line("    attempt += 1");
+				writer.line("    continue");
+				writer.line("}");
+				writer.line("val delay = policy?.let { retryDelay(it, attempt, response) } ?: return response");
+				writer.line("response.close()");
+				writer.line("kotlinx.coroutines.delay(delay)");
+				writer.line("attempt += 1");
+			});
+		});
+		writer.blank();
+		writer.block(`fun retryDelay(policy: ${options.clientName}.RetryPolicy, attempt: Int, response: Response?): Long?`, () => {
+			writer.line("if (attempt >= policy.maximumAttempts) return null");
+			writer.line("val ceiling = minOf(policy.maximumDelay.inWholeMilliseconds, policy.initialDelay.inWholeMilliseconds shl (attempt - 1))");
+			writer.line("val backoff = (Math.random() * ceiling).toLong()");
+			writer.line("if (response == null) return backoff");
+			writer.line("if (response.code != 429 && response.code != 503) return null");
+			writer.line("val asked = retryAfter(response.header(\"Retry-After\")) ?: return backoff");
+			writer.line("return if (asked <= policy.maximumDelay.inWholeMilliseconds) asked else null");
+		});
+		writer.blank();
+		writer.block("fun retryAfter(header: String?): Long?", () => {
+			writer.line("val value = header?.trim() ?: return null");
+			writer.line("value.toLongOrNull()?.let { return if (it >= 0) it * 1000 else null }");
+			writer.line("val date = try {");
+			writer.line("    java.time.ZonedDateTime.parse(value, java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME)");
+			writer.line("} catch (_: java.time.format.DateTimeParseException) {");
+			writer.line("    return null");
+			writer.line("}");
+			writer.line("return maxOf(0L, date.toInstant().toEpochMilli() - System.currentTimeMillis())");
+		});
+		writer.blank();
 		writer.block("suspend fun execute(client: OkHttpClient, request: Request): Response", () => {
 			writer.line("return kotlinx.coroutines.suspendCancellableCoroutine { continuation ->");
 			writer.indent(() => {
@@ -1680,7 +1721,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)`, () => {
+	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)`, () => {
 		if (contextFields.length > 0) {
 			writer.blank();
 			writer.line("/** Values sent as headers on every request, from the api's request context. */");
@@ -1691,6 +1732,20 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 				else writer.line(`put(${stringLiteral(field.wireName)}, requestContext.${escapeKeyword(field.name)})`);
 			});
 		}
+		writer.blank();
+		writer.line("/**");
+		writer.line(" * Retries a GET, HEAD, OPTIONS, PUT or DELETE that failed on the network or was answered 429 or 503,");
+		writer.line(" * waiting what Retry-After asks or backing off.");
+		writer.line(" *");
+		writer.line(" * @property maximumAttempts Attempts in all, the first included.");
+		writer.line(" * @property initialDelay What the first backoff waits at most.");
+		writer.line(" * @property maximumDelay What any wait may take.");
+		writer.line(" */");
+		emitConstructorClass(writer, "data class RetryPolicy", [
+			"val maximumAttempts: Int = 3",
+			"val initialDelay: kotlin.time.Duration = 500.milliseconds",
+			"val maximumDelay: kotlin.time.Duration = 30.seconds"
+		]);
 		if (usesMultipart) {
 			writer.blank();
 			emitConstructorClass(writer, "data class MultipartFile", [
@@ -1746,7 +1801,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)`);
+			writer.line(`val ${escapeKeyword(group.propertyName)} = ${group.className}(client, baseUrl, json, ${contextFields.length > 0 ? "requestContextHeaders" : "emptyMap()"}, requestInterceptor, responseInterceptor, retry)`);
 		}
 		for (const method of flatMethods) {
 			writer.blank();
@@ -1791,6 +1846,8 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	writer.line("import okhttp3.*");
 	writer.line("import okhttp3.MediaType.Companion.toMediaType");
 	writer.line("import okhttp3.RequestBody.Companion.toRequestBody");
+	writer.line("import kotlin.time.Duration.Companion.milliseconds");
+	writer.line("import kotlin.time.Duration.Companion.seconds");
 	writer.line("import okhttp3.HttpUrl.Companion.toHttpUrl");
 	writer.blank();
 	if (registry.all().some((type) => type.kind === "enum-class")) {
@@ -1847,7 +1904,10 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	});
 	emitClient(writer, { clientName }, partition, context, typesByOperation, registry);
 	for (const group of partition.groups) emitSubClientClass(writer, group, clientName, context);
-	emitKizunaObject(writer, { streaming: usesStreaming });
+	emitKizunaObject(writer, {
+		streaming: usesStreaming,
+		clientName
+	});
 	for (const warning of registry.warnings()) process.stderr.write(`[kizuna/kotlin] JsonElement fallback at ${warning}\n`);
 	return writer.toString();
 };

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

@@ -1393,7 +1393,7 @@ const emitMethodBody = (writer, method, context) => {
 		else setHeader(accessor);
 	}
 	writer.line("requestInterceptor?.invoke(requestBuilder)");
-	writer.line("val httpResponse = Kizuna.execute(client, requestBuilder.build())");
+	writer.line("val httpResponse = Kizuna.send(client, requestBuilder.build(), retry)");
 	if (method.stream) {
 		emitStreamMethodTail(writer, method, context);
 		return;
@@ -1545,7 +1545,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)?)`, () => {
+	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?)`, () => {
 		for (const method of group.methods) {
 			writer.blank();
 			emitSubClientMethod(writer, method, context);
@@ -1650,6 +1650,47 @@ const emitKizunaObject = (writer, options) => {
 			writer.line("}");
 		});
 		writer.blank();
+		writer.block(`suspend fun send(client: OkHttpClient, request: Request, retry: ${options.clientName}.RetryPolicy?): Response`, () => {
+			writer.line("val idempotent = request.method in setOf(\"GET\", \"HEAD\", \"OPTIONS\", \"PUT\", \"DELETE\")");
+			writer.line("val policy = retry?.takeIf { idempotent && request.body?.isOneShot() != true }");
+			writer.line("var attempt = 1");
+			writer.block("while (true)", () => {
+				writer.line("val response = try {");
+				writer.line("    execute(client, request)");
+				writer.line("} catch (error: java.io.IOException) {");
+				writer.line("    val delay = policy?.let { retryDelay(it, attempt, null) } ?: throw error");
+				writer.line("    kotlinx.coroutines.delay(delay)");
+				writer.line("    attempt += 1");
+				writer.line("    continue");
+				writer.line("}");
+				writer.line("val delay = policy?.let { retryDelay(it, attempt, response) } ?: return response");
+				writer.line("response.close()");
+				writer.line("kotlinx.coroutines.delay(delay)");
+				writer.line("attempt += 1");
+			});
+		});
+		writer.blank();
+		writer.block(`fun retryDelay(policy: ${options.clientName}.RetryPolicy, attempt: Int, response: Response?): Long?`, () => {
+			writer.line("if (attempt >= policy.maximumAttempts) return null");
+			writer.line("val ceiling = minOf(policy.maximumDelay.inWholeMilliseconds, policy.initialDelay.inWholeMilliseconds shl (attempt - 1))");
+			writer.line("val backoff = (Math.random() * ceiling).toLong()");
+			writer.line("if (response == null) return backoff");
+			writer.line("if (response.code != 429 && response.code != 503) return null");
+			writer.line("val asked = retryAfter(response.header(\"Retry-After\")) ?: return backoff");
+			writer.line("return if (asked <= policy.maximumDelay.inWholeMilliseconds) asked else null");
+		});
+		writer.blank();
+		writer.block("fun retryAfter(header: String?): Long?", () => {
+			writer.line("val value = header?.trim() ?: return null");
+			writer.line("value.toLongOrNull()?.let { return if (it >= 0) it * 1000 else null }");
+			writer.line("val date = try {");
+			writer.line("    java.time.ZonedDateTime.parse(value, java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME)");
+			writer.line("} catch (_: java.time.format.DateTimeParseException) {");
+			writer.line("    return null");
+			writer.line("}");
+			writer.line("return maxOf(0L, date.toInstant().toEpochMilli() - System.currentTimeMillis())");
+		});
+		writer.blank();
 		writer.block("suspend fun execute(client: OkHttpClient, request: Request): Response", () => {
 			writer.line("return kotlinx.coroutines.suspendCancellableCoroutine { continuation ->");
 			writer.indent(() => {
@@ -1680,7 +1721,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)`, () => {
+	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)`, () => {
 		if (contextFields.length > 0) {
 			writer.blank();
 			writer.line("/** Values sent as headers on every request, from the api's request context. */");
@@ -1691,6 +1732,20 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 				else writer.line(`put(${stringLiteral(field.wireName)}, requestContext.${escapeKeyword(field.name)})`);
 			});
 		}
+		writer.blank();
+		writer.line("/**");
+		writer.line(" * Retries a GET, HEAD, OPTIONS, PUT or DELETE that failed on the network or was answered 429 or 503,");
+		writer.line(" * waiting what Retry-After asks or backing off.");
+		writer.line(" *");
+		writer.line(" * @property maximumAttempts Attempts in all, the first included.");
+		writer.line(" * @property initialDelay What the first backoff waits at most.");
+		writer.line(" * @property maximumDelay What any wait may take.");
+		writer.line(" */");
+		emitConstructorClass(writer, "data class RetryPolicy", [
+			"val maximumAttempts: Int = 3",
+			"val initialDelay: kotlin.time.Duration = 500.milliseconds",
+			"val maximumDelay: kotlin.time.Duration = 30.seconds"
+		]);
 		if (usesMultipart) {
 			writer.blank();
 			emitConstructorClass(writer, "data class MultipartFile", [
@@ -1746,7 +1801,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)`);
+			writer.line(`val ${escapeKeyword(group.propertyName)} = ${group.className}(client, baseUrl, json, ${contextFields.length > 0 ? "requestContextHeaders" : "emptyMap()"}, requestInterceptor, responseInterceptor, retry)`);
 		}
 		for (const method of flatMethods) {
 			writer.blank();
@@ -1791,6 +1846,8 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	writer.line("import okhttp3.*");
 	writer.line("import okhttp3.MediaType.Companion.toMediaType");
 	writer.line("import okhttp3.RequestBody.Companion.toRequestBody");
+	writer.line("import kotlin.time.Duration.Companion.milliseconds");
+	writer.line("import kotlin.time.Duration.Companion.seconds");
 	writer.line("import okhttp3.HttpUrl.Companion.toHttpUrl");
 	writer.blank();
 	if (registry.all().some((type) => type.kind === "enum-class")) {
@@ -1847,7 +1904,10 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	});
 	emitClient(writer, { clientName }, partition, context, typesByOperation, registry);
 	for (const group of partition.groups) emitSubClientClass(writer, group, clientName, context);
-	emitKizunaObject(writer, { streaming: usesStreaming });
+	emitKizunaObject(writer, {
+		streaming: usesStreaming,
+		clientName
+	});
 	for (const warning of registry.warnings()) process.stderr.write(`[kizuna/kotlin] JsonElement fallback at ${warning}\n`);
 	return writer.toString();
 };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-D4SnsG2Q.cjs");
+const require_generator = require("./generator-Bg4HlRb3.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-DT7c2Vo3.mjs";
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-D4GvH1-a.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.19",
+  "version": "2.0.0-beta.20",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,14 +60,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.19"
+    "@kizunajs/cli": "2.0.0-beta.20"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.19",
+    "kizunajs": "2.0.0-beta.20",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.19",
+    "kizunajs": "2.0.0-beta.20",
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",