mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
zeekay
acaeda400a
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.
49 lines
1.6 KiB
JavaScript
49 lines
1.6 KiB
JavaScript
export function reconnectDelayMs(
|
|
attempt,
|
|
opts = { baseMs: 1000, maxMs: 30000, jitterMs: 1000, random: Math.random },
|
|
) {
|
|
const baseMs = Number.isFinite(opts.baseMs) ? opts.baseMs : 1000;
|
|
const maxMs = Number.isFinite(opts.maxMs) ? opts.maxMs : 30000;
|
|
const jitterMs = Number.isFinite(opts.jitterMs) ? opts.jitterMs : 1000;
|
|
const random = typeof opts.random === "function" ? opts.random : Math.random;
|
|
const safeAttempt = Math.max(0, Number.isFinite(attempt) ? attempt : 0);
|
|
const backoff = Math.min(baseMs * 2 ** safeAttempt, maxMs);
|
|
return backoff + Math.max(0, jitterMs) * random();
|
|
}
|
|
|
|
export async function deriveRelayToken(gatewayToken, port) {
|
|
const enc = new TextEncoder();
|
|
const key = await crypto.subtle.importKey(
|
|
"raw",
|
|
enc.encode(gatewayToken),
|
|
{ name: "HMAC", hash: "SHA-256" },
|
|
false,
|
|
["sign"],
|
|
);
|
|
const sig = await crypto.subtle.sign(
|
|
"HMAC",
|
|
key,
|
|
enc.encode(`bot-extension-relay-v1:${port}`),
|
|
);
|
|
return [...new Uint8Array(sig)].map((b) => b.toString(16).padStart(2, "0")).join("");
|
|
}
|
|
|
|
export async function buildRelayWsUrl(port, gatewayToken) {
|
|
const token = String(gatewayToken || "").trim();
|
|
if (!token) {
|
|
throw new Error(
|
|
"Missing gatewayToken in extension settings (chrome.storage.local.gatewayToken)",
|
|
);
|
|
}
|
|
const relayToken = await deriveRelayToken(token, port);
|
|
return `ws://127.0.0.1:${port}/extension?token=${encodeURIComponent(relayToken)}`;
|
|
}
|
|
|
|
export function isRetryableReconnectError(err) {
|
|
const message = err instanceof Error ? err.message : String(err || "");
|
|
if (message.includes("Missing gatewayToken")) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|