@daolmedo/openclaw-twilio-whatsapp 1.1.20 → 1.1.22

package/dist/index.js

@@ -38,6 +38,9 @@ function normalizePhoneNumber(phone) {
   return phone.replace(/^whatsapp:/, "").replace(/\s+/g, "");
 }
 
+// src/outbound-adapter.ts
+import { createChannelMessageAdapterFromOutbound } from "openclaw/plugin-sdk/channel-outbound";
+
 // src/send.ts
 import twilio from "twilio";
 var MAX_BODY_LENGTH = 1550;
@@ -55,7 +58,7 @@ 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];
@@ -87,6 +90,13 @@ async function deliver(ctx) {
 }
 var twilioWhatsappOutbound = {
   deliveryMode: "direct",
+  deliveryCapabilities: {
+    durableFinal: {
+      text: true,
+      media: true,
+      messageSendingHooks: true
+    }
+  },
   async sendText(ctx) {
     const messageId = await deliver(ctx);
     return {
@@ -102,6 +112,10 @@ var twilioWhatsappOutbound = {
     };
   }
 };
+var twilioWhatsappMessageAdapter = createChannelMessageAdapterFromOutbound({
+  id: "twilio-whatsapp",
+  outbound: twilioWhatsappOutbound
+});
 
 // src/runtime-store.ts
 var phoneToRuntime = /* @__PURE__ */ new Map();
@@ -152,6 +166,7 @@ var twilioWhatsappPlugin = {
     }
   },
   outbound: twilioWhatsappOutbound,
+  message: twilioWhatsappMessageAdapter,
   gateway: {
     async startAccount(ctx) {
       const account = ctx.account;
@@ -196,7 +211,7 @@ var twilioWhatsappPlugin = {
 // src/http-routes.ts
 import { readFile } from "node:fs/promises";
 import path from "node:path";
-import { dispatchInboundDirectDmWithRuntime } from "openclaw/plugin-sdk/direct-dm";
+import { resolveInboundRouteEnvelopeBuilderWithRuntime } from "openclaw/plugin-sdk/inbound-envelope";
 import { saveMediaBuffer } from "openclaw/plugin-sdk/media-runtime";
 
 // src/webhook.ts
@@ -426,53 +441,103 @@ ${text}`;
         }
       }
       console.log("[twilio-whatsapp] Dispatching bodyForAgent:", bodyForAgent);
-      const stopTyping = fields.messageSid ? startTypingKeepalive({
+      const stopTypingKeepalive = fields.messageSid ? startTypingKeepalive({
         accountSid: account.accountSid,
         authToken: account.authToken,
         messageId: fields.messageSid
       }) : () => {
       };
-      dispatchInboundDirectDmWithRuntime({
+      let typingStopped = false;
+      const stopTyping = () => {
+        if (typingStopped) return;
+        typingStopped = true;
+        stopTypingKeepalive();
+      };
+      const { route, buildEnvelope } = resolveInboundRouteEnvelopeBuilderWithRuntime({
         cfg: stored.cfg,
-        runtime: { channel: stored.channelRuntime },
         channel: "twilio-whatsapp",
-        channelLabel: "WhatsApp",
         accountId: account.accountId,
         peer: { kind: "direct", id: fromPhone },
-        senderId: fromPhone,
-        senderAddress,
-        recipientAddress,
-        conversationLabel,
-        rawBody: mediaContext.Transcript ? String(mediaContext.Transcript) : messageText,
-        bodyForAgent,
-        messageId: fields.messageSid,
-        timestamp: Date.now(),
-        commandAuthorized: true,
-        extraContext: mediaContext,
-        deliver: async (payload) => {
-          stopTyping();
-          const text = payload.text ?? "";
-          const mediaUrl = payload.mediaUrl ?? payload.mediaUrls?.[0];
-          if (!text && !mediaUrl) return;
-          await sendTwilioWhatsappMessage({
-            accountSid: account.accountSid,
-            authToken: account.authToken,
-            from: toPhone,
-            to: fromPhone,
-            body: text || void 0,
-            mediaUrl
-          });
+        runtime: stored.channelRuntime,
+        sessionStore: stored.cfg.session?.store
+      });
+      const timestamp = Date.now();
+      const rawBodyForContext = mediaContext.Transcript ? String(mediaContext.Transcript) : messageText;
+      const { storePath, body } = buildEnvelope({
+        channel: "WhatsApp",
+        from: conversationLabel,
+        body: rawBodyForContext,
+        timestamp
+      });
+      const ctxPayload = stored.channelRuntime.reply.finalizeInboundContext({
+        Body: body,
+        BodyForAgent: bodyForAgent ?? rawBodyForContext,
+        RawBody: rawBodyForContext,
+        CommandBody: rawBodyForContext,
+        From: senderAddress,
+        To: recipientAddress,
+        SessionKey: route.sessionKey,
+        AccountId: route.accountId ?? account.accountId,
+        ChatType: "direct",
+        ConversationLabel: conversationLabel,
+        SenderId: fromPhone,
+        Provider: "twilio-whatsapp",
+        Surface: "twilio-whatsapp",
+        MessageSid: fields.messageSid,
+        MessageSidFull: fields.messageSid,
+        Timestamp: timestamp,
+        CommandAuthorized: true,
+        OriginatingChannel: "twilio-whatsapp",
+        OriginatingTo: senderAddress,
+        ...mediaContext
+      });
+      stored.channelRuntime.inbound.dispatchReply({
+        cfg: stored.cfg,
+        channel: "twilio-whatsapp",
+        accountId: route.accountId ?? account.accountId,
+        agentId: route.agentId,
+        routeSessionKey: route.sessionKey,
+        storePath,
+        ctxPayload,
+        recordInboundSession: stored.channelRuntime.session.recordInboundSession,
+        dispatchReplyWithBufferedBlockDispatcher: stored.channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher,
+        delivery: {
+          deliver: async (payload) => {
+            const outbound = payload;
+            const text = outbound.text ?? "";
+            const mediaUrl = outbound.mediaUrl ?? outbound.mediaUrls?.[0];
+            if (!text && !mediaUrl) {
+              return { visibleReplySent: false };
+            }
+            const messageId = await sendTwilioWhatsappMessage({
+              accountSid: account.accountSid,
+              authToken: account.authToken,
+              from: toPhone,
+              to: fromPhone,
+              body: text || void 0,
+              mediaUrl
+            });
+            return {
+              messageIds: [messageId],
+              visibleReplySent: true
+            };
+          },
+          onError: (err, info) => {
+            stopTyping();
+            console.error(`[twilio-whatsapp] Dispatch error (${info.kind}):`, err);
+          }
         },
-        onRecordError: (err) => {
-          console.error("[twilio-whatsapp] Session record error:", err);
+        replyPipeline: {},
+        record: {
+          onRecordError: (err) => {
+            console.error("[twilio-whatsapp] Session record error:", err);
+          }
         },
-        onDispatchError: (err, info) => {
-          stopTyping();
-          console.error(`[twilio-whatsapp] Dispatch error (${info.kind}):`, err);
-        }
+        messageId: fields.messageSid
       }).catch((err) => {
-        stopTyping();
         console.error("[twilio-whatsapp] Unhandled dispatch error:", err);
+      }).finally(() => {
+        stopTyping();
       });
       return true;
     }

package/package.json

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