maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Serve built-in extensions from /static/extensions

Browse source
This commit is contained in:
Alex Dima 2020-08-06 21:05:51 +02:00
parent cdde5c3bb1
commit f2f4a9d3fb
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
resources/serverless/code-web.js
View file

@ -179,10 +179,6 @@ const server = http.createServer((req, res) => {
// default extension requests
return handleExtension(req, res, parsedUrl);
}
if (/^\/builtin-extension\//.test(pathname)) {
// built-in extension requests
return handleBuiltInExtension(req, res, parsedUrl);
}
if (pathname === '/') {
// main web
return handleRoot(req, res);
@ -219,7 +215,18 @@ server.on('error', err => {
* @param {import('http').ServerResponse} res
* @param {import('url').UrlWithParsedQuery} parsedUrl
*/
function handleStatic(req, res, parsedUrl) {
async function handleStatic(req, res, parsedUrl) {
if (/^\/static\/extensions\//.test(parsedUrl.pathname)) {
const relativePath = decodeURIComponent(parsedUrl.pathname.substr('/static/extensions/'.length));
const filePath = getExtensionFilePath(relativePath, (await builtInExtensionsPromise).locations);
if (!filePath) {
return serveError(req, res, 400, `Bad request.`);
}
return serveFile(req, res, filePath, {
'Access-Control-Allow-Origin': '*'
});
}
// Strip `/static/` from the path
const relativeFilePath = path.normalize(decodeURIComponent(parsedUrl.pathname.substr('/static/'.length)));
@ -244,23 +251,6 @@ async function handleExtension(req, res, parsedUrl) {
});
}
/**
* @param {import('http').IncomingMessage} req
* @param {import('http').ServerResponse} res
* @param {import('url').UrlWithParsedQuery} parsedUrl
*/
async function handleBuiltInExtension(req, res, parsedUrl) {
// Strip `/builtin-extension/` from the path
const relativePath = decodeURIComponent(parsedUrl.pathname.substr('/builtin-extension/'.length));
const filePath = getExtensionFilePath(relativePath, (await builtInExtensionsPromise).locations);
if (!filePath) {
return serveError(req, res, 400, `Bad request.`);
}
return serveFile(req, res, filePath, {
'Access-Control-Allow-Origin': '*'
});
}
/**
* @param {import('http').IncomingMessage} req
* @param {import('http').ServerResponse} res
@ -306,7 +296,7 @@ async function handleRoot(req, res) {
const webConfigJSON = escapeAttribute(JSON.stringify({
folderUri: folderUri,
staticExtensions,
builtinExtensionsServiceUrl: `${SCHEME}://${AUTHORITY}/builtin-extension`
builtinExtensionsServiceUrl: `${SCHEME}://${AUTHORITY}/static/extensions`
}));
const data = (await readFile(WEB_MAIN)).toString()