mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 06:01:23 +00:00
refactor: rename to openclaw
This commit is contained in:
@@ -4,7 +4,7 @@ import os from "node:os";
|
||||
import path from "node:path";
|
||||
import { promisify } from "node:util";
|
||||
|
||||
import type { MoltbotConfig } from "../config/config.js";
|
||||
import type { OpenClawConfig } from "../config/config.js";
|
||||
import { note } from "../terminal/note.js";
|
||||
import { shortenHomePath } from "../utils.js";
|
||||
|
||||
@@ -16,9 +16,10 @@ function resolveHomeDir(): string {
|
||||
|
||||
export async function noteMacLaunchAgentOverrides() {
|
||||
if (process.platform !== "darwin") return;
|
||||
const markerPath = path.join(resolveHomeDir(), ".clawdbot", "disable-launchagent");
|
||||
const hasMarker = fs.existsSync(markerPath);
|
||||
if (!hasMarker) return;
|
||||
const home = resolveHomeDir();
|
||||
const markerCandidates = [path.join(home, ".openclaw", "disable-launchagent")];
|
||||
const markerPath = markerCandidates.find((candidate) => fs.existsSync(candidate));
|
||||
if (!markerPath) return;
|
||||
|
||||
const displayMarkerPath = shortenHomePath(markerPath);
|
||||
const lines = [
|
||||
@@ -39,7 +40,7 @@ async function launchctlGetenv(name: string): Promise<string | undefined> {
|
||||
}
|
||||
}
|
||||
|
||||
function hasConfigGatewayCreds(cfg: MoltbotConfig): boolean {
|
||||
function hasConfigGatewayCreds(cfg: OpenClawConfig): boolean {
|
||||
const localToken =
|
||||
typeof cfg.gateway?.auth?.token === "string" ? cfg.gateway?.auth?.token.trim() : "";
|
||||
const localPassword =
|
||||
@@ -52,7 +53,7 @@ function hasConfigGatewayCreds(cfg: MoltbotConfig): boolean {
|
||||
}
|
||||
|
||||
export async function noteMacLaunchctlGatewayEnvOverrides(
|
||||
cfg: MoltbotConfig,
|
||||
cfg: OpenClawConfig,
|
||||
deps?: {
|
||||
platform?: NodeJS.Platform;
|
||||
getenv?: (name: string) => Promise<string | undefined>;
|
||||
@@ -64,20 +65,72 @@ export async function noteMacLaunchctlGatewayEnvOverrides(
|
||||
if (!hasConfigGatewayCreds(cfg)) return;
|
||||
|
||||
const getenv = deps?.getenv ?? launchctlGetenv;
|
||||
const envToken = await getenv("CLAWDBOT_GATEWAY_TOKEN");
|
||||
const envPassword = await getenv("CLAWDBOT_GATEWAY_PASSWORD");
|
||||
const deprecatedLaunchctlEntries = [
|
||||
["MOLTBOT_GATEWAY_TOKEN", await getenv("MOLTBOT_GATEWAY_TOKEN")],
|
||||
["MOLTBOT_GATEWAY_PASSWORD", await getenv("MOLTBOT_GATEWAY_PASSWORD")],
|
||||
["CLAWDBOT_GATEWAY_TOKEN", await getenv("CLAWDBOT_GATEWAY_TOKEN")],
|
||||
["CLAWDBOT_GATEWAY_PASSWORD", await getenv("CLAWDBOT_GATEWAY_PASSWORD")],
|
||||
].filter((entry): entry is [string, string] => Boolean(entry[1]?.trim()));
|
||||
if (deprecatedLaunchctlEntries.length > 0) {
|
||||
const lines = [
|
||||
"- Deprecated launchctl environment variables detected (ignored).",
|
||||
...deprecatedLaunchctlEntries.map(
|
||||
([key]) =>
|
||||
`- \`${key}\` is set; use \`OPENCLAW_${key.slice(key.indexOf("_") + 1)}\` instead.`,
|
||||
),
|
||||
];
|
||||
(deps?.noteFn ?? note)(lines.join("\n"), "Gateway (macOS)");
|
||||
}
|
||||
|
||||
const tokenEntries = [
|
||||
["OPENCLAW_GATEWAY_TOKEN", await getenv("OPENCLAW_GATEWAY_TOKEN")],
|
||||
] as const;
|
||||
const passwordEntries = [
|
||||
["OPENCLAW_GATEWAY_PASSWORD", await getenv("OPENCLAW_GATEWAY_PASSWORD")],
|
||||
] as const;
|
||||
const tokenEntry = tokenEntries.find(([, value]) => value?.trim());
|
||||
const passwordEntry = passwordEntries.find(([, value]) => value?.trim());
|
||||
const envToken = tokenEntry?.[1]?.trim() ?? "";
|
||||
const envPassword = passwordEntry?.[1]?.trim() ?? "";
|
||||
const envTokenKey = tokenEntry?.[0];
|
||||
const envPasswordKey = passwordEntry?.[0];
|
||||
if (!envToken && !envPassword) return;
|
||||
|
||||
const lines = [
|
||||
"- launchctl environment overrides detected (can cause confusing unauthorized errors).",
|
||||
envToken ? "- `CLAWDBOT_GATEWAY_TOKEN` is set; it overrides config tokens." : undefined,
|
||||
envToken && envTokenKey
|
||||
? `- \`${envTokenKey}\` is set; it overrides config tokens.`
|
||||
: undefined,
|
||||
envPassword
|
||||
? "- `CLAWDBOT_GATEWAY_PASSWORD` is set; it overrides config passwords."
|
||||
? `- \`${envPasswordKey ?? "OPENCLAW_GATEWAY_PASSWORD"}\` is set; it overrides config passwords.`
|
||||
: undefined,
|
||||
"- Clear overrides and restart the app/gateway:",
|
||||
envToken ? " launchctl unsetenv CLAWDBOT_GATEWAY_TOKEN" : undefined,
|
||||
envPassword ? " launchctl unsetenv CLAWDBOT_GATEWAY_PASSWORD" : undefined,
|
||||
envTokenKey ? ` launchctl unsetenv ${envTokenKey}` : undefined,
|
||||
envPasswordKey ? ` launchctl unsetenv ${envPasswordKey}` : undefined,
|
||||
].filter((line): line is string => Boolean(line));
|
||||
|
||||
(deps?.noteFn ?? note)(lines.join("\n"), "Gateway (macOS)");
|
||||
}
|
||||
|
||||
export function noteDeprecatedLegacyEnvVars(
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
deps?: { noteFn?: typeof note },
|
||||
) {
|
||||
const entries = Object.entries(env)
|
||||
.filter(
|
||||
([key, value]) =>
|
||||
(key.startsWith("MOLTBOT_") || key.startsWith("CLAWDBOT_")) && value?.trim(),
|
||||
)
|
||||
.map(([key]) => key);
|
||||
if (entries.length === 0) return;
|
||||
|
||||
const lines = [
|
||||
"- Deprecated legacy environment variables detected (ignored).",
|
||||
"- Use OPENCLAW_* equivalents instead:",
|
||||
...entries.map((key) => {
|
||||
const suffix = key.slice(key.indexOf("_") + 1);
|
||||
return ` ${key} -> OPENCLAW_${suffix}`;
|
||||
}),
|
||||
];
|
||||
(deps?.noteFn ?? note)(lines.join("\n"), "Environment");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user