refactor: improve base executor and encryption handling, standardize tag constants and method enums across codebase

Author: gzuuus

packages/dvmcp-bridge/src/announcer.ts

@@ -12,6 +12,8 @@ import {
   TAG_KIND,
   TAG_SERVER_IDENTIFIER,
   TAG_SUPPORT_ENCRYPTION,
+  TAG_EVENT_ID,
+  TAG_CAPABILITY,
 } from '@dvmcp/commons/core';
 import type { Event } from 'nostr-tools/pure';
 import { loggerBridge } from '@dvmcp/commons/core';
@@ -120,7 +122,12 @@ export class NostrAnnouncer {
       for (const tool of toolsResult.tools) {
         const pricing = this.mcpPool.getToolPricing(tool.name);
         if (pricing?.price) {
-          tags.push(['cap', tool.name, pricing.price, pricing.unit || 'sats']);
+          tags.push([
+            TAG_CAPABILITY,
+            tool.name,
+            pricing.price,
+            pricing.unit || 'sats',
+          ]);
         }
       }
     }
@@ -148,7 +155,7 @@ export class NostrAnnouncer {
           const pricing = this.mcpPool.getResourcePricing(resource.uri);
           if (pricing?.price) {
             tags.push([
-              'cap',
+              TAG_CAPABILITY,
               resource.uri,
               pricing.price,
               pricing.unit || 'sats',
@@ -189,7 +196,7 @@ export class NostrAnnouncer {
     // Add capability tags for each resource template name
     for (const template of resourceTemplatesResult.resourceTemplates) {
       if (template.name) {
-        tags.push(['cap', template.name]);
+        tags.push([TAG_CAPABILITY, template.name]);
       }
     }
 
@@ -218,7 +225,7 @@ export class NostrAnnouncer {
           const pricing = this.mcpPool.getPromptPricing(prompt.name);
           if (pricing?.price) {
             tags.push([
-              'cap',
+              TAG_CAPABILITY,
               prompt.name,
               pricing.price,
               pricing.unit || 'sats',
@@ -341,7 +348,7 @@ export class NostrAnnouncer {
         ...this.keyManager.createEventTemplate(5),
         content: reason,
         tags: [
-          ...events.map((ev) => ['e', ev.id]),
+          ...events.map((ev) => [TAG_EVENT_ID, ev.id]),
           [TAG_UNIQUE_IDENTIFIER, this.serverId],
         ],
       });

packages/dvmcp-bridge/src/dvm-bridge.ts

@@ -13,11 +13,12 @@ import {
   TAG_EVENT_ID,
   TAG_STATUS,
   TAG_SERVER_IDENTIFIER,
+  MCPMETHODS,
 } from '@dvmcp/commons/core';
 import { loggerBridge } from '@dvmcp/commons/core';
-import { type NostrEvent, type EventTemplate, getEventHash } from 'nostr-tools';
+import { type NostrEvent, getEventHash } from 'nostr-tools';
 import { getServerId } from './utils';
-import { EncryptionManager } from '@dvmcp/commons/encryption';
+import { EncryptionManager, EncryptionMode } from '@dvmcp/commons/encryption';
 import { EventPublisher } from '@dvmcp/commons/nostr';
 
 import { handleToolsList, handleToolsCall } from './handlers/tool-handlers';
@@ -203,7 +204,7 @@ export class DVMBridge {
   private async decryptEventAndExtractSender(
     giftWrapEvent: NostrEvent
   ): Promise<{
-    eventTemplate: EventTemplate;
+    eventTemplate: NostrEvent;
     realSenderPubkey: string;
   } | null> {
     try {
@@ -221,15 +222,8 @@ export class DVMBridge {
         return null;
       }
 
-      const eventTemplate: EventTemplate = {
-        kind: decryptionResult.decryptedEvent.kind,
-        content: decryptionResult.decryptedEvent.content,
-        tags: decryptionResult.decryptedEvent.tags,
-        created_at: decryptionResult.decryptedEvent.created_at,
-      };
-
       return {
-        eventTemplate,
+        eventTemplate: decryptionResult.decryptedEvent,
         realSenderPubkey: decryptionResult.sender,
       };
     } catch (error) {
@@ -281,7 +275,9 @@ export class DVMBridge {
       }
 
       // Handle regular unencrypted events
-      await this.processRegularRequest(event);
+      if (this.config.encryption?.mode !== EncryptionMode.REQUIRED) {
+        await this.processRegularRequest(event);
+      }
     } catch (error) {
       console.error('Error handling request:', error);
     }
@@ -392,17 +388,17 @@ export class DVMBridge {
         };
 
         switch (method) {
-          case 'initialize':
+          case MCPMETHODS.initialize:
             break;
-          case 'ping':
+          case MCPMETHODS.ping:
             await handlePing(
               event,
               this.keyManager,
               this.relayHandler,
               responseContext
             );
             break;
-          case 'tools/list':
+          case MCPMETHODS.toolsList:
             await handleToolsList(
               event,
               this.mcpPool,
@@ -411,7 +407,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'tools/call':
+          case MCPMETHODS.toolsCall:
             await handleToolsCall(
               event,
               this.mcpPool,
@@ -421,7 +417,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'resources/list':
+          case MCPMETHODS.resourcesList:
             await handleResourcesList(
               event,
               this.mcpPool,
@@ -430,7 +426,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'resources/read':
+          case MCPMETHODS.resourcesRead:
             await handleResourcesRead(
               event,
               this.mcpPool,
@@ -440,7 +436,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'resources/templates/list':
+          case MCPMETHODS.resourcesTemplatesList:
             await handleResourceTemplatesList(
               event,
               this.mcpPool,
@@ -449,7 +445,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'prompts/list':
+          case MCPMETHODS.promptsList:
             await handlePromptsList(
               event,
               this.mcpPool,
@@ -458,7 +454,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'prompts/get':
+          case MCPMETHODS.promptsGet:
             await handlePromptsGet(
               event,
               this.mcpPool,
@@ -467,7 +463,7 @@ export class DVMBridge {
               responseContext
             );
             break;
-          case 'completion/complete':
+          case MCPMETHODS.completionComplete:
             await handleCompletionComplete(
               event,
               this.mcpPool,
@@ -494,7 +490,7 @@ export class DVMBridge {
             await this.publishResponse(notImpl, responseContext);
         }
       } else if (kind === NOTIFICATION_KIND) {
-        if (method === 'notifications/cancel') {
+        if (method === MCPMETHODS.notificationsCancel) {
           const shouldEncryptResponse =
             this.encryptionManager?.shouldEncryptResponse(isEncrypted) || false;
 

packages/dvmcp-bridge/src/handlers/notification-handlers.ts

@@ -1,4 +1,4 @@
-import { loggerBridge } from '@dvmcp/commons/core';
+import { loggerBridge, MCPMETHODS } from '@dvmcp/commons/core';
 import {
   TAG_EVENT_ID,
   TAG_PUBKEY,
@@ -37,15 +37,15 @@ export async function handleNotificationsCancel(
 
     await eventPublisher.publishNotification(
       JSON.stringify({
-        method: 'notifications/progress',
+        method: MCPMETHODS.notificationsProgress,
         params: { message: 'cancellation-acknowledged' },
       }),
       pubkey,
       [
         [TAG_STATUS, 'cancelled'],
         [TAG_EVENT_ID, eventIdToCancel],
         [TAG_PUBKEY, pubkey],
-        [TAG_METHOD, 'notifications/progress'],
+        [TAG_METHOD, MCPMETHODS.notificationsProgress],
       ],
       responseContext?.shouldEncrypt || false
     );

packages/dvmcp-bridge/src/handlers/payment-handler.ts

@@ -1,4 +1,4 @@
-import { loggerBridge } from '@dvmcp/commons/core';
+import { loggerBridge, TAG_INVOICE } from '@dvmcp/commons/core';
 import {
   TAG_AMOUNT,
   TAG_EVENT_ID,
@@ -65,7 +65,7 @@ export async function handlePaymentFlow(
       [
         [TAG_STATUS, 'payment-required'],
         [TAG_AMOUNT, price, unit],
-        ['invoice', zapRequest.paymentRequest],
+        [TAG_INVOICE, zapRequest.paymentRequest],
         [TAG_EVENT_ID, eventId],
         [TAG_PUBKEY, pubkey],
       ],

packages/dvmcp-bridge/src/handlers/payment-processor.ts

@@ -1,4 +1,4 @@
-import { loggerBridge } from '@dvmcp/commons/core';
+import { loggerBridge, MCPMETHODS } from '@dvmcp/commons/core';
 import type { DvmcpBridgeConfig, MCPPricingConfig } from '../config-schema.js';
 import type { KeyManager } from '@dvmcp/commons/nostr'; // KeyManager might still be needed for handlePaymentFlow
 import type { RelayHandler } from '@dvmcp/commons/nostr'; // RelayHandler might still be needed for handlePaymentFlow
@@ -51,14 +51,14 @@ export class PaymentProcessor {
 
     await this.notificationPublisher.publishNotification(
       JSON.stringify({
-        method: 'notifications/progress',
+        method: MCPMETHODS.notificationsProgress,
         params: { message: 'processing payment' },
       }),
       pubkey,
       [
         [TAG_PUBKEY, pubkey],
         [TAG_EVENT_ID, eventId],
-        [TAG_METHOD, 'notifications/progress'],
+        [TAG_METHOD, MCPMETHODS.notificationsProgress],
       ],
       shouldEncrypt
     );

packages/dvmcp-commons/src/core/constants.ts

@@ -25,10 +25,16 @@ export const TAG_AMOUNT = 'amount'; // Nostr-specific notification amount/invoic
 export const TAG_INVOICE = 'invoice'; // Nostr-specific notification invoice
 export const TAG_SUPPORT_ENCRYPTION = 'support_encryption';
 export const MCPMETHODS = {
+  initialize: 'initialize',
   toolsList: 'tools/list',
   toolsCall: 'tools/call',
   resourcesList: 'resources/list',
+  resourcesTemplatesList: 'resources/templates/list',
   resourcesRead: 'resources/read',
   promptsList: 'prompts/list',
-  promptsCall: 'prompts/call',
+  promptsGet: 'prompts/get',
+  completionComplete: 'completion/complete',
+  ping: 'ping',
+  notificationsCancel: 'notifications/cancel',
+  notificationsProgress: 'notifications/progress',
 } as const;

packages/dvmcp-commons/src/encryption/encryption-manager.test.ts

@@ -12,7 +12,6 @@ describe('EncryptionManager', () => {
       expect(manager.getEncryptionMode()).toBe(EncryptionMode.REQUIRED);
       expect(manager.isEncryptionRequired()).toBe(true);
       expect(manager.shouldAttemptEncryption()).toBe(true);
-      expect(manager.canAcceptUnencrypted()).toBe(false);
     });
 
     it('should default to OPTIONAL when no config provided', () => {
@@ -22,7 +21,6 @@ describe('EncryptionManager', () => {
       expect(manager.isEncryptionEnabled()).toBe(true);
       expect(manager.isEncryptionRequired()).toBe(false);
       expect(manager.shouldAttemptEncryption()).toBe(false);
-      expect(manager.canAcceptUnencrypted()).toBe(true);
     });
   });
 
@@ -33,7 +31,6 @@ describe('EncryptionManager', () => {
       expect(manager.isEncryptionEnabled()).toBe(false);
       expect(manager.isEncryptionRequired()).toBe(false);
       expect(manager.shouldAttemptEncryption()).toBe(false);
-      expect(manager.canAcceptUnencrypted()).toBe(true);
 
       // Should never encrypt responses regardless of incoming format
       expect(manager.shouldEncryptResponse(true)).toBe(false);
@@ -46,7 +43,6 @@ describe('EncryptionManager', () => {
       expect(manager.isEncryptionEnabled()).toBe(true);
       expect(manager.isEncryptionRequired()).toBe(false);
       expect(manager.shouldAttemptEncryption()).toBe(false);
-      expect(manager.canAcceptUnencrypted()).toBe(true);
 
       // Should mirror incoming message format
       expect(manager.shouldEncryptResponse(true)).toBe(true);
@@ -59,7 +55,6 @@ describe('EncryptionManager', () => {
       expect(manager.isEncryptionEnabled()).toBe(true);
       expect(manager.isEncryptionRequired()).toBe(true);
       expect(manager.shouldAttemptEncryption()).toBe(true);
-      expect(manager.canAcceptUnencrypted()).toBe(false);
 
       // Should always encrypt responses regardless of incoming format
       expect(manager.shouldEncryptResponse(true)).toBe(true);

packages/dvmcp-commons/src/encryption/encryption-manager.ts

@@ -13,6 +13,7 @@ import {
   GIFT_WRAP_KIND,
   PRIVATE_DIRECT_MESSAGE_KIND,
   SEALED_DIRECT_MESSAGE_KIND,
+  TAG_PUBKEY,
 } from '../core/constants';
 
 export interface DecryptedMessage {
@@ -67,13 +68,6 @@ export class EncryptionManager {
     return this.mode === EncryptionMode.REQUIRED;
   }
 
-  /**
-   * Determines if we can accept unencrypted messages
-   */
-  public canAcceptUnencrypted(): boolean {
-    return this.mode !== EncryptionMode.REQUIRED;
-  }
-
   /**
    * Encrypt a message using NIP-17/NIP-59 gift wrap scheme
    * @param senderPrivateKey - Sender's private key
@@ -131,7 +125,7 @@ export class EncryptionManager {
       const giftWrap: UnsignedEvent = {
         kind: GIFT_WRAP_KIND,
         content: encryptedSeal,
-        tags: [['p', recipientPublicKey]],
+        tags: [[TAG_PUBKEY, recipientPublicKey]],
         created_at: Math.floor(Date.now() / 1000),
         pubkey: giftWrapPublicKey,
       };
@@ -162,7 +156,7 @@ export class EncryptionManager {
 
       // Check if this gift wrap is for us
       const isForUs = event.tags.some(
-        (tag) => tag[0] === 'p' && tag[1] === recipientPublicKey
+        (tag) => tag[0] === TAG_PUBKEY && tag[1] === recipientPublicKey
       );
 
       if (!isForUs) {
@@ -258,7 +252,7 @@ export class EncryptionManager {
     }
 
     return event.tags.some(
-      (tag) => tag[0] === 'p' && tag[1] === recipientPublicKey
+      (tag) => tag[0] === TAG_PUBKEY && tag[1] === recipientPublicKey
     );
   }