Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c08d8b42
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,发现更多精彩内容 >>
提交
c08d8b42
编写于
7月 16, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
introduce gallery machine id resource in env
上级
73a34e68
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
29 addition
and
22 deletion
+29
-22
src/vs/platform/environment/common/environment.ts
src/vs/platform/environment/common/environment.ts
+2
-0
src/vs/platform/environment/node/environmentService.ts
src/vs/platform/environment/node/environmentService.ts
+3
-0
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
...orm/extensionManagement/common/extensionGalleryService.ts
+23
-22
src/vs/workbench/services/environment/browser/environmentService.ts
...kbench/services/environment/browser/environmentService.ts
+1
-0
未找到文件。
src/vs/platform/environment/common/environment.ts
浏览文件 @
c08d8b42
...
...
@@ -170,4 +170,6 @@ export interface IEnvironmentService {
webviewEndpoint
?:
string
;
readonly
webviewResourceRoot
:
string
;
readonly
webviewCspSource
:
string
;
readonly
galleryMachineIdResource
?:
URI
;
}
src/vs/platform/environment/node/environmentService.ts
浏览文件 @
c08d8b42
...
...
@@ -266,6 +266,9 @@ export class EnvironmentService implements IEnvironmentService {
@
memoize
get
nodeCachedDataDir
():
string
|
undefined
{
return
process
.
env
[
'
VSCODE_NODE_CACHED_DATA_DIR
'
]
||
undefined
;
}
@
memoize
get
galleryMachineIdResource
():
URI
{
return
resources
.
joinPath
(
URI
.
file
(
this
.
userDataPath
),
'
machineid
'
);
}
get
disableUpdates
():
boolean
{
return
!!
this
.
_args
[
'
disable-updates
'
];
}
get
disableCrashReporter
():
boolean
{
return
!!
this
.
_args
[
'
disable-crash-reporter
'
];
}
...
...
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
浏览文件 @
c08d8b42
...
...
@@ -9,7 +9,7 @@ import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGallery
import
{
assign
,
getOrDefault
}
from
'
vs/base/common/objects
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IPager
}
from
'
vs/base/common/paging
'
;
import
{
IRequestService
,
IRequestOptions
,
IRequestContext
,
asJson
,
asText
}
from
'
vs/platform/request/common/request
'
;
import
{
IRequestService
,
IRequestOptions
,
IRequestContext
,
asJson
,
asText
,
IHeaders
}
from
'
vs/platform/request/common/request
'
;
import
{
isEngineValid
}
from
'
vs/platform/extensions/common/extensionValidator
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
generateUuid
,
isUUID
}
from
'
vs/base/common/uuid
'
;
...
...
@@ -774,12 +774,14 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
}
export
async
function
resolveMarketplaceHeaders
(
version
:
string
,
environmentService
:
IEnvironmentService
,
fileService
:
IFileService
):
Promise
<
{
[
key
:
string
]:
string
;
}
>
{
const
marketplaceMachineIdFile
=
joinPath
(
URI
.
file
(
environmentService
.
userDataPath
),
'
machineid
'
);
const
headers
:
IHeaders
=
{
'
X-Market-Client-Id
'
:
`VSCode
${
version
}
`
,
'
User-Agent
'
:
`VSCode
${
version
}
`
};
let
uuid
:
string
|
null
=
null
;
if
(
environmentService
.
galleryMachineIdResource
)
{
try
{
const
contents
=
await
fileService
.
readFile
(
marketplaceMachineIdFil
e
);
const
contents
=
await
fileService
.
readFile
(
environmentService
.
galleryMachineIdResourc
e
);
const
value
=
contents
.
value
.
toString
();
uuid
=
isUUID
(
value
)
?
value
:
null
;
}
catch
(
e
)
{
...
...
@@ -789,14 +791,13 @@ export async function resolveMarketplaceHeaders(version: string, environmentServ
if
(
!
uuid
)
{
uuid
=
generateUuid
();
try
{
await
fileService
.
writeFile
(
marketplaceMachineIdFil
e
,
VSBuffer
.
fromString
(
uuid
));
await
fileService
.
writeFile
(
environmentService
.
galleryMachineIdResourc
e
,
VSBuffer
.
fromString
(
uuid
));
}
catch
(
error
)
{
//noop
}
}
return
{
'
X-Market-Client-Id
'
:
`VSCode
${
version
}
`
,
'
User-Agent
'
:
`VSCode
${
version
}
`
,
'
X-Market-User-Id
'
:
uuid
};
headers
[
'
X-Market-User-Id
'
]
=
uuid
;
}
return
headers
;
}
\ No newline at end of file
src/vs/workbench/services/environment/browser/environmentService.ts
浏览文件 @
c08d8b42
...
...
@@ -143,6 +143,7 @@ export class BrowserWorkbenchEnvironmentService implements IEnvironmentService {
driverHandle
?:
string
;
driverVerbose
:
boolean
;
webviewEndpoint
?:
string
;
galleryMachineIdResource
?:
URI
;
get
webviewResourceRoot
():
string
{
return
this
.
webviewEndpoint
?
this
.
webviewEndpoint
+
'
/vscode-resource{{resource}}
'
:
'
vscode-resource:{{resource}}
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录