From 1fbf415c0660dff4ae8036ca3ce52a86bf6cb222 Mon Sep 17 00:00:00 2001
From: Florent CHAMPIGNY <champigny.florent@gmail.com>
Date: Fri, 29 Aug 2025 14:55:11 +0200
Subject: [PATCH] fix: network late headers (#173)

Co-authored-by: Florent Champigny <florent@bere.al>
---
 .../.idea/deploymentTargetSelector.xml        |   4 +-
 .../network/model/FloconHttpRequest.kt        |   1 +
 .../mapper/FloconNetworkRequestToJson.kt      |   4 +
 .../flocon/grpc/FloconGrpcBaseInterceptor.kt  |   2 +
 .../flocon/ktor/FloconKtorPlugin.kt           |   5 +
 .../flocon/okhttp/OkHttpInterceptor.kt        |   5 +
 .../network/list/view/NetworkItemView.kt      | 121 +++++++++---------
 .../repository/NetworkRepositoryImpl.kt       |  14 +-
 .../models/FloconNetworkRequestDataModel.kt   |   4 +
 .../models/FloconNetworkCallDomainModel.kt    |  13 +-
 10 files changed, 94 insertions(+), 79 deletions(-)

diff --git a/FloconAndroid/.idea/deploymentTargetSelector.xml b/FloconAndroid/.idea/deploymentTargetSelector.xml
index ca6b8518..77cff427 100644
--- a/FloconAndroid/.idea/deploymentTargetSelector.xml
+++ b/FloconAndroid/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-08-12T08:13:43.107088Z">
+        <DropdownSelection timestamp="2025-08-29T12:06:34.695705Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/florentchampigny/.android/avd/Pixel_6_API_26.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=v859mbnzin5px8dq" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/FloconAndroid/flocon-base/src/main/java/io/github/openflocon/flocon/plugins/network/model/FloconHttpRequest.kt b/FloconAndroid/flocon-base/src/main/java/io/github/openflocon/flocon/plugins/network/model/FloconHttpRequest.kt
index 1c507772..41b72ac9 100644
--- a/FloconAndroid/flocon-base/src/main/java/io/github/openflocon/flocon/plugins/network/model/FloconHttpRequest.kt
+++ b/FloconAndroid/flocon-base/src/main/java/io/github/openflocon/flocon/plugins/network/model/FloconHttpRequest.kt
@@ -17,5 +17,6 @@ data class FloconNetworkResponse(
     val body: String?,
     val size: Long?,
     val headers: Map<String, String>,
+    val requestHeaders: Map<String, String>?, // we might receive the request headers later if the interceptor is at first position in the http interceptor chain
     val error: String?,
 )
\ No newline at end of file
diff --git a/FloconAndroid/flocon/src/main/java/io/github/openflocon/flocon/plugins/network/mapper/FloconNetworkRequestToJson.kt b/FloconAndroid/flocon/src/main/java/io/github/openflocon/flocon/plugins/network/mapper/FloconNetworkRequestToJson.kt
index 89a6342c..077f3473 100644
--- a/FloconAndroid/flocon/src/main/java/io/github/openflocon/flocon/plugins/network/mapper/FloconNetworkRequestToJson.kt
+++ b/FloconAndroid/flocon/src/main/java/io/github/openflocon/flocon/plugins/network/mapper/FloconNetworkRequestToJson.kt
@@ -38,6 +38,10 @@ fun floconNetworkCallResponseToJson(network: FloconNetworkCallResponse): JSONObj
         response.contentType?.let { json.put("responseContentType", it) }
         response.body?.let { json.put("responseBody", it) }
         json.put("responseHeaders", JSONObject(response.headers))
+        // if we have delayed headers
+        response.requestHeaders?.takeIf { it.isNotEmpty() }?.let { requestHeaders ->
+            json.put("requestHeaders", JSONObject(requestHeaders))
+        }
         json.put("responseSize", response.size)
         response.error?.let { json.put("responseError", it) }
     }
diff --git a/FloconAndroid/grpc/grpc-interceptor-base/src/main/java/io/github/openflocon/flocon/grpc/FloconGrpcBaseInterceptor.kt b/FloconAndroid/grpc/grpc-interceptor-base/src/main/java/io/github/openflocon/flocon/grpc/FloconGrpcBaseInterceptor.kt
index 19e5f45b..fb08f027 100644
--- a/FloconAndroid/grpc/grpc-interceptor-base/src/main/java/io/github/openflocon/flocon/grpc/FloconGrpcBaseInterceptor.kt
+++ b/FloconAndroid/grpc/grpc-interceptor-base/src/main/java/io/github/openflocon/flocon/grpc/FloconGrpcBaseInterceptor.kt
@@ -132,6 +132,7 @@ private class LoggingClientCallListener<RespT>(
                             size = null,
                             grpcStatus = null,
                             error = cause.message ?: cause.javaClass.simpleName,
+                            requestHeaders = null,
                         ),
                     )
                 } ?: run {
@@ -146,6 +147,7 @@ private class LoggingClientCallListener<RespT>(
                             size = 0L,
                             grpcStatus = status.code.toString(),
                             error = null,
+                            requestHeaders = null,
                         ),
                     )
                 }
diff --git a/FloconAndroid/ktor-interceptor/src/main/java/io/github/openflocon/flocon/ktor/FloconKtorPlugin.kt b/FloconAndroid/ktor-interceptor/src/main/java/io/github/openflocon/flocon/ktor/FloconKtorPlugin.kt
index cfbf2076..1aaffa76 100644
--- a/FloconAndroid/ktor-interceptor/src/main/java/io/github/openflocon/flocon/ktor/FloconKtorPlugin.kt
+++ b/FloconAndroid/ktor-interceptor/src/main/java/io/github/openflocon/flocon/ktor/FloconKtorPlugin.kt
@@ -97,6 +97,7 @@ val FloconKtorPlugin = createClientPlugin("FloconKtorPlugin") {
                 size = null,
                 grpcStatus = null,
                 error = t.message ?: t.javaClass.simpleName,
+                requestHeaders = requestHeadersMap,
             )
 
             floconNetworkPlugin.logResponse(
@@ -135,6 +136,9 @@ val FloconKtorPlugin = createClientPlugin("FloconKtorPlugin") {
         val contentType = response.contentType()?.toString()
         val isImage = contentType?.startsWith("image/") == true
 
+        val requestHeadersMap =
+            request.headers.entries().associate { it.key to it.value.joinToString(",") }
+
         val floconCallResponse = FloconNetworkResponse(
             httpCode = response.status.value,
             contentType = contentType,
@@ -143,6 +147,7 @@ val FloconKtorPlugin = createClientPlugin("FloconKtorPlugin") {
             size = responseSize,
             grpcStatus = null,
             error = null,
+            requestHeaders = requestHeadersMap,
         )
 
         floconNetworkPlugin.logResponse(
diff --git a/FloconAndroid/okhttp-interceptor/src/main/java/io/github/openflocon/flocon/okhttp/OkHttpInterceptor.kt b/FloconAndroid/okhttp-interceptor/src/main/java/io/github/openflocon/flocon/okhttp/OkHttpInterceptor.kt
index e2b58012..6e5f6f77 100644
--- a/FloconAndroid/okhttp-interceptor/src/main/java/io/github/openflocon/flocon/okhttp/OkHttpInterceptor.kt
+++ b/FloconAndroid/okhttp-interceptor/src/main/java/io/github/openflocon/flocon/okhttp/OkHttpInterceptor.kt
@@ -124,6 +124,9 @@ class FloconOkhttpInterceptor() : Interceptor {
 
             val isImage = responseContentType?.toString()?.startsWith("image/") == true
 
+            val requestHeadersMapUpToDate =
+                response.request.headers.toMultimap().mapValues { it.value.joinToString(",") }
+
             val floconCallResponse = FloconNetworkResponse(
                 httpCode = response.code,
                 contentType = responseContentType?.toString(),
@@ -132,6 +135,7 @@ class FloconOkhttpInterceptor() : Interceptor {
                 size = responseSize,
                 grpcStatus = null,
                 error = null,
+                requestHeaders = requestHeadersMapUpToDate,
             )
 
             floconNetworkPlugin.logResponse(
@@ -161,6 +165,7 @@ class FloconOkhttpInterceptor() : Interceptor {
                 size = null,
                 grpcStatus = null,
                 error = e.message ?: e.javaClass.simpleName,
+                requestHeaders = null,
             )
 
             floconNetworkPlugin.logResponse(
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/view/NetworkItemView.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/view/NetworkItemView.kt
index 00f6993a..b4d6bb09 100644
--- a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/view/NetworkItemView.kt
+++ b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/view/NetworkItemView.kt
@@ -174,67 +174,68 @@ private fun contextualActions(
                         }
                     ),
                 )
-                add(
-                    ContextualItem(
-                        text = "Filter: Include this domain",
-                        onClick = {
-                            onActionCallback(
-                                NetworkAction.HeaderAction.FilterAction(
-                                    OnFilterAction.TextFilter(
-                                        column = NetworkTextFilterColumns.Domain,
-                                        action = TextFilterAction.Include(text = state.domain)
-                                    )
-                                )
-                            )
-                        }
-                    ),
-                )
-                add(
-                    ContextualItem(
-                        text = "Filter: Include this url",
-                        onClick = {
-                            onActionCallback(
-                                NetworkAction.HeaderAction.FilterAction(
-                                    OnFilterAction.TextFilter(
-                                        column = NetworkTextFilterColumns.Query,
-                                        action = TextFilterAction.Include(text = state.type.query)
-                                    )
-                                )
-                            )
-                        }
-                    ),
-                )
-                add(
-                    ContextualItem(
-                        text = "Filter: Exclude this domain",
-                        onClick = {
-                            onActionCallback(
-                                NetworkAction.HeaderAction.FilterAction(
-                                    OnFilterAction.TextFilter(
-                                        column = NetworkTextFilterColumns.Domain,
-                                        action = TextFilterAction.Exclude(text = state.domain)
-                                    )
-                                )
-                            )
-                        }
-                    ),
-                )
-                add(
-                    ContextualItem(
-                        text = "Filter: Exclude this url",
-                        onClick = {
-                            onActionCallback(
-                                NetworkAction.HeaderAction.FilterAction(
-                                    OnFilterAction.TextFilter(
-                                        column = NetworkTextFilterColumns.Query,
-                                        action = TextFilterAction.Exclude(text = state.type.query)
-                                    )
-                                )
-                            )
-                        }
-                    ),
-                )
             }
+            add(
+                ContextualItem(
+                    text = "Filter: Include this domain",
+                    onClick = {
+                        onActionCallback(
+                            NetworkAction.HeaderAction.FilterAction(
+                                OnFilterAction.TextFilter(
+                                    column = NetworkTextFilterColumns.Domain,
+                                    action = TextFilterAction.Include(text = state.domain)
+                                )
+                            )
+                        )
+                    }
+                ),
+            )
+            add(
+                ContextualItem(
+                    text = "Filter: Include this Query",
+                    onClick = {
+                        onActionCallback(
+                            NetworkAction.HeaderAction.FilterAction(
+                                OnFilterAction.TextFilter(
+                                    column = NetworkTextFilterColumns.Query,
+                                    action = TextFilterAction.Include(text = state.type.query)
+                                )
+                            )
+                        )
+                    }
+                ),
+            )
+            add(
+                ContextualItem(
+                    text = "Filter: Exclude this domain",
+                    onClick = {
+                        onActionCallback(
+                            NetworkAction.HeaderAction.FilterAction(
+                                OnFilterAction.TextFilter(
+                                    column = NetworkTextFilterColumns.Domain,
+                                    action = TextFilterAction.Exclude(text = state.domain)
+                                )
+                            )
+                        )
+                    }
+                ),
+            )
+            add(
+                ContextualItem(
+                    text = "Filter: Exclude this Query",
+                    onClick = {
+                        onActionCallback(
+                            NetworkAction.HeaderAction.FilterAction(
+                                OnFilterAction.TextFilter(
+                                    column = NetworkTextFilterColumns.Query,
+                                    action = TextFilterAction.Exclude(text = state.type.query)
+                                )
+                            )
+                        )
+                    }
+                ),
+            )
+
             add(
                 ContextualItem(
                     text = "Remove",
diff --git a/FloconDesktop/data/core/src/commonMain/kotlin/io/github/openflocon/data/core/network/repository/NetworkRepositoryImpl.kt b/FloconDesktop/data/core/src/commonMain/kotlin/io/github/openflocon/data/core/network/repository/NetworkRepositoryImpl.kt
index a9fdd66b..2d0a726d 100644
--- a/FloconDesktop/data/core/src/commonMain/kotlin/io/github/openflocon/data/core/network/repository/NetworkRepositoryImpl.kt
+++ b/FloconDesktop/data/core/src/commonMain/kotlin/io/github/openflocon/data/core/network/repository/NetworkRepositoryImpl.kt
@@ -116,7 +116,7 @@ class NetworkRepositoryImpl(
                                 println("cannot decode response")
                                 return@let null
                             }
-                            toDomainForResponse(response = response, request = request)
+                            toDomainForResponse(receivedResponse = response, request = request)
                         }?.let { call ->
                             if (call.response?.getContentType()?.startsWith("image/") == true) {
                                 networkImageRepository.onImageReceived(deviceIdAndPackageName = deviceIdAndPackageName, call = call)
@@ -164,13 +164,13 @@ class NetworkRepositoryImpl(
     }
 
     fun toDomainForResponse(
-        response: FloconNetworkResponseOnlyDomainModel,
+        receivedResponse: FloconNetworkResponseOnlyDomainModel,
         request: FloconNetworkCallDomainModel,
     ): FloconNetworkCallDomainModel? {
         val isRequestGraphQl = request.request.specificInfos is FloconNetworkCallDomainModel.Request.SpecificInfos.GraphQl
         return try {
             val response = if(isRequestGraphQl) {
-                when (val r = response.response) {
+                when (val r = receivedResponse.response) {
                     is FloconNetworkCallDomainModel.Response.Success -> {
                         // specific case : map to graphQl if needed
                         when (val s = r.specificInfos) {
@@ -186,12 +186,16 @@ class NetworkRepositoryImpl(
                         }
                     }
 
-                    is FloconNetworkCallDomainModel.Response.Failure -> response.response
+                    is FloconNetworkCallDomainModel.Response.Failure -> receivedResponse.response
                 }
             } else {
-                response.response
+                receivedResponse.response
             }
+
             request.copy(
+                request = request.request.copy(
+                    headers = receivedResponse.toUpdateRequestHeaders ?: request.request.headers,
+                ),
                 response = response,
             )
         } catch (t: Throwable) {
diff --git a/FloconDesktop/data/remote/src/commonMain/kotlin/com/flocon/data/remote/network/models/FloconNetworkRequestDataModel.kt b/FloconDesktop/data/remote/src/commonMain/kotlin/com/flocon/data/remote/network/models/FloconNetworkRequestDataModel.kt
index 53554caa..8c60f7b3 100644
--- a/FloconDesktop/data/remote/src/commonMain/kotlin/com/flocon/data/remote/network/models/FloconNetworkRequestDataModel.kt
+++ b/FloconDesktop/data/remote/src/commonMain/kotlin/com/flocon/data/remote/network/models/FloconNetworkRequestDataModel.kt
@@ -38,6 +38,9 @@ data class FloconNetworkResponseDataModel(
     val responseSize: Long? = null,
     val responseGrpcStatus: String? = null,
     val responseError: String? = null,
+
+    // if we have delayed headers (if the flocon-interceptor is before others)
+    val requestHeaders: Map<String, String>? = null,
 )
 
 internal fun FloconNetworkResponseDataModel.toDomain(): FloconNetworkResponseOnlyDomainModel? {
@@ -71,6 +74,7 @@ internal fun FloconNetworkResponseDataModel.toDomain(): FloconNetworkResponseOnl
         FloconNetworkResponseOnlyDomainModel(
             floconCallId = callId,
             response = response,
+            toUpdateRequestHeaders = requestHeaders,
         )
     } catch (t: Throwable) {
         t.printStackTrace()
diff --git a/FloconDesktop/domain/src/commonMain/kotlin/io/github/openflocon/domain/network/models/FloconNetworkCallDomainModel.kt b/FloconDesktop/domain/src/commonMain/kotlin/io/github/openflocon/domain/network/models/FloconNetworkCallDomainModel.kt
index 09395a6e..17a6cc69 100644
--- a/FloconDesktop/domain/src/commonMain/kotlin/io/github/openflocon/domain/network/models/FloconNetworkCallDomainModel.kt
+++ b/FloconDesktop/domain/src/commonMain/kotlin/io/github/openflocon/domain/network/models/FloconNetworkCallDomainModel.kt
@@ -94,19 +94,8 @@ data class FloconNetworkCallIdDomainModel(
     val floconCallId: String,
 )
 
-/*
-data class FloconNetworkRequestDomainModel(
-    val url: String,
-    val startTime: Long,
-    val method: String,
-    val headers: Map<String, String>,
-    val body: String?,
-    val byteSize: Long,
-    val isMocked: Boolean,
-)
- */
-
 data class FloconNetworkResponseOnlyDomainModel(
     val floconCallId: String,
+    val toUpdateRequestHeaders: Map<String, String>?,
     val response: FloconNetworkCallDomainModel.Response,
 )