refactor: update token handling to use lambda type and enhance exception handling in generators and tests

- Changed `token` parameter and property to accept `() -> String` instead of `String`.
- Improved exception handling by adding `HttpRequestTimeoutException` in `safeCall`.
- Adjusted tests to reflect updated `token` and exception handling logic.

Author: halotukozak

core/src/main/kotlin/com/avsystem/justworks/core/gen/ApiClientBaseGenerator.kt

@@ -63,6 +63,12 @@ object ApiClientBaseGenerator {
         .beginControlFlow("return when (status.value)")
         .addStatement("in 200..299 -> %T(status.value, %L())", HTTP_SUCCESS, SUCCESS_BODY)
         .addStatement(
+            "in 300..399 -> %M(%T(status.value, %M(), %T.Server))",
+            RAISE_FUN,
+            HTTP_ERROR,
+            BODY_AS_TEXT_FUN,
+            HTTP_ERROR_TYPE,
+        ).addStatement(
             "in 400..499 -> %M(%T(status.value, %M(), %T.Client))",
             RAISE_FUN,
             HTTP_ERROR,
@@ -97,10 +103,12 @@ object ApiClientBaseGenerator {
         .build()
 
     private fun buildApiClientBaseClass(): TypeSpec {
+        val tokenType = LambdaTypeName.get(returnType = STRING)
+
         val constructor = FunSpec
             .constructorBuilder()
             .addParameter(BASE_URL, STRING)
-            .addParameter(TOKEN, STRING)
+            .addParameter(TOKEN, tokenType)
             .build()
 
         val baseUrlProp = PropertySpec
@@ -110,7 +118,7 @@ object ApiClientBaseGenerator {
             .build()
 
         val tokenProp = PropertySpec
-            .builder(TOKEN, STRING)
+            .builder(TOKEN, tokenType)
             .initializer(TOKEN)
             .addModifiers(KModifier.PRIVATE)
             .build()
@@ -149,7 +157,7 @@ object ApiClientBaseGenerator {
         .addStatement(
             "append(%T.Authorization, %P)",
             HTTP_HEADERS,
-            CodeBlock.of($$"Bearer ${'$'}{$$TOKEN}"),
+            CodeBlock.of($$"Bearer ${'$'}{$$TOKEN()}"),
         ).endControlFlow()
         .build()
 
@@ -162,6 +170,13 @@ object ApiClientBaseGenerator {
         .beginControlFlow("return try")
         .addStatement("%L()", BLOCK)
         .nextControlFlow("catch (e: %T)", IO_EXCEPTION)
+        .addStatement(
+            "%M(%T(0, e.message ?: %S, %T.Network))",
+            RAISE_FUN,
+            HTTP_ERROR,
+            NETWORK_ERROR,
+            HTTP_ERROR_TYPE,
+        ).nextControlFlow("catch (e: %T)", HTTP_REQUEST_TIMEOUT_EXCEPTION)
         .addStatement(
             "%M(%T(0, e.message ?: %S, %T.Network))",
             RAISE_FUN,

core/src/main/kotlin/com/avsystem/justworks/core/gen/ClientGenerator.kt

@@ -13,6 +13,7 @@ import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.LambdaTypeName
 import com.squareup.kotlinpoet.MemberName
 import com.squareup.kotlinpoet.ParameterSpec
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
@@ -50,10 +51,12 @@ class ClientGenerator(private val apiPackage: String, private val modelPackage:
             CodeBlock.of("$CREATE_HTTP_CLIENT()")
         }
 
+        val tokenType = LambdaTypeName.get(returnType = STRING)
+
         val primaryConstructor = FunSpec
             .constructorBuilder()
             .addParameter(BASE_URL, STRING)
-            .addParameter(TOKEN, STRING)
+            .addParameter(TOKEN, tokenType)
             .build()
 
         val httpClientProperty = PropertySpec

core/src/main/kotlin/com/avsystem/justworks/core/gen/Names.kt

@@ -69,6 +69,7 @@ val HTTP_SUCCESS = ClassName("com.avsystem.justworks", "HttpSuccess")
 
 val CLOSEABLE = ClassName("java.io", "Closeable")
 val IO_EXCEPTION = ClassName("java.io", "IOException")
+val HTTP_REQUEST_TIMEOUT_EXCEPTION = ClassName("io.ktor.client.plugins", "HttpRequestTimeoutException")
 val OPT_IN = ClassName("kotlin", "OptIn")
 
 // ============================================================================

core/src/test/kotlin/com/avsystem/justworks/core/gen/ApiClientBaseGeneratorTest.kt

@@ -5,7 +5,6 @@ import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterizedTypeName
 import com.squareup.kotlinpoet.TypeSpec
-import com.squareup.kotlinpoet.TypeVariableName
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
@@ -34,11 +33,13 @@ class ApiClientBaseGeneratorTest {
     }
 
     @Test
-    fun `ApiClientBase has constructor with baseUrl and token`() {
+    fun `ApiClientBase has constructor with baseUrl and token provider`() {
         val constructor = assertNotNull(classSpec.primaryConstructor)
         val paramNames = constructor.parameters.map { it.name }
         assertTrue("baseUrl" in paramNames)
         assertTrue("token" in paramNames)
+        val tokenParam = constructor.parameters.first { it.name == "token" }
+        assertEquals("() -> kotlin.String", tokenParam.type.toString(), "token should be a () -> String lambda")
     }
 
     @Test
@@ -64,7 +65,7 @@ class ApiClientBaseGeneratorTest {
         val body = applyAuth.body.toString()
         assertTrue(body.contains("Authorization"), "Expected Authorization header")
         assertTrue(body.contains("Bearer"), "Expected Bearer prefix")
-        assertTrue(body.contains("token"), "Expected token reference")
+        assertTrue(body.contains("token()"), "Expected token() invocation")
     }
 
     @Test
@@ -75,6 +76,7 @@ class ApiClientBaseGeneratorTest {
         assertTrue(safeCall.contextParameters.isNotEmpty(), "Expected context parameter")
         val body = safeCall.body.toString()
         assertTrue(body.contains("IOException"), "Expected IOException catch")
+        assertTrue(body.contains("HttpRequestTimeoutException"), "Expected HttpRequestTimeoutException catch")
         assertTrue(body.contains("Network error"), "Expected Network error message")
     }
 

core/src/test/kotlin/com/avsystem/justworks/core/gen/ClientGeneratorTest.kt

@@ -297,11 +297,11 @@ class ClientGeneratorTest {
     // -- AUTH-01: Client constructor has token parameter --
 
     @Test
-    fun `client constructor has token parameter`() {
+    fun `client constructor has token provider parameter`() {
         val cls = clientClass(listOf(endpoint()))
         val constructor = assertNotNull(cls.primaryConstructor)
         val token = constructor.parameters.first { it.name == "token" }
-        assertTrue(token.type.toString().contains("String"), "token should return String")
+        assertEquals("() -> kotlin.String", token.type.toString(), "token should be a () -> String lambda")
     }
 
     // -- Pitfall 3: Untagged endpoints go to DefaultClient --