mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-10-03 22:52:36 +02:00
Add a UnsignedEventDeserializer
This commit is contained in:
@@ -60,7 +60,8 @@ class EventMapper {
|
|||||||
.addSerializer(BunkerRequest::class.java, BunkerRequest.BunkerRequestSerializer())
|
.addSerializer(BunkerRequest::class.java, BunkerRequest.BunkerRequestSerializer())
|
||||||
.addDeserializer(BunkerRequest::class.java, BunkerRequest.BunkerRequestDeserializer())
|
.addDeserializer(BunkerRequest::class.java, BunkerRequest.BunkerRequestDeserializer())
|
||||||
.addSerializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseSerializer())
|
.addSerializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseSerializer())
|
||||||
.addDeserializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseDeserializer()),
|
.addDeserializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseDeserializer())
|
||||||
|
.addDeserializer(Event::class.java, UnsignedEventDeserializer()),
|
||||||
)
|
)
|
||||||
|
|
||||||
fun fromJson(json: String): Event = mapper.readValue(json, Event::class.java)
|
fun fromJson(json: String): Event = mapper.readValue(json, Event::class.java)
|
||||||
|
@@ -0,0 +1,33 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 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.quartz.nip01Core.jackson
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonParser
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationContext
|
||||||
|
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||||
|
|
||||||
|
class UnsignedEventDeserializer : StdDeserializer<Event>(Event::class.java) {
|
||||||
|
override fun deserialize(
|
||||||
|
jp: JsonParser,
|
||||||
|
ctxt: DeserializationContext,
|
||||||
|
): Event = UnsignedEventManualDeserializer.fromJson(jp.codec.readTree(jp))
|
||||||
|
}
|
@@ -0,0 +1,43 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 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.quartz.nip01Core.jackson
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.JsonNode
|
||||||
|
import com.vitorpamplona.quartz.EventFactory
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||||
|
|
||||||
|
class UnsignedEventManualDeserializer {
|
||||||
|
companion object {
|
||||||
|
fun fromJson(jsonObject: JsonNode): Event =
|
||||||
|
EventFactory.create(
|
||||||
|
id = jsonObject.get("id")?.asText()?.intern() ?: "",
|
||||||
|
pubKey = jsonObject.get("pubkey")?.asText()?.intern() ?: "",
|
||||||
|
createdAt = jsonObject.get("created_at").asLong(),
|
||||||
|
kind = jsonObject.get("kind").asInt(),
|
||||||
|
tags =
|
||||||
|
jsonObject.get("tags").toTypedArray {
|
||||||
|
it.toTypedArray { s -> if (s.isNull) "" else s.asText().intern() }
|
||||||
|
},
|
||||||
|
content = jsonObject.get("content").asText(),
|
||||||
|
sig = jsonObject.get("sig")?.asText()?.intern() ?: "",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,56 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 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.quartz.nip01Core.jackson
|
||||||
|
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.verify
|
||||||
|
import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class EventDeserializerTest {
|
||||||
|
@Test
|
||||||
|
fun testUnsignedEvent() {
|
||||||
|
val unsignedEventJson = """{"kind":"1","content":"This is an unsigned event.","created_at":1234,"tags":[]}"""
|
||||||
|
val event = Event.fromJson(unsignedEventJson)
|
||||||
|
assert(event.id.isEmpty())
|
||||||
|
assert(event.pubKey.isEmpty())
|
||||||
|
assert(event.sig.isEmpty())
|
||||||
|
assert(!event.verify())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testSignedEvent() {
|
||||||
|
val keyPair = KeyPair()
|
||||||
|
val signer = NostrSignerInternal(keyPair)
|
||||||
|
|
||||||
|
val unsignedEvent = TextNoteEvent.build("test")
|
||||||
|
val signedEvent = signer.signerSync.sign(unsignedEvent)!!
|
||||||
|
val eventJson = signedEvent.toJson()
|
||||||
|
val event = Event.fromJson(eventJson)
|
||||||
|
|
||||||
|
assert(event.id.isNotEmpty())
|
||||||
|
assert(event.sig.isNotEmpty())
|
||||||
|
assert(event.pubKey.isNotEmpty())
|
||||||
|
assert(event.verify())
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user