Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enable main request service in insiders #167190

Merged
merged 1 commit into from Nov 24, 2022
Merged

enable main request service in insiders #167190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
View file
Open in desktop
Expand Up @@ -277,7 +277,7 @@ class SharedProcessMain extends Disposable {
services.set(IUriIdentityService, new UriIdentityService(fileService));

// Request
services.set(IRequestService, new SharedProcessRequestService(mainProcessService, configurationService, logService));
services.set(IRequestService, new SharedProcessRequestService(mainProcessService, configurationService, productService, logService));

// Checksum
services.set(IChecksumService, new SyncDescriptor(ChecksumService, undefined, false /* proxied to other processes */));
Expand Down
13 changes: 12 additions & 1 deletion src/vs/platform/request/electron-browser/sharedProcessRequestService.ts
View file
Open in desktop
Expand Up @@ -4,10 +4,12 @@
*--------------------------------------------------------------------------------------------*/

import { CancellationToken } from 'vs/base/common/cancellation';
import { isBoolean } from 'vs/base/common/types';
import { IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
import { ILogService } from 'vs/platform/log/common/log';
import { IProductService } from 'vs/platform/product/common/productService';
import { RequestService } from 'vs/platform/request/browser/requestService';
import { IRequestService } from 'vs/platform/request/common/request';
import { RequestChannelClient } from 'vs/platform/request/common/requestIpc';
Expand All @@ -22,6 +24,7 @@ export class SharedProcessRequestService implements IRequestService {
constructor(
mainProcessService: IMainProcessService,
private readonly configurationService: IConfigurationService,
private readonly productService: IProductService,
private readonly logService: ILogService,
) {
this.browserRequestService = new RequestService(configurationService, logService);
Expand All @@ -37,11 +40,19 @@ export class SharedProcessRequestService implements IRequestService {
}

private getRequestService(): IRequestService {
if (this.configurationService.getValue('developer.sharedProcess.redirectRequestsToMain') === true) {
if (this.isMainRequestServiceEnabled()) {
this.logService.trace('Using main request service');
return this.mainRequestService;
}
this.logService.trace('Using browser request service');
return this.browserRequestService;
}

private isMainRequestServiceEnabled(): boolean {
const value = this.configurationService.getValue('developer.sharedProcess.redirectRequestsToMain');
if (isBoolean(value)) {
return value;
}
return this.productService.quality !== 'stable';
}
}