chore: Enable "curly" rule to avoid single-statement if confusion/errors.

This commit is contained in:
cpojer
2026-01-31 16:19:20 +09:00
parent 009b16fab8
commit 5ceff756e1
1266 changed files with 27871 additions and 9393 deletions

View File

@@ -5,14 +5,20 @@ import { buildAgentMainSessionKey, normalizeAgentId } from "../routing/session-k
export function getHeader(req: IncomingMessage, name: string): string | undefined {
const raw = req.headers[name.toLowerCase()];
if (typeof raw === "string") return raw;
if (Array.isArray(raw)) return raw[0];
if (typeof raw === "string") {
return raw;
}
if (Array.isArray(raw)) {
return raw[0];
}
return undefined;
}
export function getBearerToken(req: IncomingMessage): string | undefined {
const raw = getHeader(req, "authorization")?.trim() ?? "";
if (!raw.toLowerCase().startsWith("bearer ")) return undefined;
if (!raw.toLowerCase().startsWith("bearer ")) {
return undefined;
}
const token = raw.slice(7).trim();
return token || undefined;
}
@@ -22,19 +28,25 @@ export function resolveAgentIdFromHeader(req: IncomingMessage): string | undefin
getHeader(req, "x-openclaw-agent-id")?.trim() ||
getHeader(req, "x-openclaw-agent")?.trim() ||
"";
if (!raw) return undefined;
if (!raw) {
return undefined;
}
return normalizeAgentId(raw);
}
export function resolveAgentIdFromModel(model: string | undefined): string | undefined {
const raw = model?.trim();
if (!raw) return undefined;
if (!raw) {
return undefined;
}
const m =
raw.match(/^openclaw[:/](?<agentId>[a-z0-9][a-z0-9_-]{0,63})$/i) ??
raw.match(/^agent:(?<agentId>[a-z0-9][a-z0-9_-]{0,63})$/i);
const agentId = m?.groups?.agentId;
if (!agentId) return undefined;
if (!agentId) {
return undefined;
}
return normalizeAgentId(agentId);
}
@@ -43,7 +55,9 @@ export function resolveAgentIdForRequest(params: {
model: string | undefined;
}): string {
const fromHeader = resolveAgentIdFromHeader(params.req);
if (fromHeader) return fromHeader;
if (fromHeader) {
return fromHeader;
}
const fromModel = resolveAgentIdFromModel(params.model);
return fromModel ?? "main";
@@ -56,7 +70,9 @@ export function resolveSessionKey(params: {
prefix: string;
}): string {
const explicit = getHeader(params.req, "x-openclaw-session-key")?.trim();
if (explicit) return explicit;
if (explicit) {
return explicit;
}
const user = params.user?.trim();
const mainKey = user ? `${params.prefix}-user:${user}` : `${params.prefix}:${randomUUID()}`;