OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix service worker scope when there is a base path

Browse Source
This commit is contained in:
Asher
2019-08-12 10:30:02 -05:00
parent 7389d9e2cb
commit b566b66590
3 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server.ts
View File

@ -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/, ""));