matt/flotilla
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Only return error from attemptRelayAccess if there is a claim sent

Browse source
This commit is contained in:
Jon Staab 2025-11-03 12:08:50 -08:00
parent 42a550788a
commit 1d3f32fb99
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/app/core/commands.ts
View file

@ -249,12 +249,6 @@ export const setInboxRelayPolicy = (url: string, enabled: boolean) => {
// Relay access // Relay access
export const attemptAuth = async (url: string) => {
const socket = Pool.get().get(url)
await socket.auth.attemptAuth(e => signer.get()?.sign(e))
}
export const canEnforceNip70 = async (url: string) => { export const canEnforceNip70 = async (url: string) => {
const socket = Pool.get().get(url) const socket = Pool.get().get(url)
@ -277,7 +271,7 @@ export const attemptRelayAccess = async (url: string, claim = "") => {
return `Failed to connect` return `Failed to connect`
} }
await attemptAuth(url) await socket.auth.attemptAuth(e => signer.get()?.sign(e))
// Only raise an error if it's not a timeout. // Only raise an error if it's not a timeout.
// If it is, odds are the problem is with our signer, not the relay // If it is, odds are the problem is with our signer, not the relay
@ -299,7 +293,7 @@ export const attemptRelayAccess = async (url: string, claim = "") => {
// TODO: remove this if relay29 ever gets less strict // TODO: remove this if relay29 ever gets less strict
if (error?.includes("missing group (`h`) tag")) return if (error?.includes("missing group (`h`) tag")) return
return error?.replace(/^\w+: /, "") return claim ? error?.replace(/^\w+: /, "") : ""
} }
// Deletions // Deletions
@ -509,7 +503,9 @@ export const createAlert = async (params: CreateAlertParams): Promise<CreateAler
} }
// If we don't do this we'll get an event rejection // If we don't do this we'll get an event rejection
await attemptAuth(NOTIFIER_RELAY) await Pool.get()
.get(NOTIFIER_RELAY)
.auth.attemptAuth(e => signer.get()?.sign(e))
const thunk = await publishAlert(params as AlertParams) const thunk = await publishAlert(params as AlertParams)
const error = await waitForThunkError(thunk) const error = await waitForThunkError(thunk)