feat(notificiations): initial changes to check notifications per each user

This commit is contained in:
eugene 2024-08-29 19:25:58 +03:00
parent b965623a02
commit de7a8a868a
6 changed files with 102 additions and 92 deletions

View File

@ -2,7 +2,8 @@ import { Event, Filter, Relay } from 'nostr-tools'
import { import {
settleAllFullfilfedPromises, settleAllFullfilfedPromises,
normalizeWebSocketURL, normalizeWebSocketURL,
timeout publishToRelay,
isPromiseFulfilled
} from '../utils' } from '../utils'
import { SIGIT_RELAY } from '../utils/const' import { SIGIT_RELAY } from '../utils/const'
@ -261,17 +262,17 @@ export class RelayController {
event: Event, event: Event,
relayUrls: string[] = [] relayUrls: string[] = []
): Promise<string[]> => { ): Promise<string[]> => {
if (!relayUrls.includes(SIGIT_RELAY)) {
/** /**
* NOTE: To avoid side-effects on external relayUrls array passed as argument * Ensure that the default Sigit Relay is included.
* re-assigned relayUrls with added sigit relay instead of just appending to same array * Copy the array instead of mutating it.
*/ */
relayUrls = [...relayUrls, SIGIT_RELAY] // Add app relay to relays array if not exists already const updatedRelayUrls = !relayUrls.includes(SIGIT_RELAY)
} ? [...relayUrls, SIGIT_RELAY]
: [...relayUrls]
// connect to all specified relays // connect to all specified relays
const relays = await settleAllFullfilfedPromises( const relays = await settleAllFullfilfedPromises(
relayUrls, updatedRelayUrls,
this.connectRelay this.connectRelay
) )
@ -280,26 +281,15 @@ export class RelayController {
throw new Error('No relay is connected to publish event!') throw new Error('No relay is connected to publish event!')
} }
const publishedOnRelays: string[] = [] // List to track which relays successfully published the event const settledPromises: PromiseSettledResult<string>[] =
await Promise.allSettled(
// Create a promise for publishing the event to each connected relay relays.map(async (relay) => publishToRelay(relay, event))
const publishPromises = relays.map(async (relay) => { )
try {
await Promise.race([
relay.publish(event), // Publish the event to the relay
timeout(20 * 1000) // Set a timeout to handle cases where publishing takes too long
])
publishedOnRelays.push(relay.url) // Add the relay URL to the list of successfully published relays
} catch (err) {
console.error(`Failed to publish event on relay: ${relay.url}`, err)
}
})
// Wait for all publish operations to complete (either fulfilled or rejected)
await Promise.allSettled(publishPromises)
// Return the list of relay URLs where the event was published // Return the list of relay URLs where the event was published
return publishedOnRelays return settledPromises
.filter(isPromiseFulfilled)
.map((res) => res.value) as string[]
} }
} }

View File

@ -46,7 +46,9 @@ import {
shorten, shorten,
signEventForMetaFile, signEventForMetaFile,
updateUsersAppData, updateUsersAppData,
uploadToFileStorage uploadToFileStorage,
isPromiseFulfilled,
isPromiseRejected
} from '../../utils' } from '../../utils'
import { Container } from '../../components/Container' import { Container } from '../../components/Container'
import styles from './style.module.scss' import styles from './style.module.scss'
@ -720,7 +722,7 @@ export const CreatePage = () => {
: viewers.map((viewer) => viewer.pubkey) : viewers.map((viewer) => viewer.pubkey)
).filter((receiver) => receiver !== usersPubkey) ).filter((receiver) => receiver !== usersPubkey)
return receivers.map((receiver) => sendNotification(receiver, meta)) return receivers.map(async (receiver) => sendNotification(receiver, meta))
} }
const handleCreate = async () => { const handleCreate = async () => {
@ -784,15 +786,25 @@ export const CreatePage = () => {
if (!event) return if (!event) return
setLoadingSpinnerDesc('Sending notifications to counterparties') setLoadingSpinnerDesc('Sending notifications to counterparties')
const promises = sendNotifications(meta) const notifications = await Promise.allSettled(sendNotifications(meta))
if (notifications.every(isPromiseFulfilled)) {
toast.success('finished processing notifications!')
} else {
notifications
.filter(isPromiseRejected)
.map((res: PromiseRejectedResult) => res.reason)
.forEach((res) => console.log('rejected result: ', res))
}
await Promise.all(promises) // const promises = sendNotifications(meta)
.then(() => {
toast.success('Notifications sent successfully') // await Promise.all(promises)
}) // .then(() => {
.catch(() => { // toast.success('Notifications sent successfully')
toast.error('Failed to publish notifications') // })
}) // .catch(() => {
// toast.error('Failed to publish notifications')
// })
navigate(appPrivateRoutes.sign, { state: { meta: meta } }) navigate(appPrivateRoutes.sign, { state: { meta: meta } })
} else { } else {

View File

@ -701,17 +701,19 @@ export const SignPage = () => {
setLoadingSpinnerDesc('Sending notifications') setLoadingSpinnerDesc('Sending notifications')
const users = Array.from(userSet) const users = Array.from(userSet)
const promises = users.map((user) => console.log('users: ', users)
sendNotification(npubToHex(user)!, meta) const publishedRelays = await Promise.all(
users.map(async (user) => sendNotification(npubToHex(user)!, meta))
) )
await Promise.all(promises) console.log('published relays: ', publishedRelays)
.then(() => { // await Promise.all(promises)
toast.success('Notifications sent successfully') // .then(() => {
setMeta(meta) // toast.success('Notifications sent successfully')
}) // setMeta(meta)
.catch(() => { // })
toast.error('Failed to publish notifications') // .catch(() => {
}) // toast.error('Failed to publish notifications')
// })
setIsLoading(false) setIsLoading(false)
} }

View File

@ -916,9 +916,9 @@ const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
* @param meta - Metadata associated with the notification. * @param meta - Metadata associated with the notification.
*/ */
export const sendNotification = async (receiver: string, meta: Meta) => { export const sendNotification = async (receiver: string, meta: Meta) => {
try {
// Retrieve the user's public key from the state // Retrieve the user's public key from the state
const usersPubkey = (store.getState().auth as AuthState).usersPubkey! const usersPubkey = (store.getState().auth as AuthState).usersPubkey!
// Create an unsigned event object with the provided metadata // Create an unsigned event object with the provided metadata
const unsignedEvent: UnsignedEvent = { const unsignedEvent: UnsignedEvent = {
kind: 938, kind: 938,
@ -933,33 +933,16 @@ export const sendNotification = async (receiver: string, meta: Meta) => {
// Instantiate the MetadataController to retrieve relay list metadata // Instantiate the MetadataController to retrieve relay list metadata
const metadataController = new MetadataController() const metadataController = new MetadataController()
const relaySet = await metadataController
.findRelayListMetadata(receiver)
.catch((err) => {
// Log an error if retrieving relay list metadata fails
console.log(
`An error occurred while finding relay list metadata for ${hexToNpub(receiver)}`,
err
)
return null
})
// Return if metadata retrieval failed const relaySet = await metadataController.findRelayListMetadata(receiver)
if (!relaySet) return
// Ensure relay list is not empty return await Promise.race([
if (relaySet.read.length === 0) return
// Publish the notification event to the recipient's read relays
await Promise.race([
relayController.publish(wrappedEvent, relaySet.read), relayController.publish(wrappedEvent, relaySet.read),
timeout(40 * 1000) timeout(40 * 1000)
]).catch((err) => { ])
// Log an error if publishing the notification event fails } catch (error) {
console.log( throw new Error(`Failed to publish a notification for ${receiver}`, {
`An error occurred while publishing notification event for ${hexToNpub(receiver)}`, cause: error
err
)
throw err
}) })
}
} }

View File

@ -1,6 +1,6 @@
import { Event, Filter, kinds, UnsignedEvent } from 'nostr-tools' import { Event, Filter, kinds, Relay, UnsignedEvent } from 'nostr-tools'
import { RelayList } from 'nostr-tools/kinds' import { RelayList } from 'nostr-tools/kinds'
import { getRelayInfo, unixNow } from '.' import { getRelayInfo, timeout, unixNow } from '.'
import { NostrController, relayController } from '../controllers' import { NostrController, relayController } from '../controllers'
import { localCache } from '../services' import { localCache } from '../services'
import { RelayMap, RelaySet } from '../types' import { RelayMap, RelaySet } from '../types'
@ -229,6 +229,16 @@ const publishRelayMap = async (
return Promise.reject('Publishing updated relay map was unsuccessful.') return Promise.reject('Publishing updated relay map was unsuccessful.')
} }
const publishToRelay = async (relay: Relay, event: Event): Promise<string> => {
try {
await Promise.race([relay.publish(event), timeout(20 * 1000)])
return relay.url
} catch (err) {
console.error(`Failed to publish event on relay: ${relay.url}`, err)
throw new Error(`Failed to publish event on relay: ${relay.url}`)
}
}
export { export {
findRelayListAndUpdateCache, findRelayListAndUpdateCache,
findRelayListInCache, findRelayListInCache,
@ -238,5 +248,6 @@ export {
getUserRelaySet, getUserRelaySet,
isOlderThanOneDay, isOlderThanOneDay,
isOlderThanOneWeek, isOlderThanOneWeek,
publishRelayMap publishRelayMap,
publishToRelay
} }

View File

@ -118,3 +118,15 @@ export const settleAllFullfilfedPromises = async <Item, FulfilledItem = Item>(
return acc return acc
}, []) }, [])
} }
export const isPromiseFulfilled = <T>(
result: PromiseSettledResult<T>
): result is PromiseFulfilledResult<T> => {
return result.status === 'fulfilled'
}
export const isPromiseRejected = <T>(
result: PromiseSettledResult<T>
): result is PromiseRejectedResult => {
return result.status === 'rejected'
}