kt

Author: millotp

clients/algoliasearch-client-kotlin/client/src/commonMain/kotlin/com/algolia/client/configuration/ClientOptions.kt

@@ -7,12 +7,11 @@ import io.ktor.client.plugins.logging.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonBuilder
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
 public expect class ClientOptions(
-  connectTimeout: Duration = 2.seconds,
-  writeTimeout: Duration = 30.seconds,
-  readTimeout: Duration = 5.seconds,
+  connectTimeout: Duration? = null,
+  writeTimeout: Duration? = null,
+  readTimeout: Duration? = null,
   logLevel: LogLevel = LogLevel.NONE,
   logger: Logger = Logger.DEFAULT,
   hosts: List<Host>? = null,
@@ -25,13 +24,13 @@ public expect class ClientOptions(
 ) {
 
   /** Connect timeout for each request */
-  public val connectTimeout: Duration
+  public val connectTimeout: Duration?
 
   /** The timeout for each request when performing write operations. */
-  public val writeTimeout: Duration
+  public val writeTimeout: Duration?
 
   /** The timeout for each request when performing read operations. */
-  public val readTimeout: Duration
+  public val readTimeout: Duration?
 
   /** [LogLevel] to display in the console. */
   public val logLevel: LogLevel

clients/algoliasearch-client-kotlin/client/src/commonMain/kotlin/com/algolia/client/transport/internal/Requester.kt

@@ -11,6 +11,7 @@ import com.algolia.client.transport.RequestConfig
 import com.algolia.client.transport.RequestOptions
 import com.algolia.client.transport.Requester
 import io.ktor.util.reflect.*
+import kotlin.time.Duration
 
 /**
  * Executes a network request with the specified configuration and options, then returns the
@@ -40,6 +41,9 @@ internal fun requesterOf(
   clientName: String,
   appId: String,
   apiKey: String,
+  connectTimeout: Duration,
+  readTimeout: Duration,
+  writeTimeout: Duration,
   options: ClientOptions,
   defaultHosts: () -> List<Host>,
 ) = options.requester ?: KtorRequester(
@@ -52,8 +56,8 @@ internal fun requesterOf(
       add(AgentSegment(clientName, BuildConfig.VERSION))
     },
   ),
-  connectTimeout = options.connectTimeout,
-  readTimeout = options.readTimeout,
-  writeTimeout = options.writeTimeout,
+  connectTimeout = options.connectTimeout ?: connectTimeout,
+  readTimeout = options.readTimeout ?: readTimeout,
+  writeTimeout = options.writeTimeout ?: writeTimeout,
   hosts = options.hosts ?: defaultHosts(),
 )

clients/algoliasearch-client-kotlin/client/src/jvmMain/kotlin/com/algolia/client/configuration/ClientOptions.jvm.kt

@@ -11,9 +11,9 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 public actual class ClientOptions(
-  public actual val connectTimeout: Duration = 2.seconds,
-  public actual val writeTimeout: Duration = 30.seconds,
-  public actual val readTimeout: Duration = 5.seconds,
+  public actual val connectTimeout: Duration? = null,
+  public actual val writeTimeout: Duration? = null,
+  public actual val readTimeout: Duration? = null,
   public actual val logLevel: LogLevel = LogLevel.NONE,
   public actual val logger: Logger = Logger.DEFAULT,
   public actual val hosts: List<Host>? = null,
@@ -29,9 +29,9 @@ public actual class ClientOptions(
   public actual val json: Json = buildJson(jsonConfig)
 
   public actual constructor(
-    connectTimeout: Duration,
-    writeTimeout: Duration,
-    readTimeout: Duration,
+    connectTimeout: Duration?,
+    writeTimeout: Duration?,
+    readTimeout: Duration?,
     logLevel: LogLevel,
     logger: Logger,
     hosts: List<Host>?,

clients/algoliasearch-client-kotlin/client/src/nativeMain/kotlin/com/algolia/client/configuration/ClientOptions.native.kt

@@ -10,9 +10,9 @@ import kotlinx.serialization.json.JsonBuilder
 import kotlin.time.Duration
 
 public actual class ClientOptions actual constructor(
-  public actual val connectTimeout: Duration,
-  public actual val writeTimeout: Duration,
-  public actual val readTimeout: Duration,
+  public actual val connectTimeout: Duration?,
+  public actual val writeTimeout: Duration?,
+  public actual val readTimeout: Duration?,
   public actual val logLevel: LogLevel,
   public actual val logger: Logger,
   public actual val hosts: List<Host>?,

generators/src/main/java/com/algolia/codegen/AlgoliaKotlinGenerator.java

@@ -132,6 +132,8 @@ public void processOpenAPI(OpenAPI openAPI) {
       String hostForKotlin = host.replaceAll("\\{([^}]+)}", "\\$$1");
       additionalProperties.put("hostForKotlin", hostForKotlin);
     }
+
+    Timeouts.enrichBundle(openAPI, additionalProperties);
   }
 
   @Override

templates/kotlin/api.mustache

@@ -8,6 +8,7 @@ import {{modelPackage}}.*
 import {{packageName}}.transport.*
 import {{packageName}}.transport.internal.*
 import kotlinx.serialization.json.*
+import kotlin.time.Duration.Companion.milliseconds
 
 {{#operations}}
 public class {{classname}}(
@@ -24,7 +25,7 @@ public class {{classname}}(
       require(apiKey.isNotBlank()) { "`apiKey` is missing." }
   }
 
-  override val requester: Requester = requesterOf(clientName = "{{{baseName}}}", appId = appId, apiKey = apiKey, options = options) {
+  override val requester: Requester = requesterOf(clientName = "{{{baseName}}}", appId = appId, apiKey = apiKey, connectTimeout = {{x-timeouts.server.connect}}.milliseconds, readTimeout = {{x-timeouts.server.read}}.milliseconds, writeTimeout = {{x-timeouts.server.write}}.milliseconds, options = options) {
   {{#hostWithAppID}}
     listOf(
       Host("$appId-dsn.algolia.net", CallType.Read),