Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

use base proxy util for request service too

Browse Source 
related to #155
This commit is contained in:
Joao Moreno
2016-01-08 11:11:03 +01:00
parent df43d6a7ee
commit 4a7ddb0788
2 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/vs/workbench/services/request/node/rawHttpService.ts
View File

@@ -9,9 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import { assign } from 'vs/base/common/objects';
import { Url, parse as parseUrl } from 'url';
import { request, IRequestOptions } from 'vs/base/node/request';
import HttpProxyAgent = require('http-proxy-agent');
import HttpsProxyAgent = require('https-proxy-agent');
import { getProxyAgent } from 'vs/workbench/node/proxy';
export interface IXHROptions extends IRequestOptions {
responseType?: string;
@@ -23,41 +21,18 @@ export interface IXHRResponse {
status: number;
}
let proxyConfiguration: string = null;
let proxyUrl: string = null;
let strictSSL: boolean = true;
export function configure(proxyURI: string): void {
proxyConfiguration = proxyURI;
}
function getProxyURI(uri: Url): string {
let proxyURI = proxyConfiguration;
if (!proxyURI) {
if (uri.protocol === 'http:') {
proxyURI = process.env.HTTP_PROXY || process.env.http_proxy || null;
} else if (uri.protocol === 'https:') {
proxyURI = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || null;
}
}
return proxyURI;
}
function getProxyAgent(uri: Url): any {
let proxyURI = getProxyURI(uri);
if (proxyURI) {
let proxyEndpoint = parseUrl(proxyURI);
switch (proxyEndpoint.protocol) {
case 'http:':
case 'https:':
return uri.protocol === 'http:' ? new HttpProxyAgent(proxyURI) : new HttpsProxyAgent(proxyURI);
}
}
return void 0;
export function configure(_proxyUrl: string, _strictSSL: boolean): void {
proxyUrl = _proxyUrl;
strictSSL = _strictSSL;
}
export function xhr(options: IXHROptions): TPromise<IXHRResponse> {
let endpoint = parseUrl(options.url);
const agent = getProxyAgent(options.url, { proxyUrl, strictSSL });
options = assign({}, options);
options = assign(options, { agent: getProxyAgent(endpoint) });
options = assign(options, { agent });
return request(options).then(result => new TPromise<IXHRResponse>((c, e, p) => {
let res = result.res;
@@ -88,12 +63,10 @@ export function xhr(options: IXHROptions): TPromise<IXHRResponse> {
}
});
}, err => {
let endpoint = parseUrl(options.url);
let agent = getProxyAgent(endpoint);
let message: string;
if (agent) {
message = 'Unable to to connect to ' + options.url + ' through proxy ' + getProxyURI(endpoint) + '. Error: ' + err.message;
message = 'Unable to to connect to ' + options.url + ' through a proxy . Error: ' + err.message;
} else {
message = 'Unable to to connect to ' + options.url + '. Error: ' + err.message;
}

6
src/vs/workbench/services/request/node/requestService.ts
View File

@@ -23,7 +23,7 @@ import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
interface IRawHttpService {
xhr(options: http.IXHROptions): TPromise<http.IXHRResponse>;
configure(proxy: string): void;
configure(proxy: string, strictSSL: boolean): void;
}
interface IXHRFunction {
@@ -44,7 +44,7 @@ export class RequestService extends BaseRequestService implements IThreadSynchro
// proxy setting updating
this.callOnDispose.push(configurationService.addListener(ConfigurationServiceEventTypes.UPDATED, (e: IConfigurationServiceEvent) => {
this.rawHttpServicePromise.then((rawHttpService) => {
rawHttpService.configure(e.config.http && e.config.http.proxy);
rawHttpService.configure(e.config.http && e.config.http.proxy, e.config.http.proxyStrictSSL);
});
}));
}
@@ -53,7 +53,7 @@ export class RequestService extends BaseRequestService implements IThreadSynchro
private get rawHttpServicePromise(): TPromise<IRawHttpService> {
if (!this._rawHttpServicePromise) {
this._rawHttpServicePromise = this.configurationService.loadConfiguration().then((configuration: any) => {
rawHttpService.configure(configuration.http && configuration.http.proxy);
rawHttpService.configure(configuration.http && configuration.http.proxy, configuration.http.proxyStrictSSL);
return rawHttpService;
});
}