Standardize bridge send/receive params

apps/bridge-worker/tasks/whatsapp/receive-whatsapp-message.ts

@@ -2,130 +2,48 @@ import { db, getWorkerUtils } from "@link-stack/bridge-common";
 
 interface ReceiveWhatsappMessageTaskOptions {
   token: string;
-  sender: string;
+  to: string;
+  from: string;
+  messageId: string;
+  sentAt: string;
   message: string;
+  attachment?: string;
+  filename?: string;
+  mimeType?: string;
 }
 
 const receiveWhatsappMessageTask = async ({
   token,
-  sender,
+  to,
+  from,
+  messageId,
+  sentAt,
   message,
+  attachment,
+  filename,
+  mimeType,
 }: ReceiveWhatsappMessageTaskOptions): Promise<void> => {
-  console.log({ token, sender, message });
+  console.log({ token, to, from });
+
   const worker = await getWorkerUtils();
   const row = await db
     .selectFrom("WhatsappBot")
     .selectAll()
     .where("id", "=", token)
     .executeTakeFirstOrThrow();
-
-  console.log(row);
-
   const backendId = row.id;
   const payload = {
+    to,
+    from,
+    message_id: messageId,
+    sent_at: sentAt,
     message,
-    recipient: sender,
+    attachment,
+    filename,
+    mime_type: mimeType,
   };
 
   await worker.addJob("common/notify-webhooks", { backendId, payload });
 };
 
 export default receiveWhatsappMessageTask;
-
-/* eslint-disable camelcase */
-/*
-import { withDb, AppDatabase } from "../../lib/db";
-import workerUtils from "../../lib/utils";
-
-interface WebhookPayload {
-  to: string;
-  from: string;
-  message_id: string;
-  sent_at: string;
-  message: string;
-  attachment: string;
-  filename: string;
-  mime_type: string;
-}
-
-interface WhatsappMessageTaskOptions {
-  waMessageId: string;
-  waMessage: string;
-  waTimestamp: string;
-  attachment: string;
-  filename: string;
-  mimetype: string;
-  botPhoneNumber: string;
-  whatsappBotId: string;
-}
-
-const formatPayload = (
-  messageInfo: WhatsappMessageTaskOptions,
-): WebhookPayload => {
-  const {
-    waMessageId,
-    waMessage,
-    waTimestamp,
-    attachment,
-    filename,
-    mimetype,
-    botPhoneNumber,
-  } = messageInfo;
-  const parsedMessage = JSON.parse(waMessage);
-  const message =
-    parsedMessage.message?.conversation ??
-    parsedMessage.message?.extendedTextMessage?.text ??
-    parsedMessage.message?.imageMessage?.caption ??
-    parsedMessage.message?.videoMessage?.caption;
-
-  return {
-    to: botPhoneNumber,
-    from: parsedMessage.key.remoteJid,
-    message_id: waMessageId,
-    sent_at: waTimestamp,
-    message,
-    attachment,
-    filename,
-    mime_type: mimetype,
-  };
-};
-
-const notifyWebhooks = async (
-  db: AppDatabase,
-  messageInfo: WhatsappMessageTaskOptions,
-) => {
-  const { waMessageId, whatsappBotId } = messageInfo;
-  const webhooks = await db.webhooks.findAllByBackendId(
-    "whatsapp",
-    whatsappBotId,
-  );
-  if (webhooks && webhooks.length === 0) return;
-
-  webhooks.forEach(({ id }) => {
-    const payload = formatPayload(messageInfo);
-    console.log({ payload });
-    workerUtils.addJob(
-      "notify-webhook",
-      {
-        payload,
-        webhookId: id,
-      },
-      {
-        // this de-deduplicates the job
-        jobKey: `webhook-${id}-message-${waMessageId}`,
-      },
-    );
-  });
-};
-
-const whatsappMessageTask = async (
-  options: WhatsappMessageTaskOptions,
-): Promise<void> => {
-  console.log(options);
-  withDb(async (db: AppDatabase) => {
-    await notifyWebhooks(db, options);
-  });
-};
-
-export default whatsappMessageTask;
-*/

apps/bridge-worker/tasks/whatsapp/send-whatsapp-message.ts

@@ -2,13 +2,13 @@ import { db } from "@link-stack/bridge-common";
 
 interface SendWhatsappMessageTaskOptions {
   token: string;
-  recipient: string;
+  to: string;
   message: any;
 }
 
 const sendWhatsappMessageTask = async ({
   message,
-  recipient,
+  to,
   token,
 }: SendWhatsappMessageTaskOptions): Promise<void> => {
   const bot = await db
@@ -18,15 +18,18 @@ const sendWhatsappMessageTask = async ({
     .executeTakeFirstOrThrow();
 
   const url = `${process.env.BRIDGE_WHATSAPP_URL}/api/bots/${bot.id}/send`;
-  const params = { message, phoneNumber: recipient };
-  console.log({ params });
-  const result = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(params),
-  });
-
-  console.log({ result });
+  const params = { message, phoneNumber: to };
+  try {
+    const result = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(params),
+    });
+    console.log({ result });
+  } catch (error) {
+    console.error({ error });
+    throw new Error("Failed to send message");
+  }
 };
 
 export default sendWhatsappMessageTask;