feat: metrics for speed, startTime and endTime

Author: enahum

android/src/main/java/com/mattermost/networkclient/Extensions.kt

@@ -58,8 +58,14 @@ fun Response.toWritableMap(metadata: RequestMetadata?): WritableMap {
 
         if (metadata != null) {
             val compressedSize = header("X-Compressed-Size")?.toDoubleOrNull() ?: header("Content-Length")?.toDoubleOrNull() ?: 0.0
+            val startTime = header("X-Start-Time")?.toDoubleOrNull() ?: 0.0
+            val endTime = header("X-End-Time")?.toDoubleOrNull() ?: 0.0
+            val mbps = header("X-Speed-Mbps")?.toDoubleOrNull() ?: 0.0
             metrics.putDouble("compressedSize", compressedSize)
             metrics.putDouble("size", buffer.size.toDouble())
+            metrics.putDouble("startTime", startTime)
+            metrics.putDouble("endTime", endTime)
+            metrics.putDouble("speedInMbps", mbps)
         }
 
         val bodyString = buffer.readUtf8()

android/src/main/java/com/mattermost/networkclient/interceptors/CompressedResponseSizeInterceptor.kt

@@ -6,8 +6,17 @@ import okhttp3.ResponseBody.Companion.toResponseBody
 
 class CompressedResponseSizeInterceptor: Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
+        // Record the start time
+        val startTime = System.nanoTime()
+
         val response = chain.proceed(chain.request())
 
+        // Record the end time
+        val endTime = System.nanoTime()
+
+        // Calculate elapsed time in seconds
+        val elapsedTimeSeconds = (endTime - startTime) / 1_000_000_000.0
+
         val modifiedResponse = response.newBuilder()
 
         var compressedSize = response.header("Content-Length")?.toLongOrNull() ?: response.header("content-length")?.toLongOrNull()
@@ -17,8 +26,18 @@ class CompressedResponseSizeInterceptor: Interceptor {
             modifiedResponse.body((rawBytes ?: ByteArray(0)).toResponseBody(response.body?.contentType()))
         }
 
+        // Calculate speed in Mbps
+        val speedMbps = if (elapsedTimeSeconds > 0 && compressedSize > 0) {
+            (compressedSize * 8 / elapsedTimeSeconds) / 1_000_000.0
+        } else {
+            0.0
+        }
+
         return modifiedResponse
             .header("X-Compressed-Size", compressedSize.toString())
+            .header("X-Start-Time", startTime.toString())
+            .header("X-End-Time", endTime.toString())
+            .header("X-Speed-Mbps", "%.4f".format(speedMbps)) // Format to 4 decimal places
             .build()
     }
 }

ios/NetworkClient.swift

@@ -157,9 +157,10 @@ extension NetworkClient {
 
             if let metrics = response.metrics?.transactionMetrics {
                 let compressedSize = metrics.compactMap { transaction in
-                    (transaction.countOfResponseBodyBytesReceived)
+                    guard transaction.resourceFetchType == .networkLoad else { return nil }
+                    return transaction.countOfResponseBodyBytesReceived
                 }.reduce(0, +)
-                metricsData!["compressedSize"] = compressedSize
+                metricsData!["compressedSize"] = metrics.last?.countOfResponseBodyBytesReceived ?? compressedSize
 
                 let totalLatency = metrics.compactMap { transaction in
                     (transaction.responseStartDate?.timeIntervalSince(transaction.fetchStartDate ?? Date()) ?? 0) * 1000
@@ -171,6 +172,21 @@ extension NetworkClient {
                 }.reduce(0, +)
                 metricsData!["connectionTime"] = totalConnectionTime
 
+                if let fetchStart = metrics.first?.fetchStartDate,
+                   let responseEnd = metrics.last?.responseEndDate {
+                    var timeTaken = responseEnd.timeIntervalSince(fetchStart)
+
+                    
+                    // Ensure timeTaken is reasonable
+                    if timeTaken < 0.001 { // Cap minimum duration to avoid unrealistic speeds
+                        timeTaken = 0.001
+                    }
+                    
+                    metricsData!["startTime"] = fetchStart.timeIntervalSince1970
+                    metricsData!["endTime"] = responseEnd.timeIntervalSince1970
+                    metricsData!["speedInMbps"] = Double(metricsData!["compressedSize"] as! Int64 * 8) / (timeTaken * 1_000_000)
+                }
+                
                 if let lastTransaction = metrics.last {
                     metricsData!["httpVersion"] = lastTransaction.networkProtocolName ?? "Unknown"
 

src/types/APIClient.ts

@@ -46,8 +46,11 @@ export type ClientResponseMetrics = {
     isCached: boolean;
     compressedSize: number;
     size: number;
+    startTime: number;
+    endTime: number;
     connectionTime: number;
     latency: number;
+    speedInMbps: number;
 };
 
 export type ClientResponse = {