Clean up types, interfaces.

Author: GirlBossRush

src/vs/server/@types/code-server-lib/index.d.ts

@@ -3,12 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Server } from 'http';
 import type { NativeParsedArgs } from '../../../platform/environment/common/argv';
 import type { NLSConfiguration, InternalNLSConfiguration } from '../../../base/node/languagePacks';
+import type { Server as NetServer } from 'http';
 
 declare global {
 	namespace CodeServerLib {
+
+		export interface IServerProcessMainStartupOptions {
+			listenWhenReady?: boolean;
+		}
+		export interface IServerProcessMain {
+			startup(startupOptions: IServerProcessMainStartupOptions): Promise<NetServer>;
+			dispose(): void;
+		}
+
 		export interface StartPath {
 			url: string;
 			workspace: boolean;
@@ -27,7 +36,7 @@ declare global {
 		 * @deprecated This primarily exists to bridge the gap between code-server and lib/vscode
 		 */
 
-		export type CreateVSServer = (serverConfiguration: ServerConfiguration) => Promise<Server>;
+		export type CreateVSServer = (serverConfiguration: ServerConfiguration) => Promise<IServerProcessMain>;
 
 
 		/**

src/vs/server/entry.ts

@@ -48,7 +48,5 @@ export const main = async () => {
  * It should eventually be phased out and folded into VS Code's existing CLI flow.
  */
 export const createVSServer: CodeServerLib.CreateVSServer = async serverConfig => {
-	const codeServer = new ServerProcessMain(serverConfig);
-
-	return codeServer.startup({ listenWhenReady: false });
+	return new ServerProcessMain(serverConfig);
 };

src/vs/server/main.ts

@@ -89,14 +89,6 @@ import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/workbench/services/remote/co
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
 
-interface IServerProcessMainStartupOptions {
-	listenWhenReady?: boolean;
-}
-
-interface IServerProcessMain {
-	startup(startupOptions: IServerProcessMainStartupOptions): Promise<NetServer>;
-}
-
 interface ServicesResult {
 	instantiationService: IInstantiationService;
 	logService: ILogService;
@@ -106,7 +98,7 @@ interface ServicesResult {
 /**
  * Handles client connections to a editor instance via IPC.
  */
-export class ServerProcessMain extends Disposable implements IServerProcessMain {
+export class ServerProcessMain extends Disposable implements CodeServerLib.IServerProcessMain {
 	private logPrefix = '[Code Server]';
 	netServer = createNetServer();
 
@@ -122,9 +114,10 @@ export class ServerProcessMain extends Disposable implements IServerProcessMain
 
 	private registerListeners(): void {
 		process.once('exit', () => this.dispose());
+		process.once('disconnect', () => this.dispose());
 	}
 
-	public async startup(startupOptions: IServerProcessMainStartupOptions = { listenWhenReady: true }): Promise<NetServer> {
+	public async startup(startupOptions: CodeServerLib.IServerProcessMainStartupOptions = { listenWhenReady: true }): Promise<NetServer> {
 		// Services
 		const {
 			instantiationService,
@@ -160,7 +153,7 @@ export class ServerProcessMain extends Disposable implements IServerProcessMain
 	// References:
 	// ../../electron-browser/sharedProcess/sharedProcessMain.ts#L148
 	// ../../../code/electron-main/app.ts
-	public async createServices(startupOptions: IServerProcessMainStartupOptions): Promise<ServicesResult> {
+	public async createServices(startupOptions: CodeServerLib.IServerProcessMainStartupOptions): Promise<ServicesResult> {
 		const services = new ServiceCollection();
 
 		// Product

src/vs/server/services/net/common/http.ts

@@ -12,21 +12,6 @@ import { UriComponents } from 'vs/base/common/uri';
 import { ParsedRequest } from 'vs/server/services/net/abstractIncomingRequestService';
 import * as Handlebars from 'handlebars';
 import { IWorkbenchConfigurationSerialized } from 'vs/platform/workspaces/common/workbench';
-import { dirname } from 'vs/base/common/path';
-import { FileAccess } from 'vs/base/common/network';
-
-
-// TODO: Infer from environment service.
-export const APP_ROOT = dirname(FileAccess.asFileUri('', require).fsPath);
-export const WORKBENCH_PATH = path.join(APP_ROOT, 'vs', 'code', 'browser', 'workbench');
-export const SERVICE_WORKER_FILE_NAME = 'service-worker.js';
-
-export const AssetPaths = {
-	StaticBase: '/static',
-	ProxyUri: '/proxy/{port}',
-	Webview: path.join(APP_ROOT, 'vs', 'workbench', 'contrib', 'webview', 'browser', 'pre'),
-	ServiceWorker: path.join(APP_ROOT, 'vs', 'code', 'browser', 'workbench', SERVICE_WORKER_FILE_NAME),
-};
 
 /** Matching the given keys in `PollingURLCallbackProvider.QUERY_KEYS` */
 export const wellKnownKeys = [