Skip to content

Commit a7626f6

Browse files
committed
Restrict WebSocket server to a single browser connection and remove multi-browser selection
- remove support for multiple connected browsers and selecting between them (while keeping profiles). One browser (chrome) can be connected only.
1 parent b0c8266 commit a7626f6

5 files changed

Lines changed: 75 additions & 258 deletions

File tree

‎apps/browser/src/background/websocket.ts‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,21 +132,7 @@ export const connect_websocket = async (port: number): Promise<void> => {
132132
}
133133

134134
try {
135-
const manifest = chrome.runtime.getManifest()
136-
const version = manifest.version
137-
const user_agent = navigator.userAgent
138-
139-
const storage = await chrome.storage.local.get('browser-id')
140-
141-
let browser_id = storage['browser-id'] as string | undefined
142-
if (!browser_id) {
143-
browser_id = crypto.randomUUID()
144-
await chrome.storage.local.set({ 'browser-id': browser_id })
145-
}
146-
147-
if (is_busy(c)) return
148-
149-
const ws_url = `ws://localhost:${port}?client_type=${CLIENT_TYPE.BROWSER}&version=${version}&user_agent=${encodeURIComponent(user_agent)}&browser_id=${encodeURIComponent(browser_id)}`
135+
const ws_url = `ws://localhost:${port}?client_type=${CLIENT_TYPE.BROWSER}`
150136

151137
const ws = new WebSocket(ws_url)
152138
c.ws = ws

‎apps/editor/src/constants/state-keys.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ export const get_last_used_cli_configuration_key = (prompt_type: string) =>
9191
export const get_last_used_template_key = (prompt_type: string) =>
9292
`last-used-template-${prompt_type}`
9393

94-
export const LAST_SELECTED_BROWSER_ID_STATE_KEY = 'last-selected-browser-id'
9594
export const LAST_SELECTED_BROWSER_PROFILE_STATE_KEY =
9695
'last-selected-browser-profile'
9796

‎apps/editor/src/services/websocket-manager.ts‎

Lines changed: 10 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import * as WebSocket from 'ws'
77
import * as vscode from 'vscode'
88
import {
99
ApplyResponseMessage,
10-
ConnectedBrowser,
1110
InitializeChatMessage,
1211
WebSocketMessage
1312
} from '@shared/types/websocket-message'
@@ -16,7 +15,6 @@ import { DEFAULT_PORT, CLIENT_TYPE } from '@shared/constants/websocket'
1615
import { Logger } from '@shared/utils/logger'
1716
import { WebConfiguration } from '@/types/web-configuration'
1817
import { ConfigWebConfigurationFormat } from '@/utils/web-configuration-format-converters'
19-
import { LAST_SELECTED_BROWSER_ID_STATE_KEY } from '@/constants/state-keys'
2018
import { t } from '@/i18n'
2119

2220
/**
@@ -29,9 +27,8 @@ export class WebSocketManager {
2927
private client: WebSocket.WebSocket | null = null
3028
private _on_connection_status_change: vscode.EventEmitter<boolean> =
3129
new vscode.EventEmitter<boolean>()
32-
private connected_browsers: ConnectedBrowser[] = []
3330
private reconnect_timer: NodeJS.Timeout | null = null
34-
private has_connected_browsers: boolean = false
31+
private has_connected_browser: boolean = false
3532
private client_id: string | null = null
3633

3734
public readonly on_connection_status_change: vscode.Event<boolean> =
@@ -261,9 +258,8 @@ export class WebSocketManager {
261258
if (message.action === 'client-id-assignment') {
262259
this.client_id = message.client_id
263260
} else if (message.action === 'browser-connection-status') {
264-
this.connected_browsers = message.connected_browsers
265-
this.has_connected_browsers = this.connected_browsers.length > 0
266-
this._on_connection_status_change.fire(this.has_connected_browsers)
261+
this.has_connected_browser = message.has_connected_browser
262+
this._on_connection_status_change.fire(this.has_connected_browser)
267263

268264
const config = vscode.workspace.getConfiguration('codeWebChat')
269265
const forwarded_ports = config.get<number[]>('forwardedPorts') ?? []
@@ -290,7 +286,7 @@ export class WebSocketManager {
290286
message: 'WebSocket client error',
291287
data: error
292288
})
293-
this.has_connected_browsers = false
289+
this.has_connected_browser = false
294290
this._on_connection_status_change.fire(false)
295291

296292
this._schedule_reconnect()
@@ -301,7 +297,7 @@ export class WebSocketManager {
301297
function_name: '_connect_as_client',
302298
message: 'Disconnected from WebSocket server'
303299
})
304-
this.has_connected_browsers = false
300+
this.has_connected_browser = false
305301
this._on_connection_status_change.fire(false)
306302

307303
this._schedule_reconnect()
@@ -327,109 +323,7 @@ export class WebSocketManager {
327323
}
328324

329325
is_connected_with_browser(): boolean {
330-
return this.has_connected_browsers
331-
}
332-
333-
private _get_browser_name(user_agent: string): string {
334-
if (user_agent.includes('Edg/')) {
335-
return 'Edge'
336-
} else if (user_agent.includes('Chrome/')) {
337-
return 'Chrome'
338-
} else if (user_agent.includes('Firefox/')) {
339-
return 'Firefox'
340-
} else if (user_agent.includes('Safari/')) {
341-
return 'Safari'
342-
} else {
343-
return 'Browser'
344-
}
345-
}
346-
347-
private async _select_browser(): Promise<string | undefined> {
348-
if (this.connected_browsers.length === 0) {
349-
return undefined
350-
}
351-
352-
if (this.connected_browsers.length === 1) {
353-
const id = this.connected_browsers[0].id
354-
await this.extension_context.workspaceState.update(
355-
LAST_SELECTED_BROWSER_ID_STATE_KEY,
356-
id
357-
)
358-
return id
359-
}
360-
361-
const last_selected_browser_id = this.extension_context.workspaceState.get<
362-
string | number
363-
>(LAST_SELECTED_BROWSER_ID_STATE_KEY)
364-
365-
const items = this.connected_browsers
366-
.map((b) => ({
367-
label: this._get_browser_name(b.user_agent),
368-
id: b.id
369-
}))
370-
.sort(
371-
(a, b) => a.label.localeCompare(b.label) || a.id.localeCompare(b.id)
372-
)
373-
374-
return new Promise<string | undefined>((resolve) => {
375-
const quick_pick = vscode.window.createQuickPick<
376-
vscode.QuickPickItem & { id: string }
377-
>()
378-
quick_pick.items = items
379-
380-
if (last_selected_browser_id !== undefined) {
381-
const active_item = items.find(
382-
(item) => item.id === last_selected_browser_id
383-
)
384-
if (active_item) {
385-
quick_pick.activeItems = [active_item]
386-
}
387-
}
388-
389-
quick_pick.placeholder = 'Select a browser to use'
390-
quick_pick.title = 'Connected Browsers'
391-
392-
const close_button = {
393-
iconPath: new vscode.ThemeIcon('close'),
394-
tooltip: 'Close'
395-
}
396-
397-
quick_pick.buttons = [close_button]
398-
399-
const disposables: vscode.Disposable[] = []
400-
401-
disposables.push(
402-
quick_pick.onDidTriggerButton((button) => {
403-
if (button === close_button) {
404-
quick_pick.hide()
405-
}
406-
})
407-
)
408-
409-
disposables.push(
410-
quick_pick.onDidAccept(async () => {
411-
const selected = quick_pick.selectedItems[0]
412-
if (selected) {
413-
await this.extension_context.workspaceState.update(
414-
LAST_SELECTED_BROWSER_ID_STATE_KEY,
415-
selected.id
416-
)
417-
resolve(selected.id)
418-
}
419-
quick_pick.hide()
420-
})
421-
)
422-
423-
disposables.push(
424-
quick_pick.onDidHide(() => {
425-
resolve(undefined)
426-
disposables.forEach((d) => d.dispose())
427-
quick_pick.dispose()
428-
})
429-
)
430-
431-
quick_pick.show()
432-
})
326+
return this.has_connected_browser
433327
}
434328

435329
async initialize_chat(params: {
@@ -438,8 +332,8 @@ export class WebSocketManager {
438332
raw_instructions?: string
439333
inject_apply_response_button?: boolean
440334
}): Promise<boolean> {
441-
if (!this.has_connected_browsers) {
442-
throw new Error('Does not have connected browsers.')
335+
if (!this.has_connected_browser) {
336+
throw new Error('Does not have a connected browser.')
443337
}
444338

445339
const config = vscode.workspace.getConfiguration('codeWebChat')
@@ -448,11 +342,6 @@ export class WebSocketManager {
448342
const gemini_user_id = config.get<number | null>('geminiUserId')
449343
const ai_studio_user_id = config.get<number | null>('aiStudioUserId')
450344

451-
const target_browser_id = await this._select_browser()
452-
if (target_browser_id === undefined) {
453-
return false
454-
}
455-
456345
const web_configuration = web_configurations.find(
457346
(p) => p.name === params.web_configuration_name
458347
)
@@ -512,7 +401,6 @@ export class WebSocketManager {
512401
url,
513402
chatbot: web_configuration.chatbot,
514403
model: web_configuration.model,
515-
target_browser_id,
516404
reasoning_effort: web_configuration.reasoningEffort,
517405
system_instructions:
518406
web_configuration.systemInstructions ||
@@ -531,7 +419,6 @@ export class WebSocketManager {
531419
data: {
532420
url: message.url,
533421
model: message.model,
534-
target_browser_id: message.target_browser_id,
535422
client_id: message.client_id
536423
}
537424
})
@@ -547,13 +434,8 @@ export class WebSocketManager {
547434
raw_instructions: string
548435
inject_apply_response_button?: boolean
549436
}): Promise<boolean> {
550-
if (!this.has_connected_browsers) {
551-
throw new Error('Does not have connected browsers.')
552-
}
553-
554-
const target_browser_id = await this._select_browser()
555-
if (target_browser_id === undefined) {
556-
return false
437+
if (!this.has_connected_browser) {
438+
throw new Error('Does not have a connected browser.')
557439
}
558440

559441
const config = vscode.workspace.getConfiguration('codeWebChat')
@@ -620,7 +502,6 @@ export class WebSocketManager {
620502
url,
621503
chatbot: params.web_configuration.chatbot,
622504
model: params.web_configuration.model,
623-
target_browser_id,
624505
reasoning_effort: params.web_configuration.reasoning_effort,
625506
system_instructions:
626507
params.web_configuration.system_instructions ||
@@ -639,7 +520,6 @@ export class WebSocketManager {
639520
data: {
640521
url: message.url,
641522
model: message.model,
642-
target_browser_id: message.target_browser_id,
643523
client_id: message.client_id
644524
}
645525
})

0 commit comments

Comments
 (0)