perf: loop once through tags in NIP-25 validation and parsing

Author: CKodidela

src/schemas/event-schema.ts

@@ -33,8 +33,13 @@ export const eventSchema = z
   .strict()
   .superRefine((event, ctx) => {
     if (isReactionEvent(event)) {
-      const hasEventTag = event.tags.some((tag) => tag[0] === EventTags.Event && typeof tag[1] === 'string' && tag[1].length > 0)
-      const hasAddressTag = event.tags.some((tag) => tag[0] === EventTags.Address && typeof tag[1] === 'string' && tag[1].length > 0)
+      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,
@@ -43,8 +48,13 @@ export const eventSchema = z
         })
       }
     } else if (isExternalContentReactionEvent(event)) {
-      const hasKTag = event.tags.some((tag) => tag[0] === EventTags.Kind && tag.length >= 2 && typeof tag[1] === 'string' && tag[1].length > 0)
-      const hasITag = event.tags.some((tag) => tag[0] === EventTags.Index && tag.length >= 2 && typeof tag[1] === 'string' && tag[1].length > 0)
+      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,

src/utils/nip25.ts

@@ -13,17 +13,26 @@ export const isDislikeReaction = (event: { kind?: number; content?: string }): b
     isReactionEvent(event) && event.content === '-'
 
 export const parseReaction = (event: Event): ReactionEntry => {
-    const eTags = event.tags.filter((tag) => tag[0] === EventTags.Event)
-    const pTags = event.tags.filter((tag) => tag[0] === EventTags.Pubkey)
-    const aTags = event.tags.filter((tag) => tag[0] === EventTags.Address)
-    const kTag = event.tags.find((tag) => tag[0] === EventTags.Kind)
+    let lastETag: string[] | undefined
+    let lastPTag: string[] | undefined
+    let lastATag: string[] | undefined
+    let firstKTag: string[] | undefined
 
-    const kTagValue = kTag && kTag.length > 1 ? kTag[1] : 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: eTags.length > 0 ? eTags[eTags.length - 1][1] : undefined,
-        targetPubkey: pTags.length > 0 ? pTags[pTags.length - 1][1] : undefined,
-        targetAddress: aTags.length > 0 ? aTags[aTags.length - 1][1] : undefined,
+        targetEventId: lastETag?.[1],
+        targetPubkey: lastPTag?.[1],
+        targetAddress: lastATag?.[1],
         targetKind: parsedKind !== undefined && Number.isFinite(parsedKind) ? parsedKind : undefined,
         content: event.content,
     }