remove request handler api and make web request service self registerable

sandy081 · sandy081 · commit c76a7e69a638 · 2019-08-12T17:35:53.000+02:00
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
@@ -40,8 +40,6 @@ import { joinPath } from 'vs/base/common/resources';
 import { BrowserStorageService } from 'vs/platform/storage/browser/storageService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { getThemeTypeSelector, DARK, HIGH_CONTRAST, LIGHT } from 'vs/platform/theme/common/themeService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { RequestService } from 'vs/workbench/services/request/browser/requestService';
 import { InMemoryUserDataProvider } from 'vs/workbench/services/userData/common/inMemoryUserDataProvider';
 
 class CodeRendererMain extends Disposable {
@@ -170,7 +168,7 @@ class CodeRendererMain extends Disposable {
 		// User Data Provider
 		fileService.registerProvider(Schemas.userData, userDataProvider);
 
-		const [configurationService, storageService] = await Promise.all([
+		const services = await Promise.all([
 			this.createWorkspaceService(payload, environmentService, fileService, remoteAgentService, logService).then(service => {
 
 				// Workspace
@@ -191,10 +189,7 @@ class CodeRendererMain extends Disposable {
 			})
 		]);
 
-		// Request Service
-		serviceCollection.set(IRequestService, new RequestService(this.configuration.requestHandler, remoteAgentService, configurationService, logService));
-
-		return { serviceCollection, logService, storageService };
+		return { serviceCollection, logService, storageService: services[1] };
 	}
 
 	private async createStorageService(payload: IWorkspaceInitializationPayload, environmentService: IWorkbenchEnvironmentService, fileService: IFileService, logService: ILogService): Promise<BrowserStorageService> {
diff --git a/src/vs/workbench/services/request/browser/requestService.ts b/src/vs/workbench/services/request/browser/requestService.ts
@@ -16,7 +16,6 @@ export class RequestService extends BrowserRequestService {
 	private readonly remoteRequestChannel: RequestChannelClient | null;
 
 	constructor(
-		private readonly requestHandler: ((options: IRequestOptions) => Promise<IRequestContext>) | undefined,
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@ILogService logService: ILogService
@@ -27,9 +26,6 @@ export class RequestService extends BrowserRequestService {
 	}
 
 	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
-		if (this.requestHandler) {
-			return this.requestHandler(options);
-		}
 		try {
 			const context = await super.request(options, token);
 			if (this.remoteRequestChannel && context.res.statusCode === 405) {
@@ -45,4 +41,4 @@ export class RequestService extends BrowserRequestService {
 		}
 	}
 
-}
+}
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -7,7 +7,6 @@ import 'vs/workbench/workbench.web.main';
 import { main } from 'vs/workbench/browser/web.main';
 import { UriComponents } from 'vs/base/common/uri';
 import { IFileSystemProvider } from 'vs/platform/files/common/files';
-import { IRequestOptions, IRequestContext } from 'vs/platform/request/common/request';
 import { IWebSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
 
 export interface IWorkbenchConstructionOptions {
@@ -45,12 +44,6 @@ export interface IWorkbenchConstructionOptions {
 	 */
 	userDataProvider?: IFileSystemProvider;
 
-	/**
-	 * Experimental: Optional request handler to handle http requests.
-	 * In case not provided, workbench uses <code>XMLHttpRequest</code>.
-	 */
-	requestHandler?: (requestOptions: IRequestOptions) => Promise<IRequestContext>;
-
 	/**
 	 * A factory for web sockets.
 	 */
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
@@ -38,6 +38,8 @@ import 'vs/workbench/services/configurationResolver/browser/configurationResolve
 import 'vs/workbench/browser/web.simpleservices';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IRequestService } from 'vs/platform/request/common/request';
+import { RequestService } from 'vs/workbench/services/request/browser/requestService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
@@ -53,6 +55,7 @@ import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { BackupFileService } from 'vs/workbench/services/backup/common/backupFileService';
 import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
 
+registerSingleton(IRequestService, RequestService, true);
 registerSingleton(IExtensionManagementService, ExtensionManagementService);
 registerSingleton(IBackupFileService, BackupFileService);
 registerSingleton(IDialogService, DialogService, true);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ export class RequestService extends BrowserRequestService {`
`16`	`16`	`private readonly remoteRequestChannel: RequestChannelClient \| null;`
`17`	`17`
`18`	`18`	`constructor(`
`19`		`- private readonly requestHandler: ((options: IRequestOptions) => Promise<IRequestContext>) \| undefined,`
`20`	`19`	`@IRemoteAgentService remoteAgentService: IRemoteAgentService,`
`21`	`20`	`@IConfigurationService configurationService: IConfigurationService,`
`22`	`21`	`@ILogService logService: ILogService`
`@@ -27,9 +26,6 @@ export class RequestService extends BrowserRequestService {`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {`
`30`		`- if (this.requestHandler) {`
`31`		`- return this.requestHandler(options);`
`32`		`- }`
`33`	`29`	`try {`
`34`	`30`	`const context = await super.request(options, token);`
`35`	`31`	`if (this.remoteRequestChannel && context.res.statusCode === 405) {`
`@@ -45,4 +41,4 @@ export class RequestService extends BrowserRequestService {`
`45`	`41`	`}`
`46`	`42`	`}`
`47`	`43`
`48`		`-}`
	`44`	`+}`