Java 21 et merge

nostr-java-api/pom.xml

@@ -53,4 +53,4 @@
     <properties>
         <exec.mainClass>nostr.java.api.NostrJavaApi</exec.mainClass>
     </properties>
-</project>
+</project>

nostr-java-api/src/main/java/nostr/api/EventNostr.java

@@ -12,16 +12,20 @@
 import nostr.base.PublicKey;
 import nostr.event.BaseTag;
 import nostr.event.impl.GenericEvent;
+import nostr.event.json.codec.BaseMessageDecoder;
 import nostr.id.Identity;
 
+import java.util.List;
 import java.util.Map;
 
+import nostr.event.BaseMessage;
+
 /**
  * @author guilhermegps
  */
 @Getter
 @NoArgsConstructor
-public abstract class EventNostr<T extends GenericEvent> extends Nostr {
+public abstract class EventNostr<T extends GenericEvent> extends NostrSpringWebSocketClient {
 
     @Setter
     private T event;
@@ -38,22 +42,28 @@ public EventNostr sign() {
         return this;
     }
 
-    public T send() {
+    public <U extends BaseMessage> U send() {
         return this.send(getRelays());
     }
 
-    public T send(Map<String, String> relays) {
-        super.send(this.event, relays);
+    @SuppressWarnings("unchecked")
+    public <U extends BaseMessage> U send(Map<String, String> relays) {
+        List<String> messages = super.send(this.event, relays);
+        BaseMessageDecoder<U> decoder = new BaseMessageDecoder<U>();
 
-        return this.event;
+        return messages.stream()
+                .map(msg -> (U) decoder.decode(msg))
+                .filter(msg -> msg != null)
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException("No message received"));
     }
 
-    public T signAndSend() {
+    public <U extends BaseMessage> U signAndSend() {
         return this.signAndSend(getRelays());
     }
 
-    public T signAndSend(Map<String, String> relays) {
-        return (T) sign().send(relays);
+    public <U extends BaseMessage> U signAndSend(Map<String, String> relays) {
+        return (U) sign().send(relays);
     }
 
     public EventNostr setSender(@NonNull Identity sender) {

nostr-java-api/src/main/java/nostr/api/NIP12.java

@@ -12,7 +12,7 @@
 import nostr.event.tag.HashtagTag;
 import nostr.event.tag.ReferenceTag;
 
-import java.net.URL;
+import java.net.URI;
 
 /**
  *
@@ -27,20 +27,20 @@ public class NIP12 {
     public static HashtagTag createHashtagTag(@NonNull String hashtag) {
         return new HashtagTagFactory(hashtag).create();
     }
-    
+
     /**
      * Create an URL tag
      * @param url the reference
      */
-    public static ReferenceTag createReferenceTag(@NonNull URL url) {
+    public static ReferenceTag createReferenceTag(@NonNull URI url) {
         return new ReferenceTagFactory(url).create();
     }
-    
+
     /**
      * Create a Geo tag 
      * @param location the geohash
      */
     public static GeohashTag createGeohashTag(@NonNull String location) {
         return new GeohashTagFactory(location).create();
-    }    
+    }
 }

nostr-java-api/src/main/java/nostr/api/NIP52.java

@@ -0,0 +1,21 @@
+package nostr.api;
+
+import lombok.NonNull;
+import nostr.api.factory.impl.NIP52Impl.CalendarTimeBasedEventFactory;
+import nostr.event.BaseTag;
+import nostr.event.NIP52Event;
+import nostr.event.impl.CalendarContent;
+import nostr.id.Identity;
+
+import java.util.List;
+
+public class NIP52<T extends NIP52Event> extends EventNostr<T> {
+  public NIP52(@NonNull Identity sender) {
+    setSender(sender);
+  }
+
+  public NIP52<T> createCalendarTimeBasedEvent(@NonNull List<BaseTag> baseTags, @NonNull String content, @NonNull CalendarContent calendarContent) {
+    setEvent((T) new CalendarTimeBasedEventFactory(getSender(), baseTags, content, calendarContent).create());
+    return this;
+  }
+}

nostr-java-api/src/main/java/nostr/api/Nostr.java

@@ -45,7 +45,7 @@
  * @author eric
  */
 @NoArgsConstructor
-public class Nostr {
+public class Nostr implements NostrIF {
 
     private static Nostr INSTANCE;
 
@@ -56,30 +56,33 @@ public class Nostr {
     @Getter
     private Map<String, String> relays;
 
-    public static Nostr getInstance() {
+    public static NostrIF getInstance() {
         return (INSTANCE == null) ? new Nostr() : INSTANCE;
     }
 
-    public static Nostr getInstance(@NonNull Identity sender) {
+    public static NostrIF getInstance(@NonNull Identity sender) {
         return (INSTANCE == null) ? new Nostr(sender) : INSTANCE;
     }
 
     public Nostr(@NonNull Identity sender) {
         this.sender = sender;
     }
 
-    public Nostr setSender(@NonNull Identity sender) {
+    @Override
+    public NostrIF setSender(@NonNull Identity sender) {
         this.sender = sender;
 
         return this;
     }
 
-    public Nostr setRelays(@NonNull Map<String, String> relays) {
+    @Override
+    public NostrIF setRelays(@NonNull Map<String, String> relays) {
         this.relays = relays;
 
         return this;
     }
 
+    @Override
     public void close() {
         if (client == null) {
             throw new IllegalStateException("Client is not initialized");
@@ -91,63 +94,73 @@ public void close() {
         }
     }
 
-    public void send(@NonNull IEvent event) {
-        send(event, getRelays());
+    @Override
+    public List<String> send(@NonNull IEvent event) {
+        return send(event, getRelays());
     }
 
-    public void send(@NonNull IEvent event, Map<String, String> relays) {
+    @Override
+    public List<String> send(@NonNull IEvent event, Map<String, String> relays) {
         var context = new DefaultRequestContext();
         context.setPrivateKey(getSender().getPrivateKey().getRawData());
         context.setRelays(relays);
 
-        send(new EventMessage(event), context);
+        return send(new EventMessage(event), context);
     }
 
 
-    public void send(@NonNull Filters filters, @NonNull String subscriptionId) {
-        send(filters, subscriptionId, getRelays());
+    @Override
+    public List<String> send(@NonNull Filters filters, @NonNull String subscriptionId) {
+        return send(filters, subscriptionId, getRelays());
     }
 
-    public void send(@NonNull Filters filters, @NonNull String subscriptionId, Map<String, String> relays) {
+    @Override
+    public List<String> send(@NonNull Filters filters, @NonNull String subscriptionId, Map<String, String> relays) {
         List<Filters> filtersList = new ArrayList<>();
         filtersList.add(filters);
 
-        send(filtersList, subscriptionId, relays);
+        return send(filtersList, subscriptionId, relays);
     }
 
-    public void send(@NonNull List<Filters> filtersList, @NonNull String subscriptionId) {
-        send(filtersList, subscriptionId, getRelays());
+    @Override
+    public List<String> send(@NonNull List<Filters> filtersList, @NonNull String subscriptionId) {
+        return send(filtersList, subscriptionId, getRelays());
     }
 
-    public void send(@NonNull List<Filters> filtersList, @NonNull String subscriptionId, Map<String, String> relays) {
+    @Override
+    public List<String> send(@NonNull List<Filters> filtersList, @NonNull String subscriptionId, Map<String, String> relays) {
 
         var context = new DefaultRequestContext();
         context.setRelays(relays);
         context.setPrivateKey(getSender().getPrivateKey().getRawData());
         var message = new ReqMessage(subscriptionId, filtersList);
 
-        send(message, context);
+        return send(message, context);
     }
 
-    public void send(@NonNull BaseMessage message, @NonNull RequestContext context) {
+    @Override
+    public List<String> send(@NonNull BaseMessage message, @NonNull RequestContext context) {
         if (context instanceof DefaultRequestContext) {
             try {
                 Client.getInstance().connect(context).send(message);
             } catch (TimeoutException e) {
                 throw new RuntimeException(e);
             }
         }
+        return List.of();
     }
 
     /**
      * @param signable
      */
-    public Nostr sign(@NonNull Identity identity, @NonNull ISignable signable) {
+    @Override
+    public NostrIF sign(@NonNull Identity identity, @NonNull ISignable signable) {
         identity.sign(signable);
 
         return this;
     }
 
+    @Override
     public boolean verify(@NonNull GenericEvent event) {
         if (!event.isSigned()) {
             throw new IllegalStateException("The event is not signed");

nostr-java-api/src/main/java/nostr/api/NostrIF.java

@@ -0,0 +1,31 @@
+package nostr.api;
+
+import lombok.NonNull;
+import nostr.base.IEvent;
+import nostr.base.ISignable;
+import nostr.context.RequestContext;
+import nostr.event.BaseMessage;
+import nostr.event.impl.Filters;
+import nostr.event.impl.GenericEvent;
+import nostr.id.Identity;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public interface NostrIF {
+  NostrIF setSender(@NonNull Identity sender);
+  NostrIF setRelays(@NonNull Map<String, String> relays);
+  List<String> send(@NonNull IEvent event);
+  List<String> send(@NonNull IEvent event, Map<String, String> relays);
+  List<String> send(@NonNull Filters filters, @NonNull String subscriptionId);
+  List<String> send(@NonNull Filters filters, @NonNull String subscriptionId, Map<String, String> relays);
+  List<String> send(@NonNull List<Filters> filtersList, @NonNull String subscriptionId);
+  List<String> send(@NonNull List<Filters> filtersList, @NonNull String subscriptionId, Map<String, String> relays);
+  List<String> send(@NonNull BaseMessage message, @NonNull RequestContext context);
+  NostrIF sign(@NonNull Identity identity, @NonNull ISignable signable);
+  boolean verify(@NonNull GenericEvent event);
+  Identity getSender();
+  Map<String, String> getRelays();
+  void close() throws IOException;
+}