Skip to content

Commit 67ee535

Browse files
szuendDevtools-frontend LUCI CQ
authored andcommitted
[protocol] Rename various *Connection classes to *Transport
We added a new layer inbetween "transport" and "session management": The CDPConnection interface. This CL renames existing transport implementations to better reflect what they really are. [email protected] Bug: 453469270 Change-Id: I2d7266081a119758a4687d7f419e3a24ea87b49a Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7116099 Reviewed-by: Benedikt Meurer <[email protected]> Commit-Queue: Simon Zünd <[email protected]>
1 parent 416cc7a commit 67ee535

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

front_end/core/sdk/Connections.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type * as Platform from '../platform/platform.js';
99
import * as ProtocolClient from '../protocol_client/protocol_client.js';
1010
import * as Root from '../root/root.js';
1111

12-
import {RehydratingConnection} from './RehydratingConnection.js';
12+
import {RehydratingConnectionTransport} from './RehydratingConnection.js';
1313

1414
const UIStrings = {
1515
/**
@@ -81,7 +81,7 @@ export class MainConnection implements ProtocolClient.ConnectionTransport.Connec
8181
}
8282
}
8383

84-
export class WebSocketConnection implements ProtocolClient.ConnectionTransport.ConnectionTransport {
84+
export class WebSocketTransport implements ProtocolClient.ConnectionTransport.ConnectionTransport {
8585
#socket: WebSocket|null;
8686
onMessage: ((arg0: Object|string) => void)|null = null;
8787
#onDisconnect: ((arg0: string) => void)|null = null;
@@ -176,7 +176,7 @@ export class WebSocketConnection implements ProtocolClient.ConnectionTransport.C
176176
}
177177
}
178178

179-
export class StubConnection implements ProtocolClient.ConnectionTransport.ConnectionTransport {
179+
export class StubTransport implements ProtocolClient.ConnectionTransport.ConnectionTransport {
180180
onMessage: ((arg0: Object|string) => void)|null = null;
181181
#onDisconnect: ((arg0: string) => void)|null = null;
182182

@@ -216,28 +216,28 @@ export class StubConnection implements ProtocolClient.ConnectionTransport.Connec
216216
export async function initMainConnection(
217217
createRootTarget: () => Promise<void>,
218218
onConnectionLost: (message: Platform.UIString.LocalizedString) => void): Promise<void> {
219-
ProtocolClient.ConnectionTransport.ConnectionTransport.setFactory(createMainConnection.bind(null, onConnectionLost));
219+
ProtocolClient.ConnectionTransport.ConnectionTransport.setFactory(createMainTransport.bind(null, onConnectionLost));
220220
await createRootTarget();
221221
Host.InspectorFrontendHost.InspectorFrontendHostInstance.connectionReady();
222222
}
223223

224-
function createMainConnection(onConnectionLost: (message: Platform.UIString.LocalizedString) => void):
224+
function createMainTransport(onConnectionLost: (message: Platform.UIString.LocalizedString) => void):
225225
ProtocolClient.ConnectionTransport.ConnectionTransport {
226226
if (Root.Runtime.Runtime.isTraceApp()) {
227-
return new RehydratingConnection(onConnectionLost);
227+
return new RehydratingConnectionTransport(onConnectionLost);
228228
}
229229

230230
const wsParam = Root.Runtime.Runtime.queryParam('ws');
231231
const wssParam = Root.Runtime.Runtime.queryParam('wss');
232232
if (wsParam || wssParam) {
233233
const ws = (wsParam ? `ws://${wsParam}` : `wss://${wssParam}`) as Platform.DevToolsPath.UrlString;
234-
return new WebSocketConnection(ws, onConnectionLost);
234+
return new WebSocketTransport(ws, onConnectionLost);
235235
}
236236

237237
const notEmbeddedOrWs = Host.InspectorFrontendHost.InspectorFrontendHostInstance.isHostedMode();
238238
if (notEmbeddedOrWs) {
239239
// eg., hosted mode (e.g. `http://localhost:9222/devtools/inspector.html`) without a WebSocket URL,
240-
return new StubConnection();
240+
return new StubTransport();
241241
}
242242

243243
return new MainConnection();

front_end/core/sdk/RehydratingConnection.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ describeWithEnvironment('RehydratingConnection emittance', function() {
213213
const reveal = sinon.stub(Common.Revealer.RevealerRegistry.prototype, 'reveal').resolves();
214214
const messageLog: Array<string|Message> = [];
215215

216-
const conn = new SDK.RehydratingConnection.RehydratingConnection((e: string) => {
216+
const conn = new SDK.RehydratingConnection.RehydratingConnectionTransport((e: string) => {
217217
throw new Error(`Connection lost: ${e}`);
218218
});
219219

front_end/core/sdk/RehydratingConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const enum RehydratingConnectionState {
6363
REHYDRATED = 3,
6464
}
6565

66-
export class RehydratingConnection implements ProtocolClient.ConnectionTransport.ConnectionTransport {
66+
export class RehydratingConnectionTransport implements ProtocolClient.ConnectionTransport.ConnectionTransport {
6767
rehydratingConnectionState: RehydratingConnectionState = RehydratingConnectionState.UNINITIALIZED;
6868
onDisconnect: ((arg0: string) => void)|null = null;
6969
onMessage: ((arg0: Object) => void)|null = null;

front_end/testing/MockConnection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ async function enable({reset = true} = {}) {
9191
await initializeGlobalVars({reset});
9292
setMockResourceTree(true);
9393

94-
ProtocolClient.ConnectionTransport.ConnectionTransport.setFactory(() => new MockConnection());
94+
ProtocolClient.ConnectionTransport.ConnectionTransport.setFactory(() => new MockTransport());
9595
}
9696

97-
class MockConnection extends ProtocolClient.ConnectionTransport.ConnectionTransport {
97+
class MockTransport extends ProtocolClient.ConnectionTransport.ConnectionTransport {
9898
messageCallback?: MessageCallback;
9999
override setOnMessage(callback: MessageCallback) {
100100
this.messageCallback = callback;

0 commit comments

Comments
 (0)