wip: support proxyDomain

Author: jsjoeio

patches/proxy-uri.diff

@@ -14,11 +14,12 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -35,6 +35,7 @@ export interface IProductConfiguration {
+@@ -35,6 +35,8 @@ export interface IProductConfiguration {
  	readonly rootEndpoint?: string
  	readonly updateEndpoint?: string
  	readonly logoutEndpoint?: string
 +	readonly proxyEndpointTemplate?: string
++	readonly proxyDomain?: string
 
  	readonly version: string;
  	readonly date?: string;
@@ -40,17 +41,26 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityReso
  	private readonly _connectionTokens: Map<string, string>;
 
 -	constructor(@IProductService productService: IProductService, connectionToken: Promise<string> | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined) {
-+	constructor(@IProductService productService: IProductService, connectionToken: Promise<string> | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined, private readonly proxyEndpointTemplate?: string) {
++	constructor(@IProductService productService: IProductService, connectionToken: Promise<string> | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined, private readonly proxyEndpointTemplate?: string, private readonly proxyDomain?: string) {
  		super();
  		this._connectionToken = connectionToken;
  		this._connectionTokens = new Map<string, string>();
-@@ -61,9 +61,14 @@ export class RemoteAuthorityResolverServ
+@@ -61,9 +61,23 @@ export class RemoteAuthorityResolverServ
 
  	private async _doResolveAuthority(authority: string): Promise<ResolverResult> {
  		const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken);
 +		let options: ResolvedOptions | undefined;
 +		if (this.proxyEndpointTemplate) {
-+			const proxyUrl = new URL(this.proxyEndpointTemplate, window.location.href);
++			let proxyUrl = new URL(this.proxyEndpointTemplate, window.location.href);
++			// TODO@jsjoeio - check for host match
++			if (this.proxyDomain) {
++				const host = window.location.host
++				const hostAndProxyDomainMatch = host === this.proxyDomain
++
++				if(hostAndProxyDomainMatch) {
++					proxyUrl = new URL(this.proxyDomain, window.location.href);
++				}
++			}
 +			options = { extensionHostEnv: { VSCODE_PROXY_URI: decodeURIComponent(proxyUrl.toString()) }}
 +		}
  		const defaultPort = (/^https:/.test(window.location.href) ? 443 : 80);
@@ -64,14 +74,20 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -314,6 +314,7 @@ export class WebClientServer {
+@@ -314,10 +314,12 @@ export class WebClientServer {
  				rootEndpoint: base,
  				updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
  				logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined,
 +				proxyEndpointTemplate: base + '/proxy/{{port}}',
  				embedderIdentifier: 'server-distro',
  				extensionsGallery: this._productService.extensionsGallery,
  			},
+-			callbackRoute: this._callbackRoute
++			callbackRoute: this._callbackRoute,
++			proxyDomain: this._environmentService.args['proxyDomain'] ? `{{port}}.${this._environmentService.args['proxyDomain']}` : undefined
+ 		};
+ 
+ 		const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
 Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
@@ -81,7 +97,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
  		// Remote
  		const connectionToken = environmentService.options.connectionToken || getCookieValue(connectionTokenCookieName);
 -		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(productService, connectionToken, this.configuration.resourceUriProvider);
-+		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(productService, connectionToken, this.configuration.resourceUriProvider, this.configuration.productConfiguration?.proxyEndpointTemplate);
++		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(productService, connectionToken, this.configuration.resourceUriProvider, this.configuration.productConfiguration?.proxyEndpointTemplate, this.configuration.productConfiguration?.proxyDomain);
  		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
  		// Signing
@@ -133,3 +149,38 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 +		}
  	});
  })();
+Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
++++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
+@@ -328,6 +328,8 @@ export interface IWorkbenchConstructionO
+ 
+ 	//#endregion
+ 
++	readonly proxyDomain?: string;
++
+ }
+ 
+ export interface IResourceUriProvider {
+Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
++++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
+@@ -14,6 +14,7 @@ export const serverOptions: OptionDescri
+ 	/* ----- code-server ----- */
+ 	'disable-update-check': { type: 'boolean' },
+ 	'auth': { type: 'string' },
++	'proxyDomain': { type: 'string' },
+ 
+ 	/* ----- server setup ----- */
+ 
+@@ -94,7 +95,8 @@ export const serverOptions: OptionDescri
+ export interface ServerParsedArgs {
+ 	/* ----- code-server ----- */
+ 	'disable-update-check'?: boolean;
+-	'auth'?: string
++	'auth'?: string;
++	'proxyDomain'?: string;
+ 
+ 	/* ----- server setup ----- */
+