Develop

nostr-java-api/src/main/java/nostr/config/Constants.java

@@ -1,52 +1,60 @@
 package nostr.config;
 
+import nostr.base.Kind;
+
 /** Collection of common constants used across the API. */
 public final class Constants {
   private Constants() {}
 
+  /**
+   * @deprecated Prefer using {@link Kind} directly. This indirection remains for backward
+   *     compatibility and will be removed in a future release.
+   */
+  @Deprecated(forRemoval = true, since = "1.2.0")
   public static final class Kind {
     private Kind() {}
 
-    public static final int USER_METADATA = 0;
-    public static final int SHORT_TEXT_NOTE = 1;
-    @Deprecated public static final int RECOMMENDED_RELAY = 2;
-    public static final int CONTACT_LIST = 3;
-    public static final int ENCRYPTED_DIRECT_MESSAGE = 4;
-    public static final int EVENT_DELETION = 5;
-    public static final int OTS_ATTESTATION = 1040;
-    public static final int DATE_BASED_CALENDAR_CONTENT = 31922;
-    public static final int TIME_BASED_CALENDAR_CONTENT = 31923;
-    public static final int CALENDAR = 31924;
-    public static final int CALENDAR_EVENT_RSVP = 31925;
-    public static final int REPOST = 6;
-    public static final int REACTION = 7;
-    public static final int CHANNEL_CREATION = 40;
-    public static final int CHANNEL_METADATA = 41;
-    public static final int CHANNEL_MESSAGE = 42;
-    public static final int CHANNEL_HIDE_MESSAGE = 43;
-    public static final int CHANNEL_MUTE_USER = 44;
-    public static final int REPORT = 1984;
-    public static final int ZAP_REQUEST = 9734;
-    public static final int ZAP_RECEIPT = 9735;
-    public static final int RELAY_LIST_METADATA = 10002;
-    public static final int CLIENT_AUTHENTICATION = 22242;
-    public static final int BADGE_DEFINITION = 30008;
-    public static final int BADGE_AWARD = 30009;
-    public static final int LONG_FORM_TEXT_NOTE = 30023;
-    public static final int LONG_FORM_DRAFT = 30024;
-    public static final int APPLICATION_SPECIFIC_DATA = 30078;
-    public static final int CASHU_WALLET_EVENT = 17375;
-    public static final int CASHU_WALLET_TOKENS = 7375;
-    public static final int CASHU_WALLET_HISTORY = 7376;
-    public static final int CASHU_RESERVED_WALLET_TOKENS = 7374;
-    public static final int CASHU_NUTZAP_EVENT = 9321;
-    public static final int CASHU_NUTZAP_INFO_EVENT = 10019;
-    public static final int SET_STALL = 30017;
-    public static final int SET_PRODUCT = 30018;
-    public static final int REACTION_TO_WEBSITE = 17;
-    public static final int REQUEST_EVENTS = 24133;
-    public static final int CLASSIFIED_LISTING = 30_402;
-    public static final int RELAY_LIST_METADATA_EVENT = 10_002;
+    public static final int USER_METADATA = Kind.SET_METADATA.getValue();
+    public static final int SHORT_TEXT_NOTE = Kind.TEXT_NOTE.getValue();
+    /** @deprecated Use {@link Kind#RECOMMEND_SERVER}. */
+    @Deprecated public static final int RECOMMENDED_RELAY = Kind.RECOMMEND_SERVER.getValue();
+    public static final int CONTACT_LIST = Kind.CONTACT_LIST.getValue();
+    public static final int ENCRYPTED_DIRECT_MESSAGE = Kind.ENCRYPTED_DIRECT_MESSAGE.getValue();
+    public static final int EVENT_DELETION = Kind.DELETION.getValue();
+    public static final int OTS_ATTESTATION = Kind.OTS_EVENT.getValue();
+    public static final int DATE_BASED_CALENDAR_CONTENT = Kind.CALENDAR_DATE_BASED_EVENT.getValue();
+    public static final int TIME_BASED_CALENDAR_CONTENT = Kind.CALENDAR_TIME_BASED_EVENT.getValue();
+    public static final int CALENDAR = Kind.CALENDAR_EVENT.getValue();
+    public static final int CALENDAR_EVENT_RSVP = Kind.CALENDAR_RSVP_EVENT.getValue();
+    public static final int REPOST = Kind.REPOST.getValue();
+    public static final int REACTION = Kind.REACTION.getValue();
+    public static final int CHANNEL_CREATION = Kind.CHANNEL_CREATE.getValue();
+    public static final int CHANNEL_METADATA = Kind.CHANNEL_METADATA.getValue();
+    public static final int CHANNEL_MESSAGE = Kind.CHANNEL_MESSAGE.getValue();
+    public static final int CHANNEL_HIDE_MESSAGE = Kind.HIDE_MESSAGE.getValue();
+    public static final int CHANNEL_MUTE_USER = Kind.MUTE_USER.getValue();
+    public static final int REPORT = Kind.REPORT.getValue();
+    public static final int ZAP_REQUEST = Kind.ZAP_REQUEST.getValue();
+    public static final int ZAP_RECEIPT = Kind.ZAP_RECEIPT.getValue();
+    public static final int RELAY_LIST_METADATA = Kind.RELAY_LIST_METADATA.getValue();
+    public static final int CLIENT_AUTHENTICATION = Kind.CLIENT_AUTH.getValue();
+    public static final int BADGE_DEFINITION = Kind.BADGE_DEFINITION.getValue();
+    public static final int BADGE_AWARD = Kind.BADGE_AWARD.getValue();
+    public static final int LONG_FORM_TEXT_NOTE = Kind.LONG_FORM_TEXT_NOTE.getValue();
+    public static final int LONG_FORM_DRAFT = Kind.LONG_FORM_DRAFT.getValue();
+    public static final int APPLICATION_SPECIFIC_DATA = Kind.APPLICATION_SPECIFIC_DATA.getValue();
+    public static final int CASHU_WALLET_EVENT = Kind.WALLET.getValue();
+    public static final int CASHU_WALLET_TOKENS = Kind.WALLET_UNSPENT_PROOF.getValue();
+    public static final int CASHU_WALLET_HISTORY = Kind.WALLET_TX_HISTORY.getValue();
+    public static final int CASHU_RESERVED_WALLET_TOKENS = Kind.RESERVED_CASHU_WALLET_TOKENS.getValue();
+    public static final int CASHU_NUTZAP_EVENT = Kind.NUTZAP.getValue();
+    public static final int CASHU_NUTZAP_INFO_EVENT = Kind.NUTZAP_INFORMATIONAL.getValue();
+    public static final int SET_STALL = Kind.STALL_CREATE_OR_UPDATE.getValue();
+    public static final int SET_PRODUCT = Kind.PRODUCT_CREATE_OR_UPDATE.getValue();
+    public static final int REACTION_TO_WEBSITE = Kind.REACTION_TO_WEBSITE.getValue();
+    public static final int REQUEST_EVENTS = Kind.REQUEST_EVENTS.getValue();
+    public static final int CLASSIFIED_LISTING = Kind.CLASSIFIED_LISTING.getValue();
+    public static final int RELAY_LIST_METADATA_EVENT = Kind.RELAY_LIST_METADATA.getValue();
   }
 
   public static final class Tag {

nostr-java-base/src/main/java/nostr/base/Kind.java

@@ -16,11 +16,13 @@ public enum Kind {
   TEXT_NOTE(1, "text_note"),
   RECOMMEND_SERVER(2, "recommend_server"),
   COINJOIN_POOL(2022, "coinjoin_pool"),
+  REACTION_TO_WEBSITE(17, "reaction_to_website"),
   CONTACT_LIST(3, "contact_list"),
   ENCRYPTED_DIRECT_MESSAGE(4, "encrypted_direct_message"),
   DELETION(5, "deletion"),
   REPOST(6, "repost"),
   REACTION(7, "reaction"),
+  REPORT(1984, "report"),
   CHANNEL_CREATE(40, "channel_create"),
   CHANNEL_METADATA(41, "channel_metadata"),
   CHANNEL_MESSAGE(42, "channel_message"),
@@ -33,14 +35,18 @@ public enum Kind {
   WALLET_TX_HISTORY(7_376, "wallet_tx_history"),
   ZAP_REQUEST(9734, "zap_request"),
   ZAP_RECEIPT(9735, "zap_receipt"),
+  BADGE_DEFINITION(30_008, "badge_definition"),
+  BADGE_AWARD(30_009, "badge_award"),
   REPLACEABLE_EVENT(10_000, "replaceable_event"),
   EPHEMEREAL_EVENT(20_000, "ephemereal_event"),
   ADDRESSABLE_EVENT(30_000, "addressable_event"),
   PIN_LIST(10_001, "pin_list"),
   CLIENT_AUTH(22_242, "authentication_of_clients_to_relays"),
   STALL_CREATE_OR_UPDATE(30_017, "create_or_update_stall"),
   PRODUCT_CREATE_OR_UPDATE(30_018, "create_or_update_product"),
-  PRE_LONG_FORM_CONTENT(30_023, "long_form_content"),
+  LONG_FORM_TEXT_NOTE(30_023, "long_form_text_note"),
+  LONG_FORM_DRAFT(30_024, "long_form_draft"),
+  APPLICATION_SPECIFIC_DATA(30_078, "application_specific_data"),
   CLASSIFIED_LISTING(30_402, "classified_listing_active"),
   CLASSIFIED_LISTING_INACTIVE(30_403, "classified_listing_inactive"),
   CLASSIFIED_LISTING_DRAFT(30_403, "classified_listing_draft"),
@@ -50,7 +56,8 @@ public enum Kind {
   CALENDAR_RSVP_EVENT(31_925, "calendar_rsvp_event"),
   NUTZAP_INFORMATIONAL(10_019, "nutzap_informational"),
   NUTZAP(9_321, "nutzap"),
-  RELAY_LIST_METADATA(10_002, "relay_list_metadata");
+  RELAY_LIST_METADATA(10_002, "relay_list_metadata"),
+  REQUEST_EVENTS(24_133, "request_events");
 
   @JsonValue private final int value;
 

nostr-java-event/src/main/java/nostr/event/impl/GenericEvent.java

@@ -11,6 +11,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
@@ -43,13 +44,13 @@
 @EqualsAndHashCode(callSuper = false)
 public class GenericEvent extends BaseEvent implements ISignable, Deleteable {
 
   @Key @EqualsAndHashCode.Include private String id;
 
   @Key
   @JsonProperty("pubkey")
   @EqualsAndHashCode.Include
   @JsonDeserialize(using = PublicKeyDeserializer.class)
   private PublicKey pubKey;
 
   @Key
   @JsonProperty("created_at")
@@ -118,6 +119,45 @@
     updateTagsParents(this.tags);
   }
 
+  @Builder(
+      builderClassName = "GenericEventBuilder",
+      builderMethodName = "builder",
+      toBuilder = true)
+  private static GenericEvent newGenericEvent(
+      String id,
+      @NonNull PublicKey pubKey,
+      Kind kind,
+      Integer customKind,
+      List<BaseTag> tags,
+      String content,
+      Long createdAt,
+      Signature signature,
+      Integer nip) {
+
+    GenericEvent event = new GenericEvent();
+
+    Optional.ofNullable(id).ifPresent(event::setId);
+    event.setPubKey(pubKey);
+
+    if (customKind == null && kind == null) {
+      throw new IllegalArgumentException("A kind value must be provided when building a GenericEvent.");
+    }
+
+    if (customKind != null) {
+      event.setKind(customKind);
+    } else if (kind != null) {
+      event.setKind(kind.getValue());
+    }
+
+    event.setTags(Optional.ofNullable(tags).map(ArrayList::new).orElseGet(ArrayList::new));
+    event.setContent(Optional.ofNullable(content).orElse(""));
+    event.setCreatedAt(createdAt);
+    event.setSignature(signature);
+    event.setNip(nip);
+
+    return event;
+  }
+
   public void setId(String id) {
     HexStringValidator.validateHex(id, 64);
     this.id = id;

nostr-java-event/src/main/java/nostr/event/json/deserializer/CalendarDateBasedEventDeserializer.java

@@ -6,51 +6,28 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.StreamSupport;
-import nostr.base.IEvent;
-import nostr.base.PublicKey;
-import nostr.base.Signature;
-import nostr.event.BaseTag;
+import nostr.base.json.EventJsonMapper;
 import nostr.event.impl.CalendarDateBasedEvent;
-import nostr.event.impl.CalendarTimeBasedEvent;
+import nostr.event.impl.GenericEvent;
+import nostr.util.NostrException;
 
 public class CalendarDateBasedEventDeserializer extends StdDeserializer<CalendarDateBasedEvent> {
   public CalendarDateBasedEventDeserializer() {
-    super(CalendarTimeBasedEvent.class);
+    super(CalendarDateBasedEvent.class);
   }
 
-  //    TODO: below methods needs comprehensive tags assignment completion
   @Override
   public CalendarDateBasedEvent deserialize(JsonParser jsonParser, DeserializationContext ctxt)
       throws IOException {
-    JsonNode calendarTimeBasedEventNode = jsonParser.getCodec().readTree(jsonParser);
-    ArrayNode tags = (ArrayNode) calendarTimeBasedEventNode.get("tags");
-
-    List<BaseTag> baseTags =
-        StreamSupport.stream(tags.spliterator(), false).toList().stream()
-            .map(JsonNode::elements)
-            .map(element -> EventJsonMapper.mapper().convertValue(element, BaseTag.class))
-            .toList();
-
-    Map<String, String> generalMap = new HashMap<>();
-    var fieldNames = calendarTimeBasedEventNode.fieldNames();
-    while (fieldNames.hasNext()) {
-      String key = fieldNames.next();
-      generalMap.put(key, calendarTimeBasedEventNode.get(key).asText());
+    JsonNode calendarEventNode = jsonParser.getCodec().readTree(jsonParser);
+    GenericEvent genericEvent =
+        EventJsonMapper.mapper().treeToValue(calendarEventNode, GenericEvent.class);
+
+    try {
+      return GenericEvent.convert(genericEvent, CalendarDateBasedEvent.class);
+    } catch (NostrException ex) {
+      throw new IOException("Failed to convert generic event into CalendarDateBasedEvent", ex);
     }
-
-    CalendarDateBasedEvent calendarDateBasedEvent =
-        new CalendarDateBasedEvent(
-            new PublicKey(generalMap.get("pubkey")), baseTags, generalMap.get("content"));
-    calendarDateBasedEvent.setId(generalMap.get("id"));
-    calendarDateBasedEvent.setCreatedAt(Long.valueOf(generalMap.get("created_at")));
-    calendarDateBasedEvent.setSignature(Signature.fromString(generalMap.get("sig")));
-
-    return calendarDateBasedEvent;
   }
 }

nostr-java-event/src/main/java/nostr/event/json/deserializer/CalendarEventDeserializer.java

@@ -6,50 +6,28 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.StreamSupport;
-import nostr.base.IEvent;
-import nostr.base.PublicKey;
-import nostr.base.Signature;
-import nostr.event.BaseTag;
+import nostr.base.json.EventJsonMapper;
 import nostr.event.impl.CalendarEvent;
+import nostr.event.impl.GenericEvent;
+import nostr.util.NostrException;
 
 public class CalendarEventDeserializer extends StdDeserializer<CalendarEvent> {
   public CalendarEventDeserializer() {
     super(CalendarEvent.class);
   }
 
-  //    TODO: below methods needs comprehensive tags assignment completion
   @Override
   public CalendarEvent deserialize(JsonParser jsonParser, DeserializationContext ctxt)
       throws IOException {
-    JsonNode calendarTimeBasedEventNode = jsonParser.getCodec().readTree(jsonParser);
-    ArrayNode tags = (ArrayNode) calendarTimeBasedEventNode.get("tags");
-
-    List<BaseTag> baseTags =
-        StreamSupport.stream(tags.spliterator(), false).toList().stream()
-            .map(JsonNode::elements)
-            .map(element -> EventJsonMapper.mapper().convertValue(element, BaseTag.class))
-            .toList();
-
-    Map<String, String> generalMap = new HashMap<>();
-    var fieldNames = calendarTimeBasedEventNode.fieldNames();
-    while (fieldNames.hasNext()) {
-      String key = fieldNames.next();
-      generalMap.put(key, calendarTimeBasedEventNode.get(key).asText());
+    JsonNode calendarEventNode = jsonParser.getCodec().readTree(jsonParser);
+    GenericEvent genericEvent =
+        EventJsonMapper.mapper().treeToValue(calendarEventNode, GenericEvent.class);
+
+    try {
+      return GenericEvent.convert(genericEvent, CalendarEvent.class);
+    } catch (NostrException ex) {
+      throw new IOException("Failed to convert generic event into CalendarEvent", ex);
     }
-
-    CalendarEvent calendarEvent =
-        new CalendarEvent(
-            new PublicKey(generalMap.get("pubkey")), baseTags, generalMap.get("content"));
-    calendarEvent.setId(generalMap.get("id"));
-    calendarEvent.setCreatedAt(Long.valueOf(generalMap.get("created_at")));
-    calendarEvent.setSignature(Signature.fromString(generalMap.get("sig")));
-
-    return calendarEvent;
   }
 }

nostr-java-event/src/main/java/nostr/event/json/deserializer/CalendarRsvpEventDeserializer.java

@@ -6,50 +6,28 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.StreamSupport;
-import nostr.base.IEvent;
-import nostr.base.PublicKey;
-import nostr.base.Signature;
-import nostr.event.BaseTag;
+import nostr.base.json.EventJsonMapper;
 import nostr.event.impl.CalendarRsvpEvent;
+import nostr.event.impl.GenericEvent;
+import nostr.util.NostrException;
 
 public class CalendarRsvpEventDeserializer extends StdDeserializer<CalendarRsvpEvent> {
   public CalendarRsvpEventDeserializer() {
     super(CalendarRsvpEvent.class);
   }
 
-  //    TODO: below methods needs comprehensive tags assignment completion
   @Override
   public CalendarRsvpEvent deserialize(JsonParser jsonParser, DeserializationContext ctxt)
       throws IOException {
-    JsonNode calendarTimeBasedEventNode = jsonParser.getCodec().readTree(jsonParser);
-    ArrayNode tags = (ArrayNode) calendarTimeBasedEventNode.get("tags");
-
-    List<BaseTag> baseTags =
-        StreamSupport.stream(tags.spliterator(), false).toList().stream()
-            .map(JsonNode::elements)
-            .map(element -> EventJsonMapper.mapper().convertValue(element, BaseTag.class))
-            .toList();
-
-    Map<String, String> generalMap = new HashMap<>();
-    var fieldNames = calendarTimeBasedEventNode.fieldNames();
-    while (fieldNames.hasNext()) {
-      String key = fieldNames.next();
-      generalMap.put(key, calendarTimeBasedEventNode.get(key).asText());
+    JsonNode calendarEventNode = jsonParser.getCodec().readTree(jsonParser);
+    GenericEvent genericEvent =
+        EventJsonMapper.mapper().treeToValue(calendarEventNode, GenericEvent.class);
+
+    try {
+      return GenericEvent.convert(genericEvent, CalendarRsvpEvent.class);
+    } catch (NostrException ex) {
+      throw new IOException("Failed to convert generic event into CalendarRsvpEvent", ex);
     }
-
-    CalendarRsvpEvent calendarTimeBasedEvent =
-        new CalendarRsvpEvent(
-            new PublicKey(generalMap.get("pubkey")), baseTags, generalMap.get("content"));
-    calendarTimeBasedEvent.setId(generalMap.get("id"));
-    calendarTimeBasedEvent.setCreatedAt(Long.valueOf(generalMap.get("created_at")));
-    calendarTimeBasedEvent.setSignature(Signature.fromString(generalMap.get("sig")));
-
-    return calendarTimeBasedEvent;
   }
 }