mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-10 01:52:44 +00:00
chore: Enable "curly" rule to avoid single-statement if confusion/errors.
This commit is contained in:
@@ -75,9 +75,13 @@ export function resolveConfigSnapshotHash(snapshot: {
|
||||
}): string | null {
|
||||
if (typeof snapshot.hash === "string") {
|
||||
const trimmed = snapshot.hash.trim();
|
||||
if (trimmed) return trimmed;
|
||||
if (trimmed) {
|
||||
return trimmed;
|
||||
}
|
||||
}
|
||||
if (typeof snapshot.raw !== "string") {
|
||||
return null;
|
||||
}
|
||||
if (typeof snapshot.raw !== "string") return null;
|
||||
return hashConfigRaw(snapshot.raw);
|
||||
}
|
||||
|
||||
@@ -89,7 +93,9 @@ function coerceConfig(value: unknown): OpenClawConfig {
|
||||
}
|
||||
|
||||
async function rotateConfigBackups(configPath: string, ioFs: typeof fs.promises): Promise<void> {
|
||||
if (CONFIG_BACKUP_COUNT <= 1) return;
|
||||
if (CONFIG_BACKUP_COUNT <= 1) {
|
||||
return;
|
||||
}
|
||||
const backupBase = `${configPath}.bak`;
|
||||
const maxIndex = CONFIG_BACKUP_COUNT - 1;
|
||||
await ioFs.unlink(`${backupBase}.${maxIndex}`).catch(() => {
|
||||
@@ -115,9 +121,13 @@ export type ConfigIoDeps = {
|
||||
};
|
||||
|
||||
function warnOnConfigMiskeys(raw: unknown, logger: Pick<typeof console, "warn">): void {
|
||||
if (!raw || typeof raw !== "object") return;
|
||||
if (!raw || typeof raw !== "object") {
|
||||
return;
|
||||
}
|
||||
const gateway = (raw as Record<string, unknown>).gateway;
|
||||
if (!gateway || typeof gateway !== "object") return;
|
||||
if (!gateway || typeof gateway !== "object") {
|
||||
return;
|
||||
}
|
||||
if ("token" in (gateway as Record<string, unknown>)) {
|
||||
logger.warn(
|
||||
'Config uses "gateway.token". This key is ignored; use "gateway.auth.token" instead.',
|
||||
@@ -139,9 +149,13 @@ function stampConfigVersion(cfg: OpenClawConfig): OpenClawConfig {
|
||||
|
||||
function warnIfConfigFromFuture(cfg: OpenClawConfig, logger: Pick<typeof console, "warn">): void {
|
||||
const touched = cfg.meta?.lastTouchedVersion;
|
||||
if (!touched) return;
|
||||
if (!touched) {
|
||||
return;
|
||||
}
|
||||
const cmp = compareOpenClawVersions(VERSION, touched);
|
||||
if (cmp === null) return;
|
||||
if (cmp === null) {
|
||||
return;
|
||||
}
|
||||
if (cmp < 0) {
|
||||
logger.warn(
|
||||
`Config was last written by a newer OpenClaw (${touched}); current version is ${VERSION}.`,
|
||||
@@ -152,13 +166,17 @@ function warnIfConfigFromFuture(cfg: OpenClawConfig, logger: Pick<typeof console
|
||||
function applyConfigEnv(cfg: OpenClawConfig, env: NodeJS.ProcessEnv): void {
|
||||
const entries = collectConfigEnvVars(cfg);
|
||||
for (const [key, value] of Object.entries(entries)) {
|
||||
if (env[key]?.trim()) continue;
|
||||
if (env[key]?.trim()) {
|
||||
continue;
|
||||
}
|
||||
env[key] = value;
|
||||
}
|
||||
}
|
||||
|
||||
function resolveConfigPathForDeps(deps: Required<ConfigIoDeps>): string {
|
||||
if (deps.configPath) return deps.configPath;
|
||||
if (deps.configPath) {
|
||||
return deps.configPath;
|
||||
}
|
||||
return resolveConfigPath(deps.env, resolveStateDir(deps.env, deps.homedir));
|
||||
}
|
||||
|
||||
@@ -226,7 +244,9 @@ export function createConfigIO(overrides: ConfigIoDeps = {}) {
|
||||
|
||||
const resolvedConfig = substituted;
|
||||
warnOnConfigMiskeys(resolvedConfig, deps.logger);
|
||||
if (typeof resolvedConfig !== "object" || resolvedConfig === null) return {};
|
||||
if (typeof resolvedConfig !== "object" || resolvedConfig === null) {
|
||||
return {};
|
||||
}
|
||||
const preValidationDuplicates = findDuplicateAgentDirs(resolvedConfig as OpenClawConfig, {
|
||||
env: deps.env,
|
||||
homedir: deps.homedir,
|
||||
@@ -538,15 +558,23 @@ let configCache: {
|
||||
|
||||
function resolveConfigCacheMs(env: NodeJS.ProcessEnv): number {
|
||||
const raw = env.OPENCLAW_CONFIG_CACHE_MS?.trim();
|
||||
if (raw === "" || raw === "0") return 0;
|
||||
if (!raw) return DEFAULT_CONFIG_CACHE_MS;
|
||||
if (raw === "" || raw === "0") {
|
||||
return 0;
|
||||
}
|
||||
if (!raw) {
|
||||
return DEFAULT_CONFIG_CACHE_MS;
|
||||
}
|
||||
const parsed = Number.parseInt(raw, 10);
|
||||
if (!Number.isFinite(parsed)) return DEFAULT_CONFIG_CACHE_MS;
|
||||
if (!Number.isFinite(parsed)) {
|
||||
return DEFAULT_CONFIG_CACHE_MS;
|
||||
}
|
||||
return Math.max(0, parsed);
|
||||
}
|
||||
|
||||
function shouldUseConfigCache(env: NodeJS.ProcessEnv): boolean {
|
||||
if (env.OPENCLAW_DISABLE_CONFIG_CACHE?.trim()) return false;
|
||||
if (env.OPENCLAW_DISABLE_CONFIG_CACHE?.trim()) {
|
||||
return false;
|
||||
}
|
||||
return resolveConfigCacheMs(env) > 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user