This commit reworks the cache data structures and operations to
significantly cut down on unnecessary allocations and improve overall
cache management logic.
Key changes include:
- Replacing event-specific CacheEntry types with a generic CacheEntry<T>
that stores values and timestamps.
- Removing the old Arc references in HashMap entries, reducing
reference-counted pointer overhead.
- Providing helper methods (new(), maybe(), empty(), value()) on
CacheEntry for more ergonomic and explicit value handling.
- Simplifying the retrieval functions (get_mute_list, get_relay_list,
get_contact_list) by using a shared helper (get_cache_entry) that
checks for expiration and removes stale entries automatically.
- Streamlining add_event and related cache insertion methods to insert
the correct CacheEntry variant depending on the event kind.
- Removing unnecessary methods (e.g., references_pubkey) and simplifying
extensions in nostr_event_extensions.rs.
- Enhancing code clarity by separating expiration logic from retrieval
and insertion, making the cache easier to maintain, debug, and extend.
These improvements should reduce runtime memory overhead and increase
code clarity, while maintaining the existing external behavior of the
cache. Future changes will be easier to implement, as the new generic
CacheEntry abstraction and simplified code paths provide a more
maintainable foundation.
Signed-off-by: William Casarin <jb55@jb55.com>
This commit improves the robustness of mute list handling:
1. It listens to new mute lists from the relay interface, and saves them whenever there is a new one
2. It uses the user's own relay lists to fetch events (such as mute lists), helping to ensure we get their mute lists even when they are not stored in the Damus relay
3. It saves events it sees when fetching them from the network, if applicable
Changelog-Changed: Improved robustness of mute handling
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Testing
-------
Device: iPhone 15 simulator
iOS: 17.5
Damus: 1.10 (8) 3902fe7b30f38ec104c13087948799e38e26fa91 (Local build)
notepush: This commit
Setup:
1. Open app in two separate simulator devices under the same nostr account
2. On both, setup the environment to be local, pointing to the same local notepush
Steps:
1. Go to notification settings and try to set notification mode to "push" on both devices
2. Ensure both can be set to push without displaying an error
3. Ensure preferences can be changed without displaying an error
4. When changing one setting, on both devices go back and forth on the
notification setting screen and ensure both are independent
5. Send some notifications to this account. Ensure both get the
notification
6. Disable DM notifications on one device and send a DM. Ensure only one
device gets the notification
7. Try step 6 again, but with likes (and disabling it on the other device)
Results: PASS
- Can register with both devices
- Both devices get new push notifications
- Settings are independent and get respected on each device.
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Closes: https://github.com/damus-io/damus/issues/2434
There was an issue where an empty cache entry would get interpreted as a
"no cache entry found" situation and cause notepush to always fetch a
new mutelist
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit fixes an issue where having one invalid device token
registered can cause other device tokens to not receive push
notifications.
The issue was fixed by improving error handling around APNS requests
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Closes: https://github.com/damus-io/damus/issues/2408
This commit drastically improves the performance of notification manager
by changing the mutex architecture to be only around the cache, instead
of the entire nostr_network_helper.
Furthermore, the lock is acquired twice when getting events that may be
cached (or need caching), to avoid having the cache locked across Nostr fetch requests,
which can take up to 10 seconds each in the worst case scenario.
Testing
--------
Quickly smoke tested sending some events to ensure push notifications
are still working overall
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit adds a simple in-memory Nostr Event cache, to reduce the
amount of bandwidth used as well as to improve performance.
Testing
-------
Setup:
- Two iPhone simulators running Damus and on different accounts
- Damus version: 774da239b92ed630fbf91fce42d9e233661c0d7f
- Notepush: This commit
- Push notifications turned on, setup to connect to localhost, and configured to receive DM notifications
- Run Notepush with `RUST_LOG=DEBUG` env variable for debug logging
Steps:
1. Send a DM from one account to another.
- Push notification should arrive with a few seconds delay
- Push notification logs should mention that the event was cached
2. Send a DM again.
- Push notification should arrive immediately
3. Wait for more than a minute
4. Send a DM again.
- Push notification should take a few seconds again
- Push notification logs should mention that the cache item expired and was deleted
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Closes: https://github.com/damus-io/notepush/issues/3
This commit refactors nostr_network_helper code without substantial business logic changes.
It improves the code by separating concerns, making it more concise, and less repetitive
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Testing
-------
PASS
Devices: Mix of iPhone simulators and real devices
notepush: This commit
Damus: 4ea6c360e6e33747cb09ecf085049948ec1dadd1 (WIP change from GH issue #2360)
Setup:
- Account A with push notifications enabled, DM notifications enabled,
and "only notifications from following enabled"
- Account A follows B but not C
Steps:
1. Send DM to A from B. Push notification appears
2. Send DM to A from C. Push notification does not appear
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Closes: https://github.com/damus-io/damus/issues/2360
This commit implements basic push notification preferences as well as
the interface to change them.
Furthermore, the API interface was reworked to follow better REST API
conventions.
Testing
--------
PASS
Device: iPhone 15 simulators
iOS: 17.5
Damus: 4ea6c360e6e33747cb09ecf085049948ec1dadd1 (A commit from GH issue #2360)
notepush: This commit
Steps:
1. Disable all types of notifications, except for DMs.
2. Send a like to this user's post. Push notification should not appear. PASS
3. Send a DM to this user's post. Push notification should appear. PASS
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Previously, the nostr event data was being transformed into
serde::Value, which is incompatible with the current notification
extension implementation. This commit fixes that by serializing it all
into a single JSON string
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit should drastically improve performance of the relay.
It reduces contention by removing the mutex on NotificationManager and
replacing it with several smaller mutexes for each shared resource, so
that more operations can happen concurrently.
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
If a relay does not have a user's mutelist, a function in our pipeline
would wait indefinitely, causing all other requests to be locked as
well.
This commit adds a timeout to avoid this issue
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Previously, the APNS client would be reinitialized in every send.
This commit makes it so that the client is initialized with the rest of
Notification manager, to avoid performance and token management issues.
This commit brings a compilable, runnable relay draft, with logging
setup, basic README instructions, Mutex protection around shared
resources, implemented with code safety in mind
Notes:
- This is not fully tested
- The mutex design is not the most efficient, and could cause some contention on high traffic
- The REST API is not yet integrated
