Refactor CLI and Twilio modules; add helper tests and comments

src/twilio/update-webhook.ts

@@ -0,0 +1,194 @@
+import { success, isVerbose, warn } from "../globals.js";
+import { readEnv } from "../env.js";
+import { normalizeE164 } from "../utils.js";
+import type { RuntimeEnv } from "../runtime.js";
+import { createClient } from "./client.js";
+import type { TwilioSenderListClient, TwilioRequester } from "./types.js";
+
+export async function findIncomingNumberSid(client: TwilioSenderListClient): Promise<string | null> {
+	// Look up incoming phone number SID matching the configured WhatsApp number.
+	try {
+		const env = readEnv();
+		const phone = env.whatsappFrom.replace("whatsapp:", "");
+		const list = await client.incomingPhoneNumbers.list({
+			phoneNumber: phone,
+			limit: 1,
+		});
+		return list?.[0]?.sid ?? null;
+	} catch {
+		return null;
+	}
+}
+
+export async function findMessagingServiceSid(client: TwilioSenderListClient): Promise<string | null> {
+	// Attempt to locate a messaging service tied to the WA phone number (webhook fallback).
+	type IncomingNumberWithService = { messagingServiceSid?: string };
+	try {
+		const env = readEnv();
+		const phone = env.whatsappFrom.replace("whatsapp:", "");
+		const list = await client.incomingPhoneNumbers.list({
+			phoneNumber: phone,
+			limit: 1,
+		});
+		const msid =
+			(list?.[0] as IncomingNumberWithService | undefined)
+				?.messagingServiceSid ?? null;
+		return msid;
+	} catch {
+		return null;
+	}
+}
+
+export async function setMessagingServiceWebhook(
+	client: TwilioSenderListClient,
+	url: string,
+	method: "POST" | "GET",
+): Promise<boolean> {
+	const msid = await findMessagingServiceSid(client);
+	if (!msid) return false;
+	try {
+		await client.messaging.v1.services(msid).update({
+			InboundRequestUrl: url,
+			InboundRequestMethod: method,
+		});
+		const fetched = await client.messaging.v1.services(msid).fetch();
+		const stored = fetched?.inboundRequestUrl;
+		console.log(
+			success(
+				`✅ Messaging Service webhook set to ${stored ?? url} (service ${msid})`,
+			),
+		);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+
+// Update sender webhook URL with layered fallbacks (channels, form, helper, phone).
+export async function updateWebhook(
+	client: ReturnType<typeof createClient>,
+	senderSid: string,
+	url: string,
+	method: "POST" | "GET" = "POST",
+	runtime: RuntimeEnv,
+) {
+	// Point Twilio sender webhook at the provided URL.
+	const requester = client as unknown as TwilioRequester;
+	const clientTyped = client as unknown as TwilioSenderListClient;
+
+	// 1) Raw request (Channels/Senders) with JSON webhook payload — most reliable for WA
+	try {
+		await requester.request({
+			method: "post",
+			uri: `https://messaging.twilio.com/v2/Channels/Senders/${senderSid}`,
+			body: {
+				webhook: {
+					callback_url: url,
+					callback_method: method,
+				},
+			},
+			contentType: "application/json",
+		});
+		const fetched = await clientTyped.messaging.v2
+			.channelsSenders(senderSid)
+			.fetch();
+		const storedUrl =
+			fetched?.webhook?.callback_url || fetched?.webhook?.fallback_url;
+		if (storedUrl) {
+			console.log(success(`✅ Twilio sender webhook set to ${storedUrl}`));
+			return;
+		}
+		if (isVerbose())
+			console.error(
+				"Sender updated but webhook callback_url missing; will try fallbacks",
+			);
+	} catch (err) {
+		if (isVerbose())
+			console.error(
+				"channelsSenders request update failed, will try client helpers",
+				err,
+			);
+	}
+
+	// 1b) Form-encoded fallback for older Twilio stacks
+	try {
+		await requester.request({
+			method: "post",
+			uri: `https://messaging.twilio.com/v2/Channels/Senders/${senderSid}`,
+			form: {
+				"Webhook.CallbackUrl": url,
+				"Webhook.CallbackMethod": method,
+			},
+		});
+		const fetched = await clientTyped.messaging.v2
+			.channelsSenders(senderSid)
+			.fetch();
+		const storedUrl =
+			fetched?.webhook?.callback_url || fetched?.webhook?.fallback_url;
+		if (storedUrl) {
+			console.log(success(`✅ Twilio sender webhook set to ${storedUrl}`));
+			return;
+		}
+		if (isVerbose())
+			console.error(
+				"Form update succeeded but callback_url missing; will try helper fallback",
+			);
+	} catch (err) {
+		if (isVerbose())
+			console.error(
+				"Form channelsSenders update failed, will try helper fallback",
+				err,
+			);
+	}
+
+	// 2) SDK helper fallback (if supported by this client)
+	try {
+		if (clientTyped.messaging?.v2?.channelsSenders) {
+			await clientTyped.messaging.v2.channelsSenders(senderSid).update({
+				callbackUrl: url,
+				callbackMethod: method,
+			});
+			const fetched = await clientTyped.messaging.v2
+				.channelsSenders(senderSid)
+				.fetch();
+			const storedUrl =
+				fetched?.webhook?.callback_url || fetched?.webhook?.fallback_url;
+			console.log(
+				success(
+					`✅ Twilio sender webhook set to ${storedUrl ?? url} (helper API)`,
+				),
+			);
+			return;
+		}
+	} catch (err) {
+		if (isVerbose())
+			console.error(
+				"channelsSenders helper update failed, will try phone number fallback",
+				err,
+			);
+	}
+
+	// 3) Incoming phone number fallback (works for many WA senders)
+	try {
+		const phoneSid = await findIncomingNumberSid(clientTyped);
+		if (phoneSid) {
+			await clientTyped.incomingPhoneNumbers(phoneSid).update({
+				smsUrl: url,
+				smsMethod: method,
+			});
+			console.log(success(`✅ Phone webhook set to ${url} (number ${phoneSid})`));
+			return;
+		}
+	} catch (err) {
+		if (isVerbose())
+			console.error(
+				"Incoming phone number webhook update failed; no more fallbacks",
+				err,
+			);
+	}
+
+	runtime.error(
+		`❌ Failed to update Twilio webhook for sender ${senderSid} after multiple attempts`,
+	);
+}