Merge pull request #145 from xmtp/return-message-from-send

Return message upon sending

src/Client.ts

@@ -290,7 +290,7 @@ export default class Client {
     peerAddress: string,
     content: any,
     options?: SendOptions
-  ): Promise<void> {
+  ): Promise<Message> {
     let topics: string[]
     const recipient = await this.getUserContact(peerAddress)
 
@@ -312,14 +312,18 @@ export default class Client {
     }
     const timestamp = options?.timestamp || new Date()
     const msg = await this.encodeMessage(recipient, timestamp, content, options)
+    const msgBytes = msg.toBytes()
+
     await Promise.all(
       topics.map(async (topic) => {
-        const wakuMsg = await WakuMessage.fromBytes(msg.toBytes(), topic, {
+        const wakuMsg = await WakuMessage.fromBytes(msgBytes, topic, {
           timestamp,
         })
         return this.sendWakuMessage(wakuMsg)
       })
     )
+
+    return this.decodeMessage(msgBytes, topics[0])
   }
 
   private async sendWakuMessage(msg: WakuMessage): Promise<void> {

src/conversations/Conversation.ts

@@ -33,10 +33,10 @@ export default class Conversation {
   /**
    * Send a message into the conversation
    */
-  async send(
+  send(
     message: any, // eslint-disable-line @typescript-eslint/no-explicit-any
     options?: SendOptions
-  ): Promise<void> {
-    await this.client.sendMessage(this.peerAddress, message, options)
+  ): Promise<Message> {
+    return this.client.sendMessage(this.peerAddress, message, options)
   }
 }

test/Client.test.ts

@@ -94,7 +94,10 @@ describe('Client', () => {
         const aliceBob = await alice.streamConversationMessages(bob.address)
 
         // alice sends intro
-        await alice.sendMessage(bob.address, 'hi bob!')
+        const sentMessage = await alice.sendMessage(bob.address, 'hi bob!')
+        assert.equal(sentMessage.content, 'hi bob!')
+        assert.ok(sentMessage.id)
+        assert.ok(sentMessage.sent)
         let msg = await aliceIntros.next()
         assert.equal(msg.value.content, 'hi bob!')