nostr/coracle
1
0
Fork 0
mirror of https://github.com/coracle-social/coracle.git synced 2024-10-01 09:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for relays that require AUTH

Browse Source
This commit is contained in:
Jonathan Staab 2023-04-24 16:11:01 -05:00
parent fa6e17fc24
commit 0c291d6375
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/agent/pool.ts
View File

@ -5,8 +5,9 @@ import {verifySignature} from "nostr-tools"
import {pluck, identity} from "ramda"
import {ensurePlural, switcher} from "hurdak/lib/hurdak"
import {warn, log, error} from "src/util/logger"
import {union, difference} from "src/util/misc"
import {union, sleep, difference} from "src/util/misc"
import {normalizeRelayUrl} from "src/util/nostr"
import {relays} from "src/agent/db"
const Config = {
multiplextrUrl: null,
@ -174,7 +175,7 @@ function getQuality(url) {
return [0.5, "Not Connected"]
}
function getExecutor(urls) {
async function getExecutor(urls, {bypassBoot = false} = {}) {
if (forceUrls.length > 0) {
urls = forceUrls
}
@ -210,12 +211,31 @@ function getExecutor(urls) {
},
})
// Eagerly connect and handle AUTH
await Promise.all(
ensurePlural(executor.target.sockets).map(async socket => {
const relay = relays.get(socket.url)
const waitForBoot = relay?.limitation?.payment_required || relay?.limitation?.auth_required
if (socket.status === Socket.STATUS.NEW) {
socket.booted = sleep(2000)
await socket.connect()
}
// Delay REQ/EVENT until AUTH flow happens
if (!bypassBoot && waitForBoot) {
await socket.booted
}
})
)
return executor
}
async function publish({relays, event, onProgress, timeout = 3000, verb = "EVENT"}) {
const urls = getUrls(relays)
const executor = getExecutor(urls)
const executor = await getExecutor(urls, {bypassBoot: verb === "AUTH"})
Meta.onPublish(urls)
@ -285,7 +305,7 @@ type SubscribeOpts = {
async function subscribe({relays, filter, onEvent, onEose}: SubscribeOpts) {
const urls = getUrls(relays)
const executor = getExecutor(urls)
const executor = await getExecutor(urls)
const filters = ensurePlural(filter)
const now = Date.now()
const seen = new Map()
@ -358,7 +378,7 @@ async function subscribe({relays, filter, onEvent, onEose}: SubscribeOpts) {
async function count(filter) {
const filters = ensurePlural(filter)
const executor = getExecutor(["wss://rbr.bio"])
const executor = await getExecutor(["wss://rbr.bio"])
return new Promise(resolve => {
const sub = executor.count(filters, {

4
src/app/views/ChatListItem.svelte
View File

@ -30,12 +30,12 @@
<h2 class="text-lg">{room.name || ""}</h2>
</div>
{#if joined}
<Anchor type="button" preventDefault class="flex items-center gap-2" on:click={leave}>
<Anchor type="button" killEvent class="flex items-center gap-2" on:click={leave}>
<i class="fa fa-right-from-bracket" />
<span>Leave</span>
</Anchor>
{:else}
<Anchor type="button" preventDefault class="flex items-center gap-2" on:click={join}>
<Anchor type="button" killEvent class="flex items-center gap-2" on:click={join}>
<i class="fa fa-right-to-bracket" />
<span>Join</span>
</Anchor>