Merge branch 'main' into fix-serialize-javascript

cameri · web-flow · commit a85ca447cbb4 · 2026-05-03T19:27:15.000-04:00
diff --git a/.changeset/brown-bears-pay.md b/.changeset/brown-bears-pay.md
@@ -0,0 +1,5 @@
+---
+"nostream": patch
+---
+
+fix: maxLimit checks added to subscription message handler
diff --git a/.changeset/marmot-protocol-support.md b/.changeset/marmot-protocol-support.md
@@ -0,0 +1,14 @@
+---
+"nostream": minor
+---
+
+Add relay support for the Marmot Protocol (E2EE group messaging over Nostr).
+
+Supported MIPs: 00 (KeyPackages), 01 (Group Construction), 02 (Welcome Events), 03 (Group Messages).
+
+- kind 443 (legacy KeyPackage): stored as a regular event
+- kind 10051 (KeyPackage relay list): stored as a replaceable event
+- kind 30443 (KeyPackage): stored as a parameterized-replaceable event with `d`-tag deduplication
+- kind 444 (Welcome rumor): blocked from direct publishing; must travel inside a kind 1059 gift wrap
+- kind 445 (Group Event): dedicated strategy validates the required `h` tag (nostr_group_id) before storing; `#h` tag subscriptions work via the existing generic tag index
+- NIP-11 relay info now advertises `supported_mips: [0, 1, 2, 3]`
diff --git a/.changeset/nip-25-reactions.md b/.changeset/nip-25-reactions.md
@@ -0,0 +1,5 @@
+---
+"nostream": minor
+---
+
+Add NIP-25 Reactions support for kind 7 and kind 17 events: reaction utility helpers (`isReactionEvent`, `isExternalContentReactionEvent`, `isLikeReaction`, `isDislikeReaction`, `parseReaction`), schema validation enforcing required `e` tag on kind 7 and required `k`/`i` tags on kind 17, unit tests, and integration tests.
diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ NIPs with a relay-specific implementation are listed here.
 - [x] NIP-16: Event Treatment
 - [x] NIP-20: Command Results
 - [x] NIP-22: Event `created_at` Limits
+- [x] NIP-25: Reactions
 - [ ] NIP-26: Delegated Event Signing (REMOVED)
 - [x] NIP-28: Public Chat
 - [x] NIP-33: Parameterized Replaceable Events
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     17,
     20,
     22,
+    25,
     28,
     33,
     40,
@@ -26,6 +27,7 @@
     65
   ],
   "supportedNipExtensions": [],
+  "supportedMips": [0, 1, 2, 3],
   "main": "src/index.ts",
   "bin": {
     "nostream": "./dist/src/cli/index.js"
diff --git a/resources/default-settings.yaml b/resources/default-settings.yaml
@@ -181,6 +181,11 @@ limits:
             - 39999
         period: 60000
         rate: 24
+      - description: 60 events/min for Marmot group events (kind 445)
+        kinds:
+          - 445
+        period: 60000
+        rate: 60
       - description: 60 events/min for ephemeral events
         kinds:
           - - 20000
diff --git a/src/@types/event.ts b/src/@types/event.ts
@@ -49,6 +49,14 @@ export interface DBEvent {
   expires_at?: number
 }
 
+export type ReactionEntry = {
+  targetEventId?: string
+  targetPubkey?: string
+  targetAddress?: string
+  targetKind?: number
+  content: string
+}
+
 export type RelayListEntry = {
   url: string
   marker?: 'read' | 'write'
diff --git a/src/constants/base.ts b/src/constants/base.ts
@@ -11,6 +11,8 @@ export enum EventKinds {
   SEAL = 13,
   DIRECT_MESSAGE = 14,
   FILE_MESSAGE = 15,
+  // NIP-25: External content reaction
+  EXTERNAL_CONTENT_REACTION = 17,
   REQUEST_TO_VANISH = 62,
   // Channels
   CHANNEL_CREATION = 40,
@@ -20,6 +22,10 @@ export enum EventKinds {
   CHANNEL_MUTE_USER = 44,
   CHANNEL_RESERVED_FIRST = 45,
   CHANNEL_RESERVED_LAST = 49,
+  // Marmot Protocol: E2EE Group Messaging (MIPs)
+  MARMOT_KEY_PACKAGE_LEGACY = 443, // MIP-00: legacy KeyPackage (regular event, superseded by 30443)
+  MARMOT_WELCOME_RUMOR = 444, // MIP-02: Welcome rumor (must not be published directly; wraps inside gift wrap)
+  MARMOT_GROUP_EVENT = 445, // MIP-03: Group Event (proposals, commits, application messages)
   // NIP-17: Gift Wrap
   GIFT_WRAP = 1059,
   // NIP-03: OpenTimestamps attestation
@@ -34,12 +40,16 @@ export enum EventKinds {
   REPLACEABLE_FIRST = 10000,
   // NIP-65: Relay List Metadata
   RELAY_LIST = 10002,
+  // Marmot Protocol MIP-00: KeyPackage Relay List
+  MARMOT_KEY_PACKAGE_RELAY_LIST = 10051,
   REPLACEABLE_LAST = 19999,
   // Ephemeral events
   EPHEMERAL_FIRST = 20000,
   EPHEMERAL_LAST = 29999,
   // Parameterized replaceable events
   PARAMETERIZED_REPLACEABLE_FIRST = 30000,
+  // Marmot Protocol MIP-00: KeyPackage (addressable, replaces legacy 443)
+  MARMOT_KEY_PACKAGE = 30443,
   PARAMETERIZED_REPLACEABLE_LAST = 39999,
   USER_APPLICATION_FIRST = 40000,
 }
@@ -56,8 +66,14 @@ export enum EventTags {
   Invoice = 'bolt11',
   // NIP-03: target event kind on an OpenTimestamps attestation
   Kind = 'k',
+  // NIP-25: Reactions
+  Address = 'a',
+  Index = 'i',
+  Emoji = 'emoji',
   // NIP-12: geohash tag for location-based queries
   Geohash = 'g',
+  // Marmot Protocol MIP-03: group ID for filtering kind:445 Group Events
+  Group = 'h',
 }
 
 export const ALL_RELAYS = 'ALL_RELAYS'
diff --git a/src/factories/event-strategy-factory.ts b/src/factories/event-strategy-factory.ts
@@ -3,6 +3,7 @@ import {
   isDeleteEvent,
   isEphemeralEvent,
   isGiftWrapEvent,
+  isMarmotGroupEvent,
   isOpenTimestampsEvent,
   isParameterizedReplaceableEvent,
   isReplaceableEvent,
@@ -15,6 +16,7 @@ import { EphemeralEventStrategy } from '../handlers/event-strategies/ephemeral-e
 import { Event } from '../@types/event'
 import { Factory } from '../@types/base'
 import { GiftWrapEventStrategy } from '../handlers/event-strategies/gift-wrap-event-strategy'
+import { GroupEventStrategy } from '../handlers/event-strategies/group-event-strategy'
 import { IEventStrategy } from '../@types/message-handlers'
 import { IWebSocketAdapter } from '../@types/adapters'
 import { ParameterizedReplaceableEventStrategy } from '../handlers/event-strategies/parameterized-replaceable-event-strategy'
@@ -32,6 +34,8 @@ export const eventStrategyFactory =
       return new VanishEventStrategy(adapter, eventRepository, userRepository)
     } else if (isGiftWrapEvent(event)) {
       return new GiftWrapEventStrategy(adapter, eventRepository)
+    } else if (isMarmotGroupEvent(event)) {
+      return new GroupEventStrategy(adapter, eventRepository)
     } else if (isOpenTimestampsEvent(event)) {
       return new TimestampEventStrategy(adapter, eventRepository)
     } else if (isRelayListEvent(event) || isReplaceableEvent(event)) {
@@ -45,4 +49,4 @@ export const eventStrategyFactory =
     }
 
     return new DefaultEventStrategy(adapter, eventRepository)
-  }
+  }
diff --git a/src/handlers/event-message-handler.ts b/src/handlers/event-message-handler.ts
@@ -23,6 +23,7 @@ import {
   isFileMessageEvent,
   isRequestToVanishEvent,
   isSealEvent,
+  isWelcomeRumorEvent,
 } from '../utils/event'
 import { IEventRepository, INip05VerificationRepository, IUserRepository } from '../@types/repositories'
 import { IEventStrategy, IMessageHandler } from '../@types/message-handlers'
@@ -238,7 +239,9 @@ export class EventMessageHandler implements IMessageHandler {
     // NIP-17: kind 13 (Seal) and kind 14 (Direct Message) are inner events that
     // must never be published directly to a relay. They are encrypted inside a
     // kind 1059 Gift Wrap (NIP-59) before being sent here.
-    if (isSealEvent(event) || isDirectMessageEvent(event) || isFileMessageEvent(event)) {
+    // Marmot MIP-02: kind 444 (Welcome rumor) is similarly an inner event that
+    // must only be delivered inside a kind 1059 gift wrap.
+    if (isSealEvent(event) || isDirectMessageEvent(event) || isFileMessageEvent(event) || isWelcomeRumorEvent(event)) {
       return `blocked: kind ${event.kind} events must not be published directly; wrap them in a kind 1059 gift wrap`
     }
   }
diff --git a/src/handlers/event-strategies/group-event-strategy.ts b/src/handlers/event-strategies/group-event-strategy.ts
@@ -0,0 +1,56 @@
+import { createCommandResult } from '../../utils/messages'
+import { createLogger } from '../../factories/logger-factory'
+import { Event } from '../../@types/event'
+import { EventTags } from '../../constants/base'
+import { IEventRepository } from '../../@types/repositories'
+import { IEventStrategy } from '../../@types/message-handlers'
+import { IWebSocketAdapter } from '../../@types/adapters'
+import { WebSocketAdapterEvent } from '../../constants/adapter'
+
+const logger = createLogger('group-event-strategy')
+
+export class GroupEventStrategy implements IEventStrategy<Event, Promise<void>> {
+  public constructor(
+    private readonly webSocket: IWebSocketAdapter,
+    private readonly eventRepository: IEventRepository,
+  ) {}
+
+  public async execute(event: Event): Promise<void> {
+    logger('received group event: %o', event)
+
+    const reason = this.validateGroupEvent(event)
+    if (reason) {
+      this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, `invalid: ${reason}`))
+      return
+    }
+
+    const count = await this.eventRepository.create(event)
+    this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, true, count ? '' : 'duplicate:'))
+
+    if (count) {
+      this.webSocket.emit(WebSocketAdapterEvent.Broadcast, event)
+    }
+  }
+
+  // MIP-03: kind:445 Group Events MUST carry exactly one `h` tag whose value is the
+  // 64-character lowercase hex-encoded nostr_group_id from the Marmot Group Data Extension.
+  // The relay enforces this so that #h tag subscriptions always work correctly.
+  private validateGroupEvent(event: Event): string | undefined {
+    const groupTags = event.tags.filter((tag) => tag.length >= 2 && tag[0] === EventTags.Group)
+
+    if (groupTags.length === 0) {
+      return 'group event (kind 445) must have an h tag identifying the group'
+    }
+
+    if (groupTags.length > 1) {
+      return 'group event (kind 445) must have exactly one h tag'
+    }
+
+    const groupId = groupTags[0][1]
+    if (!/^[0-9a-f]{64}$/.test(groupId)) {
+      return 'group event (kind 445) h tag must contain a valid 64-character lowercase hex group id'
+    }
+
+    return undefined
+  }
+}
diff --git a/src/handlers/request-handlers/root-request-handler.ts b/src/handlers/request-handlers/root-request-handler.ts
@@ -80,6 +80,7 @@ export const rootRequestHandler = (request: Request, response: Response, next: N
       contact,
       supported_nips: packageJson.supportedNips,
       supported_nip_extensions: packageJson.supportedNipExtensions,
+      supported_mips: packageJson.supportedMips,
       software: packageJson.repository.url,
       version: packageJson.version,
       ...(terms_of_service !== undefined ? { terms_of_service } : {}),
diff --git a/src/handlers/subscribe-message-handler.ts b/src/handlers/subscribe-message-handler.ts
@@ -116,6 +116,14 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
       }
     }
 
+    const maxLimit = subscriptionLimits?.maxLimit ?? 0
+    if (maxLimit > 0) {
+      const hasExcessiveLimit = filters.some((filter) => filter.limit !== undefined && filter.limit > maxLimit)
+      if (hasExcessiveLimit) {
+        return `Limit too high: Filter limit must be less than or equal to ${maxLimit}`
+      }
+    }
+
     if (
       typeof subscriptionLimits?.maxSubscriptionIdLength === 'number' &&
       subscriptionId.length > subscriptionLimits.maxSubscriptionIdLength
diff --git a/src/schemas/event-schema.ts b/src/schemas/event-schema.ts
@@ -1,6 +1,7 @@
 import { z } from 'zod'
 
 import { EventKinds, EventTags } from '../constants/base'
+import { isExternalContentReactionEvent, isReactionEvent } from '../utils/nip25'
 import {
   createdAtSchema,
   geohashSchema,
@@ -39,7 +40,37 @@ export const eventSchema = z
   })
   .strict()
   .superRefine((event, ctx) => {
-    if (event.kind === EventKinds.RELAY_LIST) {
+    if (isReactionEvent(event)) {
+      let hasEventTag = false
+      let hasAddressTag = false
+      for (const tag of event.tags) {
+        if (tag[0] === EventTags.Event && typeof tag[1] === 'string' && tag[1].length > 0) { hasEventTag = true }
+        else if (tag[0] === EventTags.Address && typeof tag[1] === 'string' && tag[1].length > 0) { hasAddressTag = true }
+        if (hasEventTag && hasAddressTag) { break }
+      }
+      if (!hasEventTag && !hasAddressTag) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: 'Reaction event (kind 7) must have at least one e or a tag',
+          path: ['tags'],
+        })
+      }
+    } else if (isExternalContentReactionEvent(event)) {
+      let hasKTag = false
+      let hasITag = false
+      for (const tag of event.tags) {
+        if (tag[0] === EventTags.Kind && tag.length >= 2 && typeof tag[1] === 'string' && tag[1].length > 0) { hasKTag = true }
+        else if (tag[0] === EventTags.Index && tag.length >= 2 && typeof tag[1] === 'string' && tag[1].length > 0) { hasITag = true }
+        if (hasKTag && hasITag) { break }
+      }
+      if (!hasKTag || !hasITag) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: 'External content reaction event (kind 17) must have k and i tags',
+          path: ['tags'],
+        })
+      }
+    } else if (event.kind === EventKinds.RELAY_LIST) {
       event.tags.forEach((tag, index) => {
         if (tag[0] === EventTags.Relay && !z.string().url().safeParse(tag[1]).success) {
           ctx.addIssue({
diff --git a/src/utils/event.ts b/src/utils/event.ts
@@ -279,3 +279,13 @@ export const isFileMessageEvent = (event: Event): boolean => {
 export const isOpenTimestampsEvent = (event: Event): boolean => {
   return event.kind === EventKinds.OPEN_TIMESTAMPS
 }
+
+// Marmot Protocol helpers
+
+export const isWelcomeRumorEvent = (event: Event): boolean => {
+  return event.kind === EventKinds.MARMOT_WELCOME_RUMOR
+}
+
+export const isMarmotGroupEvent = (event: Event): boolean => {
+  return event.kind === EventKinds.MARMOT_GROUP_EVENT
+}
diff --git a/src/utils/nip25.ts b/src/utils/nip25.ts
@@ -0,0 +1,39 @@
+import { Event, ReactionEntry } from '../@types/event'
+import { EventKinds, EventTags } from '../constants/base'
+
+export const isReactionEvent = (event: { kind?: number }): boolean => event.kind === EventKinds.REACTION
+
+export const isExternalContentReactionEvent = (event: { kind?: number }): boolean =>
+    event.kind === EventKinds.EXTERNAL_CONTENT_REACTION
+
+export const isLikeReaction = (event: { kind?: number; content?: string }): boolean =>
+    isReactionEvent(event) && (event.content === '+' || event.content === '')
+
+export const isDislikeReaction = (event: { kind?: number; content?: string }): boolean =>
+    isReactionEvent(event) && event.content === '-'
+
+export const parseReaction = (event: Event): ReactionEntry => {
+    let lastETag: string[] | undefined
+    let lastPTag: string[] | undefined
+    let lastATag: string[] | undefined
+    let firstKTag: string[] | undefined
+
+    for (const tag of event.tags) {
+        switch (tag[0]) {
+            case EventTags.Event: lastETag = tag; break
+            case EventTags.Pubkey: lastPTag = tag; break
+            case EventTags.Address: lastATag = tag; break
+            case EventTags.Kind: if (!firstKTag) { firstKTag = tag } break
+        }
+    }
+
+    const kTagValue = firstKTag && firstKTag.length > 1 ? firstKTag[1] : undefined
+    const parsedKind = kTagValue !== undefined ? Number(kTagValue) : undefined
+    return {
+        targetEventId: lastETag?.[1],
+        targetPubkey: lastPTag?.[1],
+        targetAddress: lastATag?.[1],
+        targetKind: parsedKind !== undefined && Number.isFinite(parsedKind) ? parsedKind : undefined,
+        content: event.content,
+    }
+}
diff --git a/test/integration/features/nip-25/nip-25.feature b/test/integration/features/nip-25/nip-25.feature
@@ -0,0 +1,24 @@
+Feature: NIP-25 Reactions
+  Scenario: Alice likes Bob's note
+    Given someone called Alice
+    And someone called Bob
+    When Bob sends a text_note event with content "hello world"
+    And Alice reacts to Bob's note with "+"
+    And Alice subscribes to her reaction events
+    Then Alice receives a reaction event with content "+"
+
+  Scenario: Alice dislikes Bob's note
+    Given someone called Alice
+    And someone called Bob
+    When Bob sends a text_note event with content "hello world"
+    And Alice reacts to Bob's note with "-"
+    And Alice subscribes to her reaction events
+    Then Alice receives a reaction event with content "-"
+
+  Scenario: Alice reacts with an emoji
+    Given someone called Alice
+    And someone called Bob
+    When Bob sends a text_note event with content "hello world"
+    And Alice reacts to Bob's note with "🤙"
+    And Alice subscribes to her reaction events
+    Then Alice receives a reaction event with content "🤙"
diff --git a/test/integration/features/nip-25/nip-25.feature.ts b/test/integration/features/nip-25/nip-25.feature.ts
diff --git a/test/unit/factories/event-strategy-factory.spec.ts b/test/unit/factories/event-strategy-factory.spec.ts
diff --git a/test/unit/handlers/event-message-handler.spec.ts b/test/unit/handlers/event-message-handler.spec.ts
diff --git a/test/unit/handlers/event-strategies/group-event-strategy.spec.ts b/test/unit/handlers/event-strategies/group-event-strategy.spec.ts
diff --git a/test/unit/handlers/subscribe-message-handler.spec.ts b/test/unit/handlers/subscribe-message-handler.spec.ts
diff --git a/test/unit/schemas/event-schema.spec.ts b/test/unit/schemas/event-schema.spec.ts
diff --git a/test/unit/utils/event.spec.ts b/test/unit/utils/event.spec.ts
diff --git a/test/unit/utils/nip25.spec.ts b/test/unit/utils/nip25.spec.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"nostream": patch
 +---
++
 +fix: maxLimit checks added to subscription message handler