Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gzupanda
code-server
提交
b566b665
C
code-server
项目概览
gzupanda
/
code-server
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
code-server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b566b665
编写于
8月 12, 2019
作者:
A
Asher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix service worker scope when there is a base path
上级
7389d9e2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
46 addition
and
7 deletion
+46
-7
README.md
README.md
+2
-3
scripts/vscode.patch
scripts/vscode.patch
+29
-2
src/server.ts
src/server.ts
+15
-2
未找到文件。
README.md
浏览文件 @
b566b665
...
...
@@ -110,9 +110,8 @@ directory.
Our changes include:
-
Add a
`code-server`
schema.
-
Allow multiple extension directories (both user and built-in).
-
Rewrite assets requested by the browser to use the base URL.
-
Modify the loader, websocket, webview, and service worker to use the URL of
the page as a base (and TLS if necessary for the websocket).
-
Modify the loader, websocket, webview, service worker, and asset requests to
use the URL of the page as a base (and TLS if necessary for the websocket).
-
Send client-side telemetry through the server.
-
Add a file prefix to ignore for temporary files created during upload.
-
Insert our upload service for use in editor windows and explorer.
...
...
scripts/vscode.patch
浏览文件 @
b566b665
...
...
@@ -60,7 +60,7 @@ index 99bd930a91..319c4bd3c3 100644
];
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index fa12f62900..
1dbaac1640
100644
index fa12f62900..
a4c72fee8e
100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -1187,6 +1187,7 @@
export function animate(fn: () => void): IDisposable {
...
...
@@ -80,7 +80,7 @@ index fa12f62900..1dbaac1640 100644
// rewrite vscode-remote-uris to uris of the window location
// so that they can be intercepted by the service worker
- return _location.with({ path: '/vscode-resources/fetch', query: `u=${JSON.stringify(uri)}` });
+ return _location.with({ path: `${basePath}/vscode-resources/
${uri.fsPath
}` });
+ return _location.with({ path: `${basePath}/vscode-resources/
fetch`, query: `u=${JSON.stringify(uri)
}` });
}
return uri;
}
...
...
@@ -715,6 +715,33 @@ index 9235c739fb..32d203eb32 100644
this._register(logService.onDidChangeLogLevel(level => logLevelClient.setLevel(level)));
}
}
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
index 622bb7889b..66dd4b0bbc 100644
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
@@ -36,7 +36,8 @@
self.addEventListener('activate', event => {
//#region --- fetching/caching
const _cacheName = 'vscode-resources';
-const _resourcePrefix = '/vscode-resources/fetch';
+const rootPath = self.location.pathname.replace(/\/out\/vs\/workbench\/contrib\/resources\/browser\/resourceServiceWorkerMain.js$/, '');
+const _resourcePrefix = `${rootPath}/vscode-resources/fetch`;
const _pendingFetch = new Map<string, Function>();
self.addEventListener('message', event => {
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
index dfda6a1cfb..44a01fb0fb 100644
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
@@ -24,7 +24,7 @@
const _serviceWorker = new class ServiceWorkerStarter {
private _messageHandler?: (event: ExtendableMessageEvent) => void;
constructor() {
- navigator.serviceWorker.register(ServiceWorkerStarter._url, { scope: '/' }).then(reg => {
+ navigator.serviceWorker.register(ServiceWorkerStarter._url, { scope: window.location.pathname.replace(/\/+$/, '') }).then(reg => {
// console.debug('SW#reg', reg);
return reg.update();
// }).then(() => {
diff --git a/src/vs/workbench/contrib/update/electron-browser/update.contribution.ts b/src/vs/workbench/contrib/update/electron-browser/update.contribution.ts
index e39fa57979..3c775c9a06 100644
--- a/src/vs/workbench/contrib/update/electron-browser/update.contribution.ts
...
...
src/server.ts
浏览文件 @
b566b665
...
...
@@ -198,7 +198,7 @@ export abstract class Server {
response
.
writeHead
(
payload
.
redirect
?
HttpCode
.
Redirect
:
payload
.
code
||
HttpCode
.
Ok
,
{
"
Content-Type
"
:
getMediaMime
(
payload
.
filePath
),
...(
payload
.
redirect
?
{
Location
:
this
.
withBase
(
request
,
payload
.
redirect
)
}
:
{}),
...(
request
.
headers
[
"
service-worker
"
]
?
{
"
Service-Worker-Allowed
"
:
this
.
options
.
basePath
+
"
/
"
}
:
{}),
...(
request
.
headers
[
"
service-worker
"
]
?
{
"
Service-Worker-Allowed
"
:
this
.
options
.
basePath
||
"
/
"
}
:
{}),
...
payload
.
headers
,
});
response
.
end
(
payload
.
content
);
...
...
@@ -442,7 +442,20 @@ export class MainServer extends Server {
):
Promise
<
Response
>
{
switch
(
base
)
{
case
"
/
"
:
return
this
.
getRoot
(
request
,
parsedUrl
);
case
"
/vscode-resources
"
:
return
this
.
getResource
(
requestPath
);
case
"
/vscode-resources
"
:
if
(
requestPath
===
"
/fetch
"
)
{
// For some reason VS Code encodes the = so the query doesn't parse
// correctly. We'll look through what's available and try to find it.
for
(
let
value
in
parsedUrl
.
query
)
{
if
(
value
&&
typeof
value
===
"
string
"
)
{
const
query
=
querystring
.
parse
(
value
);
if
(
typeof
query
.
u
===
"
string
"
)
{
return
this
.
getResource
(
JSON
.
parse
(
query
.
u
).
path
);
}
}
}
}
throw
new
HttpError
(
"
Not found
"
,
HttpCode
.
NotFound
);
case
"
/webview
"
:
if
(
requestPath
.
indexOf
(
"
/vscode-resource
"
)
===
0
)
{
return
this
.
getResource
(
requestPath
.
replace
(
/^
\/
vscode-resource/
,
""
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录