mirror of
https://github.com/hanzoai/bot.git
synced 2026-11-02 20:15:14 +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.
92 lines
3.1 KiB
TypeScript
92 lines
3.1 KiB
TypeScript
/**
|
|
* Twitch access token resolution with environment variable support.
|
|
*
|
|
* Supports reading Twitch OAuth access tokens from config or environment variable.
|
|
* The BOT_TWITCH_ACCESS_TOKEN env var is only used for the default account.
|
|
*
|
|
* Token resolution priority:
|
|
* 1. Account access token from merged config (accounts.{id} or base-level for default)
|
|
* 2. Environment variable: BOT_TWITCH_ACCESS_TOKEN (default account only)
|
|
*/
|
|
|
|
import type { BotConfig } from "../../../src/config/config.js";
|
|
import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../../src/routing/session-key.js";
|
|
|
|
export type TwitchTokenSource = "env" | "config" | "none";
|
|
|
|
export type TwitchTokenResolution = {
|
|
token: string;
|
|
source: TwitchTokenSource;
|
|
};
|
|
|
|
/**
|
|
* Normalize a Twitch OAuth token - ensure it has the oauth: prefix
|
|
*/
|
|
function normalizeTwitchToken(raw?: string | null): string | undefined {
|
|
if (!raw) {
|
|
return undefined;
|
|
}
|
|
const trimmed = raw.trim();
|
|
if (!trimmed) {
|
|
return undefined;
|
|
}
|
|
// Twitch tokens should have oauth: prefix
|
|
return trimmed.startsWith("oauth:") ? trimmed : `oauth:${trimmed}`;
|
|
}
|
|
|
|
/**
|
|
* Resolve Twitch access token from config or environment variable.
|
|
*
|
|
* Priority:
|
|
* 1. Account access token (from merged config - base-level for default, or accounts.{accountId})
|
|
* 2. Environment variable: BOT_TWITCH_ACCESS_TOKEN (default account only)
|
|
*
|
|
* The getAccountConfig function handles merging base-level config with accounts.default,
|
|
* so this logic works for both simplified and multi-account patterns.
|
|
*
|
|
* @param cfg - HanzoBot config
|
|
* @param opts - Options including accountId and optional envToken override
|
|
* @returns Token resolution with source
|
|
*/
|
|
export function resolveTwitchToken(
|
|
cfg?: BotConfig,
|
|
opts: { accountId?: string | null; envToken?: string | null } = {},
|
|
): TwitchTokenResolution {
|
|
const accountId = normalizeAccountId(opts.accountId);
|
|
|
|
// Get merged account config (handles both simplified and multi-account patterns)
|
|
const twitchCfg = cfg?.channels?.twitch;
|
|
const accountCfg =
|
|
accountId === DEFAULT_ACCOUNT_ID
|
|
? (twitchCfg?.accounts?.[DEFAULT_ACCOUNT_ID] as Record<string, unknown> | undefined)
|
|
: (twitchCfg?.accounts?.[accountId] as Record<string, unknown> | undefined);
|
|
|
|
// For default account, also check base-level config
|
|
let token: string | undefined;
|
|
if (accountId === DEFAULT_ACCOUNT_ID) {
|
|
// Base-level config takes precedence
|
|
token = normalizeTwitchToken(
|
|
(typeof twitchCfg?.accessToken === "string" ? twitchCfg.accessToken : undefined) ||
|
|
(accountCfg?.accessToken as string | undefined),
|
|
);
|
|
} else {
|
|
// Non-default accounts only use accounts object
|
|
token = normalizeTwitchToken(accountCfg?.accessToken as string | undefined);
|
|
}
|
|
|
|
if (token) {
|
|
return { token, source: "config" };
|
|
}
|
|
|
|
// Environment variable (default account only)
|
|
const allowEnv = accountId === DEFAULT_ACCOUNT_ID;
|
|
const envToken = allowEnv
|
|
? normalizeTwitchToken(opts.envToken ?? process.env.BOT_TWITCH_ACCESS_TOKEN)
|
|
: undefined;
|
|
if (envToken) {
|
|
return { token: envToken, source: "env" };
|
|
}
|
|
|
|
return { token: "", source: "none" };
|
|
}
|