fix buffer import and use rollup for transpiling the package.

.eslintrc.json

@@ -1,5 +1,4 @@
 {
-  "root": true,
   "parserOptions": {
     "ecmaVersion": 9,
     "ecmaFeatures": {

.gitignore

@@ -2,5 +2,3 @@ node_modules
 dist
 yarn.lock
 package-lock.json
-nostr.js
-.envrc

README.md

@@ -15,7 +15,7 @@ pool.addRelay('ws://some.relay.com', {read: true, write: true})
 pool.addRelay('ws://other.relay.cool', {read: true, write: true})
 
 // example callback function for a subscription
-function onEvent(event, relay) {
+function onEvent(event, relay) => {
   console.log(`got an event from ${relay.url} which is already validated.`, event)
 }
 
@@ -67,27 +67,4 @@ pool.addRelay('<url>')
 // will automatically subscribe to the all the events called with .sub above
 ```
 
-All functions expect bytearrays as hex strings and output bytearrays as hex strings.
-
 For other utils please read the source (for now).
-
-### Using from the browser (if you don't want to use a bundler)
-
-You can import nostr-tools as an ES module. Just add a script tag like this:
-
-```html
-<script type="module">
-  import {generatePrivateKey} from 'https://unpkg.com/nostr-tools/nostr.js'
-  console.log(generatePrivateKey())
-</script>
-```
-
-And import whatever function you would import from `"nostr-tools"` in a bundler.
-
-## TypeScript
-
-This module has hand-authored TypeScript declarations. `npm run check-ts` will run a lint-check script to ensure the typings can be loaded and call at least a few standard library functions. It's not at all comprehensive and likely to contain bugs. Issues welcome; tag @rcoder as needed.
-
-## License
-
-Public domain.

build.cjs

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-const esbuild = require('esbuild')
-const alias = require('esbuild-plugin-alias')
-const nodeGlobals = require('@esbuild-plugins/node-globals-polyfill').default
-
-const buildOptions = {
-  entryPoints: ['index.js'],
-  outfile: 'nostr.js',
-  bundle: true,
-  format: 'esm',
-  plugins: [
-    alias({
-      stream: require.resolve('readable-stream')
-    }),
-    nodeGlobals({buffer: true})
-  ],
-  define: {
-    window: 'self',
-    global: 'self'
-  },
-  loader: {'.js': 'jsx'}
-}
-
-esbuild.build(buildOptions).then(() => console.log('build success.'))

event.js

@@ -1,58 +0,0 @@
-import {Buffer} from 'buffer'
-import createHash from 'create-hash'
-import * as secp256k1 from '@noble/secp256k1'
-
-export function getBlankEvent() {
-  return {
-    kind: 255,
-    pubkey: null,
-    content: '',
-    tags: [],
-    created_at: 0
-  }
-}
-
-export function serializeEvent(evt) {
-  return JSON.stringify([
-    0,
-    evt.pubkey,
-    evt.created_at,
-    evt.kind,
-    evt.tags,
-    evt.content
-  ])
-}
-
-export function getEventHash(event) {
-  let eventHash = createHash('sha256')
-    .update(Buffer.from(serializeEvent(event)))
-    .digest()
-  return Buffer.from(eventHash).toString('hex')
-}
-
-export function validateEvent(event) {
-  if (event.id !== getEventHash(event)) return false
-  if (typeof event.content !== 'string') return false
-  if (typeof event.created_at !== 'number') return false
-
-  if (!Array.isArray(event.tags)) return false
-  for (let i = 0; i < event.tags.length; i++) {
-    let tag = event.tags[i]
-    if (!Array.isArray(tag)) return false
-    for (let j = 0; j < tag.length; j++) {
-      if (typeof tag[j] === 'object') return false
-    }
-  }
-
-  return true
-}
-
-export function verifySignature(event) {
-  return secp256k1.schnorr.verify(event.sig, event.id, event.pubkey)
-}
-
-export async function signEvent(event, key) {
-  return Buffer.from(
-    await secp256k1.schnorr.sign(getEventHash(event), key)
-  ).toString('hex')
-}

filter.js

@@ -1,30 +0,0 @@
-export function matchFilter(filter, event) {
-  if (filter.ids && filter.ids.indexOf(event.id) === -1) return false
-  if (filter.kinds && filter.kinds.indexOf(event.kind) === -1) return false
-  if (filter.authors && filter.authors.indexOf(event.pubkey) === -1)
-    return false
-
-  for (let f in filter) {
-    if (f[0] === '#') {
-      if (
-        filter[f] &&
-        !event.tags.find(
-          ([t, v]) => t === f.slice(1) && filter[f].indexOf(v) !== -1
-        )
-      )
-        return false
-    }
-  }
-
-  if (filter.since && event.created_at < filter.since) return false
-  if (filter.until && event.created_at >= filter.until) return false
-
-  return true
-}
-
-export function matchFilters(filters, event) {
-  for (let i = 0; i < filters.length; i++) {
-    if (matchFilter(filters[i], event)) return true
-  }
-  return false
-}

index.d.ts

@@ -1,107 +0,0 @@
-import { type Buffer } from 'buffer';
-
-// these should be available from the native @noble/secp256k1 type
-// declarations, but they somehow aren't so instead: copypasta
-declare type Hex = Uint8Array | string;
-declare type PrivKey = Hex | bigint | number;
-
-declare enum EventKind {
-    Metadata = 0,
-    Text = 1,
-    RelayRec = 2,
-    Contacts = 3,
-    DM = 4,
-    Deleted = 5,
-}
-
-// event.js
-declare type Event = {
-    kind: EventKind,
-    pubkey?: string,
-    content: string,
-    tags: string[],
-    created_at: number,
-};
-
-declare function getBlankEvent(): Event;
-declare function serializeEvent(event: Event): string;
-declare function getEventHash(event: Event): string;
-declare function validateEvent(event: Event): boolean;
-declare function validateSignature(event: Event): boolean;
-declare function signEvent(event: Event, key: PrivKey): Promise<[Uint8Array, number]>;
-
-// filter.js
-declare type Filter = {
-    ids: string[],
-    kinds: EventKind[],
-    authors: string[],
-    since: number,
-    until: number,
-    "#e": string[],
-    "#p": string[],
-};
-
-declare function matchFilter(filter: Filter, event: Event): boolean;
-declare function matchFilters(filters: Filter[], event: Event): boolean;
-
-// general
-declare type ClientMessage =
-    ["EVENT", Event] |
-    ["REQ", string, Filter[]] |
-    ["CLOSE", string];
-
-declare type ServerMessage =
-    ["EVENT", string, Event] |
-    ["NOTICE", unknown];
-
-// keys.js
-declare function generatePrivateKey(): string;
-declare function getPublicKey(privateKey: Buffer): string;
-
-// pool.js
-declare type RelayPolicy = {
-    read: boolean,
-    write: boolean,
-};
-
-declare type SubscriptionCallback = (event: Event, relay: string) => void;
-
-declare type SubscriptionOptions = {
-    cb: SubscriptionCallback,
-    filter: Filter,
-    skipVerification: boolean
-    // TODO: thread through how `beforeSend` actually works before trying to type it
-    // beforeSend(event: Event): 
-};
-
-declare type Subscription = {
-    unsub(): void,
-};
-
-declare type PublishCallback = (status: number) => void;
-
-// relay.js
-declare type Relay = {
-    url: string,
-    sub: SubscriptionCallback,
-    publish: (event: Event, cb: PublishCallback) => Promise<Event>,
-};
-
-declare type PoolPublishCallback = (status: number, relay: string) => void;
-
-declare type RelayPool = {
-    setPrivateKey(key: string): void,
-    addRelay(url: string, opts?: RelayPolicy): Relay,
-    sub(opts: SubscriptionOptions, id?: string): Subscription,
-    publish(event: Event, cb: PoolPublishCallback): Promise<Event>,
-    close: () => void,
-    status: number,
-};
-
-declare function relayPool(): RelayPool;
-
-// nip04.js
-
-// nip05.js
-
-// nip06.js

index.js

@@ -1,27 +0,0 @@
-import {generatePrivateKey, getPublicKey} from './keys.js'
-import {relayConnect} from './relay.js'
-import {relayPool} from './pool.js'
-import {
-  getBlankEvent,
-  signEvent,
-  validateEvent,
-  verifySignature,
-  serializeEvent,
-  getEventHash
-} from './event.js'
-import {matchFilter, matchFilters} from './filter.js'
-
-export {
-  generatePrivateKey,
-  relayConnect,
-  relayPool,
-  signEvent,
-  validateEvent,
-  verifySignature,
-  serializeEvent,
-  getEventHash,
-  getPublicKey,
-  getBlankEvent,
-  matchFilter,
-  matchFilters
-}

index.test-d.ts

@@ -1,42 +0,0 @@
-import * as process from 'process';
-import {
-    relayPool,
-    getBlankEvent,
-    validateEvent,
-    RelayPool,
-    Event as NEvent
-} from './index.js';
-import { expectType } from 'tsd';
-
-const pool = relayPool();
-expectType<RelayPool>(pool);
-
-const privkey = process.env.NOSTR_PRIVATE_KEY;
-const pubkey = process.env.NOSTR_PUBLIC_KEY;
-
-const message = {
-    ...getBlankEvent(),
-    kind: 1,
-    content: `just saying hi from pid ${process.pid}`,
-    pubkey,
-};
-
-const publishCb = (status: number, url: string) => {
-    console.log({ status, url });
-};
-
-pool.setPrivateKey(privkey!);
-
-const publishF = pool.publish(message, publishCb);
-expectType<Promise<NEvent>>(publishF);
-
-publishF.then((event) => {
-    expectType<NEvent>(event);
-
-    console.info({ event });
-
-    if (!validateEvent(event)) {
-        console.error(`event failed to validate!`);
-        process.exit(1);
-    }
-});

keys.js

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

nip04.js

@@ -1,42 +0,0 @@
-import aes from 'browserify-cipher'
-import {Buffer} from 'buffer'
-import {randomBytes} from '@noble/hashes/utils'
-import * as secp256k1 from '@noble/secp256k1'
-
-export function encrypt(privkey, pubkey, text) {
-  const key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
-  const normalizedKey = getNormalizedX(key)
-
-  let iv = Uint8Array.from(randomBytes(16))
-  var cipher = aes.createCipheriv(
-    'aes-256-cbc',
-    Buffer.from(normalizedKey, 'hex'),
-    iv
-  )
-  let encryptedMessage = cipher.update(text, 'utf8', 'base64')
-  encryptedMessage += cipher.final('base64')
-
-  return `${encryptedMessage}?iv=${Buffer.from(iv.buffer).toString('base64')}`
-}
-
-export function decrypt(privkey, pubkey, ciphertext) {
-  let [cip, iv] = ciphertext.split('?iv=')
-  let key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
-  let normalizedKey = getNormalizedX(key)
-
-  var decipher = aes.createDecipheriv(
-    'aes-256-cbc',
-    Buffer.from(normalizedKey, 'hex'),
-    Buffer.from(iv, 'base64')
-  )
-  let decryptedMessage = decipher.update(cip, 'base64')
-  decryptedMessage += decipher.final('utf8')
-
-  return decryptedMessage
-}
-
-function getNormalizedX(key) {
-  return typeof key === 'string'
-    ? key.substr(2, 64)
-    : Buffer.from(key.slice(1, 33)).toString('hex')
-}

nip05.js

@@ -1,28 +0,0 @@
-import fetch from 'cross-fetch'
-
-export async function searchDomain(domain, query = '') {
-  try {
-    let res = await (
-      await fetch(`https://${domain}/.well-known/nostr.json?name=${query}`)
-    ).json()
-
-    return res.names
-  } catch (_) {
-    return []
-  }
-}
-
-export async function queryName(fullname) {
-  try {
-    let [name, domain] = fullname.split('@')
-    if (!domain) return null
-
-    let res = await (
-      await fetch(`https://${domain}/.well-known/nostr.json?name=${name}`)
-    ).json()
-
-    return res.names && res.names[name]
-  } catch (_) {
-    return null
-  }
-}

nip06.js

@@ -1,26 +0,0 @@
-import {wordlist} from 'micro-bip39/wordlists/english.js'
-import {
-  generateMnemonic,
-  mnemonicToSeedSync,
-  validateMnemonic
-} from 'micro-bip39'
-import {HDKey} from 'micro-bip32'
-
-export function privateKeyFromSeed(seed) {
-  let root = HDKey.fromMasterSeed(Buffer.from(seed, 'hex'))
-  return Buffer.from(root.derive(`m/44'/1237'/0'/0/0`).privateKey).toString(
-    'hex'
-  )
-}
-
-export function seedFromWords(mnemonic) {
-  return Buffer.from(mnemonicToSeedSync(mnemonic)).toString('hex')
-}
-
-export function generateSeedWords() {
-  return generateMnemonic(wordlist)
-}
-
-export function validateWords(words) {
-  return validateMnemonic(words, wordlist)
-}

package.json

@@ -1,21 +1,18 @@
 {
   "name": "nostr-tools",
-  "version": "0.24.0",
+  "version": "0.6.1",
   "description": "Tools for making a Nostr client.",
+  "main": "dist/nostr-tools.esm.min.js",
+  "module": "dist/nostr-tools.esm.min.js",
+  "browser": "dist/nostr-tools.umd.min.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/fiatjaf/nostr-tools.git"
   },
-  "type": "module",
   "dependencies": {
-    "@noble/hashes": "^0.5.7",
-    "@noble/secp256k1": "^1.5.2",
-    "browserify-cipher": ">=1",
-    "buffer": ">=5",
-    "create-hash": "^1.2.0",
-    "cross-fetch": "^3.1.4",
-    "micro-bip32": "^0.1.0",
-    "micro-bip39": "^0.1.3",
+    "@noble/secp256k1": "^1.3.0",
+    "buffer": "^6.0.3",
+    "dns-packet": "^5.2.4",
     "websocket-polyfill": "^0.0.3"
   },
   "keywords": [
@@ -31,19 +28,12 @@
     "client"
   ],
   "devDependencies": {
-    "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
-    "@types/node": "^18.0.3",
-    "esbuild": "^0.14.38",
-    "esbuild-plugin-alias": "^0.2.1",
-    "eslint": "^8.5.0",
-    "eslint-plugin-babel": "^5.3.1",
-    "esm-loader-typescript": "^1.0.1",
-    "events": "^3.3.0",
-    "tsd": "^0.22.0",
-    "typescript": "^4.7.4"
+    "rollup": "^2.61.1"
   },
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "prepublish": "node build.cjs",
-    "check-ts": "tsd && node --no-warnings --loader=esm-loader-typescript index.test-d.ts"
+    "prepublish": "rollup -c"
   }
 }

pool.js

@@ -1,206 +0,0 @@
-import {getEventHash, verifySignature, signEvent} from './event.js'
-import {relayConnect, normalizeRelayURL} from './relay.js'
-
-export function relayPool() {
-  var globalPrivateKey
-  var globalSigningFunction
-
-  const poolPolicy = {
-    // setting this to a number will cause events to be published to a random
-    // set of relays only, instead of publishing to all relays all the time
-    randomChoice: null,
-
-    // setting this to true will cause .publish() calls to wait until the event has
-    // been published -- or at least attempted to be published -- to all relays
-    wait: false
-  }
-  const relays = {}
-  const noticeCallbacks = []
-
-  function propagateNotice(notice, relayURL) {
-    for (let i = 0; i < noticeCallbacks.length; i++) {
-      let {relay} = relays[relayURL]
-      noticeCallbacks[i](notice, relay)
-    }
-  }
-
-  const activeSubscriptions = {}
-
-  const sub = ({cb, filter, beforeSend}, id) => {
-    if (!id) id = Math.random().toString().slice(2)
-
-    const subControllers = Object.fromEntries(
-      Object.values(relays)
-        .filter(({policy}) => policy.read)
-        .map(({relay}) => [
-          relay.url,
-          relay.sub({cb: event => cb(event, relay.url), filter, beforeSend}, id)
-        ])
-    )
-
-    const activeCallback = cb
-    const activeFilters = filter
-    const activeBeforeSend = beforeSend
-
-    const unsub = () => {
-      Object.values(subControllers).forEach(sub => sub.unsub())
-      delete activeSubscriptions[id]
-    }
-    const sub = ({
-      cb = activeCallback,
-      filter = activeFilters,
-      beforeSend = activeBeforeSend
-    }) => {
-      Object.entries(subControllers).map(([relayURL, sub]) => [
-        relayURL,
-        sub.sub({cb: event => cb(event, relayURL), filter, beforeSend}, id)
-      ])
-      return activeSubscriptions[id]
-    }
-    const addRelay = relay => {
-      subControllers[relay.url] = relay.sub(
-        {cb: event => cb(event, relay.url), filter, beforeSend},
-        id
-      )
-      return activeSubscriptions[id]
-    }
-    const removeRelay = relayURL => {
-      if (relayURL in subControllers) {
-        subControllers[relayURL].unsub()
-        if (Object.keys(subControllers).length === 0) unsub()
-      }
-      return activeSubscriptions[id]
-    }
-
-    activeSubscriptions[id] = {
-      sub,
-      unsub,
-      addRelay,
-      removeRelay
-    }
-
-    return activeSubscriptions[id]
-  }
-
-  return {
-    sub,
-    relays,
-    setPrivateKey(privateKey) {
-      globalPrivateKey = privateKey
-    },
-    registerSigningFunction(fn) {
-      globalSigningFunction = fn
-    },
-    setPolicy(key, value) {
-      poolPolicy[key] = value
-    },
-    addRelay(url, policy = {read: true, write: true}) {
-      let relayURL = normalizeRelayURL(url)
-      if (relayURL in relays) return
-
-      let relay = relayConnect(url, notice => {
-        propagateNotice(notice, relayURL)
-      })
-      relays[relayURL] = {relay, policy}
-
-      if (policy.read) {
-        Object.values(activeSubscriptions).forEach(subscription =>
-          subscription.addRelay(relay)
-        )
-      }
-
-      return relay
-    },
-    removeRelay(url) {
-      let relayURL = normalizeRelayURL(url)
-      let data = relays[relayURL]
-      if (!data) return
-
-      let {relay} = data
-      Object.values(activeSubscriptions).forEach(subscription =>
-        subscription.removeRelay(relay)
-      )
-      relay.close()
-      delete relays[relayURL]
-    },
-    onNotice(cb) {
-      noticeCallbacks.push(cb)
-    },
-    offNotice(cb) {
-      let index = noticeCallbacks.indexOf(cb)
-      if (index !== -1) noticeCallbacks.splice(index, 1)
-    },
-    async publish(event, statusCallback) {
-      event.id = getEventHash(event)
-
-      if (!event.sig) {
-        event.tags = event.tags || []
-
-        if (globalPrivateKey) {
-          event.sig = await signEvent(event, globalPrivateKey)
-        } else if (globalSigningFunction) {
-          event.sig = await globalSigningFunction(event)
-          if (!event.sig) {
-            // abort here
-            return
-          } else {
-            // check
-            if (!(await verifySignature(event)))
-              throw new Error(
-                'signature provided by custom signing function is invalid.'
-              )
-          }
-        } else {
-          throw new Error(
-            "can't publish unsigned event. either sign this event beforehand, provide a signing function or pass a private key while initializing this relay pool so it can be signed automatically."
-          )
-        }
-      }
-
-      let writeable = Object.values(relays)
-        .filter(({policy}) => policy.write)
-        .sort(() => Math.random() - 0.5) // random
-
-      let maxTargets = poolPolicy.randomChoice
-        ? poolPolicy.randomChoice
-        : writeable.length
-
-      let successes = 0
-
-      if (poolPolicy.wait) {
-        for (let i = 0; i < writeable.length; i++) {
-          let {relay} = writeable[i]
-
-          try {
-            await new Promise(async (resolve, reject) => {
-              try {
-                await relay.publish(event, status => {
-                  if (statusCallback) statusCallback(status, relay.url)
-                  resolve()
-                })
-              } catch (err) {
-                if (statusCallback) statusCallback(-1, relay.url)
-              }
-            })
-
-            successes++
-            if (successes >= maxTargets) {
-              break
-            }
-          } catch (err) {
-            /***/
-          }
-        }
-      } else {
-        writeable.forEach(async ({relay}) => {
-          let callback = statusCallback
-            ? status => statusCallback(status, relay.url)
-            : null
-          relay.publish(event, callback)
-        })
-      }
-
-      return event
-    }
-  }
-}

rollup.config.js

@@ -0,0 +1,16 @@
+import pkg from './package.json'
+
+export default {
+  input: 'src/index.js',
+  output: [
+    {
+      name: 'nostrtools',
+      file: pkg.browser,
+      format: 'umd'
+    },
+    {
+      file: pkg.module,
+      format: 'es'
+    }
+  ]
+}

src/event.js

@@ -0,0 +1,43 @@
+import Buffer from 'buffer'
+import * as secp256k1 from '@noble/secp256k1'
+
+import {sha256} from './utils'
+
+export function getBlankEvent() {
+  return {
+    kind: 255,
+    pubkey: null,
+    content: '',
+    tags: [],
+    created_at: 0
+  }
+}
+
+export function serializeEvent(evt) {
+  return JSON.stringify([
+    0,
+    evt.pubkey,
+    evt.created_at,
+    evt.kind,
+    evt.tags || [],
+    evt.content
+  ])
+}
+
+export async function getEventHash(event) {
+  let eventHash = await sha256(Buffer.from(serializeEvent(event)))
+  return Buffer.from(eventHash).toString('hex')
+}
+
+export async function verifySignature(event) {
+  return await secp256k1.schnorr.verify(
+    event.sig,
+    await getEventHash(event),
+    event.pubkey
+  )
+}
+
+export async function signEvent(event, key) {
+  let eventHash = await getEventHash(event)
+  return await secp256k1.schnorr.sign(eventHash, key)
+}

src/index.js

@@ -0,0 +1,25 @@
+import {relayConnect} from './relay'
+import {relayPool} from './pool'
+import {
+  getBlankEvent,
+  signEvent,
+  verifySignature,
+  serializeEvent,
+  getEventHash
+} from './event'
+import {makeRandom32, sha256, getPublicKey} from './utils'
+
+export {
+  relayConnect,
+  relayPool,
+  signEvent,
+  verifySignature,
+  serializeEvent,
+  getEventHash,
+  makeRandom32,
+  sha256,
+  getPublicKey,
+  getBlankEvent
+}
+export * from './nip04'
+export * from './nip05'

src/nip04.js

@@ -0,0 +1,37 @@
+import Buffer from 'buffer'
+import * as secp256k1 from '@noble/secp256k1'
+
+export function encrypt(privkey, pubkey, text) {
+  const key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
+  const normalizedKey = getOnlyXFromFullSharedSecret(key)
+
+  let iv = crypto.randomFillSync(new Uint8Array(16))
+  var cipher = crypto.createCipheriv(
+    'aes-256-cbc',
+    Buffer.from(normalizedKey, 'hex'),
+    iv
+  )
+  let encryptedMessage = cipher.update(text, 'utf8', 'base64')
+  encryptedMessage += cipher.final('base64')
+
+  return [encryptedMessage, Buffer.from(iv.buffer).toString('base64')]
+}
+
+export function decrypt(privkey, pubkey, ciphertext, iv) {
+  const key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
+  const normalizedKey = getOnlyXFromFullSharedSecret(key)
+
+  var decipher = crypto.createDecipheriv(
+    'aes-256-cbc',
+    Buffer.from(normalizedKey, 'hex'),
+    Buffer.from(iv, 'base64')
+  )
+  let decryptedMessage = decipher.update(ciphertext, 'base64')
+  decryptedMessage += decipher.final('utf8')
+
+  return decryptedMessage
+}
+
+function getOnlyXFromFullSharedSecret(fullSharedSecretCoordinates) {
+  return fullSharedSecretCoordinates.substr(2, 64)
+}

src/nip05.js

@@ -0,0 +1,52 @@
+import Buffer from 'buffer'
+import dnsPacket from 'dns-packet'
+
+const dohProviders = [
+  'cloudflare-dns.com',
+  'fi.doh.dns.snopyta.org',
+  'basic.bravedns.com',
+  'hydra.plan9-ns1.com',
+  'doh.pl.ahadns.net',
+  'dns.flatuslifir.is',
+  'doh.dns.sb',
+  'doh.li'
+]
+
+let counter = 0
+
+export async function keyFromDomain(domain) {
+  let host = dohProviders[counter % dohProviders.length]
+
+  let buf = dnsPacket.encode({
+    type: 'query',
+    id: Math.floor(Math.random() * 65534),
+    flags: dnsPacket.RECURSION_DESIRED,
+    questions: [
+      {
+        type: 'TXT',
+        name: `_nostrkey.${domain}`
+      }
+    ]
+  })
+
+  let fetching = fetch(`https://${host}/dns-query`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/dns-message',
+      'Content-Length': Buffer.byteLength(buf)
+    },
+    body: buf
+  })
+
+  counter++
+
+  try {
+    let response = Buffer.from(await (await fetching).arrayBuffer())
+    let {answers} = dnsPacket.decode(response)
+    if (answers.length === 0) return null
+    return Buffer.from(answers[0].data[0]).toString()
+  } catch (err) {
+    console.log(`error querying DNS for ${domain} on ${host}`, err)
+    return null
+  }
+}

src/pool.js

@@ -0,0 +1,122 @@
+import {getEventHash, signEvent} from './event'
+import {relayConnect, normalizeRelayURL} from './relay'
+
+export function relayPool(globalPrivateKey) {
+  const relays = {}
+  const globalSub = []
+  const noticeCallbacks = []
+
+  function propagateNotice(notice, relayURL) {
+    for (let i = 0; i < noticeCallbacks.length; i++) {
+      let {relay} = relays[relayURL]
+      noticeCallbacks[i](notice, relay)
+    }
+  }
+
+  const activeSubscriptions = {}
+
+  const sub = ({cb, filter}, id = Math.random().toString().slice(2)) => {
+    const subControllers = Object.fromEntries(
+      Object.values(relays)
+        .filter(({policy}) => policy.read)
+        .map(({relay}) => [
+          relay.url,
+          relay.sub({filter, cb: event => cb(event, relay.url)})
+        ])
+    )
+
+    const activeCallback = cb
+    const activeFilters = filter
+
+    activeSubscriptions[id] = {
+      sub: ({cb = activeCallback, filter = activeFilters}) =>
+        Object.entries(subControllers).map(([relayURL, sub]) => [
+          relayURL,
+          sub.sub({cb, filter}, id)
+        ]),
+      addRelay: relay => {
+        subControllers[relay.url] = relay.sub({cb, filter})
+      },
+      removeRelay: relayURL => {
+        if (relayURL in subControllers) {
+          subControllers[relayURL].unsub()
+          if (Object.keys(subControllers).length === 0) unsub()
+        }
+      },
+      unsub: () => {
+        Object.values(subControllers).forEach(sub => sub.unsub())
+        delete activeSubscriptions[id]
+      }
+    }
+
+    return activeSubscriptions[id]
+  }
+
+  return {
+    sub,
+    relays,
+    setPrivateKey(privateKey) {
+      globalPrivateKey = privateKey
+    },
+    async addRelay(url, policy = {read: true, write: true}) {
+      let relayURL = normalizeRelayURL(url)
+      if (relayURL in relays) return
+
+      let relay = await relayConnect(url, notice => {
+        propagateNotice(notice, relayURL)
+      })
+      relays[relayURL] = {relay, policy}
+
+      Object.values(activeSubscriptions).forEach(subscription =>
+        subscription.addRelay(relay)
+      )
+
+      return relay
+    },
+    removeRelay(url) {
+      let relayURL = normalizeRelayURL(url)
+      let {relay} = relays[relayURL]
+      if (!relay) return
+      Object.values(activeSubscriptions).forEach(subscription =>
+        subscription.removeRelay(relay)
+      )
+      relay.close()
+      delete relays[relayURL]
+    },
+    onNotice(cb) {
+      noticeCallbacks.push(cb)
+    },
+    offNotice(cb) {
+      let index = noticeCallbacks.indexOf(cb)
+      if (index !== -1) noticeCallbacks.splice(index, 1)
+    },
+    async publish(event, statusCallback = (status, relayURL) => {}) {
+      if (!event.sig) {
+        event.tags = event.tags || []
+
+        if (globalPrivateKey) {
+          event.id = await getEventHash(event)
+          event.sig = await signEvent(event, globalPrivateKey)
+        } else {
+          throw new Error(
+            "can't publish unsigned event. either sign this event beforehand or pass a private key while initializing this relay pool so it can be signed automatically."
+          )
+        }
+      }
+
+      Object.values(relays)
+        .filter(({policy}) => policy.write)
+        .map(async ({relay}) => {
+          try {
+            await relay.publish(event, status =>
+              statusCallback(status, relay.url)
+            )
+          } catch (err) {
+            statusCallback(-1, relay.url)
+          }
+        })
+
+      return event
+    }
+  }
+}

src/relay.js

@@ -1,24 +1,20 @@
-/* global WebSocket */
-
 import 'websocket-polyfill'
 
-import {verifySignature, validateEvent} from './event.js'
-import {matchFilters} from './filter.js'
+import {verifySignature} from './event'
 
 export function normalizeRelayURL(url) {
-  let [host, ...qs] = url.trim().split('?')
+  let [host, ...qs] = url.split('?')
   if (host.slice(0, 4) === 'http') host = 'ws' + host.slice(4)
   if (host.slice(0, 2) !== 'ws') host = 'wss://' + host
   if (host.length && host[host.length - 1] === '/') host = host.slice(0, -1)
   return [host, ...qs].join('?')
 }
 
-export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
+export function relayConnect(url, onNotice) {
   url = normalizeRelayURL(url)
 
-  var ws, resolveOpen, untilOpen, wasClosed
+  var ws, resolveOpen, untilOpen
   var openSubs = {}
-  var isSetToSkipVerification = {}
   let attemptNumber = 1
   let nextAttemptSeconds = 1
 
@@ -38,26 +34,19 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
       resolveOpen()
 
       // restablish old subscriptions
-      if (wasClosed) {
-        wasClosed = false
-        for (let channel in openSubs) {
-          let filters = openSubs[channel]
-          let cb = channels[channel]
-          sub({cb, filter: filters}, channel)
-        }
+      for (let channel in openSubs) {
+        let filters = openSubs[channel]
+        let cb = channels[channel]
+        sub({cb, filter: filters}, channel)
       }
     }
-    ws.onerror = err => {
+    ws.onerror = () => {
       console.log('error connecting to relay', url)
-      onError(err)
     }
     ws.onclose = () => {
       resetOpenState()
       attemptNumber++
-      nextAttemptSeconds += attemptNumber ** 3
-      if (nextAttemptSeconds > 14400) {
-        nextAttemptSeconds = 14400 // 4 hours
-      }
+      nextAttemptSeconds += attemptNumber
       console.log(
         `relay ${url} connection closed. reconnecting in ${nextAttemptSeconds} seconds.`
       )
@@ -66,8 +55,6 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
           connect()
         } catch (err) {}
       }, nextAttemptSeconds * 1000)
-
-      wasClosed = true
     }
 
     ws.onmessage = async e => {
@@ -93,13 +80,12 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
           let channel = data[1]
           let event = data[2]
 
-          if (
-            validateEvent(event) &&
-            (isSetToSkipVerification[channel] || verifySignature(event)) &&
-            channels[channel] &&
-            matchFilters(openSubs[channel], event)
-          ) {
-            channels[channel](event)
+          if (await verifySignature(event)) {
+            if (channels[channel]) {
+              channels[channel](event)
+            }
+          } else {
+            console.warn('got event with invalid signature from ' + url, event)
           }
           return
         }
@@ -120,10 +106,7 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
     ws.send(msg)
   }
 
-  const sub = (
-    {cb, filter, beforeSend, skipVerification},
-    channel = Math.random().toString().slice(2)
-  ) => {
+  const sub = ({cb, filter}, channel = Math.random().toString().slice(2)) => {
     var filters = []
     if (Array.isArray(filter)) {
       filters = filter
@@ -131,30 +114,19 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
       filters.push(filter)
     }
 
-    if (beforeSend) {
-      const beforeSendResult = beforeSend({filter, relay: url, channel})
-      filters = beforeSendResult.filter
-    }
-
     trySend(['REQ', channel, ...filters])
     channels[channel] = cb
     openSubs[channel] = filters
-    isSetToSkipVerification[channel] = skipVerification
 
     const activeCallback = cb
     const activeFilters = filters
-    const activeBeforeSend = beforeSend
 
     return {
-      sub: ({
-        cb = activeCallback,
-        filter = activeFilters,
-        beforeSend = activeBeforeSend
-      }) => sub({cb, filter, beforeSend, skipVerification}, channel),
+      sub: ({cb = activeCallback, filter = activeFilters}) =>
+        sub({cb, filter}, channel),
       unsub: () => {
         delete openSubs[channel]
         delete channels[channel]
-        delete isSetToSkipVerification[channel]
         trySend(['CLOSE', channel])
       }
     }
@@ -163,26 +135,19 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
   return {
     url,
     sub,
-    async publish(event, statusCallback) {
+    async publish(event, statusCallback = status => {}) {
       try {
         await trySend(['EVENT', event])
-        if (statusCallback) {
-          statusCallback(0)
-          let {unsub} = sub(
-            {
-              cb: () => {
-                statusCallback(1)
-                unsub()
-                clearTimeout(willUnsub)
-              },
-              filter: {ids: [event.id]}
-            },
-            `monitor-${event.id.slice(0, 5)}`
-          )
-          let willUnsub = setTimeout(unsub, 5000)
-        }
+        statusCallback(0)
+        let {unsub} = relay.sub({
+          cb: () => {
+            statusCallback(1)
+          },
+          filter: {id: event.id}
+        })
+        setTimeout(unsub, 5000)
       } catch (err) {
-        if (statusCallback) statusCallback(-1)
+        statusCallback(-1)
       }
     },
     close() {

src/utils.js

@@ -0,0 +1,6 @@
+import * as secp256k1 from '@noble/secp256k1'
+
+export const makeRandom32 = () => secp256k1.utils.randomPrivateKey()
+export const sha256 = m => secp256k1.utils.sha256(Uint8Array.from(m))
+export const getPublicKey = privateKey =>
+  secp256k1.schnorr.getPublicKey(privateKey)

tsconfig.json

@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "es2020",
-        "target": "es2020",
-        "lib": ["dom", "es2020"],
-        "esModuleInterop": true,
-        "moduleResolution": "node",
-        "allowSyntheticDefaultImports": true,
-        "declaration": true,
-        "strict": true,
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "./",
-        "typeRoots": ["."],
-        "types": ["node"],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "t/nostr-tools-tests.ts"
-    ]
-}