remove hanging if no connection

This commit is contained in:
Richard Bondi
2021-01-18 22:01:30 -06:00
committed by fiatjaf
parent 63259eb7c3
commit 6586a1b85d

View File

@@ -11,25 +11,28 @@ export function normalizeRelayURL(url) {
export function relayConnect(url, onEvent, onNotice) {
url = normalizeRelayURL(url)
const ws = new WebSocket(
url + (url.indexOf('?') !== -1 ? '&' : '?') + `session=${Math.random()}`,
{
pingTimeout: 180 * 1000
}
)
let ws, resolveOpen, untilOpen, rejectOpen
var isOpen
let untilOpen = new Promise(resolve => {
isOpen = resolve
function connect() {
untilOpen = new Promise((resolve, reject) => {
resolveOpen = resolve
rejectOpen = reject
})
ws = new WebSocket(
url + (url.indexOf('?') !== -1 ? '&' : '?') + `session=${Math.random()}`
)
ws.onopen = () => {
console.log('connected to', url)
isOpen()
resolveOpen()
}
ws.onerror = err => {
console.log('error connecting to relay', url, err)
rejectOpen()
}
ws.onerror = err => console.log('error connecting to relay', url, err)
ws.onclose = () => console.log('relay connection closed', url)
ws.onmessage = async e => {
var data
try {
@@ -67,32 +70,47 @@ export function relayConnect(url, onEvent, onNotice) {
}
}
}
}
setInterval(() => {
if (!ws || ws.readyState !== WebSocket.OPEN)
connect()
}, 180 * 1000)
connect()
async function trySend(msg) {
if (ws && ws.readyState === WebSocket.OPEN) {
ws.send(msg)
} else {
try {
await untilOpen
ws.send(msg)
} catch(e) {
console.log(`waiting to connect to ${url}`)
}
}
}
return {
url,
async subKey(key) {
await untilOpen
ws.send('sub-key:' + key)
trySend('sub-key:' + key)
},
async unsubKey(key) {
await untilOpen
ws.send('unsub-key:' + key)
trySend('unsub-key:' + key)
},
async reqFeed(params = {}) {
await untilOpen
ws.send('req-feed:' + JSON.stringify(params))
trySend('req-feed:' + JSON.stringify(params))
},
async reqEvent(params) {
await untilOpen
ws.send('req-event:' + JSON.stringify(params))
trySend('req-event:' + JSON.stringify(params))
},
async reqKey(params) {
await untilOpen
ws.send('req-key:' + JSON.stringify(params))
trySend('req-key:' + JSON.stringify(params))
},
async publish(event) {
await untilOpen
ws.send(JSON.stringify(event))
trySend(JSON.stringify(event))
},
close() {
ws.close()