@daolmedo/openclaw-twilio-whatsapp 1.1.26 → 1.1.28

package/dist/index.js

@@ -1,6 +1,11 @@
 // index.ts
 import { defineChannelPluginEntry } from "openclaw/plugin-sdk/channel-core";
 
+// src/channel.ts
+import {
+  buildChannelOutboundSessionRoute
+} from "openclaw/plugin-sdk/channel-core";
+
 // src/accounts.ts
 var getTwilioChannelConfig = (cfg) => cfg.channels && cfg.channels["twilio-whatsapp"] ? cfg.channels["twilio-whatsapp"] : void 0;
 function listTwilioAccountIds(cfg) {
@@ -35,7 +40,10 @@ function findTwilioAccountByPhoneNumber(cfg, phoneNumber) {
   return void 0;
 }
 function normalizePhoneNumber(phone) {
-  return phone.replace(/^whatsapp:/, "").replace(/\s+/g, "");
+  return phone.trim().replace(/^(?:(?:twilio-whatsapp|whatsapp):)+/i, "").replace(/\s+/g, "");
+}
+function looksLikePhoneNumber(phone) {
+  return /^\+[1-9]\d{6,14}$/.test(normalizePhoneNumber(phone));
 }
 
 // src/outbound-adapter.ts
@@ -163,6 +171,21 @@ function getRuntimeForPhoneNumber(phoneNumber) {
 }
 
 // src/channel.ts
+function resolveTwilioWhatsappOutboundSessionRoute(params) {
+  const to = normalizePhoneNumber(params.resolvedTarget?.to ?? params.target);
+  if (!looksLikePhoneNumber(to)) return null;
+  return buildChannelOutboundSessionRoute({
+    cfg: params.cfg,
+    agentId: params.agentId,
+    channel: "twilio-whatsapp",
+    accountId: params.accountId,
+    recipientSessionExact: true,
+    peer: { kind: "direct", id: to },
+    chatType: "direct",
+    from: `whatsapp:${to}`,
+    to: `whatsapp:${to}`
+  });
+}
 var twilioWhatsappPlugin = {
   id: "twilio-whatsapp",
   meta: {
@@ -196,6 +219,15 @@ var twilioWhatsappPlugin = {
       return listTwilioAccountIds(cfg).length > 0;
     }
   },
+  messaging: {
+    targetPrefixes: ["whatsapp"],
+    normalizeTarget: normalizePhoneNumber,
+    resolveOutboundSessionRoute: resolveTwilioWhatsappOutboundSessionRoute,
+    targetResolver: {
+      looksLikeId: (raw, normalized) => looksLikePhoneNumber(normalized ?? raw),
+      hint: "<+15551234567>"
+    }
+  },
   outbound: twilioWhatsappOutbound,
   message: twilioWhatsappMessageAdapter,
   gateway: {
@@ -405,6 +437,22 @@ function resolveMediaBatchFlushMs() {
   if (Number.isFinite(raw) && raw >= 0) return Math.min(raw, 6e4);
   return 3e3;
 }
+function resolveMediaBatchInitialWaitMs() {
+  const rawValue = process.env.TWILIO_WHATSAPP_MEDIA_BATCH_INITIAL_WAIT_MS;
+  const raw = Number(rawValue);
+  if (rawValue !== void 0 && Number.isFinite(raw) && raw >= 0) {
+    return Math.min(raw, 6e4);
+  }
+  if (process.env.TWILIO_WHATSAPP_MEDIA_BATCH_FLUSH_MS !== void 0) {
+    return resolveMediaBatchFlushMs();
+  }
+  return 15e3;
+}
+function resolveMediaBatchMaxWaitMs() {
+  const raw = Number(process.env.TWILIO_WHATSAPP_MEDIA_BATCH_MAX_WAIT_MS);
+  if (Number.isFinite(raw) && raw >= 0) return Math.min(raw, 6e4);
+  return Math.min(resolveMediaBatchInitialWaitMs() + resolveMediaBatchFlushMs(), 6e4);
+}
 function resolveMediaBatchMaxItems() {
   const raw = Number(process.env.TWILIO_WHATSAPP_MEDIA_BATCH_MAX_ITEMS);
   if (Number.isFinite(raw) && raw > 0) return Math.floor(Math.min(raw, 50));
@@ -469,9 +517,13 @@ function stopBatchTimer(batch) {
 }
 function armBatchTimer(api, dispatchInbound, key, batch) {
   stopBatchTimer(batch);
+  const batchAgeMs = Math.max(0, Date.now() - batch.firstReceivedAt);
+  const desiredWaitMs = batch.items.length === 1 ? resolveMediaBatchInitialWaitMs() : resolveMediaBatchFlushMs();
+  const remainingMaxWaitMs = Math.max(0, resolveMediaBatchMaxWaitMs() - batchAgeMs);
+  const waitMs = Math.min(desiredWaitMs, remainingMaxWaitMs);
   batch.timer = setTimeout(() => {
     void flushPendingMediaBatch(api, dispatchInbound, key, "timer");
-  }, resolveMediaBatchFlushMs());
+  }, waitMs);
   batch.timer.unref?.();
 }
 async function flushPendingMediaBatch(api, dispatchInbound, key, reason) {
@@ -511,7 +563,7 @@ function queueMediaBatch(api, dispatchInbound, key, item) {
   return new Promise((resolve, reject) => {
     let batch = pendingMediaByConversation.get(key);
     if (!batch) {
-      batch = { items: [] };
+      batch = { items: [], firstReceivedAt: item.receivedAt };
       pendingMediaByConversation.set(key, batch);
     }
     batch.items.push({ ...item, resolve, reject });

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "twilio-whatsapp",
   "name": "Twilio WhatsApp",
   "description": "WhatsApp channel via Twilio Business API (ISV/WABA)",
-  "version": "1.1.26",
+  "version": "1.1.27",
   "channels": ["twilio-whatsapp"],
   "channelConfigs": {
     "twilio-whatsapp": {

package/package.json

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