Fix issues surrounding IPC interfaces. Update names.

Author: GirlBossRush

src/vs/base/common/ipc.d.ts

@@ -1,11 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Coder Technologies. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 /**
  * External interfaces for integration into code-server over IPC.
- * This file exists in two locations:
- * - typings/ipc.d.ts
- * - lib/vscode/src/typings/ipc.d.ts
- * The second is a symlink to the first.
  */
-export interface Options {
+export interface CodeServerConfiguration {
 	authed: boolean
 	base: string
 	csStaticBase: string
@@ -16,7 +17,7 @@ export interface Options {
 export interface InitMessage {
 	type: 'init'
 	id: string
-	options: VscodeOptions
+	options: VscodeInitializationOptions
 }
 
 export type Query = { [key: string]: string | string[] | undefined | Query | Query[] }
@@ -81,13 +82,13 @@ export interface Args {
 	_: string[]
 }
 
-export interface VscodeOptions {
+export interface VscodeInitializationOptions {
 	readonly args: Args
 	readonly remoteAuthority: string
 	readonly startPath?: StartPath
 }
 
-export interface VscodeOptionsMessage extends VscodeOptions {
+export interface VscodeInitializationOptionsMessage extends VscodeInitializationOptions {
 	readonly id: string
 }
 

src/vs/base/common/uriServer.ts

@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Coder Technologies. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IRawURITransformer, UriParts, URITransformer } from 'vs/base/common/uriIpc';
+
+class RawURITransformer implements IRawURITransformer {
+	constructor(private readonly authority: string) { }
+
+	transformIncoming(uri: UriParts): UriParts {
+		switch (uri.scheme) {
+			case 'vscode-remote':
+				return { scheme: 'file', path: uri.path };
+			default:
+				return uri;
+		}
+	}
+
+	transformOutgoing(uri: UriParts): UriParts {
+		switch (uri.scheme) {
+			case 'file':
+				return { scheme: 'vscode-remote', authority: this.authority, path: uri.path };
+			default:
+				return uri;
+		}
+	}
+
+	transformOutgoingScheme(scheme: string): string {
+		switch (scheme) {
+			case 'file':
+				return 'vscode-remote';
+			default:
+				return scheme;
+		}
+	}
+}
+
+/**
+ * Convenience function, given that a server's raw URI transformer is often wrapped
+ * by VSCode's `URITransformer`.
+ */
+export function createServerURITransformer(authority: string) {
+	return new URITransformer(new RawURITransformer(authority));
+}

src/vs/server/channel.ts

@@ -26,7 +26,6 @@ import { IRemoteAgentEnvironment, RemoteAgentConnectionContext } from 'vs/platfo
 import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IShellLaunchConfig, ITerminalEnvironment } from 'vs/platform/terminal/common/terminal';
 import { getTranslations } from 'vs/server/nls';
-import { getUriTransformer } from 'vs/server/util';
 import { IFileChangeDto } from 'vs/workbench/api/common/extHost.protocol';
 import { IEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
 import { MergedEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableCollection';
@@ -36,6 +35,7 @@ import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/termi
 import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
 import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
 import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
+import { createServerURITransformer } from 'vs/base/common/uriServer';
 
 const logger = new ConsoleLogger();
 
@@ -86,7 +86,7 @@ export class FileProviderChannel implements IServerChannel<RemoteAgentConnection
 			onFirstListenerAdd: () => {
 				const provider = new Watcher(this.logService);
 				this.watchers.set(session, provider);
-				const transformer = getUriTransformer(context.remoteAuthority);
+				const transformer = createServerURITransformer(context.remoteAuthority);
 				provider.onDidChangeFile((events) => {
 					emitter.fire(events.map((event) => ({
 						...event,
@@ -238,12 +238,12 @@ export class ExtensionEnvironmentChannel implements IServerChannel {
 			case 'getEnvironmentData':
 				return transformOutgoingURIs(
 					await this.getEnvironmentData(),
-					getUriTransformer(context.remoteAuthority),
+					createServerURITransformer(context.remoteAuthority),
 				);
 			case 'scanExtensions':
 				return transformOutgoingURIs(
 					await this.scanExtensions(args.language),
-					getUriTransformer(context.remoteAuthority),
+					createServerURITransformer(context.remoteAuthority),
 				);
 			case 'getDiagnosticInfo': return this.getDiagnosticInfo();
 			case 'disableTelemetry': return this.disableTelemetry();
@@ -559,6 +559,6 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
 }
 
 function transformIncoming(remoteAuthority: string, uri: UriComponents | undefined): URI | undefined {
-	const transformer = getUriTransformer(remoteAuthority);
+	const transformer = createServerURITransformer(remoteAuthority);
 	return uri ? URI.revive(transformer.transformIncoming(uri)) : uri;
 }

src/vs/server/entry.ts

@@ -7,7 +7,7 @@ import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import * as proxyAgent from 'vs/base/node/proxy_agent';
 import { CodeServerMessage, VscodeMessage } from 'vs/base/common/ipc';
 import { enableCustomMarketplace } from 'vs/server/marketplace';
-import { Vscode } from 'vs/server/server';
+import { VscodeServer } from 'vs/server/server';
 import { ConsoleMainLogger } from 'vs/platform/log/common/log';
 
 const logger = new ConsoleMainLogger();
@@ -41,7 +41,7 @@ if (typeof process.env.CODE_SERVER_PARENT_PID !== 'undefined') {
 	exit(1);
 }
 
-const vscode = new Vscode();
+const vscode = new VscodeServer();
 const send = (message: VscodeMessage): void => {
 	if (!process.send) {
 		throw new Error('not spawned with IPC');
@@ -57,8 +57,9 @@ process.on('message', async (message: CodeServerMessage, socket) => {
 	switch (message.type) {
 		case 'init':
 			try {
-				const options = await vscode.initialize(message.options);
-				send({ type: 'options', id: message.id, options });
+				const workbenchOptions = await vscode.initialize(message.options);
+
+				send({ type: 'options', id: message.id, options: workbenchOptions });
 			} catch (error) {
 				logger.error(error.message);
 				logger.error(error.stack);

src/vs/server/server.ts

@@ -13,7 +13,7 @@ import { URI } from 'vs/base/common/uri';
 import { getMachineId } from 'vs/base/node/id';
 import { ClientConnectionEvent, IPCServer, IServerChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
 import { main } from 'vs/code/node/cliProcessMain';
-import { Query, VscodeOptions, WorkbenchOptions } from 'vs/base/common/ipc';
+import { Query, VscodeInitializationOptions, WorkbenchOptions } from 'vs/base/common/ipc';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
 import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
@@ -55,17 +55,20 @@ import { Connection, ExtensionHostConnection, ManagementConnection } from 'vs/se
 import { TelemetryClient } from 'vs/server/insights';
 import { getLocaleFromConfig, getNlsConfiguration } from 'vs/server/nls';
 import { Protocol } from 'vs/server/protocol';
-import { getUriTransformer } from 'vs/server/util';
 import { REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel';
 import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/workbench/services/remote/common/remoteAgentFileSystemChannel';
 import { RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
 import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner';
+import { createServerURITransformer } from 'vs/base/common/uriServer';
 
 const commit = product.commit || 'development';
 const logger = new ConsoleMainLogger();
 
-export class Vscode {
+/**
+ * Handles client connections to a VSCode instance via IPC.
+ */
+export class VscodeServer {
 	public readonly _onDidClientConnect = new Emitter<ClientConnectionEvent>();
 	public readonly onDidClientConnect = this._onDidClientConnect.event;
 	private readonly ipc = new IPCServer<RemoteAgentConnectionContext>(this.onDidClientConnect);
@@ -80,8 +83,8 @@ export class Vscode {
 		return main(args);
 	}
 
-	public async initialize(options: VscodeOptions): Promise<WorkbenchOptions> {
-		const transformer = getUriTransformer(options.remoteAuthority);
+	public async initialize(options: VscodeInitializationOptions): Promise<WorkbenchOptions> {
+		const transformer = createServerURITransformer(options.remoteAuthority);
 		if (!this.servicesPromise) {
 			this.servicesPromise = this.initializeServices(options.args);
 		}
@@ -299,7 +302,7 @@ export class Vscode {
 
 				this.ipc.registerChannel('extensions', new ExtensionManagementChannel(
 					accessor.get(IExtensionManagementService),
-					(context) => getUriTransformer(context.remoteAuthority),
+					(context) => createServerURITransformer(context.remoteAuthority),
 				));
 				this.ipc.registerChannel('remoteextensionsenvironment', new ExtensionEnvironmentChannel(
 					environmentService, logService, telemetryService, '',

src/vs/server/uriTransformer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'vs/base/common/path';
-import { Options } from 'vs/base/common/ipc';
+import { CodeServerConfiguration } from 'vs/base/common/ipc';
 import { localize } from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -22,7 +22,7 @@ import 'vs/workbench/services/localizations/browser/localizationsService';
  * possible.
  */
 
-const options = getOptions<Options>();
+const options = getOptions<CodeServerConfiguration>();
 
 /**
  * This is called by vs/workbench/browser/web.main.ts after the workbench has

src/vs/server/util.ts

@@ -17,7 +17,8 @@ import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
 import { MessageType, createMessageOfType, isMessageOfType, IExtHostSocketMessage, IExtHostReadyMessage, IExtHostReduceGraceTimeMessage, ExtensionHostExitCode } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
 import { ExtensionHostMain, IExitFn } from 'vs/workbench/services/extensions/common/extensionHostMain';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { IURITransformer, URITransformer, IRawURITransformer } from 'vs/base/common/uriIpc';
+import { IURITransformer } from 'vs/base/common/uriIpc';
+import { createServerURITransformer } from 'vs/base/common/uriServer';
 import { exists } from 'vs/base/node/pfs';
 import { realpath } from 'vs/base/node/extpath';
 import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
@@ -339,11 +340,10 @@ export async function startExtensionHostProcess(): Promise<void> {
 
 	// Attempt to load uri transformer
 	let uriTransformer: IURITransformer | null = null;
+
 	if (initData.remote.authority && args.uriTransformerPath) {
 		try {
-			const rawURITransformerFactory = <any>require.__$__nodeRequire(args.uriTransformerPath);
-			const rawURITransformer = <IRawURITransformer>rawURITransformerFactory(initData.remote.authority);
-			uriTransformer = new URITransformer(rawURITransformer);
+			uriTransformer = createServerURITransformer(initData.remote.authority);
 		} catch (e) {
 			console.error(e);
 		}