chatccc 0.2.190 → 0.2.192

package/src/__tests__/cardkit.test.ts

@@ -1,60 +1,60 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-import { updateCardKitCard } from "../cardkit.ts";
-
-function abortError(): Error {
-  const err = new Error("aborted");
-  err.name = "AbortError";
-  return err;
-}
-
-describe("CardKit request timeout", () => {
-  afterEach(() => {
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.unstubAllGlobals();
-  });
-
-  it("aborts a hung card update so display.cardBusy can be released", async () => {
-    vi.useFakeTimers();
-    vi.spyOn(console, "error").mockImplementation(() => {});
-
-    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
-      new Promise<Response>((_resolve, reject) => {
-        init?.signal?.addEventListener("abort", () => reject(abortError()));
-      })
-    ));
-    vi.stubGlobal("fetch", fetchMock);
-
-    const update = expect(updateCardKitCard("token", "card-1", "{}", 7))
-      .rejects.toThrow("updateCard cardId=card-1 seq=7 timeout after 15000ms");
-    await vi.advanceTimersByTimeAsync(15_000);
-
-    await update;
-    expect(fetchMock).toHaveBeenCalledWith(
-      expect.stringContaining("/cardkit/v1/cards/card-1"),
-      expect.objectContaining({ signal: expect.any(AbortSignal) }),
-    );
-  });
-
-  it("also aborts when response body reading hangs", async () => {
-    vi.useFakeTimers();
-    vi.spyOn(console, "error").mockImplementation(() => {});
-
-    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
-      Promise.resolve({
-        status: 200,
-        text: () => new Promise<string>((_resolve, reject) => {
-          init?.signal?.addEventListener("abort", () => reject(abortError()));
-        }),
-      } as Response)
-    ));
-    vi.stubGlobal("fetch", fetchMock);
-
-    const update = expect(updateCardKitCard("token", "card-2", "{}", 8))
-      .rejects.toThrow("updateCard cardId=card-2 seq=8 timeout after 15000ms");
-    await vi.advanceTimersByTimeAsync(15_000);
-
-    await update;
-  });
-});
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { updateCardKitCard } from "../cardkit.ts";
+
+function abortError(): Error {
+  const err = new Error("aborted");
+  err.name = "AbortError";
+  return err;
+}
+
+describe("CardKit request timeout", () => {
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+    vi.unstubAllGlobals();
+  });
+
+  it("aborts a hung card update so display.cardBusy can be released", async () => {
+    vi.useFakeTimers();
+    vi.spyOn(console, "error").mockImplementation(() => {});
+
+    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
+      new Promise<Response>((_resolve, reject) => {
+        init?.signal?.addEventListener("abort", () => reject(abortError()));
+      })
+    ));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const update = expect(updateCardKitCard("token", "card-1", "{}", 7))
+      .rejects.toThrow("updateCard cardId=card-1 seq=7 timeout after 15000ms");
+    await vi.advanceTimersByTimeAsync(15_000);
+
+    await update;
+    expect(fetchMock).toHaveBeenCalledWith(
+      expect.stringContaining("/cardkit/v1/cards/card-1"),
+      expect.objectContaining({ signal: expect.any(AbortSignal) }),
+    );
+  });
+
+  it("also aborts when response body reading hangs", async () => {
+    vi.useFakeTimers();
+    vi.spyOn(console, "error").mockImplementation(() => {});
+
+    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
+      Promise.resolve({
+        status: 200,
+        text: () => new Promise<string>((_resolve, reject) => {
+          init?.signal?.addEventListener("abort", () => reject(abortError()));
+        }),
+      } as Response)
+    ));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const update = expect(updateCardKitCard("token", "card-2", "{}", 8))
+      .rejects.toThrow("updateCard cardId=card-2 seq=8 timeout after 15000ms");
+    await vi.advanceTimersByTimeAsync(15_000);
+
+    await update;
+  });
+});

package/src/__tests__/cards.test.ts

@@ -1,18 +1,18 @@
 import { describe, it, expect } from "vitest";
-import {
-  buildProgressCard,
-  buildHelpCard,
+import {
+  buildProgressCard,
+  buildHelpCard,
   buildCdContent,
   buildCdCard,
   buildSessionsCard,
-  buildStatusCard,
-  buildCodexUsageCard,
-  buildCodexResetConfirmCard,
-  buildButtons,
-  truncateContent,
-  getToolEmoji,
-} from "../cards.ts";
-import { ABD_HELP_LINE } from "../shared-prefix.ts";
+  buildStatusCard,
+  buildCodexUsageCard,
+  buildCodexResetConfirmCard,
+  buildButtons,
+  truncateContent,
+  getToolEmoji,
+} from "../cards.ts";
+import { ABD_HELP_LINE } from "../shared-prefix.ts";
 
 // ---------------------------------------------------------------------------
 // truncateContent
@@ -154,23 +154,23 @@ describe("buildHelpCard", () => {
     expect(parsed.elements[0].text.content).toContain("你好");
   });
 
-  it("includes action buttons", () => {
-    const card = buildHelpCard("test");
-    const parsed = JSON.parse(card);
-    const action = parsed.elements[2];
-    expect(action.tag).toBe("action");
-    expect(action.actions).toHaveLength(7);
-  });
-
-  it("adds ABD prefix help as the final help line", () => {
-    const card = buildHelpCard("test");
-    const parsed = JSON.parse(card);
-    const lines = parsed.elements[1].text.content.split("\n");
-
-    expect(lines).toContain("发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡");
-    expect(lines.at(-1)).toBe(ABD_HELP_LINE);
-  });
-});
+  it("includes action buttons", () => {
+    const card = buildHelpCard("test");
+    const parsed = JSON.parse(card);
+    const action = parsed.elements[2];
+    expect(action.tag).toBe("action");
+    expect(action.actions).toHaveLength(7);
+  });
+
+  it("adds ABD prefix help as the final help line", () => {
+    const card = buildHelpCard("test");
+    const parsed = JSON.parse(card);
+    const lines = parsed.elements[1].text.content.split("\n");
+
+    expect(lines).toContain("发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡");
+    expect(lines.at(-1)).toBe(ABD_HELP_LINE);
+  });
+});
 
 // ---------------------------------------------------------------------------
 // buildCdContent
@@ -425,7 +425,7 @@ describe("buildSessionsCard", () => {
 // buildStatusCard
 // ---------------------------------------------------------------------------
 
-describe("buildStatusCard", () => {
+describe("buildStatusCard", () => {
   it("returns valid JSON with status text", () => {
     const card = buildStatusCard("一切正常");
     const parsed = JSON.parse(card);
@@ -445,54 +445,54 @@ describe("buildStatusCard", () => {
     const action = parsed.elements[2];
     expect(action.actions[0].text.content).toBe("收起");
   });
-});
-
-// ---------------------------------------------------------------------------
-// buildCodexUsageCard / buildCodexResetConfirmCard
-// ---------------------------------------------------------------------------
-
-describe("Codex usage reset cards", () => {
-  it("shows the reset button only when reset credits are available", () => {
-    const card = buildCodexUsageCard("Codex 用量", 2);
-    const parsed = JSON.parse(card);
-    const action = parsed.elements.find((element: any) => element.tag === "action");
-    expect(action.actions[0].text.content).toBe("发起重置");
-    expect(action.actions[0].value).toEqual({ action: "codex_reset_request", availableCount: 2 });
-
-    const noCreditCard = buildCodexUsageCard("Codex 用量", 0);
-    const noCreditParsed = JSON.parse(noCreditCard);
-    expect(noCreditParsed.elements.some((element: any) => element.tag === "action")).toBe(false);
-  });
-
-  it("builds yes/no confirmation buttons tied to the parent usage card", () => {
-    const card = buildCodexResetConfirmCard({
-      availableCount: 2,
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-    const parsed = JSON.parse(card);
-    const action = parsed.elements.find((element: any) => element.tag === "action");
-
-    expect(action.actions[0].text.content).toBe("是，发起重置");
-    expect(action.actions[0].value).toEqual({
-      action: "codex_reset_confirm",
-      decision: "yes",
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-    expect(action.actions[1].text.content).toBe("否");
-    expect(action.actions[1].value).toEqual({
-      action: "codex_reset_confirm",
-      decision: "no",
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-  });
-});
-
-// ---------------------------------------------------------------------------
-// buildButtons
-// ---------------------------------------------------------------------------
+});
+
+// ---------------------------------------------------------------------------
+// buildCodexUsageCard / buildCodexResetConfirmCard
+// ---------------------------------------------------------------------------
+
+describe("Codex usage reset cards", () => {
+  it("shows the reset button only when reset credits are available", () => {
+    const card = buildCodexUsageCard("Codex 用量", 2);
+    const parsed = JSON.parse(card);
+    const action = parsed.elements.find((element: any) => element.tag === "action");
+    expect(action.actions[0].text.content).toBe("发起重置");
+    expect(action.actions[0].value).toEqual({ action: "codex_reset_request", availableCount: 2 });
+
+    const noCreditCard = buildCodexUsageCard("Codex 用量", 0);
+    const noCreditParsed = JSON.parse(noCreditCard);
+    expect(noCreditParsed.elements.some((element: any) => element.tag === "action")).toBe(false);
+  });
+
+  it("builds yes/no confirmation buttons tied to the parent usage card", () => {
+    const card = buildCodexResetConfirmCard({
+      availableCount: 2,
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+    const parsed = JSON.parse(card);
+    const action = parsed.elements.find((element: any) => element.tag === "action");
+
+    expect(action.actions[0].text.content).toBe("是，发起重置");
+    expect(action.actions[0].value).toEqual({
+      action: "codex_reset_confirm",
+      decision: "yes",
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+    expect(action.actions[1].text.content).toBe("否");
+    expect(action.actions[1].value).toEqual({
+      action: "codex_reset_confirm",
+      decision: "no",
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+  });
+});
+
+// ---------------------------------------------------------------------------
+// buildButtons
+// ---------------------------------------------------------------------------
 
 describe("buildButtons", () => {
   it("returns action with buttons", () => {

package/src/__tests__/chatgpt-subscription-rpc.test.ts

@@ -1,89 +1,89 @@
-import { Readable } from "node:stream";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mockGetChatGptSubscriptionStatus = vi.hoisted(() => vi.fn());
-
-vi.mock("../chatgpt-subscription.ts", () => ({
-  getChatGptSubscriptionStatus: mockGetChatGptSubscriptionStatus,
-}));
-
-import {
-  CHATGPT_SUBSCRIPTION_PATH,
-  handleChatGptSubscriptionRequest,
-} from "../chatgpt-subscription-rpc.ts";
-
-function request(path = CHATGPT_SUBSCRIPTION_PATH, method = "GET"): Readable & {
-  url?: string;
-  method?: string;
-  headers: Record<string, string>;
-} {
-  const req = Readable.from([]) as Readable & {
-    url?: string;
-    method?: string;
-    headers: Record<string, string>;
-  };
-  req.url = path;
-  req.method = method;
-  req.headers = {};
-  return req;
-}
-
-function response() {
-  const res = {
-    statusCode: 0,
-    headers: {} as Record<string, string>,
-    body: "",
-    writeHead(status: number, headers: Record<string, string>) {
-      this.statusCode = status;
-      this.headers = headers;
-      return this;
-    },
-    end(chunk?: string) {
-      this.body += chunk ?? "";
-      return this;
-    },
-  };
-  return res;
-}
-
-describe("ChatGPT subscription RPC", () => {
-  beforeEach(() => {
-    mockGetChatGptSubscriptionStatus.mockReset();
-    mockGetChatGptSubscriptionStatus.mockResolvedValue({
-      ok: false,
-      code: "chrome_cdp_disabled",
-      reason: "Chrome CDP guard is disabled in ChatCCC config.",
-      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
-    });
-  });
-
-  it("returns the structured subscription lookup JSON", async () => {
-    const req = request();
-    const res = response();
-
-    await expect(handleChatGptSubscriptionRequest(req as never, res as never)).resolves.toBe(true);
-
-    expect(res.statusCode).toBe(200);
-    expect(JSON.parse(res.body)).toEqual({
-      ok: false,
-      code: "chrome_cdp_disabled",
-      reason: "Chrome CDP guard is disabled in ChatCCC config.",
-      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
-    });
-  });
-
-  it("does not handle other paths", async () => {
-    const res = response();
-
-    await expect(handleChatGptSubscriptionRequest(request("/api/other") as never, res as never)).resolves.toBe(false);
-    expect(res.body).toBe("");
-  });
-
-  it("rejects non-GET methods", async () => {
-    const res = response();
-
-    await expect(handleChatGptSubscriptionRequest(request(CHATGPT_SUBSCRIPTION_PATH, "POST") as never, res as never)).resolves.toBe(true);
-    expect(res.statusCode).toBe(405);
-    expect(JSON.parse(res.body)).toMatchObject({ ok: false, code: "method_not_allowed" });
-  });
-});
+import { Readable } from "node:stream";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mockGetChatGptSubscriptionStatus = vi.hoisted(() => vi.fn());
+
+vi.mock("../chatgpt-subscription.ts", () => ({
+  getChatGptSubscriptionStatus: mockGetChatGptSubscriptionStatus,
+}));
+
+import {
+  CHATGPT_SUBSCRIPTION_PATH,
+  handleChatGptSubscriptionRequest,
+} from "../chatgpt-subscription-rpc.ts";
+
+function request(path = CHATGPT_SUBSCRIPTION_PATH, method = "GET"): Readable & {
+  url?: string;
+  method?: string;
+  headers: Record<string, string>;
+} {
+  const req = Readable.from([]) as Readable & {
+    url?: string;
+    method?: string;
+    headers: Record<string, string>;
+  };
+  req.url = path;
+  req.method = method;
+  req.headers = {};
+  return req;
+}
+
+function response() {
+  const res = {
+    statusCode: 0,
+    headers: {} as Record<string, string>,
+    body: "",
+    writeHead(status: number, headers: Record<string, string>) {
+      this.statusCode = status;
+      this.headers = headers;
+      return this;
+    },
+    end(chunk?: string) {
+      this.body += chunk ?? "";
+      return this;
+    },
+  };
+  return res;
+}
+
+describe("ChatGPT subscription RPC", () => {
+  beforeEach(() => {
+    mockGetChatGptSubscriptionStatus.mockReset();
+    mockGetChatGptSubscriptionStatus.mockResolvedValue({
+      ok: false,
+      code: "chrome_cdp_disabled",
+      reason: "Chrome CDP guard is disabled in ChatCCC config.",
+      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
+    });
+  });
+
+  it("returns the structured subscription lookup JSON", async () => {
+    const req = request();
+    const res = response();
+
+    await expect(handleChatGptSubscriptionRequest(req as never, res as never)).resolves.toBe(true);
+
+    expect(res.statusCode).toBe(200);
+    expect(JSON.parse(res.body)).toEqual({
+      ok: false,
+      code: "chrome_cdp_disabled",
+      reason: "Chrome CDP guard is disabled in ChatCCC config.",
+      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
+    });
+  });
+
+  it("does not handle other paths", async () => {
+    const res = response();
+
+    await expect(handleChatGptSubscriptionRequest(request("/api/other") as never, res as never)).resolves.toBe(false);
+    expect(res.body).toBe("");
+  });
+
+  it("rejects non-GET methods", async () => {
+    const res = response();
+
+    await expect(handleChatGptSubscriptionRequest(request(CHATGPT_SUBSCRIPTION_PATH, "POST") as never, res as never)).resolves.toBe(true);
+    expect(res.statusCode).toBe(405);
+    expect(JSON.parse(res.body)).toMatchObject({ ok: false, code: "method_not_allowed" });
+  });
+});