1. Increases wait time to download events to 5 minutes

2. Adds multiple filters to do authors and citations at the same time.
3. Increases the list of fixed relays
4. Downloads a list of online relays available
This commit is contained in:
Vitor Pamplona 2023-07-27 11:26:26 -04:00
parent c99f63f6b1
commit 491b98ae72
4 changed files with 140 additions and 6 deletions

View File

@ -108,7 +108,7 @@
id="fetching-progress"
name="fetching-progress"
min="0"
max="20"
max="300"
value="0"
style="visibility: hidden" />
</p>
@ -125,7 +125,7 @@
id="broadcasting-progress"
name="broadcasting-progress"
min="0"
max="20"
max="300"
value="0"
style="visibility: hidden" />
</p>
@ -191,7 +191,7 @@
<script src="https://bundle.run/buffer@6.0.3"></script>
<script src="https://bundle.run/bech32@2.0.0"></script>
<script src="https://nostr-utils.pages.dev/js/jquery-3.6.2.min.js"></script>
<script src="https://nostr-utils.pages.dev/js/nostr-utils.js"></script>
<script src="js/nostr-utils.js"></script>
<script src="js/relays.js"></script>
<script src="js/nostr-broadcast.js"></script>
</body>

View File

@ -31,8 +31,8 @@ const fetchAndBroadcast = async () => {
$('#fetching-progress').val(currValue + 1)
}, 1000)
// get all events from relays
const filter = { authors: [pubkey] }
const data = await getEvents(filter)
const filters =[{ authors: [pubkey] }, { "#p": [pubkey] }]
const data = await getEvents(filters)
// inform user fetching is done
$('#fetching-status').html(txt.fetching + checkMark)
clearInterval(fetchInterval)

122
js/nostr-utils.js Normal file
View File

@ -0,0 +1,122 @@
// from https://github.com/paulmillr/noble-secp256k1/blob/main/index.ts#L803
function hexToBytes(hex) {
if (typeof hex !== 'string') {
throw new TypeError('hexToBytes: expected string, got ' + typeof hex)
}
if (hex.length % 2)
throw new Error('hexToBytes: received invalid unpadded hex' + hex.length)
const array = new Uint8Array(hex.length / 2)
for (let i = 0; i < array.length; i++) {
const j = i * 2
const hexByte = hex.slice(j, j + 2)
const byte = Number.parseInt(hexByte, 16)
if (Number.isNaN(byte) || byte < 0) throw new Error('Invalid byte sequence')
array[i] = byte
}
return array
}
// decode nip19 ('npub') to hex
const npub2hexa = (npub) => {
let { prefix, words } = bech32.bech32.decode(npub, 90)
if (prefix === 'npub') {
let data = new Uint8Array(bech32.bech32.fromWords(words))
return buffer.Buffer.from(data).toString('hex')
}
}
// encode hex to nip19 ('npub')
const hexa2npub = (hex) => {
const data = hexToBytes(hex)
const words = bech32.bech32.toWords(data)
const prefix = 'npub'
return bech32.bech32.encode(prefix, words, 90)
}
// parse inserted pubkey
const parsePubkey = (pubkey) =>
pubkey.match('npub1') ? npub2hexa(pubkey) : pubkey
// download js file
const downloadFile = (data, fileName) => {
const prettyJs = 'const data = ' + JSON.stringify(data, null, 2)
const tempLink = document.createElement('a')
const taBlob = new Blob([prettyJs], { type: 'text/javascript' })
tempLink.setAttribute('href', URL.createObjectURL(taBlob))
tempLink.setAttribute('download', fileName)
tempLink.click()
}
// fetch events from relay, returns a promise
const fetchFromRelay = async (relay, filters, events) =>
new Promise((resolve, reject) => {
try {
// prevent hanging forever
setTimeout(() => reject('timeout'), 300_000)
// open websocket
const ws = new WebSocket(relay)
// subscription id
const subsId = 'my-sub'
// subscribe to events filtered by author
ws.onopen = () => {
ws.send(JSON.stringify(['REQ', subsId].concat(filters)))
}
// Listen for messages
ws.onmessage = (event) => {
const [msgType, subscriptionId, data] = JSON.parse(event.data)
// event messages
if (msgType === 'EVENT' && subscriptionId === subsId) {
const { id } = data
// prevent duplicated events
if (events[id]) return
else events[id] = data
// show how many events were found until this moment
$('#events-found').text(`${Object.keys(events).length} events found`)
}
// end of subscription messages
if (msgType === 'EOSE' && subscriptionId === subsId) resolve()
}
ws.onerror = (err) => reject(err)
} catch (exception) {
reject(exception)
}
})
// query relays for events published by this pubkey
const getEvents = async (filters) => {
// events hash
const events = {}
// wait for all relays to finish
await Promise.allSettled(
relays.map((relay) => fetchFromRelay(relay, filters, events))
)
// return data as an array of events
return Object.keys(events).map((id) => events[id])
}
// send events to a relay, returns a promisse
const sendToRelay = async (relay, data) =>
new Promise((resolve, reject) => {
try {
// prevent hanging forever
setTimeout(() => reject('timeout'), 20_000)
const ws = new WebSocket(relay)
// fetch events from relay
ws.onopen = () => {
for (evnt of data) {
ws.send(JSON.stringify(['EVENT', evnt]))
}
ws.close()
resolve(`done for ${relay}`)
}
ws.onerror = (err) => reject(err)
} catch (exception) {
reject(exception)
}
})
// broadcast events to list of relays
const broadcastEvents = async (data) => {
await Promise.allSettled(relays.map((relay) => sendToRelay(relay, data)))
}

View File

@ -1,7 +1,8 @@
// list of paid relays from:
// https://thebitcoinmanual.com/articles/paid-nostr-relay/
const relays = [
const fixedRelays = [
'wss://atlas.nostr.land', // paid relay 15000 npub12262qa4uhw7u8gdwlgmntqtv7aye8vdcmvszkqwgs0zchel6mz7s6cgrkj
'wss://bitcoiner.social', // paid relay 1000 npub1dxs2pygtfxsah77yuncsmu3ttqr274qr5g5zva3c7t5s3jtgy2xszsn4st
'wss://brb.io',
@ -43,4 +44,15 @@ const relays = [
'wss://relay.snort.social',
'wss://relayer.fiatjaf.com',
'wss://rsslay.fiatjaf.com',
'wss://no.str.cr',
'wss://nostr.oxtr.dev',
'wss://nostr.mom',
'wss://relay.nostr.ch',
'wss://relay.nostr.band'
]
var relays = []
fetch("https://api.nostr.watch/v1/online")
.then(response => response.json())
.then(json => relays = fixedRelays.concat(json));