ncc-05 1.1.5 → 1.1.7

package/dist/index.d.ts

@@ -118,6 +118,7 @@ export declare class NCC05Group {
  */
 export declare class NCC05Resolver {
     private pool;
+    private _ownPool;
     private bootstrapRelays;
     private timeout;
     /**
@@ -143,7 +144,7 @@ export declare class NCC05Resolver {
         gossip?: boolean;
     }): Promise<NCC05Payload | null>;
     /**
-     * Closes connections to all relays in the pool.
+     * Closes connections to all relays in the pool if managed internally.
      */
     close(): void;
 }
@@ -152,6 +153,7 @@ export declare class NCC05Resolver {
  */
 export declare class NCC05Publisher {
     private pool;
+    private _ownPool;
     private timeout;
     /**
      * @param options - Configuration for the publisher.
@@ -185,7 +187,7 @@ export declare class NCC05Publisher {
         public?: boolean;
     }): Promise<Event>;
     /**
-     * Closes connections to the specified relays.
+     * Closes connections to the specified relays if managed internally.
      */
     close(relays: string[]): void;
 }

package/dist/index.js

@@ -51,12 +51,6 @@ function ensureUint8Array(key) {
     }
     throw new NCC05ArgumentError("Key must be a hex string or Uint8Array");
 }
-function getHexPubkey(key) {
-    if (key instanceof Uint8Array) {
-        return Array.from(key).map(b => b.toString(16).padStart(2, '0')).join('');
-    }
-    return key;
-}
 /**
  * Utility for managing shared group access to service records.
  */
@@ -95,22 +89,23 @@ export class NCC05Group {
  */
 export class NCC05Resolver {
     pool;
+    _ownPool;
     bootstrapRelays;
     timeout;
     /**
      * @param options - Configuration for the resolver.
      */
     constructor(options = {}) {
+        this._ownPool = !options.pool;
         this.pool = options.pool || new SimplePool();
-        if (!options.pool) {
+        if (this._ownPool) {
             if (options.websocketImplementation) {
                 // @ts-ignore - Patching pool for custom transport
                 this.pool.websocketImplementation = options.websocketImplementation;
             }
-            else if (typeof globalThis !== 'undefined' && !globalThis.WebSocket) {
-                // In Node.js environment without global WebSocket, this might fail later.
-                // We leave it to the user or nostr-tools to handle, but this logic
-                // allows 'websocketImplementation' to be explicitly checked.
+            else if (typeof WebSocket === 'undefined' && typeof globalThis !== 'undefined' && globalThis.WebSocket) {
+                // @ts-ignore
+                this.pool.websocketImplementation = globalThis.WebSocket;
             }
         }
         this.bootstrapRelays = options.bootstrapRelays || ['wss://relay.damus.io', 'wss://nos.lol'];
@@ -201,7 +196,7 @@ export class NCC05Resolver {
                         return null; // Not intended for us
                     }
                 }
-                catch (e) {
+                catch (_e) {
                     throw new NCC05DecryptionError("Failed to decrypt wrapped content");
                 }
             }
@@ -211,7 +206,7 @@ export class NCC05Resolver {
                     const conversationKey = nip44.getConversationKey(sk, hexPubkey);
                     content = nip44.decrypt(latestEvent.content, conversationKey);
                 }
-                catch (e) {
+                catch (_e) {
                     throw new NCC05DecryptionError("Failed to decrypt content");
                 }
             }
@@ -220,7 +215,7 @@ export class NCC05Resolver {
             try {
                 payload = JSON.parse(content);
             }
-            catch (e) {
+            catch (_e) {
                 return null; // Invalid JSON
             }
             if (!payload || !payload.endpoints || !Array.isArray(payload.endpoints)) {
@@ -242,14 +237,12 @@ export class NCC05Resolver {
         }
     }
     /**
-     * Closes connections to all relays in the pool.
+     * Closes connections to all relays in the pool if managed internally.
      */
     close() {
-        // If we didn't create the pool, we probably shouldn't close it?
-        // But the previous implementation did.
-        // We will only close bootstrap relays to be safe if sharing pool.
-        // Actually, pool.close() takes args.
-        this.pool.close(this.bootstrapRelays);
+        if (this._ownPool) {
+            this.pool.close(this.bootstrapRelays);
+        }
     }
 }
 /**
@@ -257,15 +250,23 @@ export class NCC05Resolver {
  */
 export class NCC05Publisher {
     pool;
+    _ownPool;
     timeout;
     /**
      * @param options - Configuration for the publisher.
      */
     constructor(options = {}) {
+        this._ownPool = !options.pool;
         this.pool = options.pool || new SimplePool();
-        if (!options.pool && options.websocketImplementation) {
-            // @ts-ignore
-            this.pool.websocketImplementation = options.websocketImplementation;
+        if (this._ownPool) {
+            if (options.websocketImplementation) {
+                // @ts-ignore
+                this.pool.websocketImplementation = options.websocketImplementation;
+            }
+            else if (typeof WebSocket === 'undefined' && typeof globalThis !== 'undefined' && globalThis.WebSocket) {
+                // @ts-ignore
+                this.pool.websocketImplementation = globalThis.WebSocket;
+            }
         }
         this.timeout = options.timeout || 5000;
     }
@@ -361,9 +362,11 @@ export class NCC05Publisher {
         return signedEvent;
     }
     /**
-     * Closes connections to the specified relays.
+     * Closes connections to the specified relays if managed internally.
      */
     close(relays) {
-        this.pool.close(relays);
+        if (this._ownPool) {
+            this.pool.close(relays);
+        }
     }
 }

package/dist/test-lifecycle.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test-lifecycle.js

@@ -0,0 +1,33 @@
+import { NCC05Resolver } from './index.js';
+import { SimplePool } from 'nostr-tools';
+async function testLifecycle() {
+    console.log('--- Starting Lifecycle Test ---');
+    // 1. Internal Pool Management
+    console.log('Test 1: Internal Pool (should close)');
+    const resolverInternal = new NCC05Resolver();
+    // @ts-ignore - Access private property for testing or infer from behavior
+    const internalPool = resolverInternal['pool'];
+    internalPool.close = (_relays) => {
+        console.log('Internal pool close called.');
+    };
+    resolverInternal.close(); // Should log
+    // 2. Shared Pool Management
+    console.log('Test 2: Shared Pool (should NOT close)');
+    const sharedPool = new SimplePool();
+    let sharedClosed = false;
+    sharedPool.close = (_relays) => {
+        sharedClosed = true;
+        console.error('ERROR: Shared pool was closed!');
+    };
+    const resolverShared = new NCC05Resolver({ pool: sharedPool });
+    resolverShared.close(); // Should NOT close sharedPool
+    if (!sharedClosed) {
+        console.log('Shared pool correctly remained open.');
+    }
+    else {
+        process.exit(1);
+    }
+    console.log('Lifecycle Test Suite Passed.');
+    process.exit(0);
+}
+testLifecycle().catch(console.error);

package/dist/test-new.js

@@ -1,4 +1,4 @@
-import { NCC05Publisher, NCC05Resolver } from './index.js';
+import { NCC05Publisher, NCC05Resolver, NCC05TimeoutError } from './index.js';
 import { generateSecretKey, getPublicKey, SimplePool } from 'nostr-tools';
 import { MockRelay } from './mock-relay.js';
 import { WebSocketServer } from 'ws';
@@ -73,7 +73,7 @@ async function testNewFeatures() {
     }
     catch (e) {
         const duration = Date.now() - start;
-        if (e.name === 'NCC05TimeoutError') {
+        if (e instanceof NCC05TimeoutError) {
             console.log(`Timed out as expected in ${duration}ms: OK`);
         }
         else {

package/eslint.config.mjs

@@ -0,0 +1,25 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  {files: ["**/*.{js,mjs,cjs,ts}"]},
+  {languageOptions: { globals: globals.node }},
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+      rules: {
+          "@typescript-eslint/no-explicit-any": "off",
+          "@typescript-eslint/ban-ts-comment": "off",
+          "@typescript-eslint/no-unused-vars": ["warn", { 
+              "argsIgnorePattern": "^_",
+              "varsIgnorePattern": "^_",
+              "caughtErrorsIgnorePattern": "^_"
+          }],
+          "no-console": "off"
+      }
+  },
+  {
+      ignores: ["dist/", "node_modules/"]
+  }
+];

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "ncc-05",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Nostr Community Convention 05 - Identity-Bound Service Locator Resolution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
     "build": "tsc",
+    "lint": "eslint src/**/*.ts",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -22,9 +23,15 @@
     "nostr-tools": "^2.10.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@types/node": "^25.0.3",
     "@types/ws": "^8.18.1",
+    "@typescript-eslint/eslint-plugin": "^8.50.1",
+    "@typescript-eslint/parser": "^8.50.1",
+    "eslint": "^9.39.2",
+    "globals": "^16.5.0",
     "typescript": "^5.0.0",
+    "typescript-eslint": "^8.50.1",
     "ws": "^8.18.3"
   }
 }

package/src/index.ts

@@ -69,13 +69,6 @@ function ensureUint8Array(key: string | Uint8Array): Uint8Array {
     throw new NCC05ArgumentError("Key must be a hex string or Uint8Array");
 }
 
-function getHexPubkey(key: string | Uint8Array): string {
-    if (key instanceof Uint8Array) {
-        return Array.from(key).map(b => b.toString(16).padStart(2, '0')).join('');
-    }
-    return key;
-}
-
 /**
  * Represents a single reachable service endpoint.
  */
@@ -190,6 +183,7 @@ export class NCC05Group {
  */
 export class NCC05Resolver {
     private pool: SimplePool;
+    private _ownPool: boolean;
     private bootstrapRelays: string[];
     private timeout: number;
 
@@ -197,16 +191,16 @@ export class NCC05Resolver {
      * @param options - Configuration for the resolver.
      */
     constructor(options: ResolverOptions = {}) {
+        this._ownPool = !options.pool;
         this.pool = options.pool || new SimplePool();
         
-        if (!options.pool) {
+        if (this._ownPool) {
             if (options.websocketImplementation) {
                 // @ts-ignore - Patching pool for custom transport
                 this.pool.websocketImplementation = options.websocketImplementation;
-            } else if (typeof globalThis !== 'undefined' && !globalThis.WebSocket) {
-                // In Node.js environment without global WebSocket, this might fail later.
-                // We leave it to the user or nostr-tools to handle, but this logic
-                // allows 'websocketImplementation' to be explicitly checked.
+            } else if (typeof WebSocket === 'undefined' && typeof globalThis !== 'undefined' && globalThis.WebSocket) {
+                 // @ts-ignore
+                 this.pool.websocketImplementation = globalThis.WebSocket;
             }
         }
 
@@ -320,7 +314,7 @@ export class NCC05Resolver {
                     } else {
                         return null; // Not intended for us
                     }
-                } catch (e) {
+                } catch (_e) {
                     throw new NCC05DecryptionError("Failed to decrypt wrapped content");
                 }
             } else if (sk && !content.startsWith('{')) {
@@ -328,7 +322,7 @@ export class NCC05Resolver {
                 try {
                     const conversationKey = nip44.getConversationKey(sk, hexPubkey);
                     content = nip44.decrypt(latestEvent.content, conversationKey);
-                } catch (e) {
+                } catch (_e) {
                      throw new NCC05DecryptionError("Failed to decrypt content");
                 }
             }
@@ -337,7 +331,7 @@ export class NCC05Resolver {
             let payload: NCC05Payload;
             try {
                 payload = JSON.parse(content) as NCC05Payload;
-            } catch (e) {
+            } catch (_e) {
                 return null; // Invalid JSON
             }
 
@@ -360,14 +354,12 @@ export class NCC05Resolver {
     }
 
     /**
-     * Closes connections to all relays in the pool.
+     * Closes connections to all relays in the pool if managed internally.
      */
     close() {
-        // If we didn't create the pool, we probably shouldn't close it?
-        // But the previous implementation did.
-        // We will only close bootstrap relays to be safe if sharing pool.
-        // Actually, pool.close() takes args.
-        this.pool.close(this.bootstrapRelays);
+        if (this._ownPool) {
+            this.pool.close(this.bootstrapRelays);
+        }
     }
 }
 
@@ -376,17 +368,26 @@ export class NCC05Resolver {
  */
 export class NCC05Publisher {
     private pool: SimplePool;
+    private _ownPool: boolean;
     private timeout: number;
 
     /**
      * @param options - Configuration for the publisher.
      */
     constructor(options: PublisherOptions = {}) {
+        this._ownPool = !options.pool;
         this.pool = options.pool || new SimplePool();
-        if (!options.pool && options.websocketImplementation) {
-            // @ts-ignore
-            this.pool.websocketImplementation = options.websocketImplementation;
+        
+        if (this._ownPool) {
+            if (options.websocketImplementation) {
+                // @ts-ignore
+                this.pool.websocketImplementation = options.websocketImplementation;
+            } else if (typeof WebSocket === 'undefined' && typeof globalThis !== 'undefined' && globalThis.WebSocket) {
+                // @ts-ignore
+                this.pool.websocketImplementation = globalThis.WebSocket;
+            }
         }
+        
         this.timeout = options.timeout || 5000;
     }
 
@@ -508,9 +509,11 @@ export class NCC05Publisher {
     }
 
     /**
-     * Closes connections to the specified relays.
+     * Closes connections to the specified relays if managed internally.
      */
     close(relays: string[]) {
-        this.pool.close(relays);
+        if (this._ownPool) {
+            this.pool.close(relays);
+        }
     }
 }

package/src/test-lifecycle.ts

@@ -0,0 +1,40 @@
+import { NCC05Resolver } from './index.js';
+import { SimplePool } from 'nostr-tools';
+
+async function testLifecycle() {
+    console.log('--- Starting Lifecycle Test ---');
+    
+    // 1. Internal Pool Management
+    console.log('Test 1: Internal Pool (should close)');
+    const resolverInternal = new NCC05Resolver();
+    // @ts-ignore - Access private property for testing or infer from behavior
+    const internalPool = resolverInternal['pool'];
+    internalPool.close = (_relays?: string[]) => {
+        console.log('Internal pool close called.');
+    };
+    
+    resolverInternal.close(); // Should log
+
+    // 2. Shared Pool Management
+    console.log('Test 2: Shared Pool (should NOT close)');
+    const sharedPool = new SimplePool();
+    let sharedClosed = false;
+    sharedPool.close = (_relays?: string[]) => {
+        sharedClosed = true;
+        console.error('ERROR: Shared pool was closed!');
+    };
+
+    const resolverShared = new NCC05Resolver({ pool: sharedPool });
+    resolverShared.close(); // Should NOT close sharedPool
+
+    if (!sharedClosed) {
+        console.log('Shared pool correctly remained open.');
+    } else {
+        process.exit(1);
+    }
+    
+    console.log('Lifecycle Test Suite Passed.');
+    process.exit(0);
+}
+
+testLifecycle().catch(console.error);

package/src/test-new.ts

@@ -76,9 +76,9 @@ async function testNewFeatures() {
         console.error('Should have timed out!');
         wss.close();
         process.exit(1);
-    } catch (e: any) {
+    } catch (e) {
         const duration = Date.now() - start;
-        if (e.name === 'NCC05TimeoutError') {
+        if (e instanceof NCC05TimeoutError) {
             console.log(`Timed out as expected in ${duration}ms: OK`);
         } else {
             console.error('Caught unexpected error:', e);