Skip to content

Commit a32f403

Browse files
committed
refactor: Rename NetworkRequest to RecordedNetworkRequest
Further clarify both request and response data is captured.
1 parent 485683d commit a32f403

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

android/Gutenberg/src/main/java/org/wordpress/gutenberg/GutenbergView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ class GutenbergView : WebView {
410410
}
411411

412412
interface NetworkRequestListener {
413-
fun onNetworkRequest(request: NetworkRequest)
413+
fun onNetworkRequest(request: RecordedNetworkRequest)
414414
}
415415

416416
fun getTitleAndContent(originalContent: CharSequence, callback: TitleAndContentCallback, completeComposition: Boolean = false) {
@@ -624,7 +624,7 @@ class GutenbergView : WebView {
624624
handler.post {
625625
try {
626626
val json = JSONObject(requestData)
627-
val request = NetworkRequest.fromJson(json)
627+
val request = RecordedNetworkRequest.fromJson(json)
628628
networkRequestListener?.onNetworkRequest(request)
629629
} catch (e: Exception) {
630630
Log.e("GutenbergView", "Error parsing network request: ${e.message}")

android/Gutenberg/src/main/java/org/wordpress/gutenberg/NetworkRequest.kt renamed to android/Gutenberg/src/main/java/org/wordpress/gutenberg/RecordedNetworkRequest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,26 @@ package org.wordpress.gutenberg
22

33
import org.json.JSONObject
44

5-
data class NetworkRequest(
5+
data class RecordedNetworkRequest(
66
val url: String,
77
val method: String,
88
val requestHeaders: Map<String, String>,
99
val requestBody: String?,
1010
val status: Int,
11+
val statusText: String,
1112
val responseHeaders: Map<String, String>,
1213
val responseBody: String?,
1314
val duration: Int
1415
) {
1516
companion object {
16-
fun fromJson(json: JSONObject): NetworkRequest {
17-
return NetworkRequest(
17+
fun fromJson(json: JSONObject): RecordedNetworkRequest {
18+
return RecordedNetworkRequest(
1819
url = json.getString("url"),
1920
method = json.getString("method"),
2021
requestHeaders = jsonObjectToMap(json.getJSONObject("requestHeaders")),
2122
requestBody = json.optString("requestBody").takeIf { it.isNotEmpty() },
2223
status = json.getInt("status"),
24+
statusText = json.optString("statusText", ""),
2325
responseHeaders = jsonObjectToMap(json.getJSONObject("responseHeaders")),
2426
responseBody = json.optString("responseBody").takeIf { it.isNotEmpty() },
2527
duration = json.getInt("duration")

android/app/src/main/java/com/example/gutenbergkit/EditorActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ fun EditorScreen(
226226
}
227227
})
228228
setNetworkRequestListener(object : GutenbergView.NetworkRequestListener {
229-
override fun onNetworkRequest(request: org.wordpress.gutenberg.NetworkRequest) {
229+
override fun onNetworkRequest(request: org.wordpress.gutenberg.RecordedNetworkRequest) {
230230
android.util.Log.d("EditorActivity", "🌐 Network Request: ${request.method} ${request.url}")
231231
android.util.Log.d("EditorActivity", " Status: ${request.status}, Duration: ${request.duration}ms")
232232

ios/Demo-iOS/Sources/Views/EditorView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private struct _EditorView: UIViewControllerRepresentable {
183183
viewModel.isModalDialogOpen = false
184184
}
185185

186-
func editor(_ viewController: EditorViewController, didLogNetworkRequest request: NetworkRequest) {
186+
func editor(_ viewController: EditorViewController, didLogNetworkRequest request: RecordedNetworkRequest) {
187187
print("🌐 Network Request: \(request.method) \(request.url)")
188188
print(" Status: \(request.status), Duration: \(request.duration)ms")
189189

ios/Sources/GutenbergKit/Sources/EditorViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
476476
delegate?.editor(self, didLogMessage: log.message, level: log.level)
477477
case .onNetworkRequest:
478478
guard let requestDict = message.body as? [String: Any],
479-
let networkRequest = NetworkRequest(from: requestDict) else {
479+
let networkRequest = RecordedNetworkRequest(from: requestDict) else {
480480
return
481481
}
482482
delegate?.editor(self, didLogNetworkRequest: networkRequest)

ios/Sources/GutenbergKit/Sources/EditorViewControllerDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public protocol EditorViewControllerDelegate: AnyObject {
6161
/// It provides visibility into all fetch-based network requests made by the editor.
6262
///
6363
/// - parameter request: The network request details including URL, headers, body, response, and timing.
64-
func editor(_ viewController: EditorViewController, didLogNetworkRequest request: NetworkRequest)
64+
func editor(_ viewController: EditorViewController, didLogNetworkRequest request: RecordedNetworkRequest)
6565
}
6666

6767
#endif
@@ -165,7 +165,7 @@ public struct OpenMediaLibraryAction: Codable {
165165
}
166166
}
167167

168-
public struct NetworkRequest {
168+
public struct RecordedNetworkRequest {
169169
/// The request URL
170170
public let url: String
171171
/// The HTTP method (GET, POST, etc.)

0 commit comments

Comments
 (0)