@daolmedo/openclaw-twilio-whatsapp 1.1.21 → 1.1.23

package/dist/index.js

@@ -58,35 +58,68 @@ function splitMessage(text) {
   return chunks;
 }
 async function sendTwilioWhatsappMessage(opts) {
-  const client = twilio(opts.accountSid, opts.authToken);
+  const client = twilio(opts.accountSid, opts.authToken, { timeout: 3e4 });
   const from = opts.from.startsWith("whatsapp:") ? opts.from : `whatsapp:${opts.from}`;
   const to = opts.to.startsWith("whatsapp:") ? opts.to : `whatsapp:${opts.to}`;
   const chunks = opts.body ? splitMessage(opts.body) : [void 0];
   let lastSid = "";
-  for (const chunk of chunks) {
-    const msg = await client.messages.create({
-      from,
-      to,
-      ...chunk ? { body: chunk } : {},
-      ...opts.mediaUrl ? { mediaUrl: [opts.mediaUrl] } : {}
-    });
-    lastSid = msg.sid;
+  for (let i = 0; i < chunks.length; i += 1) {
+    const chunk = chunks[i];
+    console.log(
+      `[twilio-whatsapp] Twilio create start from=${from} to=${to} chunk=${i + 1}/${chunks.length} bodyChars=${chunk?.length ?? 0} media=${opts.mediaUrl ? "yes" : "no"}`
+    );
+    try {
+      const msg = await client.messages.create({
+        from,
+        to,
+        ...chunk ? { body: chunk } : {},
+        ...opts.mediaUrl ? { mediaUrl: [opts.mediaUrl] } : {}
+      });
+      lastSid = msg.sid;
+      console.log(
+        `[twilio-whatsapp] Twilio create ok sid=${msg.sid} status=${msg.status} chunk=${i + 1}/${chunks.length}`
+      );
+    } catch (err) {
+      console.error(
+        `[twilio-whatsapp] Twilio create failed chunk=${i + 1}/${chunks.length}:`,
+        err
+      );
+      throw err;
+    }
   }
   return lastSid;
 }
 
 // src/outbound-adapter.ts
+function summarizeText(text) {
+  if (!text) return "chars=0";
+  return `chars=${text.length} preview=${JSON.stringify(text.slice(0, 120))}`;
+}
 async function deliver(ctx) {
   const account = resolveTwilioAccount(ctx.cfg, ctx.accountId);
-  const sid = await sendTwilioWhatsappMessage({
-    accountSid: account.accountSid,
-    authToken: account.authToken,
-    from: account.phoneNumber,
-    to: ctx.to,
-    body: ctx.text || void 0,
-    mediaUrl: ctx.mediaUrl
-  });
-  return sid;
+  console.log(
+    `[twilio-whatsapp] Durable adapter deliver start accountId=${ctx.accountId ?? "default"} from=${account.phoneNumber} to=${ctx.to} ${summarizeText(ctx.text)} media=${ctx.mediaUrl ? "yes" : "no"}`
+  );
+  try {
+    const sid = await sendTwilioWhatsappMessage({
+      accountSid: account.accountSid,
+      authToken: account.authToken,
+      from: account.phoneNumber,
+      to: ctx.to,
+      body: ctx.text || void 0,
+      mediaUrl: ctx.mediaUrl
+    });
+    console.log(
+      `[twilio-whatsapp] Durable adapter deliver ok accountId=${ctx.accountId ?? "default"} outboundSid=${sid}`
+    );
+    return sid;
+  } catch (err) {
+    console.error(
+      `[twilio-whatsapp] Durable adapter deliver failed accountId=${ctx.accountId ?? "default"}:`,
+      err
+    );
+    throw err;
+  }
 }
 var twilioWhatsappOutbound = {
   deliveryMode: "direct",
@@ -278,6 +311,14 @@ function startTypingKeepalive(opts) {
 
 // src/http-routes.ts
 var MEDIA_MAX_BYTES = 16 * 1024 * 1024;
+function resolveDeliveryMode() {
+  const value = process.env.TWILIO_WHATSAPP_DELIVERY_MODE?.trim().toLowerCase();
+  return value === "durable" ? "durable" : "direct";
+}
+function summarizeText2(text) {
+  if (!text) return "chars=0";
+  return `chars=${text.length} preview=${JSON.stringify(text.slice(0, 120))}`;
+}
 async function readBody(req) {
   return new Promise((resolve, reject) => {
     const chunks = [];
@@ -333,6 +374,9 @@ function registerTwilioWhatsappHttpRoutes(api) {
       const webhookUrl = String(headers["x-twilio-webhook-url"] ?? "");
       const fields = parseTwilioWebhook(rawBody);
       const toPhone = normalizePhoneNumber(fields.to);
+      console.log(
+        `[twilio-whatsapp] Webhook received sid=${fields.messageSid || "unknown"} from=${fields.from} to=${fields.to} bodyChars=${fields.body.length} media=${fields.media.length}`
+      );
       const stored = getRuntimeForPhoneNumber(toPhone);
       if (!stored) {
         console.error(`[twilio-whatsapp] No runtime found for To=${fields.to}`);
@@ -371,6 +415,9 @@ function registerTwilioWhatsappHttpRoutes(api) {
         return true;
       }
       twimlOk(res);
+      console.log(
+        `[twilio-whatsapp] Webhook acknowledged sid=${fields.messageSid || "unknown"} accountId=${account.accountId}`
+      );
       const resolvedMedia = [];
       if (hasMedia) {
         const results = await Promise.all(
@@ -379,6 +426,9 @@ function registerTwilioWhatsappHttpRoutes(api) {
         for (const r of results) {
           if (r) resolvedMedia.push(r);
         }
+        console.log(
+          `[twilio-whatsapp] Media resolved sid=${fields.messageSid || "unknown"} requested=${fields.media.length} saved=${resolvedMedia.length}`
+        );
       }
       const mediaContext = resolvedMedia.length > 0 ? {
         MediaPath: resolvedMedia[0].path,
@@ -440,18 +490,25 @@ ${text}`;
           bodyForAgent = messageText || "<media:audio>";
         }
       }
-      console.log("[twilio-whatsapp] Dispatching bodyForAgent:", bodyForAgent);
-      const stopTypingKeepalive = fields.messageSid ? startTypingKeepalive({
-        accountSid: account.accountSid,
-        authToken: account.authToken,
-        messageId: fields.messageSid
-      }) : () => {
+      const deliveryMode = resolveDeliveryMode();
+      console.log(
+        `[twilio-whatsapp] Dispatching inbound sid=${fields.messageSid || "unknown"} deliveryMode=${deliveryMode} bodyForAgent=${summarizeText2(bodyForAgent)}`
+      );
+      const stopTypingKeepalive = fields.messageSid ? (() => {
+        console.log(`[twilio-whatsapp] Typing keepalive start sid=${fields.messageSid}`);
+        return startTypingKeepalive({
+          accountSid: account.accountSid,
+          authToken: account.authToken,
+          messageId: fields.messageSid
+        });
+      })() : () => {
       };
       let typingStopped = false;
       const stopTyping = () => {
         if (typingStopped) return;
         typingStopped = true;
         stopTypingKeepalive();
+        console.log(`[twilio-whatsapp] Typing keepalive stop sid=${fields.messageSid || "unknown"}`);
       };
       const { route, buildEnvelope } = resolveInboundRouteEnvelopeBuilderWithRuntime({
         cfg: stored.cfg,
@@ -491,6 +548,9 @@ ${text}`;
         OriginatingTo: senderAddress,
         ...mediaContext
       });
+      console.log(
+        `[twilio-whatsapp] Route resolved sid=${fields.messageSid || "unknown"} agentId=${route.agentId} sessionKey=${route.sessionKey} accountId=${route.accountId ?? account.accountId}`
+      );
       stored.channelRuntime.inbound.dispatchReply({
         cfg: stored.cfg,
         channel: "twilio-whatsapp",
@@ -502,29 +562,57 @@ ${text}`;
         recordInboundSession: stored.channelRuntime.session.recordInboundSession,
         dispatchReplyWithBufferedBlockDispatcher: stored.channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher,
         delivery: {
-          durable: () => ({
-            to: senderAddress
-          }),
+          ...deliveryMode === "durable" ? {
+            durable: {
+              replyToMode: "first"
+            }
+          } : {},
           deliver: async (payload) => {
             const outbound = payload;
             const text = outbound.text ?? "";
             const mediaUrl = outbound.mediaUrl ?? outbound.mediaUrls?.[0];
+            console.log(
+              `[twilio-whatsapp] Direct fallback deliver invoked sid=${fields.messageSid || "unknown"} deliveryMode=${deliveryMode} ${summarizeText2(text)} media=${mediaUrl ? "yes" : "no"}`
+            );
             if (!text && !mediaUrl) {
+              console.log(
+                `[twilio-whatsapp] Direct fallback skipped empty payload sid=${fields.messageSid || "unknown"}`
+              );
               return { visibleReplySent: false };
             }
-            const messageId = await sendTwilioWhatsappMessage({
-              accountSid: account.accountSid,
-              authToken: account.authToken,
-              from: toPhone,
-              to: fromPhone,
-              body: text || void 0,
-              mediaUrl
-            });
+            let messageId;
+            try {
+              console.log(
+                `[twilio-whatsapp] Twilio direct send start sid=${fields.messageSid || "unknown"} from=${recipientAddress} to=${senderAddress} ${summarizeText2(text)} media=${mediaUrl ? "yes" : "no"}`
+              );
+              messageId = await sendTwilioWhatsappMessage({
+                accountSid: account.accountSid,
+                authToken: account.authToken,
+                from: toPhone,
+                to: fromPhone,
+                body: text || void 0,
+                mediaUrl
+              });
+              console.log(
+                `[twilio-whatsapp] Twilio direct send ok sid=${fields.messageSid || "unknown"} outboundSid=${messageId}`
+              );
+            } catch (err) {
+              console.error(
+                `[twilio-whatsapp] Twilio direct send failed sid=${fields.messageSid || "unknown"}:`,
+                err
+              );
+              throw err;
+            }
             return {
               messageIds: [messageId],
               visibleReplySent: true
             };
           },
+          onDelivered: (_payload, info, result) => {
+            console.log(
+              `[twilio-whatsapp] Delivery observer sid=${fields.messageSid || "unknown"} kind=${info.kind} result=${JSON.stringify(result)}`
+            );
+          },
           onError: (err, info) => {
             stopTyping();
             console.error(`[twilio-whatsapp] Dispatch error (${info.kind}):`, err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daolmedo/openclaw-twilio-whatsapp",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "Twilio WhatsApp channel plugin for OpenClaw (Cody ISV)",
   "type": "module",
   "exports": {