Moves logging out of quartz Relay class

This commit is contained in:
Vitor Pamplona
2025-04-30 14:00:08 -04:00
parent 43b761c98c
commit 9c79ef08c7
5 changed files with 144 additions and 4 deletions

View File

@@ -0,0 +1,66 @@
/**
* Copyright (c) 2024 Vitor Pamplona
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
* Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package com.vitorpamplona.ammolite.relays.datasources
import android.util.Log
import com.vitorpamplona.ammolite.relays.NostrClient
import com.vitorpamplona.ammolite.relays.Relay
import com.vitorpamplona.quartz.nip01Core.core.Event
/**
* Listens to NostrClient's onNotify messages from the relay
*/
class RelayLogger(
val client: NostrClient,
val notify: (message: String, relay: Relay) -> Unit,
) {
private val clientListener =
object : NostrClient.Listener {
/** A new message was received */
override fun onEvent(
event: Event,
subscriptionId: String,
relay: Relay,
afterEOSE: Boolean,
) {
Log.d("Relay", "Relay onEVENT ${relay.url} ($subscriptionId - $afterEOSE) ${event.toJson()}")
}
override fun onSend(
relay: Relay,
msg: String,
success: Boolean,
) {
Log.d("Relay", "Relay send ${relay.url} (${msg.length} chars) $msg")
}
}
init {
Log.d("${this.javaClass.simpleName}", "Init, Subscribe")
client.subscribe(clientListener)
}
fun destroy() {
// makes sure to run
Log.d("${this.javaClass.simpleName}", "Destroy, Unsubscribe")
client.unsubscribe(clientListener)
}
}

View File

@@ -31,6 +31,10 @@ class RelayNotifier(
val client: NostrClient,
val notify: (message: String, relay: Relay) -> Unit,
) {
companion object {
val TAG = RelayNotifier::class.java.simpleName
}
private val clientListener =
object : NostrClient.Listener {
override fun onNotify(
@@ -42,13 +46,13 @@ class RelayNotifier(
}
init {
Log.d("${this.javaClass.simpleName}", "Init, Subscribe")
Log.d(TAG, "Init, Subscribe")
client.subscribe(clientListener)
}
fun destroy() {
// makes sure to run
Log.d("${this.javaClass.simpleName}", "Destroy, Unsubscribe")
Log.d(TAG, "Destroy, Unsubscribe")
client.unsubscribe(clientListener)
}
}