playwriter
Code Issues

Reapply "simplify code. remove methods"

Browse Source 
This reverts commit 788333e142.
This commit is contained in:
Tommy D. Rossi
2025-11-15 12:18:51 +01:00
parent 70fa984572
commit d845d44b90
3 changed files with 231 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension-playwright/src/background.ts
+21 -26
View File
@@ -25,12 +25,12 @@ class SimplifiedExtension {
constructor() {
debugLog(`Using relay URL: ${RELAY_URL}`);
chrome.tabs.onRemoved.addListener(this._onTabRemoved.bind(this));
chrome.tabs.onActivated.addListener(this._onTabActivated.bind(this));
chrome.action.onClicked.addListener(this._onActionClicked.bind(this));
chrome.tabs.onRemoved.addListener(this._onTabRemoved);
chrome.tabs.onActivated.addListener(this._onTabActivated);
chrome.action.onClicked.addListener(this._onActionClicked);
}
private async _onActionClicked(tab: chrome.tabs.Tab): Promise<void> {
private _onActionClicked = async (tab: chrome.tabs.Tab): Promise<void> => {
if (!tab.id) {
debugLog('No tab ID available');
return;
@@ -41,23 +41,7 @@ class SimplifiedExtension {
} else {
await this._connectTab(tab.id);
}
}
private async _waitForServer(): Promise<void> {
const httpUrl = 'http://localhost:9988';
while (true) {
try {
debugLog('Checking if relay server is available...');
await fetch(httpUrl, { method: 'HEAD' });
debugLog('Server is available');
return;
} catch (error: any) {
debugLog(`Server not available, retrying in 1 second...`);
await new Promise(resolve => setTimeout(resolve, 1000));
}
}
}
};
private async _connectTab(tabId: number): Promise<void> {
try {
@@ -67,7 +51,18 @@ class SimplifiedExtension {
if (!this._connection) {
debugLog('No existing connection, creating new relay connection');
debugLog('Waiting for server at http://localhost:9988...');
await this._waitForServer();
// Wait for server to be available
while (true) {
try {
await fetch('http://localhost:9988', { method: 'HEAD' });
debugLog('Server is available');
break;
} catch (error: any) {
debugLog('Server not available, retrying in 1 second...');
await new Promise(resolve => setTimeout(resolve, 1000));
}
}
debugLog('Server is ready, creating WebSocket connection to:', RELAY_URL);
const socket = new WebSocket(RELAY_URL);
@@ -239,19 +234,19 @@ class SimplifiedExtension {
}
}
private async _onTabRemoved(tabId: number): Promise<void> {
private _onTabRemoved = async (tabId: number): Promise<void> => {
debugLog('Tab removed event for tab:', tabId, 'is connected:', this._connectedTabs.has(tabId));
if (!this._connectedTabs.has(tabId)) return;
debugLog(`Connected tab ${tabId} was closed, disconnecting`);
await this._disconnectTab(tabId);
}
};
private async _onTabActivated(activeInfo: chrome.tabs.TabActiveInfo): Promise<void> {
private _onTabActivated = async (activeInfo: chrome.tabs.TabActiveInfo): Promise<void> => {
const isConnected = this._connectedTabs.has(activeInfo.tabId);
debugLog('Tab activated:', activeInfo.tabId, 'is connected:', isConnected);
await this._updateIcon(activeInfo.tabId, isConnected ? 'connected' : 'disconnected');
}
};
}
new SimplifiedExtension();
extension-playwright/src/relayConnection.ts
+39 -53
View File
@@ -41,16 +41,42 @@ export class RelayConnection {
private _attachedTabs: Map<number, AttachedTab> = new Map();
private _nextSessionId: number = 1;
private _ws: WebSocket;
private _eventListener: (source: chrome.debugger.DebuggerSession, method: string, params: any) => void;
private _detachListener: (source: chrome.debugger.Debuggee, reason: string) => void;
private _closed = false;
onclose?: () => void;
constructor(ws: WebSocket) {
this._ws = ws;
this._ws.onmessage = this._onMessage.bind(this);
this._ws.onclose = (event) => {
this._ws.onmessage = async (event: MessageEvent) => {
let message: ExtensionCommandMessage;
try {
message = JSON.parse(event.data);
} catch (error: any) {
debugLog('Error parsing message:', error);
this._sendMessage({
error: {
code: -32700,
message: `Error parsing message: ${error.message}`,
},
});
return;
}
debugLog('Received message:', message);
const response: ExtensionResponseMessage = {
id: message.id,
};
try {
response.result = await this._handleCommand(message);
} catch (error: any) {
debugLog('Error handling command:', error);
response.error = error.message;
}
debugLog('Sending response:', response);
this._sendMessage(response);
};
this._ws.onclose = (event: CloseEvent) => {
debugLog('WebSocket onclose event:', {
code: event.code,
reason: event.reason,
@@ -58,13 +84,11 @@ export class RelayConnection {
});
this._onClose();
};
this._ws.onerror = (event) => {
this._ws.onerror = (event: Event) => {
debugLog('WebSocket onerror event:', event);
};
this._eventListener = this._onDebuggerEvent.bind(this);
this._detachListener = this._onDebuggerDetach.bind(this);
chrome.debugger.onEvent.addListener(this._eventListener);
chrome.debugger.onDetach.addListener(this._detachListener);
chrome.debugger.onEvent.addListener(this._onDebuggerEvent);
chrome.debugger.onDetach.addListener(this._onDebuggerDetach);
debugLog('RelayConnection created, WebSocket readyState:', this._ws.readyState);
}
@@ -167,8 +191,8 @@ export class RelayConnection {
debugLog('Connection closing, attached tabs count:', this._attachedTabs.size);
this._closed = true;
chrome.debugger.onEvent.removeListener(this._eventListener);
chrome.debugger.onDetach.removeListener(this._detachListener);
chrome.debugger.onEvent.removeListener(this._onDebuggerEvent);
chrome.debugger.onDetach.removeListener(this._onDebuggerDetach);
const tabIds = Array.from(this._attachedTabs.keys());
debugLog('Detaching all tabs:', tabIds);
@@ -191,7 +215,7 @@ export class RelayConnection {
this.onclose?.();
}
private _onDebuggerEvent(source: chrome.debugger.DebuggerSession, method: string, params: any): void {
private _onDebuggerEvent = (source: chrome.debugger.DebuggerSession, method: string, params: any): void => {
const tab = this._attachedTabs.get(source.tabId!);
if (!tab) return;
@@ -221,9 +245,9 @@ export class RelayConnection {
params,
},
});
}
};
private _onDebuggerDetach(source: chrome.debugger.Debuggee, reason: string): void {
private _onDebuggerDetach = (source: chrome.debugger.Debuggee, reason: string): void => {
const tabId = source.tabId;
debugLog('_onDebuggerDetach called for tab:', tabId, 'reason:', reason, 'isAttached:', tabId ? this._attachedTabs.has(tabId) : false);
@@ -234,36 +258,7 @@ export class RelayConnection {
debugLog(`Debugger detached from tab ${tabId}: ${reason}`);
this.detachTab(tabId);
}
private _onMessage(event: MessageEvent): void {
this._onMessageAsync(event).catch(e => debugLog('Error handling message:', e));
}
private async _onMessageAsync(event: MessageEvent): Promise<void> {
let message: ExtensionCommandMessage;
try {
message = JSON.parse(event.data);
} catch (error: any) {
debugLog('Error parsing message:', error);
this._sendError(-32700, `Error parsing message: ${error.message}`);
return;
}
debugLog('Received message:', message);
const response: ExtensionResponseMessage = {
id: message.id,
};
try {
response.result = await this._handleCommand(message);
} catch (error: any) {
debugLog('Error handling command:', error);
response.error = error.message;
}
debugLog('Sending response:', response);
this._sendMessage(response);
}
};
private async _handleCommand(message: ExtensionCommandMessage): Promise<any> {
if (message.method === 'attachToTab') {
@@ -339,15 +334,6 @@ export class RelayConnection {
}
}
private _sendError(code: number, message: string): void {
this._sendMessage({
error: {
code,
message,
},
});
}
private _sendMessage(message: any): void {
if (this._ws.readyState === WebSocket.OPEN) {
try {