v2.3.1

nip46.ts

@@ -118,7 +118,7 @@ export class BunkerSigner {
           const { id, result, error } = JSON.parse(await decrypt(clientSecretKey, event.pubkey, event.content))
 
           if (result === 'auth_url' && waitingForAuth[id]) {
-            delete listeners[id]
+            delete waitingForAuth[id]
 
             if (params.onauth) {
               params.onauth(error)
@@ -279,22 +279,35 @@ export async function createAccount(
   return rpc
 }
 
+// @deprecated use fetchBunkerProviders instead
+export const fetchCustodialBunkers = fetchBunkerProviders
+
 /**
  * Fetches info on available providers that announce themselves using NIP-89 events.
  * @returns A promise that resolves to an array of available bunker objects.
  */
-export async function fetchCustodialBunkers(pool: AbstractSimplePool, relays: string[]): Promise<BunkerProfile[]> {
+export async function fetchBunkerProviders(pool: AbstractSimplePool, relays: string[]): Promise<BunkerProfile[]> {
   const events = await pool.querySync(relays, {
     kinds: [Handlerinformation],
     '#k': [NostrConnect.toString()],
   })
 
+  events.sort((a, b) => b.created_at - a.created_at)
+
   // validate bunkers by checking their NIP-05 and pubkey
   // map to a more useful object
   const validatedBunkers = await Promise.all(
-    events.map(async event => {
+    events.map(async (event, i) => {
       try {
         const content = JSON.parse(event.content)
+
+        // skip duplicates
+        try {
+          if (events.findIndex(ev => JSON.parse(ev.content).nip05 === content.nip05) !== i) return undefined
+        } catch (err) {
+          /***/
+        }
+
         const bp = await queryBunkerProfile(content.nip05)
         if (bp && bp.pubkey === event.pubkey && bp.relays.length) {
           return {

nip47.test.ts

@@ -1,14 +1,9 @@
-import crypto from 'node:crypto'
 import { describe, test, expect } from 'bun:test'
 import { hexToBytes } from '@noble/hashes/utils'
 import { makeNwcRequestEvent, parseConnectionString } from './nip47'
 import { decrypt } from './nip04.ts'
 import { NWCWalletRequest } from './kinds.ts'
 
-// @ts-ignore
-// eslint-disable-next-line no-undef
-globalThis.crypto = crypto
-
 describe('parseConnectionString', () => {
   test('returns pubkey, relay, and secret if connection string is valid', () => {
     const connectionString =

nip96.ts

@@ -1,5 +1,7 @@
+import { sha256 } from '@noble/hashes/sha256'
 import { EventTemplate } from './core'
 import { FileServerPreference } from './kinds'
+import { bytesToHex } from '@noble/hashes/utils'
 
 /**
  * Represents the configuration for a server compliant with NIP-96.
@@ -576,15 +578,5 @@ export function generateFSPEventTemplate(serverUrls: string[]): EventTemplate {
  * @returns A promise that resolves to the SHA-256 hash of the file.
  */
 export async function calculateFileHash(file: Blob): Promise<string> {
-  // Read the file as an ArrayBuffer
+  return bytesToHex(sha256(new Uint8Array(await file.arrayBuffer())))
-  const buffer = await file.arrayBuffer()
-
-  // Calculate the SHA-256 hash of the file
-  const hashBuffer = await crypto.subtle.digest('SHA-256', buffer)
-
-  // Convert the hash to a hexadecimal string
-  const hashArray = Array.from(new Uint8Array(hashBuffer))
-  const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('')
-
-  return hashHex
 }

package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "nostr-tools",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",