Merge pull request #14 from blackcoffeexbt/main

Added support for callback functions for any REQ kind. Updated examples. Other performance improvements
lnbits · Aug 3, 2023 · b6b1623 · b6b1623
2 parents 7b6e5ac + 21432be
commit b6b1623
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 84 deletions.
diff --git a/examples/LilyGoTDisplay/LilyGoTDisplay.ino b/examples/LilyGoTDisplay/LilyGoTDisplay.ino
@@ -4,6 +4,7 @@
 #include <NostrEvent.h>
 #include <NostrRelayManager.h>
 #include <TFT_eSPI.h>
+#include <vector>
 
 const char* ssid     = "<SSID>"; // wifi SSID here
 const char* password = "<PASSWORD>"; // wifi password here
@@ -94,32 +95,31 @@ void setup() {
 
   long timestamp = getUnixTimestamp();
 
-    const char *const relays[] = {
-      "relay.damus.io",
-      "nostr.mom",
-      "relay.nostr.bg"
+  std::vector<String> relays = {
+    "relay.damus.io",
+    "nostr.mom",
+    "relay.nostr.bg"
   };
-    int relayCount = sizeof(relays) / sizeof(relays[0]);
 
-    nostr.setLogging(false);
-    nostrRelayManager.setRelays(relays, relayCount);
-    nostrRelayManager.setMinRelaysAndTimeout(2,10000);
+  nostr.setLogging(false);
+  nostrRelayManager.setRelays(relays);
+  nostrRelayManager.setMinRelaysAndTimeout(2,10000);
 
-    // Set some event specific callbacks here
-    nostrRelayManager.setEventCallback("ok", okEvent);
-    nostrRelayManager.setEventCallback("nip01", nip01Event);
-    nostrRelayManager.setEventCallback("nip04", nip04Event);
+  // Set some event specific callbacks here
+  nostrRelayManager.setEventCallback("ok", okEvent);
+  nostrRelayManager.setEventCallback("nip01", nip01Event);
+  nostrRelayManager.setEventCallback("nip04", nip04Event);
 
-    nostrRelayManager.connect();
+  nostrRelayManager.connect();
 
-    String subscriptionString = "[\"REQ\", \"" + nostrRelayManager.getNewSubscriptionId() + "\", {\"authors\": [\"d0bfc94bd4324f7df2a7601c4177209828047c4d3904d64009a3c67fb5d5e7ca\"], \"kinds\": [1], \"limit\": 1}]";
-    nostrRelayManager.enqueueMessage(subscriptionString.c_str());
+  String subscriptionString = "[\"REQ\", \"" + nostrRelayManager.getNewSubscriptionId() + "\", {\"authors\": [\"d0bfc94bd4324f7df2a7601c4177209828047c4d3904d64009a3c67fb5d5e7ca\"], \"kinds\": [1], \"limit\": 1}]";
+  nostrRelayManager.enqueueMessage(subscriptionString.c_str());
 
-    subscriptionString = "[\"REQ\", \"" + nostrRelayManager.getNewSubscriptionId() + "\", {\"#p\": [\"d0bfc94bd4324f7df2a7601c4177209828047c4d3904d64009a3c67fb5d5e7ca\"], \"kinds\": [4], \"limit\": 1}]";
-    nostrRelayManager.enqueueMessage(subscriptionString.c_str());
+  subscriptionString = "[\"REQ\", \"" + nostrRelayManager.getNewSubscriptionId() + "\", {\"#p\": [\"d0bfc94bd4324f7df2a7601c4177209828047c4d3904d64009a3c67fb5d5e7ca\"], \"kinds\": [4], \"limit\": 1}]";
+  nostrRelayManager.enqueueMessage(subscriptionString.c_str());
 
-    subscriptionString = nostr.getEncryptedDm(nsecHex, npubHex, testRecipientPubKeyHex, timestamp, "Running NIP04!");
-    nostrRelayManager.enqueueMessage(subscriptionString.c_str());
+  subscriptionString = nostr.getEncryptedDm(nsecHex, npubHex, testRecipientPubKeyHex, timestamp, "Running NIP04!");
+  nostrRelayManager.enqueueMessage(subscriptionString.c_str());
 }
 
 void loop() {

diff --git a/examples/Simple/Simple.ino b/examples/Simple/Simple.ino
@@ -3,9 +3,10 @@
 #include "time.h"
 #include <NostrEvent.h>
 #include <NostrRelayManager.h>
+#include <vector>
 
-const char* ssid     = "wubwub"; // wifi SSID here
-const char* password = "blob19750405blob"; // wifi password here
+const char* ssid     = "<SSIDHERE>"; // wifi SSID here
+const char* password = "<PASSWORDHERE>"; // wifi password here
 
 NostrEvent nostr;
 NostrRelayManager nostrRelayManager;
@@ -73,31 +74,30 @@ void setup() {
 
   long timestamp = getUnixTimestamp();
 
-    const char *const relays[] = {
-      "relay.damus.io",
-      "nostr.mom",
-      "relay.nostr.bg"
+  std::vector<String> relays = {
+    "relay.damus.io",
+    "nostr.mom",
+    "relay.nostr.bg"
   };
-    int relayCount = sizeof(relays) / sizeof(relays[0]);
-
-    nostr.setLogging(false);
-    nostrRelayManager.setRelays(relays, relayCount);
-    nostrRelayManager.setMinRelaysAndTimeout(2,10000);
-
-    // Set some event specific callbacks here
-    nostrRelayManager.setEventCallback("ok", okEvent);
-    nostrRelayManager.setEventCallback("nip01", nip01Event);
-    nostrRelayManager.setEventCallback("nip04", nip04Event);
-
-    nostrRelayManager.connect();
-
-    // Send a basic note
-    String noteString = nostr.getNote(nsecHex, npubHex, timestamp, "Running NIP01!");
-    nostrRelayManager.enqueueMessage(noteString.c_str());
-
-    // send an encrypted dm to the defined npub
-    subscriptionString = nostr.getEncryptedDm(nsecHex, npubHex, testRecipientPubKeyHex, timestamp, "Running NIP04!");
-    nostrRelayManager.enqueueMessage(subscriptionString.c_str());
+
+  nostr.setLogging(false);
+  nostrRelayManager.setRelays(relays);
+  nostrRelayManager.setMinRelaysAndTimeout(2,10000);
+
+  // Set some event specific callbacks here
+  nostrRelayManager.setEventCallback("ok", okEvent);
+  nostrRelayManager.setEventCallback("nip01", nip01Event);
+  nostrRelayManager.setEventCallback("nip04", nip04Event);
+
+  nostrRelayManager.connect();
+
+  // Send a basic note
+  String noteString = nostr.getNote(nsecHex, npubHex, timestamp, "Running NIP01!");
+  nostrRelayManager.enqueueMessage(noteString.c_str());
+
+  // send an encrypted dm to the defined npub
+  String subscriptionString = nostr.getEncryptedDm(nsecHex, npubHex, testRecipientPubKeyHex, timestamp, "Running NIP04!");
+  nostrRelayManager.enqueueMessage(subscriptionString.c_str());
 }
 
 void loop() {

diff --git a/examples/SubscribeRequest/SubscribeRequest.ino b/examples/SubscribeRequest/SubscribeRequest.ino
@@ -7,6 +7,7 @@
 #include "time.h"
 #include <NostrEvent.h>
 #include <NostrRelayManager.h>
+#include <vector>
 
 const char* ssid     = "wubwub"; // wifi SSID here
 const char* password = "blob19750405blob"; // wifi password here
@@ -77,23 +78,22 @@ void setup() {
 
   long timestamp = getUnixTimestamp();
 
-    const char *const relays[] = {
-      "relay.damus.io",
-      "nostr.mom",
-      "relay.nostr.bg"
+  std::vector<String> relays = {
+    "relay.damus.io",
+    "nostr.mom",
+    "relay.nostr.bg"
   };
-    int relayCount = sizeof(relays) / sizeof(relays[0]);
-
-    nostr.setLogging(false);
-    nostrRelayManager.setRelays(relays, relayCount);
-    nostrRelayManager.setMinRelaysAndTimeout(2,10000);
-
-    // Set some event specific callbacks here
-    nostrRelayManager.setEventCallback("ok", okEvent);
-    nostrRelayManager.setEventCallback("nip01", nip01Event);
-    nostrRelayManager.setEventCallback("nip04", nip04Event);
-
-    nostrRelayManager.connect();
+
+  nostr.setLogging(false);
+  nostrRelayManager.setRelays(relays);
+  nostrRelayManager.setMinRelaysAndTimeout(2,10000);
+
+  // Set some event specific callbacks here
+  nostrRelayManager.setEventCallback("ok", okEvent);
+  nostrRelayManager.setEventCallback(1, nip01Event);
+  nostrRelayManager.setEventCallback(4, nip04Event);
+
+  nostrRelayManager.connect();
 
 NostrRequestOptions* eventRequestOptions = new NostrRequestOptions();
 

diff --git a/library.json b/library.json
@@ -21,7 +21,7 @@
         "type": "git",
         "url": "https://github.com/lnbits/arduino-nostr"
     },
-    "version": "0.1.12",
+    "version": "0.2.0",
     "dependencies": {
         "ArduinoJson": "^6.21.1",
         "uBitcoin": "^0.2.0",

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Nostr
-version=0.1.12
+version=0.2.0
 author=bc@omg.lol
 maintainer=BlackCoffee <bc@omg.lol>
 sentence=Nostr for Arduino.