mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-06-21 00:22:00 +08:00
fix: authenticate desktop agent websocket
This commit is contained in:
@@ -42,6 +42,7 @@ const RECONNECT_MAX_MS = 30_000;
|
||||
|
||||
const consentMode: ConsentMode = process.env.CLOUDCLI_COMPUTER_USE_CONSENT_MODE === 'auto' ? 'auto' : 'ask';
|
||||
const agentLabel = process.env.CLOUDCLI_DESKTOP_AGENT_LABEL || 'cloudcli-desktop';
|
||||
const desktopAgentApiKey = process.env.CLOUDCLI_DESKTOP_AGENT_API_KEY || '';
|
||||
|
||||
function parseTargets(): string[] {
|
||||
const raw =
|
||||
@@ -195,9 +196,7 @@ function connect(url: string): void {
|
||||
|
||||
const open = () => {
|
||||
socket = new WebSocket(url, {
|
||||
headers: process.env.CLOUDCLI_DESKTOP_AGENT_TOKEN
|
||||
? { 'x-cloudcli-agent-token': process.env.CLOUDCLI_DESKTOP_AGENT_TOKEN }
|
||||
: undefined,
|
||||
headers: desktopAgentApiKey ? { 'X-API-Key': desktopAgentApiKey } : undefined,
|
||||
});
|
||||
|
||||
socket.on('open', () => {
|
||||
|
||||
@@ -15,9 +15,7 @@ export function handleDesktopAgentConnection(
|
||||
ws: WebSocket,
|
||||
request: AuthenticatedWebSocketRequest
|
||||
): void {
|
||||
const label = request.user?.username ? `desktop:${request.user.username}` : 'desktop-agent';
|
||||
console.log('[INFO] Desktop agent websocket connected:', label);
|
||||
desktopAgentRelay.register(ws, label);
|
||||
let registered = false;
|
||||
|
||||
ws.on('message', (rawMessage) => {
|
||||
const data = parseIncomingJsonObject(rawMessage);
|
||||
@@ -25,6 +23,17 @@ export function handleDesktopAgentConnection(
|
||||
return;
|
||||
}
|
||||
const kind = typeof data.kind === 'string' ? data.kind : typeof data.type === 'string' ? data.type : '';
|
||||
if (kind === 'register' && !registered) {
|
||||
const label = typeof data.label === 'string' && data.label.trim()
|
||||
? data.label.trim()
|
||||
: request.user?.username
|
||||
? `desktop:${request.user.username}`
|
||||
: 'desktop-agent';
|
||||
registered = true;
|
||||
console.log('[INFO] Desktop agent websocket registered:', label);
|
||||
desktopAgentRelay.register(ws, label);
|
||||
return;
|
||||
}
|
||||
if (kind === 'computer_relay_result' && typeof data.id === 'string') {
|
||||
desktopAgentRelay.handleResult(
|
||||
data.id,
|
||||
@@ -37,6 +46,6 @@ export function handleDesktopAgentConnection(
|
||||
});
|
||||
|
||||
ws.on('close', () => {
|
||||
console.log('[INFO] Desktop agent websocket disconnected:', label);
|
||||
console.log('[INFO] Desktop agent websocket disconnected');
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user