fix(cli): stop message send from hanging forever after delivery (#16460) (#16491)

Merged via /review-pr -> /prepare-pr -> /merge-pr.

Prepared head SHA: 78dffc9e99533715abf23d40062ed38a0fec4a50
Co-authored-by: yinghaosang <261132136+yinghaosang@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
This commit is contained in:
yinghaosang
2026-02-15 05:53:56 +08:00
committed by GitHub
parent cd747dc582
commit 8927c69b3f
3 changed files with 141 additions and 7 deletions

View File

@@ -0,0 +1,125 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
const messageCommandMock = vi.fn(async () => {});
vi.mock("../../../commands/message.js", () => ({
messageCommand: (...args: unknown[]) => messageCommandMock(...args),
}));
vi.mock("../../../globals.js", () => ({
danger: (s: string) => s,
setVerbose: vi.fn(),
}));
vi.mock("../../plugin-registry.js", () => ({
ensurePluginRegistryLoaded: vi.fn(),
}));
const exitMock = vi.fn((): never => {
throw new Error("exit");
});
const errorMock = vi.fn();
const runtimeMock = { log: vi.fn(), error: errorMock, exit: exitMock };
vi.mock("../../../runtime.js", () => ({
defaultRuntime: runtimeMock,
}));
vi.mock("../../deps.js", () => ({
createDefaultDeps: () => ({}),
}));
const { createMessageCliHelpers } = await import("./helpers.js");
describe("runMessageAction", () => {
beforeEach(() => {
vi.clearAllMocks();
messageCommandMock.mockReset().mockResolvedValue(undefined);
exitMock.mockReset().mockImplementation((): never => {
throw new Error("exit");
});
});
it("calls exit(0) after successful message delivery", async () => {
const fakeCommand = { help: vi.fn() } as never;
const { runMessageAction } = createMessageCliHelpers(fakeCommand, "discord");
await expect(
runMessageAction("send", { channel: "discord", target: "123", message: "hi" }),
).rejects.toThrow("exit");
expect(exitMock).toHaveBeenCalledOnce();
expect(exitMock).toHaveBeenCalledWith(0);
});
it("calls exit(1) when message delivery fails", async () => {
messageCommandMock.mockRejectedValueOnce(new Error("send failed"));
const fakeCommand = { help: vi.fn() } as never;
const { runMessageAction } = createMessageCliHelpers(fakeCommand, "discord");
await expect(
runMessageAction("send", { channel: "discord", target: "123", message: "hi" }),
).rejects.toThrow("exit");
expect(errorMock).toHaveBeenCalledWith("Error: send failed");
expect(exitMock).toHaveBeenCalledOnce();
expect(exitMock).toHaveBeenCalledWith(1);
});
it("does not call exit(0) when the action throws", async () => {
messageCommandMock.mockRejectedValueOnce(new Error("boom"));
const fakeCommand = { help: vi.fn() } as never;
const { runMessageAction } = createMessageCliHelpers(fakeCommand, "discord");
await expect(
runMessageAction("send", { channel: "discord", target: "123", message: "hi" }),
).rejects.toThrow("exit");
// exit should only be called once with code 1, never with 0
expect(exitMock).toHaveBeenCalledOnce();
expect(exitMock).not.toHaveBeenCalledWith(0);
});
it("does not call exit(0) if the error path returns", async () => {
messageCommandMock.mockRejectedValueOnce(new Error("boom"));
exitMock.mockReset().mockImplementation(() => undefined as never);
const fakeCommand = { help: vi.fn() } as never;
const { runMessageAction } = createMessageCliHelpers(fakeCommand, "discord");
await expect(
runMessageAction("send", { channel: "discord", target: "123", message: "hi" }),
).resolves.toBeUndefined();
expect(errorMock).toHaveBeenCalledWith("Error: boom");
expect(exitMock).toHaveBeenCalledOnce();
expect(exitMock).toHaveBeenCalledWith(1);
expect(exitMock).not.toHaveBeenCalledWith(0);
});
it("passes action and maps account to accountId", async () => {
const fakeCommand = { help: vi.fn() } as never;
const { runMessageAction } = createMessageCliHelpers(fakeCommand, "discord");
await expect(
runMessageAction("poll", {
channel: "discord",
target: "456",
account: "acct-1",
message: "hi",
}),
).rejects.toThrow("exit");
expect(messageCommandMock).toHaveBeenCalledWith(
expect.objectContaining({
action: "poll",
channel: "discord",
target: "456",
accountId: "acct-1",
message: "hi",
}),
expect.anything(),
expect.anything(),
);
// account key should be stripped in favor of accountId
const passedOpts = messageCommandMock.mock.calls[0][0] as Record<string, unknown>;
expect(passedOpts).not.toHaveProperty("account");
});
});