From fa971b1822029f92f14b1176c94846d888346835 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 10 Oct 2025 11:26:06 -0400 Subject: [PATCH] Removes stats from Orchestrator to move out of the inner classes and be an option for app developers instead. --- .../ComposeSubscriptionManagerControls.kt | 2 -- .../service/relayClient/eoseManagers/BaseEoseManager.kt | 4 ---- .../relayClient/reqCommand/RelaySubscriptionsCoordinator.kt | 2 -- .../relayClient/reqCommand/account/AccountFilterAssembler.kt | 2 -- .../reqCommand/channel/ChannelFinderFilterAssemblyGroup.kt | 2 -- .../reqCommand/event/EventFinderFilterAssembler.kt | 2 -- .../relayClient/reqCommand/nwc/NWCPaymentFilterAssembler.kt | 2 -- .../relayClient/reqCommand/user/UserFinderFilterAssembler.kt | 2 -- .../relayClient/searchCommand/SearchFilterAssembler.kt | 2 -- .../main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt | 1 - .../chats/privateDM/datasource/ChatroomFilterAssembler.kt | 2 -- .../chats/publicChannels/datasource/ChannelFilterAssembler.kt | 2 -- .../chats/rooms/datasource/ChatroomListFilterAssembler.kt | 2 -- .../communities/datasource/CommunityFilterAssembler.kt | 2 -- .../loggedIn/discover/datasource/DiscoveryFilterAssembler.kt | 2 -- .../loggedIn/geohash/datasource/GeoHashFilterAssembler.kt | 2 -- .../loggedIn/hashtag/datasource/HashtagFilterAssembler.kt | 2 -- .../ui/screen/loggedIn/home/datasource/HomeFilterAssembler.kt | 2 -- .../loggedIn/profile/datasource/UserProfileFilterAssembler.kt | 2 -- .../loggedIn/threadview/datasources/ThreadFilterAssembler.kt | 2 -- .../screen/loggedIn/video/datasource/VideoFilterAssembler.kt | 2 -- .../relay/client/subscriptions/SubscriptionController.kt | 2 -- 22 files changed, 45 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/composeSubscriptionManagers/ComposeSubscriptionManagerControls.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/composeSubscriptionManagers/ComposeSubscriptionManagerControls.kt index 479bde071..f26b1752d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/composeSubscriptionManagers/ComposeSubscriptionManagerControls.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/composeSubscriptionManagers/ComposeSubscriptionManagerControls.kt @@ -26,6 +26,4 @@ interface ComposeSubscriptionManagerControls { fun invalidateFilters() fun destroy() - - fun printStats() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt index bd87b7d69..21c789a93 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt @@ -33,8 +33,6 @@ interface IEoseManager { fun invalidateFilters(ignoreIfDoing: Boolean = false) fun destroy() - - fun printStats() } abstract class BaseEoseManager( @@ -48,8 +46,6 @@ abstract class BaseEoseManager( abstract fun updateSubscriptions(keys: Set) - override fun printStats() = orchestrator.printStats(logTag) - fun newSubscriptionId() = if (isDebug) logTag + newSubId() else newSubId() fun getSubscription(subId: String) = orchestrator.getSub(subId) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/RelaySubscriptionsCoordinator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/RelaySubscriptionsCoordinator.kt index b18735ea0..27651ce0a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/RelaySubscriptionsCoordinator.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/RelaySubscriptionsCoordinator.kt @@ -99,6 +99,4 @@ class RelaySubscriptionsCoordinator( ) fun destroy() = all.forEach { it.destroy() } - - fun printCounters() = all.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/AccountFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/AccountFilterAssembler.kt index 600fcac82..562eb7ca8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/AccountFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/AccountFilterAssembler.kt @@ -56,6 +56,4 @@ class AccountFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/ChannelFinderFilterAssemblyGroup.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/ChannelFinderFilterAssemblyGroup.kt index 97ef8d588..5600979a5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/ChannelFinderFilterAssemblyGroup.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/ChannelFinderFilterAssemblyGroup.kt @@ -49,6 +49,4 @@ class ChannelFinderFilterAssemblyGroup( override fun invalidateKeys() = invalidateFilters() override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/EventFinderFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/EventFinderFilterAssembler.kt index d62fe944b..db3d6bb25 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/EventFinderFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/EventFinderFilterAssembler.kt @@ -47,6 +47,4 @@ class EventFinderFilterAssembler( override fun invalidateKeys() = invalidateFilters() override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/nwc/NWCPaymentFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/nwc/NWCPaymentFilterAssembler.kt index f372693db..b71822d98 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/nwc/NWCPaymentFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/nwc/NWCPaymentFilterAssembler.kt @@ -46,6 +46,4 @@ class NWCPaymentFilterAssembler( override fun invalidateKeys() = invalidateFilters() override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserFinderFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserFinderFilterAssembler.kt index 8d5f4c7cd..947975270 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserFinderFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserFinderFilterAssembler.kt @@ -49,6 +49,4 @@ class UserFinderFilterAssembler( override fun invalidateKeys() = invalidateFilters() override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/SearchFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/SearchFilterAssembler.kt index 022662d95..811cd7338 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/SearchFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/SearchFilterAssembler.kt @@ -54,6 +54,4 @@ class SearchFilterAssembler( override fun invalidateKeys() = invalidateFilters() override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt index 85527e818..ba3cb4d3e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt @@ -99,7 +99,6 @@ class MainActivity : AppCompatActivity() { @OptIn(DelicateCoroutinesApi::class) GlobalScope.launch(Dispatchers.IO) { debugState(this@MainActivity) - Amethyst.instance.sources.printCounters() } super.onPause() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/ChatroomFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/ChatroomFilterAssembler.kt index c7a263ce9..96ef67020 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/ChatroomFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/ChatroomFilterAssembler.kt @@ -46,6 +46,4 @@ class ChatroomFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/ChannelFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/ChannelFilterAssembler.kt index 8d9313021..8beefc621 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/ChannelFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/ChannelFilterAssembler.kt @@ -49,6 +49,4 @@ class ChannelFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/ChatroomListFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/ChatroomListFilterAssembler.kt index 98fa6d9f7..79174b783 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/ChatroomListFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/ChatroomListFilterAssembler.kt @@ -44,6 +44,4 @@ class ChatroomListFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityFilterAssembler.kt index 380c8dbfc..531a781bd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityFilterAssembler.kt @@ -42,6 +42,4 @@ class CommunityFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryFilterAssembler.kt index 2145fe73d..9d9f83089 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryFilterAssembler.kt @@ -48,6 +48,4 @@ class DiscoveryFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/GeoHashFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/GeoHashFilterAssembler.kt index e2087c652..8b80a73b5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/GeoHashFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/GeoHashFilterAssembler.kt @@ -50,6 +50,4 @@ class GeoHashFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/HashtagFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/HashtagFilterAssembler.kt index 5ef49436d..09b7c405c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/HashtagFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/HashtagFilterAssembler.kt @@ -45,6 +45,4 @@ class HashtagFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/HomeFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/HomeFilterAssembler.kt index a6142b5c4..4b749ce55 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/HomeFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/HomeFilterAssembler.kt @@ -53,6 +53,4 @@ class HomeFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/UserProfileFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/UserProfileFilterAssembler.kt index c15cad491..5a217020b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/UserProfileFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/UserProfileFilterAssembler.kt @@ -47,6 +47,4 @@ class UserProfileFilterAssembler( override fun invalidateKeys() = invalidateFilters() override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/ThreadFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/ThreadFilterAssembler.kt index 199eaa789..e389d4501 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/ThreadFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/ThreadFilterAssembler.kt @@ -47,6 +47,4 @@ class ThreadFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/VideoFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/VideoFilterAssembler.kt index 17a901d46..435189d58 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/VideoFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/VideoFilterAssembler.kt @@ -47,6 +47,4 @@ class VideoFilterAssembler( override fun invalidateFilters() = group.forEach { it.invalidateFilters() } override fun destroy() = group.forEach { it.destroy() } - - override fun printStats() = group.forEach { it.printStats() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/subscriptions/SubscriptionController.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/subscriptions/SubscriptionController.kt index e471d4f17..d0de5dbf6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/subscriptions/SubscriptionController.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/subscriptions/SubscriptionController.kt @@ -88,8 +88,6 @@ class SubscriptionController( client.unsubscribe(clientListener) } - fun printStats(tag: String) = stats.printCounter(tag) - fun getSub(subId: String) = subscriptions.get(subId) fun requestNewSubscription(