From 0b9a478289e6f15c2ab1f9345e3ece7b2eb29180 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 5 Mar 2020 15:48:26 -0600 Subject: [PATCH] Add connection type to websocket query parameters This allows external services to distinguish between them. --- ci/vscode.patch | 13 +++++++++++++ package.json | 2 +- src/node/app/README.md | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ci/vscode.patch b/ci/vscode.patch index 8ffbca902..b01fad343 100644 --- a/ci/vscode.patch +++ b/ci/vscode.patch @@ -442,6 +442,19 @@ index d0f6e6b18a..1966fd297d 100644 - - - +diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts +index eab8591492..26668701f7 100644 +--- a/src/vs/platform/remote/common/remoteAgentConnection.ts ++++ b/src/vs/platform/remote/common/remoteAgentConnection.ts +@@ -88,7 +88,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio + options.socketFactory.connect( + options.host, + options.port, +- `reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`, ++ `type=${connectionTypeToString(connectionType)}&reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`, + (err: any, socket: ISocket | undefined) => { + if (err || !socket) { + options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`); diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts new file mode 100644 index 0000000000..95e70869f2 diff --git a/package.json b/package.json index df7cd5457..8fdba58b3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-server", "license": "MIT", - "version": "3.0.0", + "version": "3.0.1", "scripts": { "clean": "ci/clean.sh", "vscode": "ci/vscode.sh", diff --git a/src/node/app/README.md b/src/node/app/README.md index 752c2948b..d7e59e38a 100644 --- a/src/node/app/README.md +++ b/src/node/app/README.md @@ -53,6 +53,7 @@ Our changes include: - Make extensions work in the browser. - Fix getting permanently disconnected when you sleep or hibernate for a while. - Make it possible to automatically update the binary. +- Add connection type to web socket query parameters. ## Future