@openclaw/whatsapp 2026.5.2 → 2026.5.3-beta.1

package/src/login.test.ts

@@ -1,89 +0,0 @@
-import { EventEmitter } from "node:events";
-import { resetLogger, setLoggerOverride } from "openclaw/plugin-sdk/runtime-env";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { renderQrPngBase64 } from "./qr-image.js";
-
-vi.mock("./session.js", async () => {
-  const actual = await vi.importActual<typeof import("./session.js")>("./session.js");
-  const ev = new EventEmitter();
-  const sock = {
-    ev,
-    ws: { close: vi.fn() },
-    sendPresenceUpdate: vi.fn(),
-    sendMessage: vi.fn(),
-  };
-  return {
-    ...actual,
-    createWaSocket: vi.fn().mockResolvedValue(sock),
-    waitForWaConnection: vi.fn().mockResolvedValue(undefined),
-  };
-});
-
-vi.mock("./auth-store.js", async () => {
-  const actual = await vi.importActual<typeof import("./auth-store.js")>("./auth-store.js");
-  return {
-    ...actual,
-    restoreCredsFromBackupIfNeeded: vi.fn(async () => false),
-  };
-});
-
-import type { waitForWaConnection } from "./session.js";
-let loginWeb: typeof import("./login.js").loginWeb;
-let createWaSocket: typeof import("./session.js").createWaSocket;
-let restoreCredsFromBackupIfNeeded: typeof import("./auth-store.js").restoreCredsFromBackupIfNeeded;
-
-describe("web login", () => {
-  beforeAll(async () => {
-    ({ loginWeb } = await import("./login.js"));
-    ({ createWaSocket } = await import("./session.js"));
-    ({ restoreCredsFromBackupIfNeeded } = await import("./auth-store.js"));
-  });
-
-  beforeEach(() => {
-    vi.useFakeTimers();
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-    resetLogger();
-    setLoggerOverride(null);
-  });
-
-  it("loginWeb waits for connection and closes", async () => {
-    const sock = await (
-      createWaSocket as unknown as () => Promise<{ ws: { close: () => void } }>
-    )();
-    const close = vi.spyOn(sock.ws, "close");
-    const waiter: typeof waitForWaConnection = vi.fn().mockResolvedValue(undefined);
-    await loginWeb(false, waiter);
-    expect(close).not.toHaveBeenCalled();
-
-    await vi.advanceTimersByTimeAsync(499);
-    expect(close).not.toHaveBeenCalled();
-
-    await vi.advanceTimersByTimeAsync(1);
-    expect(close).toHaveBeenCalledTimes(1);
-  });
-
-  it("prints a backup recovery success message when creds are restored from backup", async () => {
-    const waiter: typeof waitForWaConnection = vi.fn().mockResolvedValue(undefined);
-    const consoleLog = vi.spyOn(console, "log").mockImplementation(() => {});
-    vi.mocked(restoreCredsFromBackupIfNeeded).mockResolvedValueOnce(true);
-
-    await loginWeb(false, waiter);
-
-    expect(consoleLog).toHaveBeenCalledWith(
-      expect.stringContaining("✅ Recovered from creds.json.bak; web session ready."),
-    );
-    consoleLog.mockRestore();
-  });
-});
-
-describe("renderQrPngBase64", () => {
-  it("renders a PNG data payload", async () => {
-    const b64 = await renderQrPngBase64("openclaw");
-    const buf = Buffer.from(b64, "base64");
-    expect(buf.subarray(0, 8).toString("hex")).toBe("89504e470d0a1a0a");
-  });
-});

package/src/login.ts

@@ -1,70 +0,0 @@
-import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
-import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
-import { danger, success } from "openclaw/plugin-sdk/runtime-env";
-import { defaultRuntime, type RuntimeEnv } from "openclaw/plugin-sdk/runtime-env";
-import { logInfo } from "openclaw/plugin-sdk/text-runtime";
-import { resolveWhatsAppAccount } from "./accounts.js";
-import { restoreCredsFromBackupIfNeeded } from "./auth-store.js";
-import { closeWaSocketSoon, waitForWhatsAppLoginResult } from "./connection-controller.js";
-import { createWaSocket, waitForWaConnection } from "./session.js";
-import { resolveWhatsAppSocketTiming } from "./socket-timing.js";
-
-export async function loginWeb(
-  verbose: boolean,
-  waitForConnection?: typeof waitForWaConnection,
-  runtime: RuntimeEnv = defaultRuntime,
-  accountId?: string,
-) {
-  const cfg = getRuntimeConfig();
-  const account = resolveWhatsAppAccount({ cfg, accountId });
-  const socketTiming = resolveWhatsAppSocketTiming(cfg);
-  const restoredFromBackup = await restoreCredsFromBackupIfNeeded(account.authDir);
-  let sock = await createWaSocket(true, verbose, {
-    authDir: account.authDir,
-    ...socketTiming,
-  });
-  logInfo("Waiting for WhatsApp connection...", runtime);
-  try {
-    const result = await waitForWhatsAppLoginResult({
-      sock,
-      authDir: account.authDir,
-      isLegacyAuthDir: account.isLegacyAuthDir,
-      verbose,
-      runtime,
-      waitForConnection,
-      socketTiming,
-      onSocketReplaced: (replacementSock) => {
-        sock = replacementSock;
-      },
-    });
-    if (result.outcome === "connected") {
-      console.log(
-        success(
-          result.restarted
-            ? "✅ Linked after restart; web session ready."
-            : restoredFromBackup
-              ? "✅ Recovered from creds.json.bak; web session ready."
-              : "✅ Linked! Credentials saved for future sends.",
-        ),
-      );
-      return;
-    }
-
-    if (result.outcome === "logged-out") {
-      console.error(
-        danger(
-          `WhatsApp reported the session is logged out. Cleared cached web session; please rerun ${formatCliCommand("openclaw channels login")} and scan the QR again.`,
-        ),
-      );
-      throw new Error("Session logged out; cache cleared. Re-run login.", {
-        cause: result.error,
-      });
-    }
-
-    console.error(danger(`WhatsApp Web connection ended before fully opening. ${result.message}`));
-    throw new Error(result.message, { cause: result.error });
-  } finally {
-    // Let Baileys flush any final events before closing the socket.
-    closeWaSocketSoon(sock);
-  }
-}

package/src/logout.test.ts

@@ -1,162 +0,0 @@
-import fs from "node:fs";
-import fsPromises from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-const runtime = {
-  log: vi.fn(),
-  error: vi.fn(),
-  exit: vi.fn(),
-};
-const WEB_LOGOUT_TEST_TIMEOUT_MS = 15_000;
-
-describe("web logout", () => {
-  let fixtureRoot = "";
-  let previousOAuthDir: string | undefined;
-  let caseId = 0;
-  let logoutWeb: typeof import("./auth-store.js").logoutWeb;
-
-  beforeAll(async () => {
-    fixtureRoot = await fsPromises.mkdtemp(path.join(os.tmpdir(), "openclaw-test-web-logout-"));
-    previousOAuthDir = process.env.OPENCLAW_OAUTH_DIR;
-    process.env.OPENCLAW_OAUTH_DIR = path.join(fixtureRoot, "oauth");
-    ({ logoutWeb } = await import("./auth-store.js"));
-  });
-
-  afterAll(async () => {
-    if (previousOAuthDir === undefined) {
-      delete process.env.OPENCLAW_OAUTH_DIR;
-    } else {
-      process.env.OPENCLAW_OAUTH_DIR = previousOAuthDir;
-    }
-    await fsPromises.rm(fixtureRoot, { recursive: true, force: true });
-  });
-
-  const makeCaseDir = async () => {
-    const dir = path.join(fixtureRoot, "oauth", "whatsapp", `case-${caseId++}`);
-    await fsPromises.mkdir(dir, { recursive: true });
-    return dir;
-  };
-
-  const makeExternalCaseDir = async () => {
-    const dir = path.join(fixtureRoot, "external", `case-${caseId++}`);
-    await fsPromises.mkdir(dir, { recursive: true });
-    return dir;
-  };
-
-  const createAuthCase = async (files: Record<string, string>) => {
-    const authDir = await makeCaseDir();
-    await Promise.all(
-      Object.entries(files).map(async ([name, contents]) => {
-        await fsPromises.writeFile(path.join(authDir, name), contents, "utf-8");
-      }),
-    );
-    return authDir;
-  };
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  it(
-    "deletes cached credentials when present",
-    { timeout: WEB_LOGOUT_TEST_TIMEOUT_MS },
-    async () => {
-      const authDir = await createAuthCase({ "creds.json": "{}" });
-      const result = await logoutWeb({ authDir, runtime: runtime as never });
-      expect(result).toBe(true);
-      expect(fs.existsSync(authDir)).toBe(false);
-    },
-  );
-
-  it("removes oauth.json too when not using legacy auth dir", async () => {
-    const authDir = await createAuthCase({
-      "creds.json": "{}",
-      "oauth.json": '{"token":true}',
-      "session-abc.json": "{}",
-    });
-    const result = await logoutWeb({ authDir, runtime: runtime as never });
-    expect(result).toBe(true);
-    expect(fs.existsSync(authDir)).toBe(false);
-  });
-
-  it("no-ops when nothing to delete", { timeout: WEB_LOGOUT_TEST_TIMEOUT_MS }, async () => {
-    const authDir = await makeCaseDir();
-    const result = await logoutWeb({ authDir, runtime: runtime as never });
-    expect(result).toBe(false);
-    expect(runtime.log).toHaveBeenCalled();
-  });
-
-  it("keeps shared oauth.json when using legacy auth dir", async () => {
-    const credsDir = path.join(fixtureRoot, "oauth");
-    await fsPromises.mkdir(credsDir, { recursive: true });
-    await fsPromises.writeFile(path.join(credsDir, "creds.json"), "{}", "utf-8");
-    await fsPromises.writeFile(path.join(credsDir, "oauth.json"), '{"token":true}', "utf-8");
-    await fsPromises.writeFile(path.join(credsDir, "session-abc.json"), "{}", "utf-8");
-
-    const result = await logoutWeb({
-      authDir: credsDir,
-      isLegacyAuthDir: true,
-      runtime: runtime as never,
-    });
-    expect(result).toBe(true);
-    expect(fs.existsSync(path.join(credsDir, "oauth.json"))).toBe(true);
-    expect(fs.existsSync(path.join(credsDir, "creds.json"))).toBe(false);
-    expect(fs.existsSync(path.join(credsDir, "session-abc.json"))).toBe(false);
-  });
-
-  it("does not delete custom auth directories outside the OpenClaw auth root", async () => {
-    const authDir = await makeExternalCaseDir();
-    await fsPromises.mkdir(path.join(authDir, "nested"));
-    await fsPromises.writeFile(path.join(authDir, "creds.json"), "{}", "utf-8");
-    await fsPromises.writeFile(path.join(authDir, "oauth.json"), '{"token":true}', "utf-8");
-    await fsPromises.writeFile(path.join(authDir, "notes.txt"), "keep", "utf-8");
-    await fsPromises.writeFile(path.join(authDir, "nested", "session-abc.json"), "keep", "utf-8");
-
-    const result = await logoutWeb({ authDir, runtime: runtime as never });
-    expect(result).toBe(false);
-    expect(fs.existsSync(authDir)).toBe(true);
-    expect(fs.existsSync(path.join(authDir, "creds.json"))).toBe(true);
-    expect(fs.existsSync(path.join(authDir, "oauth.json"))).toBe(true);
-    expect(fs.existsSync(path.join(authDir, "notes.txt"))).toBe(true);
-    expect(fs.existsSync(path.join(authDir, "nested", "session-abc.json"))).toBe(true);
-  });
-
-  it("does not delete through symlinked auth dirs inside the OpenClaw auth root", async () => {
-    const externalDir = await makeExternalCaseDir();
-    const authDir = path.join(fixtureRoot, "oauth", "whatsapp", `case-${caseId++}`);
-    await fsPromises.mkdir(path.dirname(authDir), { recursive: true });
-    await fsPromises.writeFile(path.join(externalDir, "creds.json"), "{}", "utf-8");
-    await fsPromises.writeFile(path.join(externalDir, "notes.txt"), "keep", "utf-8");
-    await fsPromises.symlink(externalDir, authDir, "dir");
-
-    const result = await logoutWeb({ authDir, runtime: runtime as never });
-    expect(result).toBe(false);
-    expect(fs.existsSync(authDir)).toBe(true);
-    expect(fs.existsSync(path.join(externalDir, "creds.json"))).toBe(true);
-    expect(fs.existsSync(path.join(externalDir, "notes.txt"))).toBe(true);
-  });
-
-  it("does not delete through intermediate symlinks inside the OpenClaw auth root", async () => {
-    const externalRoot = path.join(fixtureRoot, "external", `case-${caseId++}`);
-    const externalAuthDir = path.join(externalRoot, "default");
-    const linkedParent = path.join(fixtureRoot, "oauth", "whatsapp", `linked-${caseId++}`);
-    const authDir = path.join(linkedParent, "default");
-    await fsPromises.mkdir(externalAuthDir, { recursive: true });
-    await fsPromises.mkdir(path.dirname(linkedParent), { recursive: true });
-    await fsPromises.writeFile(path.join(externalAuthDir, "creds.json"), "{}", "utf-8");
-    await fsPromises.writeFile(path.join(externalAuthDir, "notes.txt"), "keep", "utf-8");
-    await fsPromises.symlink(externalRoot, linkedParent, "dir");
-
-    const result = await logoutWeb({ authDir, runtime: runtime as never });
-    expect(result).toBe(false);
-    expect(fs.existsSync(authDir)).toBe(true);
-    expect(fs.existsSync(path.join(externalAuthDir, "creds.json"))).toBe(true);
-    expect(fs.existsSync(path.join(externalAuthDir, "notes.txt"))).toBe(true);
-  });
-});