github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 14:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gateway): dedupe ws log meta formatting

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 05:38:42 +00:00
parent 10e6d926bc
commit 50b7607f77
1 changed files with 22 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/gateway/ws-log.ts
View File

@@ -25,6 +25,25 @@ const wsInflightOptimized = new Map<string, number>();
const wsInflightSince = new Map<string, number>(); const wsInflightSince = new Map<string, number>();
const wsLog = createSubsystemLogger("gateway/ws"); const wsLog = createSubsystemLogger("gateway/ws");
const WS_META_SKIP_KEYS = new Set(["connId", "id", "method", "ok", "event"]);
function collectWsRestMeta(meta?: Record<string, unknown>): string[] {
const restMeta: string[] = [];
if (!meta) {
return restMeta;
}
for (const [key, value] of Object.entries(meta)) {
if (value === undefined) {
continue;
}
if (WS_META_SKIP_KEYS.has(key)) {
continue;
}
restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
}
return restMeta;
}
export function shouldLogWs(): boolean { export function shouldLogWs(): boolean {
return shouldLogSubsystemToConsole("gateway/ws"); return shouldLogSubsystemToConsole("gateway/ws");
} }
@@ -252,24 +271,7 @@ export function logWs(direction: "in" | "out", kind: string, meta?: Record<strin
const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined; const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
const restMeta: string[] = []; const restMeta = collectWsRestMeta(meta);
if (meta) {
for (const [key, value] of Object.entries(meta)) {
if (value === undefined) {
continue;
}
if (key === "connId" || key === "id") {
continue;
}
if (key === "method" || key === "ok") {
continue;
}
if (key === "event") {
continue;
}
restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
}
}
const trailing: string[] = []; const trailing: string[] = [];
if (connId) { if (connId) {
@@ -336,21 +338,7 @@ function logWsOptimized(direction: "in" | "out", kind: string, meta?: Record<str
ok === undefined ? undefined : ok ? chalk.greenBright("✓") : chalk.redBright("✗"); ok === undefined ? undefined : ok ? chalk.greenBright("✓") : chalk.redBright("✗");
const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined; const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
const restMeta: string[] = []; const restMeta = collectWsRestMeta(meta);
if (meta) {
for (const [key, value] of Object.entries(meta)) {
if (value === undefined) {
continue;
}
if (key === "connId" || key === "id") {
continue;
}
if (key === "method" || key === "ok") {
continue;
}
restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
}
}
const tokens = [ const tokens = [
`${chalk.yellowBright("⇄")} ${chalk.bold("res")}`, `${chalk.yellowBright("⇄")} ${chalk.bold("res")}`,
@@ -417,24 +405,7 @@ function logWsCompact(direction: "in" | "out", kind: string, meta?: Record<strin
? chalk.bold(meta.event) ? chalk.bold(meta.event)
: undefined; : undefined;
const restMeta: string[] = []; const restMeta = collectWsRestMeta(meta);
if (meta) {
for (const [key, value] of Object.entries(meta)) {
if (value === undefined) {
continue;
}
if (key === "connId" || key === "id") {
continue;
}
if (key === "method" || key === "ok") {
continue;
}
if (key === "event") {
continue;
}
restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
}
}
const trailing: string[] = []; const trailing: string[] = [];
if (connId && connId !== wsLastCompactConnId) { if (connId && connId !== wsLastCompactConnId) {