add method

Author: stefanusayudha

Library/lib/src/commonMain/kotlin/data/HttpRequestState.kt

@@ -29,7 +29,8 @@ object HttpRequestStateSerializer : KSerializer<HttpRequestState> {
             "header" to value.header.toString(),
             "request" to value.request.toString(),
             "response" to value.response.toString(),
-            "status" to value.status.toString()
+            "status" to value.status.toString(),
+            "method" to value.method.toString()
         )
         encoder.encodeString(Json.encodeToString(data))
     }
@@ -45,6 +46,7 @@ object HttpRequestStateSerializer : KSerializer<HttpRequestState> {
                     url = data["url"],
                     header = data["header"],
                     request = data["request"],
+                    method = data["method"],
                 )
             }
 
@@ -57,6 +59,7 @@ object HttpRequestStateSerializer : KSerializer<HttpRequestState> {
                     request = data["request"],
                     response = data["response"],
                     status = data["status"]?.toInt(),
+                    method = data["method"],
                 )
             }
 
@@ -69,6 +72,7 @@ object HttpRequestStateSerializer : KSerializer<HttpRequestState> {
                     request = data["request"],
                     response = data["response"],
                     status = data["status"]?.toInt(),
+                    method = data["method"],
                 )
             }
 
@@ -81,6 +85,7 @@ object HttpRequestStateSerializer : KSerializer<HttpRequestState> {
                     request = data["request"],
                     response = data["response"],
                     status = data["status"]?.toInt(),
+                    method = data["method"],
                 )
             }
 
@@ -97,7 +102,8 @@ sealed class HttpRequestState(
     open val header: String? = null,
     open val request: String? = null,
     open val response: String? = null,
-    open val status: Int? = null
+    open val status: Int? = null,
+    open val method: String? = null
 ) {
 
     data class Executing(
@@ -106,6 +112,7 @@ sealed class HttpRequestState(
         override val url: String?,
         override val header: String?,
         override val request: String?,
+        override val method: String?,
     ) : HttpRequestState(id, timeSignMillis, url, header, request)
 
     data class Success(
@@ -115,7 +122,8 @@ sealed class HttpRequestState(
         override val header: String?,
         override val request: String?,
         override val response: String?,
-        override val status: Int?
+        override val status: Int?,
+        override val method: String?,
     ) : HttpRequestState(id, timeSignMillis, url, header, request, response)
 
     data class Error(
@@ -125,7 +133,8 @@ sealed class HttpRequestState(
         override val header: String?,
         override val request: String?,
         override val response: String?,
-        override val status: Int?
+        override val status: Int?,
+        override val method: String?,
     ) : HttpRequestState(id, timeSignMillis, url, header, request, response)
 
     data class Spoofed(
@@ -135,7 +144,8 @@ sealed class HttpRequestState(
         override val header: String?,
         override val request: String?,
         override val response: String?,
-        override val status: Int?
+        override val status: Int?,
+        override val method: String?,
     ) : HttpRequestState(id, timeSignMillis, url, header, request, response)
 
     companion object {
@@ -155,6 +165,7 @@ sealed class HttpRequestState(
                 url = pipeline.context.url.buildString(),
                 header = pipeline.context.headers.build().toString(),
                 request = pipeline.context.body.toString(),
+                method = pipeline.context.method.value,
             )
         }
 
@@ -170,7 +181,8 @@ sealed class HttpRequestState(
                 header = pipeline.context.request.headers.toString(),
                 request = pipeline.context.request.content.toString(),
                 response = data.response.toString(),
-                status = pipeline.context.response.status.value
+                status = pipeline.context.response.status.value,
+                method = pipeline.context.request.method.value,
             )
         }
     }

Library/lib/src/commonMain/kotlin/ui/DebuggerWindow.kt

@@ -86,13 +86,15 @@ data class ErrorItemDisplay(
     val executionTime: String,
     val status: String,
     val url: String,
+    val method: String,
 ) {
     companion object {
         fun from(data: HttpRequestState.Error): ErrorItemDisplay {
             return ErrorItemDisplay(
                 status = data.status?.toString().orEmpty(),
                 url = data.url.orEmpty(),
-                executionTime = data.timeSignMillis.toDate()
+                executionTime = data.timeSignMillis.toDate(),
+                method = data.method.toString()
             )
         }
     }
@@ -104,21 +106,23 @@ fun ErrorItem(
     item: ErrorItemDisplay
 ) {
     CompositionLocalProvider(LocalContentColor provides Color(colorSuccess)) {
-        StatusItem(modifier, item.executionTime, item.status, item.url)
+        StatusItem(modifier, item.executionTime, item.status, item.url, item.method)
     }
 }
 
 data class ExecutingItemDisplay(
     val executionTime: String,
     val status: String,
     val url: String,
+    val method: String,
 ) {
     companion object {
         fun from(data: HttpRequestState.Executing): ExecutingItemDisplay {
             return ExecutingItemDisplay(
                 status = "Executing..",
                 url = data.url.orEmpty(),
-                executionTime = data.timeSignMillis.toDate()
+                executionTime = data.timeSignMillis.toDate(),
+                method = data.method.toString()
             )
         }
     }
@@ -130,21 +134,23 @@ fun ExecutingItem(
     item: ExecutingItemDisplay
 ) {
     CompositionLocalProvider(LocalContentColor provides Color(colorSuccess)) {
-        StatusItem(modifier, item.executionTime, item.status, item.url)
+        StatusItem(modifier, item.executionTime, item.status, item.url, item.method)
     }
 }
 
 data class SpoofedItemDisplay(
     val executionTime: String,
     val status: String,
     val url: String,
+    val method: String,
 ) {
     companion object {
         fun from(data: HttpRequestState.Spoofed): SpoofedItemDisplay {
             return SpoofedItemDisplay(
                 status = "Spoofed",
                 url = data.url.orEmpty(),
-                executionTime = data.timeSignMillis.toDate()
+                executionTime = data.timeSignMillis.toDate(),
+                method = data.method.toString()
             )
         }
     }
@@ -156,21 +162,23 @@ fun SpoofedItem(
     item: SpoofedItemDisplay
 ) {
     CompositionLocalProvider(LocalContentColor provides Color(colorSuccess)) {
-        StatusItem(modifier, item.executionTime, item.status, item.url)
+        StatusItem(modifier, item.executionTime, item.status, item.url, item.method)
     }
 }
 
 data class SuccessItemDisplay(
     val executionTime: String,
     val status: String,
     val url: String,
+    val method: String,
 ) {
     companion object {
         fun from(data: HttpRequestState.Success): SuccessItemDisplay {
             return SuccessItemDisplay(
                 status = data.status?.toString().orEmpty(),
                 url = data.url.orEmpty(),
-                executionTime = data.timeSignMillis.toDate()
+                executionTime = data.timeSignMillis.toDate(),
+                method = data.method.toString()
             )
         }
     }
@@ -182,7 +190,7 @@ fun SuccessItem(
     item: SuccessItemDisplay
 ) {
     CompositionLocalProvider(LocalContentColor provides Color(colorSuccess)) {
-        StatusItem(modifier, item.executionTime, item.status, item.url)
+        StatusItem(modifier, item.executionTime, item.status, item.url, item.method)
     }
 }
 
@@ -192,15 +200,20 @@ fun StatusItem(
     executionTime: String,
     status: String,
     url: String,
+    method: String,
 ) {
     Column(
         modifier = modifier
             .padding(vertical = 16.dp),
     ) {
-        Text(
-            text = url,
-            overflow = TextOverflow.StartEllipsis
-        )
+        Row {
+            Text(text = method.uppercase(), color = Color.White)
+            Spacer(modifier = Modifier.width(4.dp))
+            Text(
+                text = url,
+                overflow = TextOverflow.StartEllipsis
+            )
+        }
         Row {
             Text(text = executionTime, color = Color.White)
             Spacer(modifier = Modifier.width(8.dp))
@@ -216,7 +229,6 @@ fun Long.toDate(timeZone: TimeZone = TimeZone.currentSystemDefault()): String {
     val instant = Instant.fromEpochMilliseconds(this)
     val dateTime: LocalDateTime = instant.toLocalDateTime(timeZone = timeZone)
 
-    val year = dateTime.year
     val month = dateTime.monthNumber.toString().padStart(2, '0')
     val day = dateTime.dayOfMonth.toString().padStart(2, '0')
     val hour = dateTime.hour.toString().padStart(2, '0')