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

convert relays urls to sets, regex for wss:// or ws://

Browse Source
This commit is contained in:
radixrat 2022-12-20 15:59:15 -05:00
parent e93396f636
commit e36aa31608
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/nostr_console.dart
View File

@ -120,19 +120,15 @@ Future<void> main(List<String> arguments) async {
// handle relay related argument
if( argResults[relayArg] != null) {
List<String> userRelayList = argResults[relayArg].split(",");
List<String> parsedRelays = [];
for (var i = 0; i < userRelayList.length; i++) {
if( userRelayList[i].startsWith("wss://")) {
if( !parsedRelays.contains(userRelayList[i])) {
parsedRelays.add(userRelayList[i]);
} else {
print("The given relay ${userRelayList[i]} is already present in the default relays for the app, which are $parsedRelays");
}
Set<String> userRelayList = Set.from(argResults[relayArg].split(","));
Set<String> parsedRelays = {};
userRelayList.forEach((relay) {
if(relay.startsWith(RegExp(r'^ws[a-z]?:\/\/'))) {
parsedRelays.add(relay);
} else {
print("The provided relay entry: ${userRelayList[i]} does not start with wss://, omitting");
print("The provided relay entry: $relay does not start with ws:// or wss://, omitting");
}
}
});
// verify that there is at least one valid relay they provided, otherwise keep defaults
if (parsedRelays.length > 0) {

26
lib/relays.dart
View File

@ -217,7 +217,7 @@ class Relays {
Relays relays = Relays({}, {}, {});
void getContactFeed(List<String> relayUrls, Set<String> setContacts, int numEventsToGet, int sinceWhen) {
void getContactFeed(Set<String> relayUrls, Set<String> setContacts, int numEventsToGet, int sinceWhen) {
List<String> contacts = setContacts.toList();
//print("in getContactFeed: numEventsToGet = $numEventsToGet numContacts = ${setContacts.length} num contacts list = ${contacts.length}");
@ -244,25 +244,25 @@ void getContactFeed(List<String> relayUrls, Set<String> setContacts, int numEven
return;
}
void getUserEvents(List<String> serverUrls, String publicKey, int numUserEvents, int sinceWhen) {
void getUserEvents(Set<String> serverUrls, String publicKey, int numUserEvents, int sinceWhen) {
serverUrls.forEach((serverUrl) {
relays.getUserEvents(serverUrl, publicKey, numUserEvents, sinceWhen);
});
}
void getMentionEvents(List<String> serverUrls, Set<String> ids, int numUserEvents, int sinceWhen, String tagToGet) {
void getMentionEvents(Set<String> serverUrls, Set<String> ids, int numUserEvents, int sinceWhen, String tagToGet) {
serverUrls.forEach((serverUrl) {
relays.getMentionEvents(serverUrl, ids, numUserEvents, sinceWhen, tagToGet);
});
}
getKindEvents(List<int> kind, List<String> serverUrls, int limit, int sinceWhen) {
getKindEvents(List<int> kind, Set<String> serverUrls, int limit, int sinceWhen) {
serverUrls.forEach((serverUrl) {
relays.getKindEvents(kind, serverUrl, limit, sinceWhen);
});
}
void getMultiUserEvents(List<String> serverUrls, List<String> publicKeys, int numUserEvents, int sinceWhen) {
void getMultiUserEvents(Set<String> serverUrls, List<String> publicKeys, int numUserEvents, int sinceWhen) {
if( gDebug > 0) print("Sending multi user request for ${publicKeys.length} users");
for(var serverUrl in serverUrls) {
@ -279,7 +279,7 @@ void getMultiUserEvents(List<String> serverUrls, List<String> publicKeys, int nu
}
// send request for specific events whose id's are passed as list eventIds
void sendEventsRequest(List<String> serverUrls, Set<String> eventIds) {
void sendEventsRequest(Set<String> serverUrls, Set<String> eventIds) {
if( eventIds.length == 0)
return;
@ -289,15 +289,15 @@ void sendEventsRequest(List<String> serverUrls, Set<String> eventIds) {
if( gDebug > 0) log.info("sending $getEventRequest");
//print("send event req: $getEventRequest\n");
for(int i = 0; i < serverUrls.length; i++) {
relays.sendRequest(serverUrls[i], getEventRequest);
}
serverUrls.forEach((url) {
relays.sendRequest(url, getEventRequest);
});
}
void sendRequest(List<String> serverUrls, request) {
for(int i = 0; i < serverUrls.length; i++) {
relays.sendRequest(serverUrls[i], request);
}
void sendRequest(Set<String> serverUrls, request) {
serverUrls.forEach((url) {
relays.sendRequest(url, request);
});
}
Set<Event> getRecievedEvents() {

9
lib/settings.dart
View File

@ -50,16 +50,15 @@ int numFilePosts = 0, numUserPosts = 0, numFeedPosts = 0, numOtherPosts = 0;
const String relayNostrInfo = 'wss://relay.nostr.info';
String defaultServerUrl = "wss://relay.damus.io";
List<String> gListRelayUrls1 = [ defaultServerUrl,
Set<String> gListRelayUrls1 = { defaultServerUrl,
relayNostrInfo,
"wss://nostr-relay.wlvs.space"
];
};
List<String> gListRelayUrls2 = [
Set<String> gListRelayUrls2 = {
"wss://nostr.oxtr.dev",
"wss://nostr.ono.re"
];
};
// well known disposable test private key
const String gDefaultPublicKey = "";