Merge pull request #78 from getditto/rr/use-peerkey-string

Update tools to use peer key string
getditto · Aug 14, 2024 · de868da · de868da
2 parents ac554be + b779d25
commit de868da
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 44 deletions.
diff --git a/DittoHeartbeat/build.gradle b/DittoHeartbeat/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     constraints {
         implementation(libs.live.ditto.ditto) {
             version {
-                strictly "[4.5.0,)"
+                strictly "[4.7.0,)"
             }
         }
     }

diff --git a/DittoHeartbeat/src/main/java/live.ditto.dittoheartbeat/Heartbeat.kt b/DittoHeartbeat/src/main/java/live.ditto.dittoheartbeat/Heartbeat.kt
@@ -11,7 +11,6 @@ import live.ditto.DittoPeer
 import live.ditto.healthmetrics.HealthMetric
 import live.ditto.healthmetrics.HealthMetricProvider
 import org.joda.time.DateTime
-import java.util.Base64
 import java.util.concurrent.atomic.AtomicBoolean
 
 data class DittoHeartbeatConfig(
@@ -57,18 +56,18 @@ fun startHeartbeat(ditto: Ditto, config: DittoHeartbeatConfig): Flow<DittoHeartb
         val timestamp = DateTime().toISOString()
         val presenceData = observePeers(ditto)
 
-        info =
-            DittoHeartbeatInfo(
-                id = config.id,
-                lastUpdated = timestamp,
-                presenceSnapshotDirectlyConnectedPeers = getConnections(presenceData, ditto),
-                metaData = config.metaData,
-                presenceSnapshotDirectlyConnectedPeersCount = presenceData.size,
-                secondsInterval = config.secondsInterval,
-                sdk = ditto.sdkVersion,
-                schema = HEARTBEAT_COLLECTION_SCHEMA_VALUE,
-                peerKey = byteArrayToHash(ditto.presence.graph.localPeer.peerKey)
-            )
+            info =
+                DittoHeartbeatInfo(
+                    id = config.id,
+                    lastUpdated = timestamp,
+                    presenceSnapshotDirectlyConnectedPeers = getConnections(presenceData, ditto) ,
+                    metaData = config.metaData,
+                    presenceSnapshotDirectlyConnectedPeersCount = presenceData.size,
+                    secondsInterval = config.secondsInterval,
+                    sdk = ditto.sdkVersion,
+                    schema = HEARTBEAT_COLLECTION_SCHEMA_VALUE,
+                    peerKey = ditto.presence.graph.localPeer.peerKeyString
+                )
 
         updateHealthMetrics(config)
 
@@ -78,12 +77,6 @@ fun startHeartbeat(ditto: Ditto, config: DittoHeartbeatConfig): Flow<DittoHeartb
 
 }
 
-@RequiresApi(Build.VERSION_CODES.O)
-fun byteArrayToHash(byteArray: ByteArray): String {
-    val base64String = Base64.getEncoder().encodeToString(byteArray)
-    return "pk:$base64String"
-}
-
 fun observePeers(ditto: Ditto): List<DittoPeer> {
     val presenceGraph = ditto.presence.graph
     return presenceGraph.remotePeers
@@ -116,7 +109,7 @@ fun getConnections(
     val connectionsMap: MutableMap<String, Any> = mutableMapOf()
 
     presenceSnapshotDirectlyConnectedPeers?.forEach { connection ->
-        val connectionsTypeMap = getConnectionTypeCount(connection = connection)
+        val connectionsTypeMap = getConnectionTypeCount(dittoPeer = connection)
 
         val connectionMap: Map<String, Any?> = mapOf(
             "deviceName" to connection.deviceName,
@@ -127,18 +120,18 @@ fun getConnections(
             "lan" to connectionsTypeMap["lan"],
         )
 
-        connectionsMap[byteArrayToHash(connection.peerKey)] = connectionMap
+        connectionsMap[connection.peerKeyString] = connectionMap
     }
 
     return connectionsMap
 }
 
-fun getConnectionTypeCount(connection: DittoPeer): Map<String, Int> {
+fun getConnectionTypeCount(dittoPeer: DittoPeer): Map<String, Int> {
     var bt = 0
     var p2pWifi = 0
     var lan = 0
 
-    connection.connections.forEach { connection ->
+    dittoPeer.connections.forEach { connection ->
         when (connection.connectionType) {
             DittoConnectionType.Bluetooth -> bt += 1
             DittoConnectionType.P2PWiFi -> p2pWifi += 1

diff --git a/DittoPresenceDegradationReporter/build.gradle b/DittoPresenceDegradationReporter/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     constraints {
         implementation(libs.live.ditto.ditto) {
             version {
-                strictly "[4.5.0,)"
+                strictly "[4.7.0,)"
             }
         }
     }

diff --git a/...porter/src/main/java/live/ditto/presencedegradationreporter/usecase/HashPeerKeyUseCase.kt b/...porter/src/main/java/live/ditto/presencedegradationreporter/usecase/HashPeerKeyUseCase.kt
diff --git a/...orter/src/main/java/live/ditto/presencedegradationreporter/usecase/PresenceFlowUseCase.kt b/...orter/src/main/java/live/ditto/presencedegradationreporter/usecase/PresenceFlowUseCase.kt
@@ -13,8 +13,7 @@ import live.ditto.presencedegradationreporter.model.PeerTransportInfo
 
 
 class PresenceFlowUseCase(
-    private val ditto: Ditto,
-    private val hashPeerKeyUseCase: HashPeerKeyUseCase = HashPeerKeyUseCase()
+    private val ditto: Ditto
 ) {
     operator fun invoke(bufferCapacity: Int = Channel.UNLIMITED) = callbackFlow {
         val observer = ditto.presence.observe { graph ->
@@ -26,7 +25,7 @@ class PresenceFlowUseCase(
                 transportInfo = localPeerTransportInfo,
                 connected = true,
                 lastSeen = seenAt,
-                key = hashPeerKeyUseCase(graph.localPeer.peerKey),
+                key = graph.localPeer.peerKeyString,
             )
 
             val remotePeers = graph.remotePeers.map {
@@ -37,7 +36,7 @@ class PresenceFlowUseCase(
                     transportInfo = peerTransportInfo,
                     connected = true,
                     lastSeen = seenAt,
-                    key = hashPeerKeyUseCase(it.peerKey),
+                    key = it.peerKeyString,
                 )
             }
 

diff --git a/app/src/main/java/live/ditto/dittotoolsapp/HeartbeatView.kt b/app/src/main/java/live/ditto/dittotoolsapp/HeartbeatView.kt
@@ -87,7 +87,6 @@ fun HeartbeatInfoCard(heartbeatInfo: DittoHeartbeatInfo) {
                     @Suppress("UNCHECKED_CAST")
                     val typedConnection = connection as Map<String, Any> // Type cast connection to Map<String, Any>
                     ConnectionInfo(connection = typedConnection)
-                } else {
                 }
             }
         }
@@ -102,6 +101,7 @@ fun HeartbeatHeader(heartbeatInfo: DittoHeartbeatInfo) {
         Text("SDK: ${heartbeatInfo.sdk}")
         Text("Last Updated: ${heartbeatInfo.lastUpdated}")
         Text("remotePeersCount: ${heartbeatInfo.presenceSnapshotDirectlyConnectedPeersCount}", color = Color.Black)
+        Text("Peer key: ${heartbeatInfo.peerKey}")
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ androidx-navigation = "2.5.3"
 androidx-test-ext = "1.1.5"
 androidx-webkit = "1.7.0"
 datastorePreferences = "1.0.0"
-ditto = "4.5.0"
+ditto = "4.7.4"
 live-ditto-tools = "1.1.0"
 
 junit = "4.13.2"