ncc-06-js 0.3.7 → 0.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ncc-06-js",
-  "version": "0.3.7",
-  "description": "Reusable NCC-06 discovery helpers extracted from the example relay, sidecar, and client.",
+  "version": "0.4.0",
+  "description": "Reusable NCC-06 discovery helpers for multimodal service identities.",
   "type": "module",
   "main": "src/index.js",
   "types": "index.d.ts",

package/src/ncc02.js

@@ -1,12 +1,9 @@
 import { finalizeEvent, getPublicKey, validateEvent, verifyEvent } from 'nostr-tools/pure';
-import { NCC02Builder } from 'ncc-02-js';
 
 const DEFAULT_KIND = 30059;
 
 /**
  * Build an NCC-02 service record event.
- * The event includes `d`, `u`, `k`, and `exp` tags and is signed with the provided secret key.
- * @param {object} options
  */
 export function buildNcc02ServiceRecord({
   secretKey,
@@ -18,38 +15,27 @@ export function buildNcc02ServiceRecord({
   kind = DEFAULT_KIND
 }) {
   if (!secretKey) {
-    throw new Error('secretKey is required to build NCC-02 records');
+    throw new Error('secretKey is required');
   }
+  const timestamp = createdAt ?? Math.floor(Date.now() / 1000);
+  const expiresAt = timestamp + Number(expirySeconds);
+  const tags = [
+    ['d', serviceId],
+    ['exp', expiresAt.toString()]
+  ];
+  if (endpoint) tags.push(['u', endpoint]);
+  if (fingerprint) tags.push(['k', fingerprint]);
 
-  const builder = new NCC02Builder(secretKey);
-  // NCC02Builder expects days.
-  const expiryDays = expirySeconds / (24 * 60 * 60);
-  
-  const event = builder.createServiceRecord({
-    serviceId,
-    endpoint,
-    fingerprint,
-    expiryDays
-  });
-
-  // If createdAt or kind override is needed, we must re-sign.
-  if (createdAt || kind !== DEFAULT_KIND) {
-    const template = {
-      ...event,
-      created_at: createdAt ?? event.created_at,
-      kind: kind ?? event.kind,
-      id: undefined,
-      sig: undefined
-    };
-    return finalizeEvent(template, secretKey);
-  }
-
-  return event;
+  const event = {
+    kind,
+    pubkey: getPublicKey(secretKey),
+    created_at: timestamp,
+    tags,
+    content: ''
+  };
+  return finalizeEvent(event, secretKey);
 }
 
-/**
- * Extract the NCC-02 relevant tags from an event.
- */
 export function parseNcc02Tags(event) {
   if (!event || !Array.isArray(event.tags)) {
     return {};
@@ -57,9 +43,6 @@ export function parseNcc02Tags(event) {
   return Object.fromEntries(event.tags);
 }
 
-/**
- * Verify an NCC-02 service record, ensuring signature, author, `d` tag, and expiration.
- */
 export function validateNcc02(event, { expectedAuthor, expectedD, now, allowExpired = false } = {}) {
   if (!event || event.kind !== DEFAULT_KIND) {
     return false;
@@ -80,4 +63,4 @@ export function validateNcc02(event, { expectedAuthor, expectedD, now, allowExpi
     return false;
   }
   return true;
-}
+}

package/src/resolver.js

@@ -44,18 +44,15 @@ export async function resolveServiceEndpoint(options = {}) {
 
   // 1. Resolve NCC-02 Service Record using the library
   let serviceRecord;
+  const resolver = ncc02Resolver || new NCC02Resolver(bootstrapRelays, { pool });
   try {
-    const resolver = ncc02Resolver || new NCC02Resolver(bootstrapRelays, { pool });
-    serviceRecord = await resolver.resolve(servicePubkey, serviceId, {
-       // We can pass options if needed, e.g. minLevel
-    });
+    serviceRecord = await resolver.resolve(servicePubkey, serviceId, {});
   } catch (err) {
-    // Map library errors or rethrow?
-    // The library throws generic Error or NCC02Error.
-    // We can just let it propagate or wrap.
-    // Existing code threw "No valid NCC-02 service record available".
-    // We'll let the library error bubble up as it provides more detail.
     throw err;
+  } finally {
+    if (!ncc02Resolver) {
+      resolver.close();
+    }
   }
   
   // 2. Resolve NCC-05 Locator