@qntx/nostr 0.4.0 → 0.5.0

package/dist/nips/nip57.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"nip57.mjs","names":[],"sources":["../../src/nips/nip57.ts"],"sourcesContent":["/**\n * NIP-57 Lightning Zaps — zap request template (kind 9734) and receipt validation (kind 9735). Does\n * not fetch LNURL. Receipt checks never throw.\n *\n * @see https://github.com/nostr-protocol/nips/blob/master/57.md\n */\nimport { equalBytes } from \"@noble/ciphers/utils.js\";\nimport { sha256 } from \"@noble/hashes/sha2.js\";\nimport { bech32 } from \"@scure/base\";\n\nimport { EventValidationError } from \"../core/error.ts\";\nimport { validateSignedEvent } from \"../core/event.ts\";\nimport type { Event, EventTemplate } from \"../core/event.ts\";\nimport { isAddressableKind, Kind } from \"../core/kind.ts\";\nimport { eventAddress, getDTag, parseEventAddress, Tag } from \"../core/tag.ts\";\nimport { hexToBytes, utf8Encoder } from \"../core/util.ts\";\nimport { verifyEvent } from \"../core/verifier.ts\";\n\nexport type ProfileZapRequest = {\n  pubkey: string;\n  /** Amount in millisats. */\n  amount: number;\n  relays: ReadonlyArray<string>;\n  comment?: string;\n  lnurl?: string;\n};\n\nexport type EventZapRequest = {\n  event: Event;\n  /** Amount in millisats. */\n  amount: number;\n  relays: ReadonlyArray<string>;\n  comment?: string;\n  lnurl?: string;\n};\n\nexport function makeZapRequest(params: ProfileZapRequest | EventZapRequest): EventTemplate {\n  if (params.relays.length === 0) {\n    throw new EventValidationError(\"relays tag requires one or more URLs\");\n  }\n\n  const recipient = \"event\" in params ? params.event.pubkey : params.pubkey;\n  const tags: Tag[] = [\n    Tag.p(recipient),\n    [\"amount\", params.amount.toString()],\n    [\"relays\", ...params.relays],\n  ];\n\n  if (\"event\" in params) {\n    const { event } = params;\n    tags.push(Tag.e(event.id));\n    if (isAddressableKind(event.kind)) {\n      const d = getDTag(event.tags);\n      if (d === undefined) {\n        throw new EventValidationError(\"d tag not found\");\n      }\n      const addr = eventAddress(event);\n      if (addr !== undefined) {\n        tags.push([\"a\", addr]);\n      }\n    }\n    tags.push([\"k\", event.kind.toString()]);\n  }\n\n  if (params.lnurl !== undefined && params.lnurl !== \"\") {\n    tags.push([\"lnurl\", params.lnurl]);\n  }\n\n  return {\n    kind: Kind.ZapRequest,\n    created_at: Math.floor(Date.now() / 1000),\n    content: params.comment ?? \"\",\n    tags,\n  };\n}\n\nexport type ZapReceiptContext = {\n  nostrPubkey: string;\n  lnurl?: string;\n};\n\nexport type ZapReceiptValidation = {\n  valid: boolean;\n  reason?: string;\n  request?: Event;\n  amountMsats?: number;\n};\n\nexport type Bolt11Fields = {\n  amountMsats?: number;\n  descriptionHash?: Uint8Array;\n  paymentHash?: Uint8Array;\n};\n\nfunction firstTagValue(tags: ReadonlyArray<Tag>, name: string): string | undefined {\n  for (const tag of tags) {\n    if (tag[0] === name && tag[1] !== undefined) {\n      return tag[1];\n    }\n  }\n  return undefined;\n}\n\nfunction fail(reason: string): ZapReceiptValidation {\n  return { valid: false, reason };\n}\n\nconst MSATS_PER_BTC = 100_000_000_000;\nconst MSATS_PER_MILLI = 100_000_000;\nconst MSATS_PER_MICRO = 100_000;\nconst MSATS_PER_NANO = 100;\n\n/** Amount is digits after `ln` + currency letters, optional m/u/n/p. Non-integer pico is omitted. */\nfunction amountMsatsFromHrp(hrp: string): number | undefined {\n  if (!hrp.startsWith(\"ln\")) {\n    return undefined;\n  }\n  let i = 2;\n  while (i < hrp.length) {\n    const c = hrp.codePointAt(i);\n    if (c === undefined || c < 97 || c > 122) {\n      break;\n    }\n    i++;\n  }\n  if (i === hrp.length) {\n    return undefined;\n  }\n  const rest = hrp.slice(i);\n  const m = /^([0-9]+)([munp])?$/.exec(rest);\n  if (!m) {\n    return undefined;\n  }\n  const n = Number(m[1]);\n  if (!Number.isSafeInteger(n)) {\n    return undefined;\n  }\n  const mul = m.at(2);\n  if (mul === undefined) {\n    return n * MSATS_PER_BTC;\n  }\n  if (mul === \"m\") {\n    return n * MSATS_PER_MILLI;\n  }\n  if (mul === \"u\") {\n    return n * MSATS_PER_MICRO;\n  }\n  if (mul === \"n\") {\n    return n * MSATS_PER_NANO;\n  }\n  // p: 0.1 msat; drop amounts that are not whole millisats\n  if (n % 10 !== 0) {\n    return undefined;\n  }\n  return n / 10;\n}\n\nfunction parseMsatsTag(value: string): number | undefined {\n  if (!/^[0-9]+$/.test(value)) {\n    return undefined;\n  }\n  const n = Number(value);\n  return Number.isSafeInteger(n) ? n : undefined;\n}\n\nfunction countTags(tags: ReadonlyArray<Tag>, name: string): number {\n  let n = 0;\n  for (const tag of tags) {\n    if (tag[0] === name) {\n      n++;\n    }\n  }\n  return n;\n}\n\nfunction hasHexTagValue(tags: ReadonlyArray<Tag>, name: string, value: string): boolean {\n  const needle = value.toLowerCase();\n  for (const tag of tags) {\n    if (tag[0] === name && tag[1] !== undefined && tag[1].toLowerCase() === needle) {\n      return true;\n    }\n  }\n  return false;\n}\n\nfunction hasAddressTag(tags: ReadonlyArray<Tag>, value: string): boolean {\n  const want = parseEventAddress(value);\n  if (!want) {\n    return false;\n  }\n  for (const tag of tags) {\n    if (tag[0] !== \"a\" || tag[1] === undefined) {\n      continue;\n    }\n    const got = parseEventAddress(tag[1]);\n    if (\n      got &&\n      got.kind === want.kind &&\n      got.pubkey === want.pubkey &&\n      got.identifier === want.identifier\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nconst BOLT11_TIMESTAMP_WORDS = 7;\nconst BOLT11_SIGNATURE_WORDS = 104;\nconst BOLT11_HASH_WORDS = 52;\nconst HASH_BYTES = 32;\n\n/** Decode a BOLT11 invoice. Never throws. Requires a 32-byte payment hash (type 1). */\nexport function parseBolt11(pr: string): Bolt11Fields | undefined {\n  try {\n    // Invoices exceed bech32's default 90-char limit.\n    const { prefix, words } = bech32.decode(pr.toLowerCase(), false);\n    if (!prefix.startsWith(\"ln\")) {\n      return undefined;\n    }\n    // timestamp (7) + tagged fields + secp256k1 signature (104)\n    if (words.length < BOLT11_TIMESTAMP_WORDS + BOLT11_SIGNATURE_WORDS) {\n      return undefined;\n    }\n    const fields: Bolt11Fields = {};\n    const amountMsats = amountMsatsFromHrp(prefix);\n    if (amountMsats !== undefined) {\n      fields.amountMsats = amountMsats;\n    }\n    const tlvEnd = words.length - BOLT11_SIGNATURE_WORDS;\n    let i = BOLT11_TIMESTAMP_WORDS;\n    while (i + 3 <= tlvEnd) {\n      const type = words[i];\n      const lenHigh = words[i + 1];\n      const lenLow = words[i + 2];\n      if (type === undefined || lenHigh === undefined || lenLow === undefined) {\n        break;\n      }\n      const dataLen = lenHigh * 32 + lenLow;\n      i += 3;\n      if (i + dataLen > tlvEnd) {\n        break;\n      }\n      const data = words.slice(i, i + dataLen);\n      i += dataLen;\n      if ((type !== 1 && type !== 23) || dataLen !== BOLT11_HASH_WORDS) {\n        continue;\n      }\n      const bytes = bech32.fromWordsUnsafe(data);\n      if (!bytes || bytes.length !== HASH_BYTES) {\n        continue;\n      }\n      if (type === 1) {\n        fields.paymentHash ??= bytes;\n      } else {\n        fields.descriptionHash ??= bytes;\n      }\n    }\n    if (!fields.paymentHash) {\n      return undefined;\n    }\n    return fields;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Parse the `description` tag of a kind 9735 receipt as a signed kind 9734. Never throws. */\nexport function parseZapRequestFromReceipt(receipt: Event): Event | undefined {\n  try {\n    const raw = firstTagValue(receipt.tags, \"description\");\n    if (raw === undefined) {\n      return undefined;\n    }\n    const parsed: unknown = JSON.parse(raw);\n    if (!validateSignedEvent(parsed) || parsed.kind !== Kind.ZapRequest) {\n      return undefined;\n    }\n    if (!verifyEvent(parsed)) {\n      return undefined;\n    }\n    return parsed;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Validate a kind 9735 zap receipt. Never throws. */\nexport function validateZapReceipt(receipt: Event, ctx: ZapReceiptContext): ZapReceiptValidation {\n  try {\n    if (receipt.kind !== Kind.Zap || !verifyEvent(receipt)) {\n      return fail(\"invalid receipt\");\n    }\n    if (receipt.pubkey.toLowerCase() !== ctx.nostrPubkey.toLowerCase()) {\n      return fail(\"pubkey mismatch\");\n    }\n\n    const descriptionRaw = firstTagValue(receipt.tags, \"description\");\n    const request = parseZapRequestFromReceipt(receipt);\n    if (descriptionRaw === undefined || !request) {\n      return fail(\"invalid zap request\");\n    }\n    if (countTags(request.tags, \"p\") !== 1) {\n      return fail(\"invalid p count\");\n    }\n    if (countTags(request.tags, \"e\") > 1) {\n      return fail(\"too many e tags\");\n    }\n    const relaysValue = firstTagValue(request.tags, \"relays\");\n    if (relaysValue === undefined || relaysValue === \"\") {\n      return fail(\"missing relays\");\n    }\n\n    for (const tag of request.tags) {\n      if (tag[0] !== \"a\") {\n        continue;\n      }\n      if (tag[1] === undefined) {\n        return fail(\"invalid a\");\n      }\n      const parsed = parseEventAddress(tag[1]);\n      if (!parsed || !isAddressableKind(parsed.kind)) {\n        return fail(\"invalid a\");\n      }\n    }\n\n    // Request P is the LNURL provider (receipt pubkey), not the zap sender.\n    const requestPCount = countTags(request.tags, \"P\");\n    if (requestPCount > 1) {\n      return fail(\"too many P tags\");\n    }\n    if (requestPCount === 1) {\n      const requestP = firstTagValue(request.tags, \"P\");\n      if (requestP === undefined || requestP.toLowerCase() !== receipt.pubkey.toLowerCase()) {\n        return fail(\"request P mismatch\");\n      }\n    }\n\n    const bolt11Tag = firstTagValue(receipt.tags, \"bolt11\");\n    if (bolt11Tag === undefined) {\n      return fail(\"missing bolt11\");\n    }\n    const bolt11 = parseBolt11(bolt11Tag);\n    if (!bolt11 || !bolt11.descriptionHash) {\n      return fail(\"invalid bolt11\");\n    }\n\n    const requestAmount = firstTagValue(request.tags, \"amount\");\n    if (requestAmount !== undefined) {\n      const msats = parseMsatsTag(requestAmount);\n      if (msats === undefined || bolt11.amountMsats !== msats) {\n        return fail(\"amount mismatch\");\n      }\n    }\n\n    // Hash the tag payload, not JSON.stringify(parsed) (key order may differ).\n    const digest = sha256(utf8Encoder.encode(descriptionRaw));\n    if (!equalBytes(digest, bolt11.descriptionHash)) {\n      return fail(\"description hash mismatch\");\n    }\n\n    const requestLnurl = firstTagValue(request.tags, \"lnurl\");\n    if (\n      requestLnurl !== undefined &&\n      ctx.lnurl !== undefined &&\n      requestLnurl.toLowerCase() !== ctx.lnurl.toLowerCase()\n    ) {\n      return fail(\"lnurl mismatch\");\n    }\n\n    const preimageHex = firstTagValue(receipt.tags, \"preimage\");\n    if (preimageHex !== undefined && bolt11.paymentHash) {\n      let preimage: Uint8Array;\n      try {\n        preimage = hexToBytes(preimageHex);\n      } catch {\n        return fail(\"preimage mismatch\");\n      }\n      if (!equalBytes(sha256(preimage), bolt11.paymentHash)) {\n        return fail(\"preimage mismatch\");\n      }\n    }\n\n    const recipient = firstTagValue(request.tags, \"p\");\n    if (recipient === undefined || !hasHexTagValue(receipt.tags, \"p\", recipient)) {\n      return fail(\"missing p\");\n    }\n    const requestE = firstTagValue(request.tags, \"e\");\n    if (requestE !== undefined && !hasHexTagValue(receipt.tags, \"e\", requestE)) {\n      return fail(\"missing e\");\n    }\n    for (const tag of request.tags) {\n      if (tag[0] !== \"a\" || tag[1] === undefined) {\n        continue;\n      }\n      if (!hasAddressTag(receipt.tags, tag[1])) {\n        return fail(\"missing a\");\n      }\n    }\n\n    // Receipt P is the zap sender (request pubkey). Do not copy request tag P.\n    for (const tag of receipt.tags) {\n      if (tag[0] !== \"P\") {\n        continue;\n      }\n      if (tag[1] === undefined || tag[1].toLowerCase() !== request.pubkey.toLowerCase()) {\n        return fail(\"receipt P mismatch\");\n      }\n    }\n\n    const amountMsats =\n      bolt11.amountMsats ??\n      (requestAmount === undefined ? undefined : parseMsatsTag(requestAmount));\n    return amountMsats === undefined\n      ? { valid: true, request }\n      : { valid: true, request, amountMsats };\n  } catch {\n    return fail(\"invalid receipt\");\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"nip57.mjs","names":[],"sources":["../../src/nips/nip57.ts"],"sourcesContent":["/**\n * NIP-57 Lightning Zaps — zap request template (kind 9734) and receipt validation (kind 9735). Does\n * not fetch LNURL. Receipt checks never throw.\n *\n * @see https://github.com/nostr-protocol/nips/blob/master/57.md\n */\nimport { equalBytes } from \"@noble/ciphers/utils.js\";\nimport { sha256 } from \"@noble/hashes/sha2.js\";\nimport { bech32 } from \"@scure/base\";\n\nimport { EventValidationError } from \"../core/error.ts\";\nimport { validateSignedEvent } from \"../core/event.ts\";\nimport type { Event, EventTemplate } from \"../core/event.ts\";\nimport { isAddressableKind, Kind } from \"../core/kind.ts\";\nimport { eventAddress, getDTag, parseEventAddress, Tag } from \"../core/tag.ts\";\nimport { hexToBytes, utf8Encoder } from \"../core/util.ts\";\nimport { verifyEvent } from \"../core/verifier.ts\";\n\nexport type ProfileZapRequest = {\n  pubkey: string;\n  /** Amount in millisats. */\n  amount: number;\n  relays: ReadonlyArray<string>;\n  comment?: string;\n  lnurl?: string;\n};\n\nexport type EventZapRequest = {\n  event: Event;\n  /** Amount in millisats. */\n  amount: number;\n  relays: ReadonlyArray<string>;\n  comment?: string;\n  lnurl?: string;\n};\n\nexport function makeZapRequest(params: ProfileZapRequest | EventZapRequest): EventTemplate {\n  if (params.relays.length === 0) {\n    throw new EventValidationError(\"relays tag requires one or more URLs\");\n  }\n\n  const recipient = \"event\" in params ? params.event.pubkey : params.pubkey;\n  const tags: Tag[] = [\n    Tag.p(recipient),\n    [\"amount\", params.amount.toString()],\n    [\"relays\", ...params.relays],\n  ];\n\n  if (\"event\" in params) {\n    const { event } = params;\n    tags.push(Tag.e(event.id));\n    if (isAddressableKind(event.kind)) {\n      const d = getDTag(event.tags);\n      if (d === undefined) {\n        throw new EventValidationError(\"d tag not found\");\n      }\n      const addr = eventAddress(event);\n      if (addr !== undefined) {\n        tags.push([\"a\", addr]);\n      }\n    }\n    tags.push([\"k\", event.kind.toString()]);\n  }\n\n  if (params.lnurl !== undefined && params.lnurl !== \"\") {\n    tags.push([\"lnurl\", params.lnurl]);\n  }\n\n  return {\n    kind: Kind.ZapRequest,\n    created_at: Math.floor(Date.now() / 1000),\n    content: params.comment ?? \"\",\n    tags,\n  };\n}\n\nexport type ZapReceiptContext = {\n  nostrPubkey: string;\n  lnurl?: string;\n};\n\nexport type ZapReceiptValidation = {\n  valid: boolean;\n  reason?: string;\n  request?: Event;\n  amountMsats?: number;\n};\n\nexport type Bolt11Fields = {\n  amountMsats?: number;\n  /** The `d` tagged field, UTF-8 decoded; omitted on invalid UTF-8. */\n  description?: string;\n  descriptionHash?: Uint8Array;\n  paymentHash?: Uint8Array;\n  /** Invoice creation time (unix seconds). */\n  timestamp: number;\n  /** `x` tagged field — seconds after `timestamp` until expiry. Defaults to 3600 when absent. */\n  expiry: number;\n};\n\nfunction firstTagValue(tags: ReadonlyArray<Tag>, name: string): string | undefined {\n  for (const tag of tags) {\n    if (tag[0] === name && tag[1] !== undefined) {\n      return tag[1];\n    }\n  }\n  return undefined;\n}\n\nfunction fail(reason: string): ZapReceiptValidation {\n  return { valid: false, reason };\n}\n\nconst MSATS_PER_BTC = 100_000_000_000;\nconst MSATS_PER_MILLI = 100_000_000;\nconst MSATS_PER_MICRO = 100_000;\nconst MSATS_PER_NANO = 100;\n\n/** Amount is digits after `ln` + currency letters, optional m/u/n/p. Non-integer pico is omitted. */\nfunction amountMsatsFromHrp(hrp: string): number | undefined {\n  if (!hrp.startsWith(\"ln\")) {\n    return undefined;\n  }\n  let i = 2;\n  while (i < hrp.length) {\n    const c = hrp.codePointAt(i);\n    if (c === undefined || c < 97 || c > 122) {\n      break;\n    }\n    i++;\n  }\n  if (i === hrp.length) {\n    return undefined;\n  }\n  const rest = hrp.slice(i);\n  const m = /^([0-9]+)([munp])?$/.exec(rest);\n  if (!m) {\n    return undefined;\n  }\n  const n = Number(m[1]);\n  if (!Number.isSafeInteger(n)) {\n    return undefined;\n  }\n  const mul = m.at(2);\n  if (mul === undefined) {\n    return n * MSATS_PER_BTC;\n  }\n  if (mul === \"m\") {\n    return n * MSATS_PER_MILLI;\n  }\n  if (mul === \"u\") {\n    return n * MSATS_PER_MICRO;\n  }\n  if (mul === \"n\") {\n    return n * MSATS_PER_NANO;\n  }\n  // p: 0.1 msat; drop amounts that are not whole millisats\n  if (n % 10 !== 0) {\n    return undefined;\n  }\n  return n / 10;\n}\n\nfunction parseMsatsTag(value: string): number | undefined {\n  if (!/^[0-9]+$/.test(value)) {\n    return undefined;\n  }\n  const n = Number(value);\n  return Number.isSafeInteger(n) ? n : undefined;\n}\n\nfunction countTags(tags: ReadonlyArray<Tag>, name: string): number {\n  let n = 0;\n  for (const tag of tags) {\n    if (tag[0] === name) {\n      n++;\n    }\n  }\n  return n;\n}\n\nfunction hasHexTagValue(tags: ReadonlyArray<Tag>, name: string, value: string): boolean {\n  const needle = value.toLowerCase();\n  for (const tag of tags) {\n    if (tag[0] === name && tag[1] !== undefined && tag[1].toLowerCase() === needle) {\n      return true;\n    }\n  }\n  return false;\n}\n\nfunction hasAddressTag(tags: ReadonlyArray<Tag>, value: string): boolean {\n  const want = parseEventAddress(value);\n  if (!want) {\n    return false;\n  }\n  for (const tag of tags) {\n    if (tag[0] !== \"a\" || tag[1] === undefined) {\n      continue;\n    }\n    const got = parseEventAddress(tag[1]);\n    if (\n      got &&\n      got.kind === want.kind &&\n      got.pubkey === want.pubkey &&\n      got.identifier === want.identifier\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nconst BOLT11_TIMESTAMP_WORDS = 7;\nconst BOLT11_SIGNATURE_WORDS = 104;\nconst BOLT11_HASH_WORDS = 52;\nconst HASH_BYTES = 32;\nconst BOLT11_TAG_PAYMENT_HASH = 1;\nconst BOLT11_TAG_EXPIRY = 6;\nconst BOLT11_TAG_DESCRIPTION = 13;\nconst BOLT11_TAG_DESCRIPTION_HASH = 23;\nconst DEFAULT_EXPIRY_SECONDS = 3600;\n\nconst utf8DecoderFatal = new TextDecoder(\"utf-8\", { fatal: true });\n\n/** Big-endian 5-bit words as a JS number (safe below 2^53). */\nfunction wordsToInt(words: ReadonlyArray<number>): number {\n  let value = 0;\n  for (const word of words) {\n    value = value * 32 + word;\n  }\n  return value;\n}\n\n/** Decode a BOLT11 invoice. Never throws. Requires a 32-byte payment hash (type 1). */\nexport function parseBolt11(pr: string): Bolt11Fields | undefined {\n  try {\n    // Invoices exceed bech32's default 90-char limit.\n    const { prefix, words } = bech32.decode(pr.toLowerCase(), false);\n    if (!prefix.startsWith(\"ln\")) {\n      return undefined;\n    }\n    // timestamp (7) + tagged fields + secp256k1 signature (104)\n    if (words.length < BOLT11_TIMESTAMP_WORDS + BOLT11_SIGNATURE_WORDS) {\n      return undefined;\n    }\n    const fields: Bolt11Fields = {\n      timestamp: wordsToInt(words.slice(0, BOLT11_TIMESTAMP_WORDS)),\n      expiry: DEFAULT_EXPIRY_SECONDS,\n    };\n    let sawExpiry = false;\n    const amountMsats = amountMsatsFromHrp(prefix);\n    if (amountMsats !== undefined) {\n      fields.amountMsats = amountMsats;\n    }\n    const tlvEnd = words.length - BOLT11_SIGNATURE_WORDS;\n    let i = BOLT11_TIMESTAMP_WORDS;\n    while (i + 3 <= tlvEnd) {\n      const type = words[i];\n      const lenHigh = words[i + 1];\n      const lenLow = words[i + 2];\n      if (type === undefined || lenHigh === undefined || lenLow === undefined) {\n        break;\n      }\n      const dataLen = lenHigh * 32 + lenLow;\n      i += 3;\n      if (i + dataLen > tlvEnd) {\n        break;\n      }\n      const data = words.slice(i, i + dataLen);\n      i += dataLen;\n      if (type === BOLT11_TAG_EXPIRY) {\n        if (!sawExpiry) {\n          sawExpiry = true;\n          fields.expiry = wordsToInt(data);\n        }\n        continue;\n      }\n      if (type === BOLT11_TAG_DESCRIPTION) {\n        const bytes = bech32.fromWordsUnsafe(data);\n        if (bytes !== undefined) {\n          try {\n            fields.description ??= utf8DecoderFatal.decode(bytes);\n          } catch {\n            // Invalid UTF-8 — drop the field, not the invoice.\n          }\n        }\n        continue;\n      }\n      if (\n        (type !== BOLT11_TAG_PAYMENT_HASH && type !== BOLT11_TAG_DESCRIPTION_HASH) ||\n        dataLen !== BOLT11_HASH_WORDS\n      ) {\n        continue;\n      }\n      const bytes = bech32.fromWordsUnsafe(data);\n      if (!bytes || bytes.length !== HASH_BYTES) {\n        continue;\n      }\n      if (type === BOLT11_TAG_PAYMENT_HASH) {\n        fields.paymentHash ??= bytes;\n      } else {\n        fields.descriptionHash ??= bytes;\n      }\n    }\n    if (!fields.paymentHash) {\n      return undefined;\n    }\n    return fields;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Parse the `description` tag of a kind 9735 receipt as a signed kind 9734. Never throws. */\nexport function parseZapRequestFromReceipt(receipt: Event): Event | undefined {\n  try {\n    const raw = firstTagValue(receipt.tags, \"description\");\n    if (raw === undefined) {\n      return undefined;\n    }\n    const parsed: unknown = JSON.parse(raw);\n    if (!validateSignedEvent(parsed) || parsed.kind !== Kind.ZapRequest) {\n      return undefined;\n    }\n    if (!verifyEvent(parsed)) {\n      return undefined;\n    }\n    return parsed;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Validate a kind 9735 zap receipt. Never throws. */\nexport function validateZapReceipt(receipt: Event, ctx: ZapReceiptContext): ZapReceiptValidation {\n  try {\n    if (receipt.kind !== Kind.Zap || !verifyEvent(receipt)) {\n      return fail(\"invalid receipt\");\n    }\n    if (receipt.pubkey.toLowerCase() !== ctx.nostrPubkey.toLowerCase()) {\n      return fail(\"pubkey mismatch\");\n    }\n\n    const descriptionRaw = firstTagValue(receipt.tags, \"description\");\n    const request = parseZapRequestFromReceipt(receipt);\n    if (descriptionRaw === undefined || !request) {\n      return fail(\"invalid zap request\");\n    }\n    if (countTags(request.tags, \"p\") !== 1) {\n      return fail(\"invalid p count\");\n    }\n    if (countTags(request.tags, \"e\") > 1) {\n      return fail(\"too many e tags\");\n    }\n    const relaysValue = firstTagValue(request.tags, \"relays\");\n    if (relaysValue === undefined || relaysValue === \"\") {\n      return fail(\"missing relays\");\n    }\n\n    for (const tag of request.tags) {\n      if (tag[0] !== \"a\") {\n        continue;\n      }\n      if (tag[1] === undefined) {\n        return fail(\"invalid a\");\n      }\n      const parsed = parseEventAddress(tag[1]);\n      if (!parsed || !isAddressableKind(parsed.kind)) {\n        return fail(\"invalid a\");\n      }\n    }\n\n    // Request P is the LNURL provider (receipt pubkey), not the zap sender.\n    const requestPCount = countTags(request.tags, \"P\");\n    if (requestPCount > 1) {\n      return fail(\"too many P tags\");\n    }\n    if (requestPCount === 1) {\n      const requestP = firstTagValue(request.tags, \"P\");\n      if (requestP === undefined || requestP.toLowerCase() !== receipt.pubkey.toLowerCase()) {\n        return fail(\"request P mismatch\");\n      }\n    }\n\n    const bolt11Tag = firstTagValue(receipt.tags, \"bolt11\");\n    if (bolt11Tag === undefined) {\n      return fail(\"missing bolt11\");\n    }\n    const bolt11 = parseBolt11(bolt11Tag);\n    if (!bolt11 || !bolt11.descriptionHash) {\n      return fail(\"invalid bolt11\");\n    }\n\n    const requestAmount = firstTagValue(request.tags, \"amount\");\n    if (requestAmount !== undefined) {\n      const msats = parseMsatsTag(requestAmount);\n      if (msats === undefined || bolt11.amountMsats !== msats) {\n        return fail(\"amount mismatch\");\n      }\n    }\n\n    // Hash the tag payload, not JSON.stringify(parsed) (key order may differ).\n    const digest = sha256(utf8Encoder.encode(descriptionRaw));\n    if (!equalBytes(digest, bolt11.descriptionHash)) {\n      return fail(\"description hash mismatch\");\n    }\n\n    const requestLnurl = firstTagValue(request.tags, \"lnurl\");\n    if (\n      requestLnurl !== undefined &&\n      ctx.lnurl !== undefined &&\n      requestLnurl.toLowerCase() !== ctx.lnurl.toLowerCase()\n    ) {\n      return fail(\"lnurl mismatch\");\n    }\n\n    const preimageHex = firstTagValue(receipt.tags, \"preimage\");\n    if (preimageHex !== undefined && bolt11.paymentHash) {\n      let preimage: Uint8Array;\n      try {\n        preimage = hexToBytes(preimageHex);\n      } catch {\n        return fail(\"preimage mismatch\");\n      }\n      if (!equalBytes(sha256(preimage), bolt11.paymentHash)) {\n        return fail(\"preimage mismatch\");\n      }\n    }\n\n    const recipient = firstTagValue(request.tags, \"p\");\n    if (recipient === undefined || !hasHexTagValue(receipt.tags, \"p\", recipient)) {\n      return fail(\"missing p\");\n    }\n    const requestE = firstTagValue(request.tags, \"e\");\n    if (requestE !== undefined && !hasHexTagValue(receipt.tags, \"e\", requestE)) {\n      return fail(\"missing e\");\n    }\n    for (const tag of request.tags) {\n      if (tag[0] !== \"a\" || tag[1] === undefined) {\n        continue;\n      }\n      if (!hasAddressTag(receipt.tags, tag[1])) {\n        return fail(\"missing a\");\n      }\n    }\n\n    // Receipt P is the zap sender (request pubkey). Do not copy request tag P.\n    for (const tag of receipt.tags) {\n      if (tag[0] !== \"P\") {\n        continue;\n      }\n      if (tag[1] === undefined || tag[1].toLowerCase() !== request.pubkey.toLowerCase()) {\n        return fail(\"receipt P mismatch\");\n      }\n    }\n\n    const amountMsats =\n      bolt11.amountMsats ??\n      (requestAmount === undefined ? undefined : parseMsatsTag(requestAmount));\n    return amountMsats === undefined\n      ? { valid: true, request }\n      : { valid: true, request, amountMsats };\n  } catch {\n    return fail(\"invalid receipt\");\n  }\n}\n"],"mappings":"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"}

package/dist/{pool-BGVx59yd.mjs → pool-As20OGxB.mjs}

@@ -441,11 +441,14 @@ function openExclusive(ctx, filters, opts) {
 function subscribeLive(ctx, filters, opts) {
 	const fp = filterFingerprint(filters);
 	let group = ctx.liveByFp.get(fp);
+	if (group?.sub.eosed === true) group = void 0;
 	let created = false;
 	if (!group) {
 		created = true;
+		const slot = { group: void 0 };
 		const wire = new Subscription(filters, { id: opts.id }, () => {
-			endLiveGroup(ctx, fp, {
+			const g = slot.group;
+			if (g) endLiveGroup(ctx, g, {
 				sendClose: true,
 				reason: "closed by client"
 			});
@@ -455,18 +458,20 @@ function subscribeLive(ctx, filters, opts) {
 			sub: wire,
 			attachments: /* @__PURE__ */ new Set()
 		};
+		slot.group = group;
 		ctx.liveByFp.set(fp, group);
 		ctx.liveBySubId.set(wire.id, group);
 		ctx.subs.set(wire.id, wire);
 	}
 	const slot = { handle: void 0 };
+	const attached = group;
 	const handle = new Subscription(filters, {
 		...opts,
 		id: group.sub.id
 	}, () => {
 		const current = slot.handle;
 		if (!current) return;
-		detachLive(ctx, fp, current);
+		detachLive(ctx, attached, current);
 	});
 	slot.handle = handle;
 	if (handle.closed) {
@@ -483,32 +488,23 @@ function subscribeLive(ctx, filters, opts) {
 		else if (ctx.enableReconnect()) ctx.scheduleReconnect();
 	}
 	if (opts.eoseTimeoutMs !== void 0) ctx.armEoseTimeout(handle, opts.eoseTimeoutMs);
-	if (group.sub.eosed) queueMicrotask(() => {
-		if (handle.closed || handle.eosed) return;
-		handle.eosed = true;
-		invokeSafely(() => handle.handlers.oneose?.());
-	});
 	return handle;
 }
 function forgetLiveGroup(ctx, group) {
-	ctx.liveByFp.delete(group.fp);
+	if (ctx.liveByFp.get(group.fp) === group) ctx.liveByFp.delete(group.fp);
 	ctx.liveBySubId.delete(group.sub.id);
 	ctx.subs.delete(group.sub.id);
 	group.sub.closed = true;
 }
-function detachLive(ctx, fp, handle) {
-	const group = ctx.liveByFp.get(fp);
-	if (!group) return;
+function detachLive(ctx, group, handle) {
 	if (!group.attachments.delete(handle)) return;
 	if (group.attachments.size > 0) return;
-	endLiveGroup(ctx, fp, {
+	endLiveGroup(ctx, group, {
 		sendClose: true,
 		reason: "closed by client"
 	});
 }
-function endLiveGroup(ctx, fp, opts) {
-	const group = ctx.liveByFp.get(fp);
-	if (!group) return;
+function endLiveGroup(ctx, group, opts) {
 	const { id } = group.sub;
 	const remaining = [...group.attachments];
 	group.attachments.clear();
@@ -555,9 +551,9 @@ function deliverLiveEose(group) {
 	}
 }
 function closeAllSubscriptions(ctx, reason) {
-	const fps = [...ctx.liveByFp.keys()];
-	for (const fp of fps) invokeSafely(() => {
-		endLiveGroup(ctx, fp, {
+	const groups = [...ctx.liveBySubId.values()];
+	for (const group of groups) invokeSafely(() => {
+		endLiveGroup(ctx, group, {
 			sendClose: false,
 			reason
 		});
@@ -575,7 +571,7 @@ function closeAllSubscriptions(ctx, reason) {
 function dropSubscription(ctx, sub, reason) {
 	const group = ctx.liveBySubId.get(sub.id);
 	if (group) {
-		endLiveGroup(ctx, group.fp, {
+		endLiveGroup(ctx, group, {
 			sendClose: false,
 			reason
 		});
@@ -654,6 +650,7 @@ async function fetchFilters(subscribe, filters, opts) {
 	throwIfAborted(opts.signal);
 	const events = [];
 	const seen = /* @__PURE__ */ new Set();
+	let end = { type: "timeout" };
 	await new Promise((resolve, reject) => {
 		let settled = false;
 		const done = (err) => {
@@ -667,7 +664,10 @@ async function fetchFilters(subscribe, filters, opts) {
 			if (err === void 0) resolve();
 			else reject(err);
 		};
-		const timer = setTimeout(() => done(), opts.timeoutMs);
+		const timer = setTimeout(() => {
+			end = { type: "timeout" };
+			done();
+		}, opts.timeoutMs);
 		const sub = subscribe(filters, {
 			id: opts.id,
 			signal: opts.signal,
@@ -678,15 +678,28 @@ async function fetchFilters(subscribe, filters, opts) {
 				events.push(event);
 			},
 			oneose() {
+				end = { type: "eose" };
 				done();
 			},
-			onclose() {
-				if (!settled) done(opts.signal?.aborted === true ? abortReason(opts.signal) : void 0);
+			onclose(reason) {
+				if (settled) return;
+				if (opts.signal?.aborted === true) {
+					done(abortReason(opts.signal));
+					return;
+				}
+				end = {
+					type: "closed",
+					reason
+				};
+				done();
 			}
 		});
 		opts.signal?.addEventListener("abort", () => done(opts.signal ? abortReason(opts.signal) : void 0), { once: true });
 	});
-	return events;
+	return {
+		events,
+		end
+	};
 }
 function armEoseTimeout(sub, eoseTimeoutMs) {
 	const timer = setTimeout(() => {
@@ -1264,7 +1277,11 @@ var Relay = class Relay {
 	stream(filters, opts) {
 		return streamFilters((f, o) => this.subscribe(f, o), filters, opts);
 	}
-	/** One-shot query: collect events until EOSE or timeout, then close. */
+	/**
+	* One-shot query: collect events until the REQ ends, then close. `end` reports how it ended —
+	* relay `EOSE`, relay `CLOSED` (with its reason), or the local timeout; events received before a
+	* CLOSED or the deadline are still returned. Abort rejects; a failed (re)connect rejects.
+	*/
 	async fetch(filters, opts) {
 		if (filters.length === 0) throw new MessageError("REQ requires at least one filter");
 		const canonical = canonicalizeFilters(filters);
@@ -1272,8 +1289,7 @@ var Relay = class Relay {
 		return fetchFilters((f, o) => this.subscribe(f, o), canonical, {
 			timeoutMs: opts?.timeoutMs ?? 4400,
 			signal: opts?.signal,
-			id: opts?.id,
-			url: this.url
+			id: opts?.id
 		});
 	}
 	/** Publish an event and wait for OK. */
@@ -1596,6 +1612,7 @@ function fanIn(pool, jobs, opts = {}) {
 	const closers = [];
 	let closed = false;
 	let eoseFired = false;
+	let sawEose = false;
 	let eoseTimer;
 	const eoseDone = /* @__PURE__ */ new Set();
 	const eoseAttempted = /* @__PURE__ */ new Set();
@@ -1610,12 +1627,18 @@ function fanIn(pool, jobs, opts = {}) {
 		}
 		invokeSafely(() => opts.oneose?.());
 	};
-	const markEose = (jobIndex, url) => {
+	/**
+	* Remove one relay from the pending-EOSE set. `eosed` credits a real EOSE; a CLOSED or a connect
+	* failure only drops the wait — the aggregate `oneose` fires once every remaining relay ended AND
+	* at least one actually EOSE'd.
+	*/
+	const settleEose = (jobIndex, url, eosed) => {
 		const key = `${jobIndex}:${url}`;
 		if (eoseDone.has(key)) return;
 		eoseDone.add(key);
+		if (eosed) sawEose = true;
 		pendingEose -= 1;
-		if (pendingEose === 0) fireEose();
+		if (pendingEose === 0 && sawEose) fireEose();
 	};
 	const settleClose = () => {
 		closed = true;
@@ -1637,7 +1660,7 @@ function fanIn(pool, jobs, opts = {}) {
 	}
 	opts.signal?.addEventListener("abort", () => closeAll("aborted"), { once: true });
 	const failUrl = (jobIndex, key) => {
-		markEose(jobIndex, key);
+		settleEose(jobIndex, key, false);
 		pending -= 1;
 		if (pending <= 0 && closers.length === 0 && !closed) {
 			settleClose();
@@ -1662,9 +1685,9 @@ function fanIn(pool, jobs, opts = {}) {
 				seen.add(event.id);
 				invokeSafely(() => opts.onevent?.(event, relay.url));
 			},
-			oneose: () => markEose(jobIndex, relay.url),
+			oneose: () => settleEose(jobIndex, relay.url, true),
 			onclose: (reason) => {
-				markEose(jobIndex, relay.url);
+				settleEose(jobIndex, relay.url, false);
 				pending -= 1;
 				if (pending <= 0 && !closed) {
 					settleClose();
@@ -1756,10 +1779,10 @@ async function fetchRouted(pool, jobs, opts = {}) {
 					timeoutMs: opts.connectTimeoutMs
 				});
 				relayUrl = relay.url;
-				batch = await relay.fetch([...job.filters], {
+				batch = (await relay.fetch([...job.filters], {
 					timeoutMs: opts.timeoutMs,
 					signal: opts.signal
-				});
+				})).events;
 			} catch {
 				if (opts.signal?.aborted === true) throw abortReason(opts.signal);
 				return;
@@ -2002,6 +2025,44 @@ var Pool = class {
 			connectTimeoutMs: this.#opts.connectTimeoutMs
 		});
 	}
+	/**
+	* One-shot fetch per relay: each entry reports its own events and end reason (`eose`, `closed`,
+	* `timeout`), or `failed` when the connect or REQ itself errored. An abort rejects the whole
+	* call. Events are not deduped across relays — use {@link fetch} for that.
+	*/
+	async fetchEach(relays, filters, opts) {
+		if (filters.length === 0) throw new MessageError("REQ requires at least one filter");
+		throwIfAborted(opts?.signal);
+		const canonical = canonicalizeFilters(filters);
+		return Promise.all(relays.map(async (url) => {
+			try {
+				const relay = await this.ensureRelay(url, {
+					signal: opts?.signal,
+					timeoutMs: this.#opts.connectTimeoutMs
+				});
+				this.#touch(relay.url);
+				const result = await relay.fetch([...canonical], {
+					timeoutMs: opts?.timeoutMs,
+					signal: opts?.signal
+				});
+				return {
+					url: relay.url,
+					events: result.events,
+					end: result.end
+				};
+			} catch (error) {
+				if (opts?.signal?.aborted === true) throw abortReason(opts.signal);
+				return {
+					url,
+					events: [],
+					end: {
+						type: "failed",
+						reason: error instanceof Error ? error.message : String(error)
+					}
+				};
+			}
+		}));
+	}
 	/** Fetch events until each connected relay EOSE or timeout; dedupe by id. */
 	async fetch(relays, filters, opts) {
 		if (filters.length === 0) throw new MessageError("REQ requires at least one filter");
@@ -2102,4 +2163,4 @@ var Pool = class {
 //#endregion
 export { RelayStatus as a, isInsecureRelayUrl as c, RelayClosedError as d, RelayConnectionError as f, RelayTimeoutError as g, RelaySuspendedError as h, Relay as i, getWebSocketImplementation as l, RelayPublishError as m, fanIn as n, Subscription as o, RelayError as p, fetchRouted as r, subscriptionToAsyncIterable as s, Pool as t, useWebSocketImplementation as u };
 
-//# sourceMappingURL=pool-BGVx59yd.mjs.map
+//# sourceMappingURL=pool-As20OGxB.mjs.map