@@ -27,7 +27,7 @@ http.server` and it should show a notification and show up in the ports panel
2727using the /proxy/port.
2828
2929Index: code-server/lib/vscode/src/vs/base/common/product.ts
30- ===================================================================
30+ ====================================================================
3131--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
3232+++ code-server/lib/vscode/src/vs/base/common/product.ts
3333@@ -69,6 +69,7 @@ export interface IProductConfiguration {
@@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityReso
5454@@ -86,9 +86,14 @@ export class RemoteAuthorityResolverServ
5555 const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken);
5656 performance.mark(`code/didResolveConnectionToken/${authorityPrefix}`);
57- this._logService .info(`Resolved connection token (${authorityPrefix}) after ${sw.elapsed()} ms`);
57+ this._blogService .info(`Resolved connection token (${authorityPrefix}) after ${sw.elapsed()} ms`);
5858+ let options: ResolvedOptions | undefined;
5959+ if (this.productService.proxyEndpointTemplate) {
6060+ const proxyUrl = new URL(this.productService.proxyEndpointTemplate, mainWindow.location.href);
@@ -68,13 +68,13 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityReso
6868 this._cache.set(authority, result);
6969 this._onDidChangeConnectionData.fire();
7070Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
71- ===================================================================
71+ =====================================================================
7272--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
7373+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
7474@@ -362,6 +362,7 @@ export class WebClientServer {
7575 rootEndpoint: rootBase,
76- updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
77- logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
76+ updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
77+ logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
7878+ proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/',
7979 embedderIdentifier: 'server-distro',
8080 extensionsGallery: this._productService.extensionsGallery,
@@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
126126+ }
127127+ resolvedUri = URI.parse(proxyUrl.toString())
128128+ } else {
129- + throw new Error(Failed to resolve external URI: ${uri.toString()}. Could not determine base url because productConfiguration missing.)
129+ + throw new Error(` Failed to resolve external URI: ${uri.toString()}. Could not determine base url because productConfiguration missing.` )
130130+ }
131131+ }
132132+ // If not localhost, return unmodified.
@@ -153,7 +153,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
153153 ? undefined /* with a remote without embedder-preferred storage, store on the remote */
154154 : new LocalStorageSecretStorageProvider(secretStorageCrypto),
155155Index: code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
156- ===================================================================
156+ ==================================================================9
157157--- code-server.orig/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
158158+++ code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
159159@@ -83,8 +83,8 @@ export class ForwardedPortsView extends
@@ -167,3 +167,4 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExpl
167167
168168 if (featuresEnabled || viewEnabled) {
169169 // Also enable the view if it isn't already.
170+
0 commit comments