Skip to content

Commit 74c2e87

Browse files
riccardoblriccardobl
committed
Expose relays and add connection status listener
1 parent e31a8f4 commit 74c2e87

6 files changed

Lines changed: 78 additions & 15 deletions

File tree

‎examples/ESP32TestNip01Filter/ESP32TestNip01Filter.cpp‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void setup() {
4747
testNIP01Filter();
4848
}
4949

50-
void loop() {
50+
void loop() {
5151
for (nostr::NostrPool *pool : pools) {
5252
pool->loop();
5353
}
@@ -56,28 +56,28 @@ void loop() {
5656
nostr::Transport *transport;
5757

5858
void testNIP01Filter() {
59-
try{
59+
try {
6060
String relay = RELAY;
6161
transport = nostr::esp32::ESP32Platform::getTransport();
6262
nostr::NostrPool *pool = new nostr::NostrPool(transport);
6363
pools.push_back(pool);
6464
String subId = pool->subscribeMany(
6565
{relay},
6666
{{
67-
{"kinds", {"1"}},
68-
{"since", {"1626023056"}},
69-
{"until", {"1846947856"}},
67+
{"kinds", {"1"}},
68+
{"since", {"1626023056"}},
69+
{"until", {"1846947856"}},
7070
{"limit", {"10"}},
7171
// Filters defined in NIP01 are automatically converted to the correct type
72-
// however this library support non-NIP01 filters as well, but you might need to
72+
// however this library support non-NIP01 filters as well, but you might need to
7373
// specify their type manually, if unspecified the code assumes string[]:
7474
// eg. {"int newFilter", {"1"}}
7575
// eg. {"int[] newFilter2", {"1", "2"}}
7676
// eg. {"float newFilter3", {"1.1"}}
7777
// eg. {"float[] newFilter4", {"1.1", "2.2"}}
7878
// eg. {"string newFilter5", {"hello"}}
7979
}},
80-
[&](const String &subId, nostr::SignedNostrEvent *event) {
80+
[&](const String &subId, nostr::SignedNostrEvent *event) {
8181
JsonDocument doc;
8282
JsonArray arr = doc["data"].to<JsonArray>();
8383
event->toSendableEvent(arr);
@@ -86,6 +86,22 @@ void testNIP01Filter() {
8686
Serial.println("Event received: " + json);
8787
},
8888
[&](const String &subId, const String &reason) { Serial.println("Subscription closed: " + reason); }, [&](const String &subId) { Serial.println("Subscription EOSE: " + subId); });
89+
90+
std::vector<nostr::NostrRelay *> *relays = pool->getConnectedRelays();
91+
for (nostr::NostrRelay *relay : *relays) {
92+
Serial.println("Registering to connection events of: " + relay->getUrl());
93+
relay->getConnection()->addConnectionStatusListener([&](const nostr::ConnectionStatus &status) {
94+
String sstatus="UNKNOWN";
95+
if(status==nostr::ConnectionStatus::CONNECTED){
96+
sstatus="CONNECTED";
97+
}else if(status==nostr::ConnectionStatus::DISCONNECTED){
98+
sstatus="DISCONNECTED";
99+
}else if(status==nostr::ConnectionStatus::ERROR){
100+
sstatus = "ERROR";
101+
}
102+
Serial.println("Connection status changed: " + sstatus);
103+
});
104+
}
89105
} catch (const std::exception &e) {
90106
Serial.println("Error: " + String(e.what()));
91107
}

‎src/NostrPool.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,7 @@ std::vector<NostrString> NostrPool::getRelays() {
279279
}
280280
return urls;
281281
}
282+
283+
std::vector<NostrRelay *> *NostrPool::getConnectedRelays() {
284+
return &this->relays;
285+
}

‎src/NostrPool.h‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,15 @@ namespace nostr {
4848
*/
4949
void send(NostrString message);
5050
NostrRelay(Connection *conn, NostrString url) : conn(conn), url(url){};
51-
51+
Connection *getConnection() const { return conn; }
52+
NostrString getUrl() const{
53+
return url;
54+
}
5255
protected:
53-
std::vector<NostrString> messageQueue;
54-
Connection *conn;
55-
NostrString url;
56-
void processQueue();
56+
NostrString url;
57+
std::vector<NostrString> messageQueue;
58+
Connection *conn;
59+
void processQueue();
5760
};
5861

5962
/**
@@ -138,6 +141,7 @@ namespace nostr {
138141
/**
139142
* Get all relays that the pool is connected to
140143
* @return A list of relay URLs
144+
* @deprecated Use getConnectedRelays() instead
141145
*/
142146
std::vector<NostrString> getRelays();
143147

@@ -152,6 +156,13 @@ namespace nostr {
152156
*/
153157
void close();
154158

159+
160+
/**
161+
* Get all relays that the pool is connected to
162+
* @return A list of relays
163+
*/
164+
std::vector<NostrRelay *> *getConnectedRelays();
165+
155166
private:
156167
NostrNoticeCallback noticeCallback = nullptr;
157168
long long subs = 0;

‎src/Transport.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <functional>
66

77
namespace nostr {
8+
enum class ConnectionStatus { CONNECTED, DISCONNECTED, ERROR };
89
class Connection {
910
public:
1011
virtual void addMessageListener(std::function<void(NostrString)> listener);
@@ -13,17 +14,18 @@ class Connection {
1314
virtual ~Connection() = default;
1415
virtual void loop() = 0;
1516
virtual bool isReady() = 0;
17+
virtual void addConnectionStatusListener(std::function<void(ConnectionStatus status)> listener) {};
1618
};
1719
class Transport {
1820
public:
19-
virtual void getInvoiceFromLNAddr(NostrString addr, unsigned long long amountMSats, NostrString comment , std::function<void(NostrString)> callback) = 0;
21+
virtual void getInvoiceFromLNAddr(NostrString addr, unsigned long long amountMSats, NostrString comment, std::function<void(NostrString)> callback) = 0;
2022
virtual Connection *connect(NostrString url) = 0;
2123
virtual ~Transport() = default;
2224
Transport() = default;
2325
virtual void disconnect(Connection *conn) = 0;
2426
virtual bool isReady() = 0;
2527
virtual void close() = 0;
26-
virtual void loop(){};
28+
virtual void loop() {};
2729
};
28-
}
30+
} // namespace nostr
2931
#endif

‎src/esp32/ESP32Transport.cpp‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,23 @@ esp32::ESP32Connection::ESP32Connection(ESP32Transport *transport, NostrString u
138138
switch (type) {
139139
case WStype_DISCONNECTED:
140140
Utils::log("ESP32Connection disconnected.");
141+
for (auto &listener : connectionListeners) {
142+
try {
143+
listener(ConnectionStatus::DISCONNECTED);
144+
} catch (std::exception &e) {
145+
Utils::log(e.what());
146+
}
147+
}
141148
break;
142149
case WStype_CONNECTED:
143150
Utils::log("ESP32Connection connected.");
151+
for (auto &listener : connectionListeners) {
152+
try {
153+
listener(ConnectionStatus::CONNECTED);
154+
} catch (std::exception &e) {
155+
Utils::log(e.what());
156+
}
157+
}
144158
break;
145159
case WStype_TEXT: {
146160
NostrString message = NostrString_fromChars((char *)payload);
@@ -157,6 +171,13 @@ esp32::ESP32Connection::ESP32Connection(ESP32Transport *transport, NostrString u
157171
}
158172
case WStype_ERROR:
159173
Utils::log("ESP32Connection error.");
174+
for (auto &listener : connectionListeners) {
175+
try {
176+
listener(ConnectionStatus::ERROR);
177+
} catch (std::exception &e) {
178+
Utils::log(e.what());
179+
}
180+
}
160181
break;
161182
default:
162183
break;
@@ -200,4 +221,8 @@ esp32::ESP32Connection::~ESP32Connection() {
200221

201222
esp32::ESP32Transport::ESP32Transport() {}
202223

224+
void esp32::ESP32Connection::addConnectionStatusListener(std::function<void(ConnectionStatus status)> listener) {
225+
connectionListeners.push_back(listener);
226+
}
227+
203228
#endif

‎src/esp32/ESP32Transport.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ class ESP32Connection : public Connection {
2424
void loop() override;
2525
bool isReady() override;
2626
void addMessageListener(std::function<void(NostrString)> listener) override;
27+
void addConnectionStatusListener(std::function<void(ConnectionStatus status)> listener) override;
28+
WebSocketsClient* getWebsocket(){
29+
return &ws;
30+
}
2731
~ESP32Connection() override;
2832

2933
protected:
@@ -33,6 +37,7 @@ class ESP32Connection : public Connection {
3337
ESP32Transport *transport;
3438
WebSocketsClient ws;
3539
std::vector<std::function<void(NostrString)>> messageListeners;
40+
std::vector<std::function<void(ConnectionStatus status)>> connectionListeners;
3641
};
3742
class ESP32Transport : public Transport {
3843
public:

0 commit comments

Comments
 (0)