0.6

.gitignore

@@ -90,10 +90,6 @@ nbdist/
 
 ### NetBeans specific ###
 nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
 nbactions.xml
 nb-configuration.xml
 

README.md

@@ -3,4 +3,45 @@
 
 Introducing the nostr-java library, a solution written in java for generating, signing, and publishing nostr events to relays.
 
-For detailed instructions on how to utilise the library, please refer to the [nostr-client](https://github.com/tcheeric/nostr-client/) repository.
+## Requirements
+- Maven
+- Java 19+
+
+## Usage
+To use the library in your project, add the following dependency to your pom.xml file:
+```xml
+<dependency>
+    <groupId>com.github.tcheeric.nostr-java</groupId>
+    <artifactId>nostr-java-api</artifactId>
+    <version>${nostr.java.version}</version>
+</dependency>
+```
+
+I recommend having a look at the [nostr-example](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-examples) module and the [nostr-client](https://github.com/tcheeric/nostr-client/) project for a simple example on how to use the library.
+
+## Supported NIPs
+The following NIPs are supported by the API out-of-the-box:
+- [NIP-1](https://github.com/nostr-protocol/nips/blob/master/01.md)
+- [NIP-2](https://github.com/nostr-protocol/nips/blob/master/02.md)
+- [NIP-3](https://github.com/nostr-protocol/nips/blob/master/03.md)
+- [NIP-4](https://github.com/nostr-protocol/nips/blob/master/04.md)
+- [NIP-5](https://github.com/nostr-protocol/nips/blob/master/05.md)
+- [NIP-8](https://github.com/nostr-protocol/nips/blob/master/08.md)
+- [NIP-9](https://github.com/nostr-protocol/nips/blob/master/09.md)
+- [NIP-12](https://github.com/nostr-protocol/nips/blob/master/12.md)
+- [NIP-14](https://github.com/nostr-protocol/nips/blob/master/14.md)
+- [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md)
+- [NIP-20](https://github.com/nostr-protocol/nips/blob/master/20.md)
+- [NIP-23](https://github.com/nostr-protocol/nips/blob/master/23.md)
+- [NIP-25](https://github.com/nostr-protocol/nips/blob/master/25.md)
+- [NIP-28](https://github.com/nostr-protocol/nips/blob/master/28.md)
+- [NIP-30](https://github.com/nostr-protocol/nips/blob/master/30.md)
+- [NIP-32](https://github.com/nostr-protocol/nips/blob/master/32.md)
+- [NIP-40](https://github.com/nostr-protocol/nips/blob/master/40.md)
+- [NIP-42](https://github.com/nostr-protocol/nips/blob/master/42.md)
+- [NIP-44](https://github.com/nostr-protocol/nips/blob/master/44.md)
+- [NIP-46](https://github.com/nostr-protocol/nips/blob/master/46.md)
+- [NIP-57](https://github.com/nostr-protocol/nips/blob/master/57.md)
+
+## Dev Discussion Group:
+- Nostr Public Channel: nostr:nevent1qqszqdmxg26sehmnyrcu2ler8azz6wyj6fh0qg3ad5fnnm6xfqqvhzcppamhxue69uhkummnw3ezumt0d5pzpl7nwh45p66gvet2q28dhjpcyh6clux4cjsm5gh7waza9pzjnmgglv06ew

nostr-java-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>nostr-java</groupId>
         <artifactId>nostr-java</artifactId>
-        <version>0.3.1</version>
+        <version>0.6</version>
     </parent>
     <artifactId>nostr-java-api</artifactId>
     <packaging>jar</packaging>
@@ -26,17 +26,22 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>nostr-java-ws-handler-interface</artifactId>
+            <artifactId>nostr-java-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>nostr-java-client</artifactId>
+            <groupId>nostr-java</groupId>
+            <artifactId>nostr-java-encryption</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>nostr-java-ws-handler-command-provider</artifactId>
+            <groupId>nostr-java</groupId>
+            <artifactId>nostr-java-encryption-nip04</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>nostr-java</groupId>
+            <artifactId>nostr-java-encryption-nip44</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

nostr-java-api/src/main/java/module-info.java

@@ -1,19 +1,20 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/module-info.java to edit this template
- */
-
 module nostr.api {
     requires nostr.base;
     requires nostr.util;
     requires nostr.event;
     requires nostr.id;
     requires nostr.client;
+    requires nostr.context;
+    requires nostr.context.impl;
+    requires nostr.encryption;
+    requires nostr.encryption.nip04dm;
+    requires nostr.encryption.nip44dm;
 
     requires com.fasterxml.jackson.databind;
 
     requires lombok;
     requires java.logging;
+    requires nostr.crypto;
 
     exports nostr.api;
 }

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

@@ -0,0 +1,102 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package nostr.api;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.Setter;
+import nostr.api.factory.impl.GenericEventFactory;
+import nostr.base.PublicKey;
+import nostr.event.BaseTag;
+import nostr.event.impl.GenericEvent;
+import nostr.id.Identity;
+
+import java.util.Map;
+
+/**
+ * @author guilhermegps
+ */
+@Getter
+@NoArgsConstructor
+public abstract class EventNostr<T extends GenericEvent> extends Nostr {
+
+    @Setter
+    private T event;
+
+    private PublicKey recipient;
+
+    public EventNostr(@NonNull Identity sender) {
+        super(sender);
+    }
+
+    public EventNostr sign() {
+        super.sign(getSender(), event);
+
+        return this;
+    }
+
+    public T send() {
+        return this.send(getRelays());
+    }
+
+    public T send(Map<String, String> relays) {
+        super.send(this.event, relays);
+
+        return this.event;
+    }
+
+    public T signAndSend() {
+        return this.signAndSend(getRelays());
+    }
+
+    public T signAndSend(Map<String, String> relays) {
+        return (T) sign().send(relays);
+    }
+
+    public EventNostr setSender(@NonNull Identity sender) {
+        super.setSender(sender);
+
+        return this;
+    }
+
+    public EventNostr setRelays(@NonNull Map<String, String> relays) {
+        super.setRelays(relays);
+
+        return this;
+    }
+
+    public EventNostr setRecipient(@NonNull PublicKey recipient) {
+        this.recipient = recipient;
+
+        return this;
+    }
+
+    public EventNostr addTag(@NonNull BaseTag tag) {
+        getEvent().addTag(tag);
+        return this;
+    }
+
+    @NoArgsConstructor
+    public static class GenericEventNostr<T extends GenericEvent> extends EventNostr<T> {
+
+        public GenericEventNostr(@NonNull Identity sender) {
+            super.setSender(sender);
+        }
+
+        /**
+         * @param content
+         * @return
+         */
+        public GenericEventNostr createGenericEvent(@NonNull Integer kind, @NonNull String content) {
+            var factory = new GenericEventFactory(getSender(), kind, content);
+            var event = factory.create();
+            setEvent((T) event);
+
+            return this;
+        }
+
+    }
+}