New Release #200

Merged
b merged 9 commits from staging into main 2024-09-12 12:17:47 +00:00
2 changed files with 32 additions and 6 deletions
Showing only changes of commit 235e76be4e - Show all commits

View File

@ -27,6 +27,8 @@ import {
import { useAppSelector } from '../hooks'
import styles from './style.module.scss'
const UPDATE_INTERVAL_MS = 120000
export const MainLayout = () => {
const dispatch: Dispatch = useDispatch()
const [isLoading, setIsLoading] = useState(true)
@ -35,7 +37,7 @@ export const MainLayout = () => {
const usersAppData = useAppSelector((state) => state.userAppData)
// Ref to track if `subscribeForSigits` has been called
const hasSubscribed = useRef(false)
const hasSubscribed = useRef<number | null>(null)
useEffect(() => {
const metadataController = new MetadataController()
@ -109,10 +111,27 @@ export const MainLayout = () => {
if (pubkey && !hasSubscribed.current) {
// Call `subscribeForSigits` only if it hasn't been called before
// #193 disabled websocket subscribtion, keep updating the sigits on UPDATE_INTERVAL_MS until #194 is done
// Set up the update sigit loop, use setTimeout to make sure times between updates are consistent
// (not affected by execution duration of subscribeForSigits call)
const loop = () => {
hasSubscribed.current = window.setTimeout(async () => {
await subscribeForSigits(pubkey)
loop()
}, UPDATE_INTERVAL_MS)
}
subscribeForSigits(pubkey)
loop()
// Mark `subscribeForSigits` as called
hasSubscribed.current = true
//hasSubscribed.current = true
}
}
return () => {
if (hasSubscribed.current) {
window.clearTimeout(hasSubscribed.current)
hasSubscribed.current = null
}
}
}, [authState, usersAppData])

View File

@ -859,9 +859,16 @@ export const subscribeForSigits = async (pubkey: string) => {
'#p': [pubkey]
}
relayController.subscribeForEvents(filter, relaySet.read, (event) => {
processReceivedEvent(event) // Process the received event
})
// Process the received event synchronously
const events = await relayController.fetchEvents(filter, relaySet.read)
for (const e of events) {
await processReceivedEvent(e)
}
// Async processing of the events has a race condition
// relayController.subscribeForEvents(filter, relaySet.read, (event) => {
// processReceivedEvent(event)
// })
}
const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
@ -907,7 +914,7 @@ const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
if (!meta) return
updateUsersAppData(meta)
await updateUsersAppData(meta)
}
/**