Compare commits

..

1 Commits

Author SHA1 Message Date
fiatjaf
84e4fb1f92 update noble secp256k1 and ensure we always return hex. 2022-02-11 16:20:47 -03:00
6 changed files with 17 additions and 34 deletions

View File

@@ -52,7 +52,7 @@ export function verifySignature(event) {
} }
export async function signEvent(event, key) { export async function signEvent(event, key) {
return Buffer.from( return Buffer.from(secp256k1.schnorr.sign(getEventHash(event), key)).toString(
await secp256k1.schnorr.sign(getEventHash(event), key) 'hex'
).toString('hex') )
} }

View File

@@ -1,5 +1,4 @@
import * as secp256k1 from '@noble/secp256k1' import * as secp256k1 from '@noble/secp256k1'
import {Buffer} from 'buffer'
export function generatePrivateKey() { export function generatePrivateKey() {
return Buffer.from(secp256k1.utils.randomPrivateKey()).toString('hex') return Buffer.from(secp256k1.utils.randomPrivateKey()).toString('hex')

View File

@@ -15,7 +15,11 @@ export async function searchDomain(domain, query = '') {
export async function queryName(fullname) { export async function queryName(fullname) {
try { try {
let [name, domain] = fullname.split('@') let [name, domain] = fullname.split('@')
if (!domain) return null
if (!domain) {
domain = name
name = '_'
}
let res = await ( let res = await (
await fetch(`https://${domain}/.well-known/nostr.json?name=${name}`) await fetch(`https://${domain}/.well-known/nostr.json?name=${name}`)

View File

@@ -1,6 +1,6 @@
{ {
"name": "nostr-tools", "name": "nostr-tools",
"version": "0.23.0", "version": "0.22.0",
"description": "Tools for making a Nostr client.", "description": "Tools for making a Nostr client.",
"repository": { "repository": {
"type": "git", "type": "git",

16
pool.js
View File

@@ -26,35 +26,27 @@ export function relayPool() {
const activeSubscriptions = {} const activeSubscriptions = {}
const sub = ( const sub = ({cb, filter}, id = Math.random().toString().slice(2)) => {
{cb, filter, beforeSend},
id = Math.random().toString().slice(2)
) => {
const subControllers = Object.fromEntries( const subControllers = Object.fromEntries(
Object.values(relays) Object.values(relays)
.filter(({policy}) => policy.read) .filter(({policy}) => policy.read)
.map(({relay}) => [ .map(({relay}) => [
relay.url, relay.url,
relay.sub({filter, cb: event => cb(event, relay.url), beforeSend}, id) relay.sub({filter, cb: event => cb(event, relay.url)}, id)
]) ])
) )
const activeCallback = cb const activeCallback = cb
const activeFilters = filter const activeFilters = filter
const activeBeforeSend = beforeSend
const unsub = () => { const unsub = () => {
Object.values(subControllers).forEach(sub => sub.unsub()) Object.values(subControllers).forEach(sub => sub.unsub())
delete activeSubscriptions[id] delete activeSubscriptions[id]
} }
const sub = ({ const sub = ({cb = activeCallback, filter = activeFilters}) => {
cb = activeCallback,
filter = activeFilters,
beforeSend = activeBeforeSend
}) => {
Object.entries(subControllers).map(([relayURL, sub]) => [ Object.entries(subControllers).map(([relayURL, sub]) => [
relayURL, relayURL,
sub.sub({cb, filter, beforeSend}, id) sub.sub({cb, filter}, id)
]) ])
return activeSubscriptions[id] return activeSubscriptions[id]
} }

View File

@@ -119,10 +119,7 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
ws.send(msg) ws.send(msg)
} }
const sub = ( const sub = ({cb, filter}, channel = Math.random().toString().slice(2)) => {
{cb, filter, beforeSend},
channel = Math.random().toString().slice(2)
) => {
var filters = [] var filters = []
if (Array.isArray(filter)) { if (Array.isArray(filter)) {
filters = filter filters = filter
@@ -130,25 +127,16 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
filters.push(filter) filters.push(filter)
} }
if (beforeSend) {
const beforeSendResult = beforeSend({filter, relay: url, channel})
filters = beforeSendResult.filter
}
trySend(['REQ', channel, ...filters]) trySend(['REQ', channel, ...filters])
channels[channel] = cb channels[channel] = cb
openSubs[channel] = filters openSubs[channel] = filters
const activeCallback = cb const activeCallback = cb
const activeFilters = filters const activeFilters = filters
const activeBeforeSend = beforeSend
return { return {
sub: ({ sub: ({cb = activeCallback, filter = activeFilters}) =>
cb = activeCallback, sub({cb, filter}, channel),
filter = activeFilters,
beforeSend = activeBeforeSend
}) => sub({cb, filter, beforeSend}, channel),
unsub: () => { unsub: () => {
delete openSubs[channel] delete openSubs[channel]
delete channels[channel] delete channels[channel]
@@ -172,7 +160,7 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
unsub() unsub()
clearTimeout(willUnsub) clearTimeout(willUnsub)
}, },
filter: {ids: [event.id]} filter: {id: event.id}
}, },
`monitor-${event.id.slice(0, 5)}` `monitor-${event.id.slice(0, 5)}`
) )