highperfocused/nostr_console
1
0
Fork 0
mirror of https://github.com/vishalxl/nostr_console.git synced 2025-04-24 23:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

did not delete old entries, rather just replaced the relay with new variable

Browse Source 
to avoid crashes that i was seeing. with this change, no crash seen in a while...
This commit is contained in:
Vishal 2022-12-24 21:45:49 +05:30
parent b794840c24
commit c37783acee
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/nostr_console.dart
View File

@ -404,6 +404,7 @@ Future<void> main(List<String> arguments) async {
if( gDebug > 0) log.info("Received ptag events events.");
resetRelays();
relays = Relays({}, {}, {}); // reset relay value
String req = '["REQ","cn",{"limit":40000,"kinds":[0,1,3,4,5,6,7,40,41,42,104,140,141,142],"since":${getTimeSecondsAgo(2*3600).toString()}}]';
sendRequest(gListRelayUrls1, req);

36
lib/relays.dart
View File

@ -8,7 +8,7 @@ import 'package:web_socket_channel/io.dart';
class Relay {
String url;
IOWebSocketChannel socket;
Set<String> users; // is used so that duplicate requests aren't sent for same user for this same relay
Set<String> users; // is used so that duplicate requests aren't sent for same user for this same relay; unused for now
int numReceived;
int numRequestsSent;
Relay(this.url, this.socket, this.users, this.numReceived, this.numRequestsSent);
@ -36,7 +36,7 @@ class Relays {
relay.close();
});
relays.clear();
//relays.clear();
}
void printInfo() {
@ -148,27 +148,27 @@ class Relays {
/*
* Send the given string to the given relay. Is used to send both requests, and to send evnets.
*/
void sendRequest(String relay, String request) {
if(relay == "" ) {
void sendRequest(String relayUrl, String request) {
if(relayUrl == "" ) {
if( gDebug != 0) print ("Invalid or empty relay given");
return;
}
if( gDebug > 0) print ("\nIn relay.sendRequest for relay $relay");
if( gDebug > 0) print ("\nIn relay.sendRequest for relay $relayUrl");
IOWebSocketChannel? fws;
if(relays.containsKey(relay)) {
if(relays.containsKey(relayUrl)) {
fws = relays[relay]?.socket;
relays[relay]?.numRequestsSent++;
fws = relays[relayUrl]?.socket;
relays[relayUrl]?.numRequestsSent++;
}
else {
if(gDebug !=0) print('connecting to $relay');
if(gDebug !=0) print('connecting to $relayUrl');
try {
IOWebSocketChannel fws2 = IOWebSocketChannel.connect(relay);
Relay newRelay = Relay(relay, fws2, {}, 0, 1);
relays[relay] = newRelay;
IOWebSocketChannel fws2 = IOWebSocketChannel.connect(relayUrl);
Relay newRelay = Relay(relayUrl, fws2, {}, 0, 1);
relays[relayUrl] = newRelay;
fws = fws2;
fws2.stream.listen(
(d) {
@ -185,7 +185,7 @@ class Relays {
return;
}
e = Event.fromJson(d, relay);
e = Event.fromJson(d, relayUrl);
if( rEvents.add(e) ) {
uniqueIdsRecieved.add(id);
@ -197,24 +197,24 @@ class Relays {
//dynamic json = jsonDecode(d);
return;
}
},
onError: (err) { printWarning("\nWarning: Error in creating connection to $relay. Kindly check your internet connection. Or maybe only this relay is down."); },
},
onError: (err) { printWarning("Warning: Error in creating connection to $relayUrl. Kindly check your internet connection. Or maybe only this relay is down."); },
onDone: () { if( gDebug > 0) print('Info: In onDone'); }
);
} on WebSocketException {
print('WebSocketException exception for relay $relay');
print('WebSocketException exception for relay $relayUrl');
return;
} on Exception catch(ex) {
printWarning("Invalid event\n");
}
catch(err) {
if( gDebug >= 0) printWarning('exception generic $err for relay $relay\n');
if( gDebug >= 0) printWarning('exception generic $err for relay $relayUrl\n');
return;
}
}
if(gDebug > 0) log.info('Sending request: \n$request\n to $relay\n\n');
if(gDebug > 0) log.info('Sending request: \n$request\n to $relayUrl\n\n');
fws?.sink.add(request);
}