Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions src/cdp-proxy/reactNativeCDPProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for details.

import { IncomingMessage } from "http";
import { URL } from "url";
import {
Connection,
Server,
Expand All @@ -11,6 +12,7 @@ import {
IProtocolSuccess,
} from "vscode-cdp-proxy";
import { CancellationToken, EventEmitter } from "vscode";
import WebSocket = require("ws");
import { OutputChannelLogger } from "../extension/log/OutputChannelLogger";
import { LogLevel } from "../extension/log/LogHelper";
import { DebuggerEndpointHelper } from "./debuggerEndpointHelper";
Expand Down Expand Up @@ -123,9 +125,7 @@ export class ReactNativeCDPProxy {
}
}

this.applicationTarget = new Connection(
await WebSocketTransport.create(this.browserInspectUri),
);
this.applicationTarget = new Connection(await this.createApplicationTransport());

this.applicationTarget.onError(this.onApplicationTargetError.bind(this));
this.debuggerTarget.onError(this.onDebuggerTargetError.bind(this));
Expand Down Expand Up @@ -214,6 +214,40 @@ export class ReactNativeCDPProxy {
this.logger.error("Error on application transport", err);
}

private createApplicationTransport(): Promise<WebSocketTransport> {
const webSocket = new WebSocket(this.browserInspectUri, [], {
perMessageDeflate: false,
maxPayload: 256 * 1024 * 1024,
origin: ReactNativeCDPProxy.getWebSocketOrigin(this.browserInspectUri),
} as WebSocket.IClientOptions & { maxPayload: number; perMessageDeflate: boolean });

return new Promise((resolve, reject) => {
webSocket.once("open", () => {
// TypeScript 7 resolves vscode-cdp-proxy's legacy `import * as WebSocket`
// declaration as the DOM WebSocket type, although it accepts ws at runtime.
const transportWebSocket = webSocket as unknown as ConstructorParameters<
typeof WebSocketTransport
>[0];
resolve(new WebSocketTransport(transportWebSocket));
});
webSocket.once("error", reject);
});
}

private static getWebSocketOrigin(webSocketUrl: string): string | undefined {
const url = new URL(webSocketUrl);

if (url.protocol === "ws:") {
return `http://${url.host}`;
}

if (url.protocol === "wss:") {
return `https://${url.host}`;
}

return undefined;
}

private async onApplicationTargetClosed() {
this.applicationTarget = null;
this.applicationTargetEventEmitter.fire({});
Expand Down
17 changes: 12 additions & 5 deletions src/extension/reactNativeSessionManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class ReactNativeSessionManager
): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
const rnSession = new RNSession(session);

let debugServer;
let debugServer: Net.Server;
if (session.configuration.platform != "expoweb") {
debugServer = Net.createServer(socket => {
const rnDebugSession =
Expand All @@ -45,11 +45,18 @@ export class ReactNativeSessionManager
});
}

debugServer.listen(0, "127.0.0.1");
this.servers.set(session.id, debugServer);
return new Promise<vscode.DebugAdapterServer>((resolve, reject) => {
debugServer.once("error", reject);
debugServer.listen(0, "127.0.0.1", () => {
debugServer.removeListener("error", reject);
this.servers.set(session.id, debugServer);

// make VS Code connect to debug server
return new vscode.DebugAdapterServer((<Net.AddressInfo>debugServer.address()).port);
// make VS Code connect to debug server
resolve(
new vscode.DebugAdapterServer((<Net.AddressInfo>debugServer.address()).port),
);
});
});
}

public terminate(terminateEvent: TerminateEventArgs): void {
Expand Down
9 changes: 5 additions & 4 deletions test/cdp-proxy/reactNativeCDPProxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,10 @@ suite("reactNativeCDPProxy", function () {
generateRandomPortNumber(),
);
const debuggerTarget = createConnectionStub();
const createWebSocketTransportStub = Sinon.stub(WebSocketTransport, "create").returns(
Promise.resolve(createTransportStub()),
);
const createApplicationTransportStub = Sinon.stub(
localProxy as any,
"createApplicationTransport",
).returns(Promise.resolve(createTransportStub()));

Object.assign(localProxy, {
browserInspectUri: "ws://localhost:1234/debugger",
Expand All @@ -310,7 +311,7 @@ suite("reactNativeCDPProxy", function () {
},
]);
} finally {
createWebSocketTransportStub.restore();
createApplicationTransportStub.restore();
}

assert.strictEqual(debuggerTarget.close.called, false);
Expand Down
Loading