nostr/strfry
1
0
Fork 0
mirror of https://github.com/hoytech/strfry.git synced 2025-06-16 08:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove feature: negentropy filters stored in events

Browse Source
This commit is contained in:
Doug Hoyte
2024-08-31 00:56:58 -04:00
parent 9a7128e102
commit a240f7adf9
2 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/negentropy.md
View File

@ -27,13 +27,13 @@ We're going to call the two sides engaged in the sync the client and the relay (
[
"NEG-OPEN",
<subscription ID string>,
<nostr filter or event ID>,
<nostr filter>,
<initialMessage, lowercase hex-encoded>
]
```
* The subscription ID is used by each side to identify which query a message refers to. It only needs to be long enough to distinguish it from any other concurrent NEG requests on this websocket connection (an integer that increments once per `NEG-OPEN` is fine). If a `NEG-OPEN` is issued for a currently open subscription ID, the existing subscription is first closed.
* The nostr filter is as described in [NIP-01](https://github.com/nostr-protocol/nips/blob/master/01.md), or is an event ID whose `content` contains the JSON-encoded filter/array of filters.
* The nostr filter is as described in [NIP-01](https://github.com/nostr-protocol/nips/blob/master/01.md).
* `initialMessage` is the string returned by `initiate()`, hex-encoded.
### Error message (relay to client):
@ -55,10 +55,6 @@ Current reason codes are:
* The maximum number of records that can be processed can optionally be returned as the 4th element in the response
* `CLOSED`
* Because the `NEG-OPEN` queries are stateful, relays may choose to time-out inactive queries to recover memory resources
* `FILTER_NOT_FOUND`
* If an event ID is used as the filter, this error will be returned if the relay does not have this event. The client should retry with the full filter, or upload the event to the relay.
* `FILTER_INVALID`
* The event's `content` was not valid JSON, or the filter was invalid for some other reason.
After a `NEG-ERR` is issued, the subscription is considered to be closed.

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

@ -137,35 +137,7 @@ void RelayServer::ingesterProcessNegentropy(lmdb::txn &txn, Decompressor &decomp
NostrFilterGroup filter;
auto maxFilterLimit = cfg().relay__negentropy__maxSyncEvents + 1;
if (arr.at(2).is_string()) {
auto ev = lookupEventById(txn, from_hex(arr.at(2).get_string()));
if (!ev) {
sendToConn(connId, tao::json::to_string(tao::json::value::array({
"NEG-ERR",
arr[1].get_string(),
"FILTER_NOT_FOUND"
})));
return;
}
tao::json::value json = tao::json::from_string(getEventJson(txn, decomp, ev->primaryKeyId));
try {
filter = std::move(NostrFilterGroup::unwrapped(tao::json::from_string(json.at("content").get_string()), maxFilterLimit));
} catch (std::exception &e) {
sendToConn(connId, tao::json::to_string(tao::json::value::array({
"NEG-ERR",
arr[1].get_string(),
"FILTER_INVALID"
})));
return;
}
} else {
filter = std::move(NostrFilterGroup::unwrapped(arr.at(2), maxFilterLimit));
}
filter = std::move(NostrFilterGroup::unwrapped(arr.at(2), maxFilterLimit));
Subscription sub(connId, arr[1].get_string(), std::move(filter));
std::string negPayload = from_hex(arr.at(3).get_string());