libp2r2p 0.10.7 → 0.10.9

package/nip27/helpers/user-reference.js

@@ -24,8 +24,8 @@ function stripReferencePrefix (value) {
 }
 
 // Decodes a user reference without performing any network lookup.
-// Returns `{ kind: 'pubkey', pubkey, relays, raw }` for npub/nprofile/hex or
-// `{ kind: 'nip05', local, domain, raw }` for NIP-05 (standard or extended),
+// Returns `{ type: 'pubkey', pubkey, relays, raw }` for npub/nprofile/hex or
+// `{ type: 'nip05', local, domain, raw }` for NIP-05 (standard or extended),
 // where `raw` is always the most compact canonical spelling.
 export function decodeUserReference (value) {
   if (typeof value !== 'string') return null
@@ -34,13 +34,13 @@ export function decodeUserReference (value) {
 
   if (HEX_PUBKEY.test(text)) {
     const raw = text.toLowerCase()
-    return { kind: 'pubkey', pubkey: raw, relays: [], raw }
+    return { type: 'pubkey', pubkey: raw, relays: [], raw }
   }
 
   if (text.toLowerCase().startsWith('npub1')) {
     try {
       const raw = text.toLowerCase()
-      return { kind: 'pubkey', pubkey: npubDecode(raw), relays: [], raw }
+      return { type: 'pubkey', pubkey: npubDecode(raw), relays: [], raw }
     } catch {
       return null
     }
@@ -50,7 +50,7 @@ export function decodeUserReference (value) {
     try {
       const raw = text.toLowerCase()
       const { pubkey, relays } = nprofileDecode(raw)
-      return { kind: 'pubkey', pubkey, relays, raw }
+      return { type: 'pubkey', pubkey, relays, raw }
     } catch {
       return null
     }
@@ -59,7 +59,7 @@ export function decodeUserReference (value) {
   const nip05 = decodeNip05Identifier(text)
   if (!nip05) return null
   const raw = compactNip05Raw(nip05.local, nip05.domain)
-  return { kind: 'nip05', ...nip05, raw }
+  return { type: 'nip05', ...nip05, raw }
 }
 
 // Returns the canonical compact spelling for a user reference, either as a
@@ -68,12 +68,12 @@ export function encodeUserReference (value) {
   const ref = typeof value === 'string'
     ? decodeUserReference(value)
     : value && typeof value === 'object' &&
-        (value.kind === 'pubkey' || value.kind === 'nip05')
+        (value.type === 'pubkey' || value.type === 'nip05')
       ? value
       : null
   if (!ref) {
     throw new ValidationError('INVALID_USER_REFERENCE', { message: 'Invalid user reference' })
   }
-  if (ref.kind === 'pubkey') return ref.raw ?? ref.pubkey
+  if (ref.type === 'pubkey') return ref.raw ?? ref.pubkey
   return ref.raw ?? compactNip05Raw(ref.local, ref.domain)
 }

package/nip27/index.js

@@ -119,7 +119,7 @@ export function decodeReference (value) {
 
   const account = decodeUserReference(text)
   if (account) {
-    return account.kind === 'pubkey'
+    return account.type === 'pubkey'
       ? {
           type: 'pubkey',
           original,
@@ -350,7 +350,7 @@ export function extractMedia (content, { bareNip05 = false, getMimeType } = {})
 export async function resolveUserReference (value, options = {}) {
   const account = decodeUserReference(value)
   if (!account) return null
-  if (account.kind === 'pubkey') {
+  if (account.type === 'pubkey') {
     return { pubkey: account.pubkey, relays: account.relays, label: account.raw }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2r2p",
-  "version": "0.10.7",
+  "version": "0.10.9",
   "description": "Peer-to-relay-to-peer",
   "keywords": [
     "p2r2p",

package/url/app-url.js

@@ -9,11 +9,25 @@ import {
 } from '../nip27/helpers/user-reference.js'
 import {
   NAPP_ENTITY_REGEX,
-  appDecode
+  appDecode,
+  appEncode,
+  naddrDecode
 } from '../nip19/index.js'
+import {
+  DRAFT_SITE_MANIFEST,
+  MAIN_SITE_MANIFEST,
+  NEXT_SITE_MANIFEST
+} from '../kind/index.js'
 
 export const APP_URL_MIN_ENTITY_BODY_LENGTH = 48
 
+const SITE_MANIFEST_KINDS = new Set([
+  MAIN_SITE_MANIFEST,
+  NEXT_SITE_MANIFEST,
+  DRAFT_SITE_MANIFEST
+])
+const NADDR_PREFIX = 'naddr1'
+
 const APP_NAME_MAX_LENGTH = 260
 const CHANNEL_BY_PREFIX = { '+': 'main', '++': 'next', '+++': 'draft' }
 const PREFIX_BY_CHANNEL = { main: '+', next: '++', draft: '+++' }
@@ -38,6 +52,38 @@ function isValidAppName (appName) {
     !CONTROL_CHARS.test(appName)
 }
 
+// `naddr` already carries the event kind, so it does not need the `+`/`++`/
+// `+++` channel prefix (a leading prefix is still tolerated). Only site
+// manifests are app URLs; the result is canonicalized to the `appEncode`
+// entity so downstream code keeps working unchanged.
+function tryDecodeNaddr (value) {
+  if (typeof value !== 'string' || !value) return null
+  const body = value.replace(/^\+{1,3}/, '')
+  if (!body.startsWith(NADDR_PREFIX)) return null
+
+  let decoded
+  try {
+    decoded = naddrDecode(body)
+  } catch {
+    return null
+  }
+  if (!SITE_MANIFEST_KINDS.has(decoded.kind)) return null
+
+  try {
+    return {
+      type: 'entity',
+      entity: appEncode({
+        dTag: decoded.identifier,
+        pubkey: decoded.pubkey,
+        kind: decoded.kind,
+        relays: decoded.relays
+      })
+    }
+  } catch {
+    return null
+  }
+}
+
 // Decodes a raw (still percent-encoded) first path segment such as
 // `+apps` or `+caf%C3%A9@bob@example.com` or `+3swFhu...`.
 // Returns:
@@ -47,6 +93,9 @@ function isValidAppName (appName) {
 // - `null` when the segment is not a valid app URL.
 export function decodeAppUrl (segment) {
   if (typeof segment !== 'string' || !segment) return null
+  const decodedNaddr = tryDecodeNaddr(segment)
+  if (decodedNaddr) return decodedNaddr
+
   const prefixMatch = segment.match(/^\+{1,3}/)
   if (!prefixMatch) return null
   const prefix = prefixMatch[0]
@@ -77,7 +126,7 @@ export function decodeAppUrl (segment) {
     const domain = safeDecode(parts[parts.length - 1])
     const nip05 = nip05FromLocalDomain(local, domain)
     if (nip05) {
-      user = { kind: 'nip05', ...nip05, raw: compactNip05Raw(local, domain) }
+      user = { type: 'nip05', ...nip05, raw: compactNip05Raw(local, domain) }
       appName = parts.slice(0, -2).map(safeDecode).join('@')
     } else {
       appName = safeDecode(remainder)
@@ -114,7 +163,7 @@ export function encodeAppUrl ({ appName, channel = 'main', user }) {
 
   let encodedAppName = encodeURIComponent(appName)
   let userText
-  if (userRef.kind === 'nip05') {
+  if (userRef.type === 'nip05') {
     // Keep `@` raw inside the app name so the verbose NIP-05 form stays
     // readable (`+my@app@bob@example.com`).
     encodedAppName = encodedAppName.replace(/%40/g, '@')