CLI: unify webhook ingress and keep up as tailscale alias

src/commands/send.test.ts

@@ -0,0 +1,145 @@
+import { describe, expect, it, vi } from "vitest";
+
+import type { CliDeps } from "../cli/deps.js";
+import type { RuntimeEnv } from "../runtime.js";
+import { sendCommand } from "./send.js";
+
+const runtime: RuntimeEnv = {
+	log: vi.fn(),
+	error: vi.fn(),
+	exit: vi.fn(() => {
+		throw new Error("exit");
+	}),
+};
+
+const baseDeps = {
+	assertProvider: vi.fn(),
+	sendMessageWeb: vi.fn(),
+	resolveTwilioMediaUrl: vi.fn(),
+	sendMessage: vi.fn(),
+	waitForFinalStatus: vi.fn(),
+} as unknown as CliDeps;
+
+describe("sendCommand", () => {
+	it("validates wait and poll", async () => {
+		await expect(() =>
+			sendCommand(
+				{
+					to: "+1",
+					message: "hi",
+					wait: "-1",
+					poll: "2",
+					provider: "twilio",
+				},
+				baseDeps,
+				runtime,
+			),
+		).rejects.toThrow("Wait must be >= 0 seconds");
+
+		await expect(() =>
+			sendCommand(
+				{
+					to: "+1",
+					message: "hi",
+					wait: "0",
+					poll: "0",
+					provider: "twilio",
+				},
+				baseDeps,
+				runtime,
+			),
+		).rejects.toThrow("Poll must be > 0 seconds");
+	});
+
+	it("handles web dry-run and warns on wait", async () => {
+		const deps = {
+			...baseDeps,
+			sendMessageWeb: vi.fn(),
+		} as CliDeps;
+		await sendCommand(
+			{
+				to: "+1",
+				message: "hi",
+				wait: "5",
+				poll: "2",
+				provider: "web",
+				dryRun: true,
+				media: "pic.jpg",
+			},
+			deps,
+			runtime,
+		);
+		expect(deps.sendMessageWeb).not.toHaveBeenCalled();
+	});
+
+	it("sends via web and outputs JSON", async () => {
+		const deps = {
+			...baseDeps,
+			sendMessageWeb: vi.fn().mockResolvedValue({ messageId: "web1" }),
+		} as CliDeps;
+		await sendCommand(
+			{
+				to: "+1",
+				message: "hi",
+				wait: "1",
+				poll: "2",
+				provider: "web",
+				json: true,
+			},
+			deps,
+			runtime,
+		);
+		expect(deps.sendMessageWeb).toHaveBeenCalled();
+		expect(runtime.log).toHaveBeenCalledWith(
+			expect.stringContaining("\"provider\": \"web\""),
+		);
+	});
+
+	it("supports twilio dry-run", async () => {
+		const deps = { ...baseDeps } as CliDeps;
+		await sendCommand(
+			{
+				to: "+1",
+				message: "hi",
+				wait: "0",
+				poll: "2",
+				provider: "twilio",
+				dryRun: true,
+			},
+			deps,
+			runtime,
+		);
+		expect(deps.sendMessage).not.toHaveBeenCalled();
+	});
+
+	it("sends via twilio with media and skips wait when zero", async () => {
+		const deps = {
+			...baseDeps,
+			resolveTwilioMediaUrl: vi.fn().mockResolvedValue("https://media"),
+			sendMessage: vi.fn().mockResolvedValue({ sid: "SM1", client: {} }),
+			waitForFinalStatus: vi.fn(),
+		} as CliDeps;
+		await sendCommand(
+			{
+				to: "+1",
+				message: "hi",
+				wait: "0",
+				poll: "2",
+				provider: "twilio",
+				media: "pic.jpg",
+				serveMedia: true,
+				json: true,
+			},
+			deps,
+			runtime,
+		);
+		expect(deps.resolveTwilioMediaUrl).toHaveBeenCalledWith("pic.jpg", {
+			serveMedia: true,
+			runtime,
+		});
+		expect(deps.waitForFinalStatus).not.toHaveBeenCalled();
+		expect(runtime.log).toHaveBeenCalledWith(
+			expect.stringContaining("\"provider\": \"twilio\""),
+		);
+	});
+});

src/commands/status.test.ts

@@ -0,0 +1,50 @@
+import { describe, expect, it, vi } from "vitest";
+
+import type { CliDeps } from "../cli/deps.js";
+import type { RuntimeEnv } from "../runtime.js";
+import { statusCommand } from "./status.js";
+
+vi.mock("../twilio/messages.js", () => ({
+	formatMessageLine: (m: any) => `LINE:${m.sid}`,
+}));
+
+const runtime: RuntimeEnv = {
+	log: vi.fn(),
+	error: vi.fn(),
+	exit: vi.fn(() => {
+		throw new Error("exit");
+	}),
+};
+
+const deps: CliDeps = {
+	listRecentMessages: vi.fn(),
+} as unknown as CliDeps;
+
+describe("statusCommand", () => {
+	it("validates limit and lookback", async () => {
+		await expect(
+			statusCommand({ limit: "0", lookback: "10" }, deps, runtime),
+		).rejects.toThrow("limit must be between 1 and 200");
+		await expect(
+			statusCommand({ limit: "10", lookback: "0" }, deps, runtime),
+		).rejects.toThrow("lookback must be > 0 minutes");
+	});
+
+	it("prints JSON when requested", async () => {
+		(deps.listRecentMessages as any).mockResolvedValue([{ sid: "1" }]);
+		await statusCommand(
+			{ limit: "5", lookback: "10", json: true },
+			deps,
+			runtime,
+		);
+		expect(runtime.log).toHaveBeenCalledWith(
+			JSON.stringify([{ sid: "1" }], null, 2),
+		);
+	});
+
+	it("prints formatted lines otherwise", async () => {
+		(deps.listRecentMessages as any).mockResolvedValue([{ sid: "123" }]);
+		await statusCommand({ limit: "1", lookback: "5" }, deps, runtime);
+		expect(runtime.log).toHaveBeenCalledWith("LINE:123");
+	});
+});

src/commands/webhook.ts

@@ -1,6 +1,7 @@
 import type { CliDeps } from "../cli/deps.js";
 import { retryAsync } from "../infra/retry.js";
 import type { RuntimeEnv } from "../runtime.js";
+import { upCommand } from "./up.js";
 
 export async function webhookCommand(
 	opts: {
@@ -9,6 +10,8 @@ export async function webhookCommand(
 		reply?: string;
 		verbose?: boolean;
 		yes?: boolean;
+		ingress?: "tailscale" | "none";
+		dryRun?: boolean;
 	},
 	deps: CliDeps,
 	runtime: RuntimeEnv,
@@ -17,8 +20,28 @@ export async function webhookCommand(
 	if (Number.isNaN(port) || port <= 0 || port >= 65536) {
 		throw new Error("Port must be between 1 and 65535");
 	}
+
+	const ingress = opts.ingress ?? "tailscale";
+
+	// Tailscale ingress: reuse the `up` flow (Funnel + Twilio webhook update).
+	if (ingress === "tailscale") {
+		const result = await upCommand(
+			{
+				port: opts.port,
+				path: opts.path,
+				verbose: opts.verbose,
+				yes: opts.yes,
+				dryRun: opts.dryRun,
+			},
+			deps,
+			runtime,
+		);
+		return result.server;
+	}
+
+	// Local-only webhook (no ingress / no Twilio update).
 	await deps.ensurePortAvailable(port);
-	if (opts.reply === "dry-run") {
+	if (opts.reply === "dry-run" || opts.dryRun) {
 		runtime.log(
 			`[dry-run] would start webhook on port ${port} path ${opts.path}`,
 		);