save media payload on webhook sendNewMessages

Author: clairton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoapi-cloud",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "Unoapi Cloud",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/defaults.ts

@@ -60,7 +60,7 @@ export const DATA_JID_TTL: number = parseInt(process.env.DATA_JID_TTL || `${60 *
 export const SESSION_TTL: number = parseInt(process.env.SESSION_TTL || '-1')
 export const UNOAPI_X_COUNT_RETRIES: string = process.env.UNOAPI_X_COUNT_RETRIES || 'x-unoapi-count-retries'
 export const UNOAPI_X_MAX_RETRIES: string = process.env.UNOAPI_X_MAX_RETRIES || 'x-unoapi-max-retries'
-export const UNOAPI_EXCHANGE_NAME = process.env.UNOAPI_EXCHANGE_BROKER_NAME || 'unoapi'
+export const UNOAPI_EXCHANGE_NAME = process.env.UNOAPI_EXCHANGE_NAME || 'unoapi'
 export const UNOAPI_EXCHANGE_BROKER_NAME =`${UNOAPI_EXCHANGE_NAME}.broker`
 export const UNOAPI_EXCHANGE_BRIDGE_NAME = `${UNOAPI_EXCHANGE_NAME}.brigde`
 export const UNOAPI_QUEUE_NAME = process.env.UNOAPI_QUEUE_NAME || 'unoapi'

src/jobs/incoming.ts

@@ -3,7 +3,7 @@ import { Outgoing } from '../services/outgoing'
 import { UNOAPI_QUEUE_COMMANDER, UNOAPI_QUEUE_BULK_STATUS, FETCH_TIMEOUT_MS, UNOAPI_SERVER_NAME, UNOAPI_EXCHANGE_BROKER_NAME } from '../defaults'
 import { PublishOption, amqpPublish } from '../amqp'
 import { getConfig } from '../services/config'
-import { jidToPhoneNumber, getMimetype, toBuffer } from '../services/transformer'
+import { jidToPhoneNumber, getMimetype, toBuffer, TYPE_MESSAGES_MEDIA } from '../services/transformer'
 import logger from '../services/logger'
 import fetch, { Response } from 'node-fetch'
 import mime from 'mime-types'
@@ -57,7 +57,7 @@ export class IncomingJob {
         dataStore.setKey(idUno, key)
       }
       let messagePayload = payload[payload.type]
-      if (['image', 'audio', 'document', 'video'].includes(payload.type)) {
+      if (TYPE_MESSAGES_MEDIA.includes(payload.type)) {
         const { mediaStore } = await config.getStore(phone, config)
         const mediaKey = `${phone}/${idUno}`
         const link = payload[payload.type].link
@@ -74,6 +74,7 @@ export class IncomingJob {
           mime_type: mimetype,
         }
         delete messagePayload['link']
+        await dataStore.setMediaPayload(idUno, messagePayload)
       }
       const webhookMessage = {
         object: 'whatsapp_business_account',
@@ -175,7 +176,13 @@ export class IncomingJob {
         ],
       }
     }
-    await amqpPublish(UNOAPI_EXCHANGE_BROKER_NAME, UNOAPI_QUEUE_BULK_STATUS, phone, { payload: outgingPayload, type: 'whatsapp' })
+    await amqpPublish(
+      UNOAPI_EXCHANGE_BROKER_NAME,
+      UNOAPI_QUEUE_BULK_STATUS,
+      phone,
+      { payload: outgingPayload, type: 'whatsapp' },
+      { type: 'topic' }
+    )
     await Promise.all(config.webhooks.map((w) => this.outgoing.sendHttp(phone, w, outgingPayload, optionsOutgoing)))
     return response
   }

src/jobs/outgoing.ts

@@ -2,7 +2,7 @@ import { Webhook } from '../services/config'
 import { Outgoing } from '../services/outgoing'
 import { amqpPublish } from '../amqp'
 import { UNOAPI_DELAY_AFTER_FIRST_MESSAGE_WEBHOOK_MS, UNOAPI_EXCHANGE_BROKER_NAME, UNOAPI_QUEUE_OUTGOING } from '../defaults'
-import { extractDestinyPhone } from '../services/transformer'
+import { extractDestinyPhone, TYPE_MESSAGES_MEDIA } from '../services/transformer'
 import logger from '../services/logger'
 import { getConfig } from '../services/config'
 import { isUpdateMessage } from '../services/transformer'
@@ -89,7 +89,7 @@ export class OutgoingJob {
         } else {
           payload.entry[0].changes[0].value.messages = await Promise.all(
             payload.entry[0].changes[0].value.messages.map(async message => {
-              if (['image', 'audio', 'document', 'video'].includes(message.type)) {
+              if (TYPE_MESSAGES_MEDIA.includes(message.type)) {
                 const { mediaStore } = store
                 message = await mediaStore.saveMediaForwarder(message)
               }

src/services/client_baileys.ts

@@ -20,7 +20,7 @@ import {
 } from './socket'
 import { Client, getClient, clients, Contact } from './client'
 import { Config, configs, defaultConfig, getConfig, getMessageMetadataDefault } from './config'
-import { toBaileysMessageContent, phoneNumberToJid, jidToPhoneNumber, getMessageType, TYPE_MESSAGES_TO_READ } from './transformer'
+import { toBaileysMessageContent, phoneNumberToJid, jidToPhoneNumber, getMessageType, TYPE_MESSAGES_TO_READ, TYPE_MESSAGES_MEDIA } from './transformer'
 import { v1 as uuid } from 'uuid'
 import { Response } from './response'
 import QRCode from 'qrcode'
@@ -452,13 +452,13 @@ export class ClientBaileys implements Client {
           throw new Error(`Unknow message status ${status}`)
         }
       } else if (type) {
-        if (['text', 'image', 'audio', 'document', 'video', 'template', 'interactive', 'contacts'].includes(type)) {
+        if (['text', 'image', 'audio', 'sticker', 'document', 'video', 'template', 'interactive', 'contacts'].includes(type)) {
           let content
           if ('template' === type) {
             const template = new Template(this.getConfig)
             content = await template.bind(this.phone, payload.template.name, payload.template.components)
           } else {
-            if (VALIDATE_MEDIA_LINK_BEFORE_SEND && ['image', 'audio', 'document', 'video'].includes(type)) {
+            if (VALIDATE_MEDIA_LINK_BEFORE_SEND && TYPE_MESSAGES_MEDIA.includes(type)) {
               const link = payload[type] && payload[type].link
               if (link) {
                 const response: FetchResponse = await fetch(link, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS), method: 'HEAD'})

src/services/transformer.ts

@@ -9,6 +9,7 @@ import { t } from '../i18n'
 
 export const TYPE_MESSAGES_TO_PROCESS_FILE = ['imageMessage', 'videoMessage', 'audioMessage', 'documentMessage', 'stickerMessage', 'ptvMessage']
 
+export const TYPE_MESSAGES_MEDIA = ['image', 'audio', 'document', 'video', 'sticker']
 
 const MESSAGE_STUB_TYPE_ERRORS = [
   'Message absent from node'.toLowerCase(),