mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-23 08:45:50 +00:00
style: 完成所有文件的lint
This commit is contained in:
@@ -1,26 +1,26 @@
|
||||
import { createLogger } from "./logger.js";
|
||||
import { decodeJsonWsMessage, WsPayloadTooLargeError } from "./ws-message.js";
|
||||
import { encodeWebSocketAuthProtocol } from "./ws-auth.js";
|
||||
import { createLogger } from './logger.js'
|
||||
import { decodeJsonWsMessage, WsPayloadTooLargeError } from './ws-message.js'
|
||||
import { encodeWebSocketAuthProtocol } from './ws-auth.js'
|
||||
|
||||
export interface RcsUpstreamConfig {
|
||||
rcsUrl: string; // e.g. "http://localhost:3000"
|
||||
apiToken: string;
|
||||
agentName: string;
|
||||
channelGroupId?: string;
|
||||
capabilities?: Record<string, unknown>;
|
||||
maxSessions?: number;
|
||||
rcsUrl: string // e.g. "http://localhost:3000"
|
||||
apiToken: string
|
||||
agentName: string
|
||||
channelGroupId?: string
|
||||
capabilities?: Record<string, unknown>
|
||||
maxSessions?: number
|
||||
}
|
||||
|
||||
export function buildRcsWsUrl(rcsUrl: string): string {
|
||||
let raw = rcsUrl;
|
||||
raw = raw.replace(/^http:\/\//, "ws://").replace(/^https:\/\//, "wss://");
|
||||
const url = new URL(raw);
|
||||
const path = url.pathname.replace(/\/+$/, "");
|
||||
if (!path || path === "/") {
|
||||
url.pathname = "/acp/ws";
|
||||
let raw = rcsUrl
|
||||
raw = raw.replace(/^http:\/\//, 'ws://').replace(/^https:\/\//, 'wss://')
|
||||
const url = new URL(raw)
|
||||
const path = url.pathname.replace(/\/+$/, '')
|
||||
if (!path || path === '/') {
|
||||
url.pathname = '/acp/ws'
|
||||
}
|
||||
url.searchParams.delete("token");
|
||||
return url.toString();
|
||||
url.searchParams.delete('token')
|
||||
return url.toString()
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -34,232 +34,272 @@ export function buildRcsWsUrl(rcsUrl: string): string {
|
||||
* 5. Reconnects with exponential backoff on failure
|
||||
*/
|
||||
export class RcsUpstreamClient {
|
||||
private static log = createLogger("rcs-upstream");
|
||||
private ws: WebSocket | null = null;
|
||||
private registered = false;
|
||||
private reconnectAttempts = 0;
|
||||
private closed = false;
|
||||
private readonly maxReconnectDelay = 30_000;
|
||||
private readonly baseReconnectDelay = 1_000;
|
||||
private static log = createLogger('rcs-upstream')
|
||||
private ws: WebSocket | null = null
|
||||
private registered = false
|
||||
private reconnectAttempts = 0
|
||||
private closed = false
|
||||
private readonly maxReconnectDelay = 30_000
|
||||
private readonly baseReconnectDelay = 1_000
|
||||
/** Agent ID obtained from REST registration */
|
||||
private agentId: string | null = null;
|
||||
private agentId: string | null = null
|
||||
/** Session ID from REST registration (ACP agents auto-create a session) */
|
||||
private sessionId: string | undefined;
|
||||
private sessionId: string | undefined
|
||||
|
||||
/** Handler for incoming ACP messages from RCS relay */
|
||||
private messageHandler: ((message: Record<string, unknown>) => void) | null = null;
|
||||
private messageHandler: ((message: Record<string, unknown>) => void) | null =
|
||||
null
|
||||
|
||||
constructor(private config: RcsUpstreamConfig) {}
|
||||
|
||||
/** Get the agent ID from REST registration */
|
||||
getAgentId(): string | null {
|
||||
return this.agentId;
|
||||
return this.agentId
|
||||
}
|
||||
|
||||
/** Set handler for incoming ACP messages from RCS relay */
|
||||
setMessageHandler(handler: (message: Record<string, unknown>) => void): void {
|
||||
this.messageHandler = handler;
|
||||
this.messageHandler = handler
|
||||
}
|
||||
|
||||
/** Register via REST API before establishing WS connection */
|
||||
private async registerViaRest(): Promise<string> {
|
||||
const baseUrl = this.config.rcsUrl
|
||||
.replace(/^ws:\/\//, "http://")
|
||||
.replace(/^wss:\/\//, "https://")
|
||||
.replace(/\/acp\/ws.*$/, "")
|
||||
.replace(/\/$/, "");
|
||||
.replace(/^ws:\/\//, 'http://')
|
||||
.replace(/^wss:\/\//, 'https://')
|
||||
.replace(/\/acp\/ws.*$/, '')
|
||||
.replace(/\/$/, '')
|
||||
|
||||
const url = `${baseUrl}/v1/environments/bridge`;
|
||||
RcsUpstreamClient.log.info({ url }, "REST register");
|
||||
const url = `${baseUrl}/v1/environments/bridge`
|
||||
RcsUpstreamClient.log.info({ url }, 'REST register')
|
||||
|
||||
const resp = await fetch(url, {
|
||||
method: "POST",
|
||||
method: 'POST',
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": `Bearer ${this.config.apiToken}`,
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${this.config.apiToken}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
machine_name: this.config.agentName,
|
||||
worker_type: "acp",
|
||||
worker_type: 'acp',
|
||||
bridge_id: this.config.channelGroupId || undefined,
|
||||
max_sessions: this.config.maxSessions,
|
||||
capabilities: this.config.capabilities,
|
||||
}),
|
||||
});
|
||||
})
|
||||
|
||||
if (!resp.ok) {
|
||||
const text = await resp.text();
|
||||
throw new Error(`REST register failed (${resp.status}): ${text}`);
|
||||
const text = await resp.text()
|
||||
throw new Error(`REST register failed (${resp.status}): ${text}`)
|
||||
}
|
||||
|
||||
const data = await resp.json() as { environment_id: string; environment_secret: string; status: string; session_id?: string };
|
||||
this.agentId = data.environment_id;
|
||||
this.sessionId = data.session_id;
|
||||
RcsUpstreamClient.log.info({ agentId: this.agentId, sessionId: this.sessionId }, "REST register success");
|
||||
return data.environment_id;
|
||||
const data = (await resp.json()) as {
|
||||
environment_id: string
|
||||
environment_secret: string
|
||||
status: string
|
||||
session_id?: string
|
||||
}
|
||||
this.agentId = data.environment_id
|
||||
this.sessionId = data.session_id
|
||||
RcsUpstreamClient.log.info(
|
||||
{ agentId: this.agentId, sessionId: this.sessionId },
|
||||
'REST register success',
|
||||
)
|
||||
return data.environment_id
|
||||
}
|
||||
|
||||
/** Normalize RCS URL: accept http(s) base URL and convert to ws(s) + /acp/ws path */
|
||||
private buildWsUrl(): string {
|
||||
return buildRcsWsUrl(this.config.rcsUrl);
|
||||
return buildRcsWsUrl(this.config.rcsUrl)
|
||||
}
|
||||
|
||||
/** Open connection to RCS: REST register → WS identify */
|
||||
async connect(): Promise<void> {
|
||||
if (this.closed) return;
|
||||
if (this.closed) return
|
||||
|
||||
// Step 1: REST registration
|
||||
try {
|
||||
await this.registerViaRest();
|
||||
await this.registerViaRest()
|
||||
} catch (err) {
|
||||
RcsUpstreamClient.log.error({ err }, "REST registration failed");
|
||||
RcsUpstreamClient.log.error({ err }, 'REST registration failed')
|
||||
if (!this.closed) {
|
||||
this.scheduleReconnect();
|
||||
this.scheduleReconnect()
|
||||
}
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
// Step 2: WebSocket connection with identify
|
||||
const wsUrl = this.buildWsUrl();
|
||||
RcsUpstreamClient.log.info({ url: wsUrl }, "connecting WS");
|
||||
const wsUrl = this.buildWsUrl()
|
||||
RcsUpstreamClient.log.info({ url: wsUrl }, 'connecting WS')
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
try {
|
||||
this.ws = new WebSocket(wsUrl, [
|
||||
encodeWebSocketAuthProtocol(this.config.apiToken),
|
||||
]);
|
||||
])
|
||||
|
||||
this.ws.onopen = () => {
|
||||
RcsUpstreamClient.log.debug("ws open — sending identify");
|
||||
RcsUpstreamClient.log.debug('ws open — sending identify')
|
||||
this.ws!.send(
|
||||
JSON.stringify({
|
||||
type: "identify",
|
||||
type: 'identify',
|
||||
agent_id: this.agentId,
|
||||
}),
|
||||
);
|
||||
};
|
||||
)
|
||||
}
|
||||
|
||||
this.ws.onmessage = (event) => {
|
||||
let data: Record<string, unknown>;
|
||||
this.ws.onmessage = event => {
|
||||
let data: Record<string, unknown>
|
||||
try {
|
||||
data = decodeJsonWsMessage(event.data);
|
||||
data = decodeJsonWsMessage(event.data)
|
||||
} catch (err) {
|
||||
if (err instanceof WsPayloadTooLargeError) {
|
||||
RcsUpstreamClient.log.warn({ error: err.message }, "server message too large");
|
||||
this.ws?.close(1009, "message too large");
|
||||
return;
|
||||
RcsUpstreamClient.log.warn(
|
||||
{ error: err.message },
|
||||
'server message too large',
|
||||
)
|
||||
this.ws?.close(1009, 'message too large')
|
||||
return
|
||||
}
|
||||
RcsUpstreamClient.log.warn({ raw: String(event.data).slice(0, 200) }, "invalid JSON from server");
|
||||
return;
|
||||
RcsUpstreamClient.log.warn(
|
||||
{ raw: String(event.data).slice(0, 200) },
|
||||
'invalid JSON from server',
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
if (data.type === "identified") {
|
||||
RcsUpstreamClient.log.info({ agent_id: data.agent_id, channel_group_id: data.channel_group_id }, "identified");
|
||||
this.registered = true;
|
||||
this.reconnectAttempts = 0;
|
||||
if (data.type === 'identified') {
|
||||
RcsUpstreamClient.log.info(
|
||||
{
|
||||
agent_id: data.agent_id,
|
||||
channel_group_id: data.channel_group_id,
|
||||
},
|
||||
'identified',
|
||||
)
|
||||
this.registered = true
|
||||
this.reconnectAttempts = 0
|
||||
const webBase = this.config.rcsUrl
|
||||
.replace(/^ws:\/\//, "http://")
|
||||
.replace(/^wss:\/\//, "https://")
|
||||
.replace(/\/acp\/ws.*$/, "")
|
||||
.replace(/\/$/, "");
|
||||
console.log();
|
||||
console.log(` 🔗 Dashboard: ${webBase}/code/`);
|
||||
.replace(/^ws:\/\//, 'http://')
|
||||
.replace(/^wss:\/\//, 'https://')
|
||||
.replace(/\/acp\/ws.*$/, '')
|
||||
.replace(/\/$/, '')
|
||||
console.log()
|
||||
console.log(` 🔗 Dashboard: ${webBase}/code/`)
|
||||
if (this.agentId) {
|
||||
console.log(` Agent ID: ${this.agentId}`);
|
||||
console.log(` Agent ID: ${this.agentId}`)
|
||||
}
|
||||
console.log();
|
||||
resolve();
|
||||
} else if (data.type === "registered") {
|
||||
console.log()
|
||||
resolve()
|
||||
} else if (data.type === 'registered') {
|
||||
// Legacy fallback: server still uses old register flow
|
||||
RcsUpstreamClient.log.info({ agent_id: data.agent_id }, "registered (legacy)");
|
||||
this.agentId = (data.agent_id as string) || this.agentId;
|
||||
this.registered = true;
|
||||
this.reconnectAttempts = 0;
|
||||
resolve();
|
||||
} else if (data.type === "error") {
|
||||
RcsUpstreamClient.log.error({ message: data.message }, "server error");
|
||||
RcsUpstreamClient.log.info(
|
||||
{ agent_id: data.agent_id },
|
||||
'registered (legacy)',
|
||||
)
|
||||
this.agentId = (data.agent_id as string) || this.agentId
|
||||
this.registered = true
|
||||
this.reconnectAttempts = 0
|
||||
resolve()
|
||||
} else if (data.type === 'error') {
|
||||
RcsUpstreamClient.log.error(
|
||||
{ message: data.message },
|
||||
'server error',
|
||||
)
|
||||
if (!this.registered) {
|
||||
reject(new Error(data.message as string));
|
||||
reject(new Error(data.message as string))
|
||||
}
|
||||
} else if (data.type === "keep_alive") {
|
||||
} else if (data.type === 'keep_alive') {
|
||||
// ignore keepalive
|
||||
} else {
|
||||
// Forward ACP protocol messages to handler (for RCS relay support)
|
||||
RcsUpstreamClient.log.debug({ type: data.type }, "forwarding to relay handler");
|
||||
this.messageHandler?.(data);
|
||||
RcsUpstreamClient.log.debug(
|
||||
{ type: data.type },
|
||||
'forwarding to relay handler',
|
||||
)
|
||||
this.messageHandler?.(data)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
this.ws.onerror = () => {
|
||||
// onclose fires after onerror with the actual close code, so we log there
|
||||
if (!this.registered) {
|
||||
reject(new Error("WebSocket connection failed"));
|
||||
reject(new Error('WebSocket connection failed'))
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
this.ws.onclose = (event) => {
|
||||
RcsUpstreamClient.log.info({ code: event.code, reason: event.reason || undefined }, "ws closed");
|
||||
this.registered = false;
|
||||
this.ws = null;
|
||||
this.ws.onclose = event => {
|
||||
RcsUpstreamClient.log.info(
|
||||
{ code: event.code, reason: event.reason || undefined },
|
||||
'ws closed',
|
||||
)
|
||||
this.registered = false
|
||||
this.ws = null
|
||||
if (!this.closed) {
|
||||
this.scheduleReconnect();
|
||||
this.scheduleReconnect()
|
||||
}
|
||||
};
|
||||
}
|
||||
} catch (err) {
|
||||
RcsUpstreamClient.log.error({ err }, "connect threw");
|
||||
reject(err);
|
||||
RcsUpstreamClient.log.error({ err }, 'connect threw')
|
||||
reject(err)
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
/** Send an ACP message to RCS for broadcast */
|
||||
send(message: object): void {
|
||||
if (!this.ws || this.ws.readyState !== WebSocket.OPEN || !this.registered) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
try {
|
||||
this.ws.send(JSON.stringify(message));
|
||||
this.ws.send(JSON.stringify(message))
|
||||
} catch (err) {
|
||||
RcsUpstreamClient.log.error({ err }, "send failed");
|
||||
RcsUpstreamClient.log.error({ err }, 'send failed')
|
||||
}
|
||||
}
|
||||
|
||||
/** Check if registered with RCS */
|
||||
isRegistered(): boolean {
|
||||
return this.registered && this.ws !== null && this.ws.readyState === WebSocket.OPEN;
|
||||
return (
|
||||
this.registered &&
|
||||
this.ws !== null &&
|
||||
this.ws.readyState === WebSocket.OPEN
|
||||
)
|
||||
}
|
||||
|
||||
/** Close the RCS connection permanently */
|
||||
async close(): Promise<void> {
|
||||
this.closed = true;
|
||||
this.registered = false;
|
||||
this.closed = true
|
||||
this.registered = false
|
||||
if (this.ws) {
|
||||
this.ws.close(1000, "client shutdown");
|
||||
this.ws = null;
|
||||
this.ws.close(1000, 'client shutdown')
|
||||
this.ws = null
|
||||
}
|
||||
RcsUpstreamClient.log.info("closed");
|
||||
RcsUpstreamClient.log.info('closed')
|
||||
}
|
||||
|
||||
private scheduleReconnect(): void {
|
||||
if (this.closed) return;
|
||||
if (this.closed) return
|
||||
|
||||
const delay = Math.min(
|
||||
this.baseReconnectDelay * 2 ** this.reconnectAttempts,
|
||||
this.maxReconnectDelay,
|
||||
);
|
||||
const jitter = delay * Math.random() * 0.2;
|
||||
const actualDelay = delay + jitter;
|
||||
this.reconnectAttempts++;
|
||||
)
|
||||
const jitter = delay * Math.random() * 0.2
|
||||
const actualDelay = delay + jitter
|
||||
this.reconnectAttempts++
|
||||
|
||||
RcsUpstreamClient.log.warn({ attempt: this.reconnectAttempts, delayMs: Math.round(actualDelay) }, "reconnecting");
|
||||
RcsUpstreamClient.log.warn(
|
||||
{ attempt: this.reconnectAttempts, delayMs: Math.round(actualDelay) },
|
||||
'reconnecting',
|
||||
)
|
||||
|
||||
setTimeout(async () => {
|
||||
if (this.closed) return;
|
||||
if (this.closed) return
|
||||
try {
|
||||
await this.connect();
|
||||
await this.connect()
|
||||
} catch {
|
||||
// connect() itself logs the error; nothing to add here
|
||||
}
|
||||
}, actualDelay);
|
||||
}, actualDelay)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user