Gateway: shorten ws log tag

This commit is contained in:
Peter Steinberger
2025-12-18 12:58:40 +00:00
parent 16e2193911
commit ba79977f07

View File

@@ -501,7 +501,7 @@ function logWs(
const dirArrow = direction === "in" ? "←" : "→"; const dirArrow = direction === "in" ? "←" : "→";
const dirColor = direction === "in" ? chalk.greenBright : chalk.cyanBright; const dirColor = direction === "in" ? chalk.greenBright : chalk.cyanBright;
const prefix = `${chalk.gray("gateway/ws")} ${dirColor(dirArrow)} ${chalk.bold(kind)}`; const prefix = `${chalk.gray("[gws]")} ${dirColor(dirArrow)} ${chalk.bold(kind)}`;
const headline = const headline =
(kind === "req" || kind === "res") && method (kind === "req" || kind === "res") && method
@@ -1856,14 +1856,14 @@ export async function startGatewayServer(port = 18789): Promise<GatewayServer> {
socket.once("error", (err) => { socket.once("error", (err) => {
logWarn( logWarn(
`gateway/ws error conn=${connId} remote=${remoteAddr ?? "?"}: ${formatError(err)}`, `[gws] error conn=${connId} remote=${remoteAddr ?? "?"}: ${formatError(err)}`,
); );
close(); close();
}); });
socket.once("close", (code, reason) => { socket.once("close", (code, reason) => {
if (!client) { if (!client) {
logWarn( logWarn(
`gateway/ws closed before connect conn=${connId} remote=${remoteAddr ?? "?"} code=${code ?? "n/a"} reason=${reason?.toString() || "n/a"}`, `[gws] closed before connect conn=${connId} remote=${remoteAddr ?? "?"} code=${code ?? "n/a"} reason=${reason?.toString() || "n/a"}`,
); );
} }
if (client && isWebchatConnect(client.connect)) { if (client && isWebchatConnect(client.connect)) {
@@ -1897,7 +1897,7 @@ export async function startGatewayServer(port = 18789): Promise<GatewayServer> {
const handshakeTimer = setTimeout(() => { const handshakeTimer = setTimeout(() => {
if (!client) { if (!client) {
logWarn( logWarn(
`gateway/ws handshake timeout conn=${connId} remote=${remoteAddr ?? "?"}`, `[gws] handshake timeout conn=${connId} remote=${remoteAddr ?? "?"}`,
); );
close(); close();
} }
@@ -1931,7 +1931,7 @@ export async function startGatewayServer(port = 18789): Promise<GatewayServer> {
}); });
} else { } else {
logWarn( logWarn(
`gateway/ws invalid handshake conn=${connId} remote=${remoteAddr ?? "?"}`, `[gws] invalid handshake conn=${connId} remote=${remoteAddr ?? "?"}`,
); );
} }
socket.close(1008, "invalid handshake"); socket.close(1008, "invalid handshake");
@@ -1949,7 +1949,7 @@ export async function startGatewayServer(port = 18789): Promise<GatewayServer> {
minProtocol > PROTOCOL_VERSION minProtocol > PROTOCOL_VERSION
) { ) {
logWarn( logWarn(
`gateway/ws protocol mismatch conn=${connId} remote=${remoteAddr ?? "?"} client=${connectParams.client.name} ${connectParams.client.mode} v${connectParams.client.version}`, `[gws] protocol mismatch conn=${connId} remote=${remoteAddr ?? "?"} client=${connectParams.client.name} ${connectParams.client.mode} v${connectParams.client.version}`,
); );
send({ send({
type: "res", type: "res",
@@ -1972,7 +1972,7 @@ export async function startGatewayServer(port = 18789): Promise<GatewayServer> {
const token = getGatewayToken(); const token = getGatewayToken();
if (token && connectParams.auth?.token !== token) { if (token && connectParams.auth?.token !== token) {
logWarn( logWarn(
`gateway/ws unauthorized conn=${connId} remote=${remoteAddr ?? "?"} client=${connectParams.client.name} ${connectParams.client.mode} v${connectParams.client.version}`, `[gws] unauthorized conn=${connId} remote=${remoteAddr ?? "?"} client=${connectParams.client.name} ${connectParams.client.mode} v${connectParams.client.version}`,
); );
send({ send({
type: "res", type: "res",