nostr/strfry
1
0
Fork 0
mirror of https://github.com/hoytech/strfry.git synced 2025-06-20 09:50:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

limit on events that can be processed by a sync

Browse Source
This commit is contained in:
Doug Hoyte
2023-07-20 17:45:00 -04:00
parent 78033bf03b
commit 0d21dc3255
6 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/apps/mesh/cmd_sync.cpp
View File

@ -149,6 +149,9 @@ void cmd_sync(const std::vector<std::string> &subArgs) {
} else if (msg.at(0) == "EOSE") {
inFlightDown = false;
writer.wait();
} else if (msg.at(0) == "NEG-ERR") {
LE << "Got NEG-ERR response from relay: " << msg;
::exit(1);
} else {
LW << "Unexpected message from relay: " << msg;
}

2
src/apps/relay/RelayIngester.cpp
View File

@ -121,7 +121,7 @@ void RelayServer::ingesterProcessNegentropy(lmdb::txn &txn, Decompressor &decomp
if (arr.get_array().size() < 5) throw herr("negentropy query missing elements");
NostrFilterGroup filter;
auto maxFilterLimit = MAX_U64;
auto maxFilterLimit = cfg().relay__negentropy__maxSyncEvents + 1;
if (arr.at(2).is_string()) {
auto ev = lookupEventById(txn, from_hex(arr.at(2).get_string()));

14
src/apps/relay/RelayNegentropy.cpp
View File

@ -80,6 +80,20 @@ void RelayServer::runNegentropy(ThreadPool<MsgNegentropy>::Thread &thr) {
LI << "[" << sub.connId << "] Negentropy query matched " << view->ne.items.size() << " events in "
<< (hoytech::curr_time_us() - view->startTime) << "us";
if (view->ne.items.size() > cfg().relay__negentropy__maxSyncEvents) {
LI << "[" << sub.connId << "] Negentropy query size exceeeded " << cfg().relay__negentropy__maxSyncEvents;
sendToConn(sub.connId, tao::json::to_string(tao::json::value::array({
"NEG-ERR",
sub.subId.str(),
"RESULTS_TOO_BIG",
cfg().relay__negentropy__maxSyncEvents
})));
views.removeView(sub.connId, sub.subId);
return;
}
view->ne.seal();
auto resp = view->ne.reconcile(view->initialMsg);

4
src/apps/relay/golpe.yaml
View File

@ -94,3 +94,7 @@ config:
desc: negentropy threads: Handle negentropy protocol messages
default: 2
noReload: true
- name: relay__negentropy__maxSyncEvents
desc: "Maximum records that sync will process before returning an error"
default: 1000000