mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
Three coordinated things:
1. Resolve the committed upstream/main merge conflicts. 94 files were
sitting with raw <<<<<<< HEAD ... >>>>>>> upstream/main blocks. Every
conflict had HanzoBot/Bot on HEAD and OpenClaw on upstream. Resolved
by keeping HEAD everywhere — 540 conflict blocks.
2. Rewrite remaining OpenClaw text refs.
OPENCLAW → HANZO_BOT
OpenClaw → HanzoBot (PascalCase type identifiers)
openclaw → bot (codebase convention — botToken,
botUsername etc.; avoids invalid
hyphenated JS identifiers)
openclaw[_]/openclaw[A-Z] → bot[_]/bot[A-Z] (compound)
ai.openclaw.x → ai.hanzo.bot.x (JVM package path)
3. Delete or rename openclaw-named file paths (116 of them). Dead
duplicates with a Bot-named canonical from the partial migration:
deleted. Otherwise renamed.
ai/openclaw/** → deleted (ai/hanzo/bot/** canonical)
Sources/OpenClaw*/ → deleted (Sources/Bot* canonical)
Tests/OpenClawIPCTests/ → deleted (Tests/BotIPCTests canonical)
OpenClawKit/ → deleted (BotKit canonical)
openclaw-tools.*.ts → deleted (bot-tools.*.ts canonical)
openclaw-root.ts etc. → deleted (bot-root.ts canonical)
types.openclaw.ts → deleted (types.bot.ts canonical)
extensions/*/openclaw.plugin.json → renamed hanzo-bot.plugin.json
docs/start/openclaw.md → renamed hanzo-bot.md (+ zh-CN)
docs/assets/openclaw-*.png, whatsapp-openclaw*.jpg → deleted
scripts/.../openclaw-* → deleted (bot/hanzo-bot parallels)
openclaw.mjs → deleted (hanzo-bot.mjs is package.bin)
Then patched 65 broken JS/TS import strings where hanzo-bot had ended
up inside an import path ('./types.hanzo-bot.js' → './types.bot.js'
etc., since the on-disk filename uses the brand-neutral bot- prefix).
Pre-existing lint debt cleaned up to get oxlint --type-aware to 0/0:
removed the dead i18n test that referenced a path no longer existing;
defined the missing DIDConfig and WalletConfig types in types.base.ts
(they were imported but never declared); dropped unused imports;
collapsed redundant type assertion and a tautological meta.bot lookup
that the openclaw→bot rename made redundant.
The a2ui.bundle.js generated artifact is kept at its pre-rebrand
contents — it gets regenerated by 'pnpm canvas:a2ui:bundle' from
sources I cannot rebuild in this commit; the source side is clean.
Verified: 0 occurrences of openclaw (case-insensitive) in tree source
content, 0 file or directory paths with openclaw in the name; oxlint
--type-aware src test reports 0/0.
126 lines
3.8 KiB
TypeScript
126 lines
3.8 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import { afterAll, describe, expect, it } from "vitest";
|
|
import { GatewayClient } from "../src/gateway/client.js";
|
|
import { connectGatewayClient } from "../src/gateway/test-helpers.e2e.js";
|
|
import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../src/utils/message-channel.js";
|
|
import {
|
|
type ChatEventPayload,
|
|
type GatewayInstance,
|
|
connectNode,
|
|
extractFirstTextBlock,
|
|
postJson,
|
|
spawnGatewayInstance,
|
|
stopGatewayInstance,
|
|
waitForChatFinalEvent,
|
|
waitForNodeStatus,
|
|
} from "./helpers/gateway-e2e-harness.js";
|
|
|
|
const E2E_TIMEOUT_MS = 120_000;
|
|
|
|
describe("gateway multi-instance e2e", () => {
|
|
const instances: GatewayInstance[] = [];
|
|
const nodeClients: GatewayClient[] = [];
|
|
const chatClients: GatewayClient[] = [];
|
|
|
|
afterAll(async () => {
|
|
for (const client of nodeClients) {
|
|
client.stop();
|
|
}
|
|
for (const client of chatClients) {
|
|
client.stop();
|
|
}
|
|
for (const inst of instances) {
|
|
await stopGatewayInstance(inst);
|
|
}
|
|
});
|
|
|
|
it(
|
|
"spins up two gateways and exercises WS + HTTP + node pairing",
|
|
{ timeout: E2E_TIMEOUT_MS },
|
|
async () => {
|
|
const [gwA, gwB] = await Promise.all([spawnGatewayInstance("a"), spawnGatewayInstance("b")]);
|
|
instances.push(gwA, gwB);
|
|
|
|
const [hookResA, hookResB] = await Promise.all([
|
|
postJson(
|
|
`http://127.0.0.1:${gwA.port}/hooks/wake`,
|
|
{
|
|
text: "wake a",
|
|
mode: "now",
|
|
},
|
|
{ "x-bot-token": gwA.hookToken },
|
|
),
|
|
postJson(
|
|
`http://127.0.0.1:${gwB.port}/hooks/wake`,
|
|
{
|
|
text: "wake b",
|
|
mode: "now",
|
|
},
|
|
{ "x-bot-token": gwB.hookToken },
|
|
),
|
|
]);
|
|
expect(hookResA.status).toBe(200);
|
|
expect((hookResA.json as { ok?: boolean } | undefined)?.ok).toBe(true);
|
|
expect(hookResB.status).toBe(200);
|
|
expect((hookResB.json as { ok?: boolean } | undefined)?.ok).toBe(true);
|
|
|
|
const [nodeA, nodeB] = await Promise.all([
|
|
connectNode(gwA, "node-a"),
|
|
connectNode(gwB, "node-b"),
|
|
]);
|
|
nodeClients.push(nodeA.client, nodeB.client);
|
|
|
|
await Promise.all([
|
|
waitForNodeStatus(gwA, nodeA.nodeId),
|
|
waitForNodeStatus(gwB, nodeB.nodeId),
|
|
]);
|
|
},
|
|
);
|
|
|
|
it(
|
|
"delivers final chat event for telegram-shaped session keys",
|
|
{ timeout: E2E_TIMEOUT_MS },
|
|
async () => {
|
|
const gw = await spawnGatewayInstance("chat-telegram-fixture");
|
|
instances.push(gw);
|
|
|
|
const chatEvents: ChatEventPayload[] = [];
|
|
const chatClient = await connectGatewayClient({
|
|
url: `ws://127.0.0.1:${gw.port}`,
|
|
token: gw.gatewayToken,
|
|
clientName: GATEWAY_CLIENT_NAMES.CLI,
|
|
clientDisplayName: "chat-e2e-cli",
|
|
clientVersion: "1.0.0",
|
|
platform: "test",
|
|
mode: GATEWAY_CLIENT_MODES.CLI,
|
|
onEvent: (evt) => {
|
|
if (evt.event === "chat" && evt.payload && typeof evt.payload === "object") {
|
|
chatEvents.push(evt.payload as ChatEventPayload);
|
|
}
|
|
},
|
|
});
|
|
chatClients.push(chatClient);
|
|
|
|
const sessionKey = "agent:main:telegram:direct:123456";
|
|
const idempotencyKey = `idem-${randomUUID()}`;
|
|
const sendRes = await chatClient.request<{ runId?: string; status?: string }>("chat.send", {
|
|
sessionKey,
|
|
message: "/context list",
|
|
idempotencyKey,
|
|
});
|
|
expect(sendRes.status).toBe("started");
|
|
const runId = sendRes.runId;
|
|
expect(typeof runId).toBe("string");
|
|
|
|
const finalEvent = await waitForChatFinalEvent({
|
|
events: chatEvents,
|
|
runId: String(runId),
|
|
sessionKey,
|
|
});
|
|
const finalText = extractFirstTextBlock(finalEvent.message);
|
|
expect(typeof finalText).toBe("string");
|
|
expect(finalText?.length).toBeGreaterThan(0);
|
|
},
|
|
);
|
|
});
|