Merge pull request #191 from xmtp/np/fix-decoding-empty-messages

Fix decoding messages
xmtp · Dec 20, 2023 · 3c14dfc · 3c14dfc
2 parents e95063a + 20c5541
commit 3c14dfc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/example/src/tests.ts b/example/src/tests.ts
@@ -304,6 +304,9 @@ test('can paginate batch messages', async () => {
     } as Query,
   ])
 
+  await bobConversation.send('')
+  await delayToPropogate()
+
   const messagesAsc: DecodedMessage[] = await alice.listBatchMessages([
     {
       contentTopic: bobConversation.topic,
@@ -315,8 +318,6 @@ test('can paginate batch messages', async () => {
     throw Error('Unexpected messagesLimited count ' + messagesLimited.length)
   }
 
-  const content: number = messagesLimited[0].content()
-  console.log('string', content)
   if (messagesLimited[0].content() !== 'Message 4') {
     throw Error(
       'Unexpected messagesLimited content ' + messagesLimited[0].content()
@@ -350,6 +351,10 @@ test('can paginate batch messages', async () => {
     throw Error('Unexpected messagesAsc content ' + messagesAsc[0].content())
   }
 
+  if (messagesAsc[6].contentTypeId !== 'xmtp.org/text:1.0') {
+    throw Error('Unexpected messagesAsc content ' + messagesAsc[6].content())
+  }
+
   return true
 })
 
@@ -397,7 +402,6 @@ test('can stream messages', async () => {
     )
   }
   if (!bobConvo.createdAt) {
-    console.log('bobConvo', bobConvo)
     throw Error('Missing createdAt ' + bobConvo.createdAt)
   }
 

diff --git a/src/lib/Conversation.ts b/src/lib/Conversation.ts
@@ -68,8 +68,6 @@ export class Conversation<ContentTypes> {
       | undefined
   ): Promise<DecodedMessage<ContentTypes>[]> {
     try {
-      console.log('message() client is', this.client)
-
       const messages = await XMTP.listMessages(
         this.client,
         this.topic,

diff --git a/src/lib/DecodedMessage.ts b/src/lib/DecodedMessage.ts
@@ -86,18 +86,27 @@ export class DecodedMessage<ContentTypes = any> {
       const codec = this.client.codecRegistry[
         this.contentTypeId
       ] as JSContentCodec<ContentTypes>
-
+      if (!codec) {
+        throw new Error(
+          `no content type found ${JSON.stringify(this.contentTypeId)}`
+        )
+      }
       return codec.decode(encoded)
     } else {
       for (const codec of Object.values(this.client.codecRegistry)) {
-        if ('contentKey' in codec && this.nativeContent[codec.contentKey]) {
+        if (
+          ('contentKey' in codec && this.nativeContent[codec.contentKey]) ||
+          this.nativeContent.hasOwnProperty('text')
+        ) {
           return (codec as NativeContentCodec<ContentTypes>).decode(
             this.nativeContent
           )
         }
       }
 
-      throw new Error(`no content type found ${JSON.stringify(this.nativeContent)}`)
+      throw new Error(
+        `no content type found ${JSON.stringify(this.nativeContent)}`
+      )
     }
   }
 }