mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 05:01:23 +00:00
chore: Enable "curly" rule to avoid single-statement if confusion/errors.
This commit is contained in:
@@ -51,11 +51,15 @@ export function resolveStateDir(
|
||||
homedir: () => string = os.homedir,
|
||||
): string {
|
||||
const override = env.OPENCLAW_STATE_DIR?.trim() || env.CLAWDBOT_STATE_DIR?.trim();
|
||||
if (override) return resolveUserPath(override);
|
||||
if (override) {
|
||||
return resolveUserPath(override);
|
||||
}
|
||||
const newDir = newStateDir(homedir);
|
||||
const legacyDirs = legacyStateDirs(homedir);
|
||||
const hasNew = fs.existsSync(newDir);
|
||||
if (hasNew) return newDir;
|
||||
if (hasNew) {
|
||||
return newDir;
|
||||
}
|
||||
const existingLegacy = legacyDirs.find((dir) => {
|
||||
try {
|
||||
return fs.existsSync(dir);
|
||||
@@ -63,13 +67,17 @@ export function resolveStateDir(
|
||||
return false;
|
||||
}
|
||||
});
|
||||
if (existingLegacy) return existingLegacy;
|
||||
if (existingLegacy) {
|
||||
return existingLegacy;
|
||||
}
|
||||
return newDir;
|
||||
}
|
||||
|
||||
function resolveUserPath(input: string): string {
|
||||
const trimmed = input.trim();
|
||||
if (!trimmed) return trimmed;
|
||||
if (!trimmed) {
|
||||
return trimmed;
|
||||
}
|
||||
if (trimmed.startsWith("~")) {
|
||||
const expanded = trimmed.replace(/^~(?=$|[\\/])/, os.homedir());
|
||||
return path.resolve(expanded);
|
||||
@@ -89,7 +97,9 @@ export function resolveCanonicalConfigPath(
|
||||
stateDir: string = resolveStateDir(env, os.homedir),
|
||||
): string {
|
||||
const override = env.OPENCLAW_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim();
|
||||
if (override) return resolveUserPath(override);
|
||||
if (override) {
|
||||
return resolveUserPath(override);
|
||||
}
|
||||
return path.join(stateDir, CONFIG_FILENAME);
|
||||
}
|
||||
|
||||
@@ -109,7 +119,9 @@ export function resolveConfigPathCandidate(
|
||||
return false;
|
||||
}
|
||||
});
|
||||
if (existing) return existing;
|
||||
if (existing) {
|
||||
return existing;
|
||||
}
|
||||
return resolveCanonicalConfigPath(env, resolveStateDir(env, homedir));
|
||||
}
|
||||
|
||||
@@ -122,7 +134,9 @@ export function resolveConfigPath(
|
||||
homedir: () => string = os.homedir,
|
||||
): string {
|
||||
const override = env.OPENCLAW_CONFIG_PATH?.trim();
|
||||
if (override) return resolveUserPath(override);
|
||||
if (override) {
|
||||
return resolveUserPath(override);
|
||||
}
|
||||
const stateOverride = env.OPENCLAW_STATE_DIR?.trim();
|
||||
const candidates = [
|
||||
path.join(stateDir, CONFIG_FILENAME),
|
||||
@@ -135,8 +149,12 @@ export function resolveConfigPath(
|
||||
return false;
|
||||
}
|
||||
});
|
||||
if (existing) return existing;
|
||||
if (stateOverride) return path.join(stateDir, CONFIG_FILENAME);
|
||||
if (existing) {
|
||||
return existing;
|
||||
}
|
||||
if (stateOverride) {
|
||||
return path.join(stateDir, CONFIG_FILENAME);
|
||||
}
|
||||
const defaultStateDir = resolveStateDir(env, homedir);
|
||||
if (path.resolve(stateDir) === path.resolve(defaultStateDir)) {
|
||||
return resolveConfigPathCandidate(env, homedir);
|
||||
@@ -155,7 +173,9 @@ export function resolveDefaultConfigCandidates(
|
||||
homedir: () => string = os.homedir,
|
||||
): string[] {
|
||||
const explicit = env.OPENCLAW_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim();
|
||||
if (explicit) return [resolveUserPath(explicit)];
|
||||
if (explicit) {
|
||||
return [resolveUserPath(explicit)];
|
||||
}
|
||||
|
||||
const candidates: string[] = [];
|
||||
const openclawStateDir = env.OPENCLAW_STATE_DIR?.trim() || env.CLAWDBOT_STATE_DIR?.trim();
|
||||
@@ -200,7 +220,9 @@ export function resolveOAuthDir(
|
||||
stateDir: string = resolveStateDir(env, os.homedir),
|
||||
): string {
|
||||
const override = env.OPENCLAW_OAUTH_DIR?.trim();
|
||||
if (override) return resolveUserPath(override);
|
||||
if (override) {
|
||||
return resolveUserPath(override);
|
||||
}
|
||||
return path.join(stateDir, "credentials");
|
||||
}
|
||||
|
||||
@@ -218,11 +240,15 @@ export function resolveGatewayPort(
|
||||
const envRaw = env.OPENCLAW_GATEWAY_PORT?.trim() || env.CLAWDBOT_GATEWAY_PORT?.trim();
|
||||
if (envRaw) {
|
||||
const parsed = Number.parseInt(envRaw, 10);
|
||||
if (Number.isFinite(parsed) && parsed > 0) return parsed;
|
||||
if (Number.isFinite(parsed) && parsed > 0) {
|
||||
return parsed;
|
||||
}
|
||||
}
|
||||
const configPort = cfg?.gateway?.port;
|
||||
if (typeof configPort === "number" && Number.isFinite(configPort)) {
|
||||
if (configPort > 0) return configPort;
|
||||
if (configPort > 0) {
|
||||
return configPort;
|
||||
}
|
||||
}
|
||||
return DEFAULT_GATEWAY_PORT;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user