Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
492dc4a1
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
492dc4a1
编写于
8月 16, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove NodeRequestService
上级
971b243e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
120 deletion
+1
-120
src/vs/code/node/cliProcessMain.ts
src/vs/code/node/cliProcessMain.ts
+1
-3
src/vs/platform/request/node/nodeRequestService.ts
src/vs/platform/request/node/nodeRequestService.ts
+0
-117
未找到文件。
src/vs/code/node/cliProcessMain.ts
浏览文件 @
492dc4a1
...
...
@@ -25,8 +25,7 @@ import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/ex
import
{
ITelemetryService
,
combinedAppender
,
NullTelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
TelemetryService
,
ITelemetryServiceConfig
}
from
'
vs/platform/telemetry/common/telemetryService
'
;
import
{
resolveCommonProperties
}
from
'
vs/platform/telemetry/node/commonProperties
'
;
import
{
IRequestService
,
IRequestService2
}
from
'
vs/platform/request/common/request
'
;
import
{
NodeRequestService
}
from
'
vs/platform/request/node/nodeRequestService
'
;
import
{
IRequestService2
}
from
'
vs/platform/request/common/request
'
;
import
{
RequestService2
}
from
'
vs/platform/request/node/requestService2
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
NodeConfigurationService
}
from
'
vs/platform/configuration/node/nodeConfigurationService
'
;
...
...
@@ -158,7 +157,6 @@ export function main(argv: ParsedArgs): TPromise<void> {
const
services
=
new
ServiceCollection
();
services
.
set
(
IEventService
,
new
SyncDescriptor
(
EventService
));
services
.
set
(
IConfigurationService
,
new
SyncDescriptor
(
NodeConfigurationService
));
services
.
set
(
IRequestService
,
new
SyncDescriptor
(
NodeRequestService
));
services
.
set
(
IRequestService2
,
new
SyncDescriptor
(
RequestService2
));
services
.
set
(
IExtensionManagementService
,
new
SyncDescriptor
(
ExtensionManagementService
));
services
.
set
(
IExtensionGalleryService
,
new
SyncDescriptor
(
ExtensionGalleryService
));
...
...
src/vs/platform/request/node/nodeRequestService.ts
已删除
100644 → 0
浏览文件 @
971b243e
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
xhr
}
from
'
vs/base/common/network
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IRequestService
}
from
'
vs/platform/request/common/request
'
;
import
{
assign
}
from
'
vs/base/common/objects
'
;
import
{
IXHROptions
,
IXHRResponse
}
from
'
vs/base/common/http
'
;
import
{
request
}
from
'
vs/base/node/request
'
;
import
{
getProxyAgent
}
from
'
vs/base/node/proxy
'
;
interface
IHTTPConfiguration
{
http
?:
{
proxy
?:
string
;
proxyStrictSSL
?:
boolean
;
};
}
/**
* TODO@joao: this is sort of duplicate to the existing request services...
* we need to compose, not extend!!
*/
export
class
NodeRequestService
implements
IRequestService
{
_serviceBrand
:
any
;
private
disposables
:
IDisposable
[];
private
proxyUrl
:
string
=
null
;
private
strictSSL
:
boolean
=
true
;
constructor
(
@
IConfigurationService
configurationService
:
IConfigurationService
)
{
this
.
disposables
=
[];
const
config
=
configurationService
.
getConfiguration
<
IHTTPConfiguration
>
();
this
.
configure
(
config
);
const
disposable
=
configurationService
.
onDidUpdateConfiguration
(
e
=>
this
.
configure
(
e
.
config
));
this
.
disposables
.
push
(
disposable
);
}
private
configure
(
config
:
IHTTPConfiguration
)
{
this
.
proxyUrl
=
config
.
http
&&
config
.
http
.
proxy
;
this
.
strictSSL
=
config
.
http
&&
config
.
http
.
proxyStrictSSL
;
}
makeRequest
(
options
:
IXHROptions
):
TPromise
<
IXHRResponse
>
{
let
url
=
options
.
url
;
if
(
!
url
)
{
throw
new
Error
(
'
IRequestService.makeRequest: Url is required.
'
);
}
const
{
proxyUrl
,
strictSSL
}
=
this
;
const
agent
=
getProxyAgent
(
options
.
url
,
{
proxyUrl
,
strictSSL
});
options
=
assign
({},
options
);
options
=
assign
(
options
,
{
agent
,
strictSSL
});
return
request
(
options
).
then
(
result
=>
new
TPromise
<
IXHRResponse
>
((
c
,
e
,
p
)
=>
{
const
{
res
,
stream
}
=
result
;
const
data
:
string
[]
=
[];
stream
.
on
(
'
data
'
,
c
=>
data
.
push
(
c
));
stream
.
on
(
'
end
'
,
()
=>
{
const
status
=
res
.
statusCode
;
if
(
options
.
followRedirects
>
0
&&
(
status
>=
300
&&
status
<=
303
||
status
===
307
))
{
let
location
=
res
.
headers
[
'
location
'
];
if
(
location
)
{
let
newOptions
=
{
type
:
options
.
type
,
url
:
location
,
user
:
options
.
user
,
password
:
options
.
password
,
responseType
:
options
.
responseType
,
headers
:
options
.
headers
,
timeout
:
options
.
timeout
,
followRedirects
:
options
.
followRedirects
-
1
,
data
:
options
.
data
};
xhr
(
newOptions
).
done
(
c
,
e
,
p
);
return
;
}
}
const
response
:
IXHRResponse
=
{
responseText
:
data
.
join
(
''
),
status
,
getResponseHeader
:
header
=>
res
.
headers
[
header
],
readyState
:
4
};
if
((
status
>=
200
&&
status
<
300
)
||
status
===
1223
)
{
c
(
response
);
}
else
{
e
(
response
);
}
});
},
err
=>
{
let
message
:
string
;
if
(
agent
)
{
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
;
}
return
TPromise
.
wrapError
<
IXHRResponse
>
({
responseText
:
message
,
status
:
404
});
}));
}
dispose
():
void
{
this
.
disposables
=
dispose
(
this
.
disposables
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录