Update Baileys to 7RC

apps/bridge-whatsapp/src/index.ts

@@ -1,17 +1,17 @@
 import * as Hapi from "@hapi/hapi";
 import hapiPino from "hapi-pino";
 import Schmervice from "@hapipal/schmervice";
-import WhatsappService from "./service.js";
+import WhatsappService from "./service.ts";
 import {
   RegisterBotRoute,
   UnverifyBotRoute,
   GetBotRoute,
   SendMessageRoute,
   ReceiveMessageRoute,
-} from "./routes.js";
+} from "./routes.ts";
 import { createLogger } from "@link-stack/logger";
 
-const logger = createLogger('bridge-whatsapp-index');
+const logger = createLogger("bridge-whatsapp-index");
 
 const server = Hapi.server({ port: 5000 });
 

apps/bridge-whatsapp/src/routes.ts

@@ -1,6 +1,6 @@
 import * as Hapi from "@hapi/hapi";
 import Toys from "@hapipal/toys";
-import WhatsappService from "./service";
+import WhatsappService from "./service.ts";
 
 const withDefaults = Toys.withRouteDefaults({
   options: {
@@ -27,15 +27,9 @@ export const SendMessageRoute = withDefaults({
     description: "Send a message",
     async handler(request: Hapi.Request, _h: Hapi.ResponseToolkit) {
       const { id } = request.params;
-      const { phoneNumber, message, attachments } =
-        request.payload as MessageRequest;
+      const { phoneNumber, message, attachments } = request.payload as MessageRequest;
       const whatsappService = getService(request);
-      await whatsappService.send(
-        id,
-        phoneNumber,
-        message as string,
-        attachments,
-      );
+      await whatsappService.send(id, phoneNumber, message as string, attachments);
       request.logger.info(
         {
           id,

apps/bridge-whatsapp/src/service.ts

@@ -4,12 +4,13 @@ import makeWASocket, {
   DisconnectReason,
   proto,
   downloadContentFromMessage,
-  MediaType,
   fetchLatestBaileysVersion,
   isJidBroadcast,
   isJidStatusBroadcast,
   useMultiFileAuthState,
 } from "@whiskeysockets/baileys";
+
+type MediaType = "audio" | "document" | "image" | "video" | "sticker";
 import fs from "fs";
 import { createLogger } from "@link-stack/logger";
 import {
@@ -175,11 +176,12 @@ export default class WhatsappService extends Service {
   }
 
   private async queueMessage(botID: string, webMessageInfo: proto.IWebMessageInfo) {
-    const {
-      key: { id, fromMe, remoteJid },
-      message,
-      messageTimestamp,
-    } = webMessageInfo;
+    const { key, message, messageTimestamp } = webMessageInfo;
+    if (!key) {
+      logger.warn("Message missing key, skipping");
+      return;
+    }
+    const { id, fromMe, remoteJid } = key;
     logger.info("Message type debug");
     for (const key in message) {
       logger.info(

apps/bridge-whatsapp/src/types.ts

@@ -1,4 +1,4 @@
-import type WhatsappService from "./service.js";
+import type WhatsappService from "./service.ts";
 
 declare module "@hapipal/schmervice" {
   interface SchmerviceDecorator {