44 * Copyright (c) Microsoft Corporation. All rights reserved.
55 * Licensed under the MIT License. See License.txt in the project root for license information.
66 *--------------------------------------------------------------------------------------------*/
7- Object . defineProperty ( exports , '__esModule' , { value : true } ) ;
87
98// @ts -check
109
@@ -42,17 +41,15 @@ const WEB_PLAYGROUND_VERSION = '0.0.10';
4241
4342const args = minimist ( process . argv , {
4443 boolean : [
45- 'launch' ,
44+ 'no- launch' ,
4645 'help' ,
4746 'verbose' ,
4847 'wrap-iframe' ,
4948 'enable-sync' ,
5049 ] ,
5150 string : [
52- 'server' ,
5351 'scheme' ,
5452 'host' ,
55- 'remote-authority' ,
5653 'port' ,
5754 'local_port' ,
5855 'extension' ,
@@ -63,13 +60,12 @@ const args = minimist(process.argv, {
6360if ( args . help ) {
6461 console . log (
6562 'yarn web [options]\n' +
66- ' --launch Open VSCode web in the browser\n' +
63+ ' --no- launch Do not open VSCode web in the browser\n' +
6764 ' --wrap-iframe Wrap the Web Worker Extension Host in an iframe\n' +
6865 ' --enable-sync Enable sync by default\n' +
6966 ' --scheme Protocol (https or http)\n' +
7067 ' --host Remote host\n' +
7168 ' --port Remote/Local port\n' +
72- ' --remote-authority Remote auth\n' +
7369 ' --local_port Local port override\n' +
7470 ' --secondary-port Secondary port\n' +
7571 ' --extension Path of an extension to include\n' +
@@ -225,10 +221,8 @@ const mapCallbackUriToRequestId = new Map();
225221/**
226222 * @param req {http.IncomingMessage}
227223 * @param res {http.ServerResponse}
228- * @param webConfigJSON {import('../../src/vs/workbench/workbench.web.api').IServerWorkbenchConstructionOptions}
229- * @param webConfigJSON undefined
230224 */
231- const requestHandler = ( req , res , webConfigJSON ) => {
225+ const requestHandler = ( req , res ) => {
232226 const parsedUrl = url . parse ( req . url , true ) ;
233227 const pathname = parsedUrl . pathname ;
234228
@@ -259,9 +253,6 @@ const requestHandler = (req, res, webConfigJSON) => {
259253 return handleExtension ( req , res , parsedUrl ) ;
260254 }
261255 if ( pathname === '/' ) {
262- if ( args . server ) {
263- return handleRootFromServer ( req , res , webConfigJSON ) ;
264- }
265256 // main web
266257 return handleRoot ( req , res ) ;
267258 } else if ( pathname === '/callback' ) {
@@ -270,11 +261,8 @@ const requestHandler = (req, res, webConfigJSON) => {
270261 } else if ( pathname === '/fetch-callback' ) {
271262 // callback fetch support
272263 return handleFetchCallback ( req , res , parsedUrl ) ;
273- } else if ( pathname === '/vscode-remote-resource' ) {
274- // callback fetch support
275- return handleRemoteResource ( req , res , parsedUrl ) ;
276264 } else if ( pathname === '/builtin' ) {
277- // builtin extensions JSON
265+ // builtin extnesions JSON
278266 return handleBuiltInExtensions ( req , res , parsedUrl ) ;
279267 }
280268
@@ -286,28 +274,26 @@ const requestHandler = (req, res, webConfigJSON) => {
286274 }
287275} ;
288276
289- if ( ! args . server ) {
290- const server = http . createServer ( requestHandler ) ;
291- server . listen ( LOCAL_PORT , ( ) => {
292- if ( LOCAL_PORT !== PORT ) {
293- console . log ( `Operating location at http://0.0.0.0:${ LOCAL_PORT } ) ;
294- }
295- console . log ( `Web UI available at ${ SCHEME } ${ AUTHORITY } ) ;
296- } ) ;
297- server . on ( 'error' , err => {
298- console . error ( `Error occurred in server:` ) ;
299- console . error ( err ) ;
300- } ) ;
277+ const server = http . createServer ( requestHandler ) ;
278+ server . listen ( LOCAL_PORT , ( ) => {
279+ if ( LOCAL_PORT !== PORT ) {
280+ console . log ( `Operating location at http://0.0.0.0:${ LOCAL_PORT } ) ;
281+ }
282+ console . log ( `Web UI available at ${ SCHEME } ${ AUTHORITY } ) ;
283+ } ) ;
284+ server . on ( 'error' , err => {
285+ console . error ( `Error occurred in server:` ) ;
286+ console . error ( err ) ;
287+ } ) ;
301288
302- const secondaryServer = http . createServer ( requestHandler ) ;
303- secondaryServer . listen ( SECONDARY_PORT , ( ) => {
304- console . log ( `Secondary server available at ${ SCHEME } ${ HOST } ${ SECONDARY_PORT } ) ;
305- } ) ;
306- secondaryServer . on ( 'error' , err => {
307- console . error ( `Error occurred in server:` ) ;
308- console . error ( err ) ;
309- } ) ;
310- }
289+ const secondaryServer = http . createServer ( requestHandler ) ;
290+ secondaryServer . listen ( SECONDARY_PORT , ( ) => {
291+ console . log ( `Secondary server available at ${ SCHEME } ${ HOST } ${ SECONDARY_PORT } ) ;
292+ } ) ;
293+ secondaryServer . on ( 'error' , err => {
294+ console . error ( `Error occurred in server:` ) ;
295+ console . error ( err ) ;
296+ } ) ;
311297
312298/**
313299 * @param {import('http').IncomingMessage } req
@@ -331,20 +317,6 @@ async function handleBuiltInExtensions(req, res, parsedUrl) {
331317 return res . end ( JSON . stringify ( extensions ) ) ;
332318}
333319
334- /**
335- * @param {import('http').IncomingMessage } req
336- * @param {import('http').ServerResponse } res
337- * @param {import('url').UrlWithParsedQuery } parsedUrl
338- */
339- async function handleRemoteResource ( req , res , parsedUrl ) {
340- const { path } = parsedUrl . query ;
341-
342- if ( path ) {
343- res . setHeader ( 'Content-Type' , getMediaMime ( path ) ) ;
344- res . end ( await readFile ( path ) ) ;
345- }
346- }
347-
348320/**
349321 * @param {import('http').IncomingMessage } req
350322 * @param {import('http').ServerResponse } res
@@ -448,7 +420,6 @@ async function handleRoot(req, res) {
448420 ? req . headers [ 'host' ] . replace ( ':' + PORT , ':' + SECONDARY_PORT )
449421 : `${ HOST } ${ SECONDARY_PORT }
450422 ) ;
451-
452423 const webConfigJSON = {
453424 folderUri : folderUri ,
454425 staticExtensions,
@@ -486,37 +457,6 @@ async function handleRoot(req, res) {
486457 return res . end ( data ) ;
487458}
488459
489- /**
490- * @param {import('http').IncomingMessage } req
491- * @param {import('http').ServerResponse } res
492- * @param webConfigJSON {import('../../src/vs/workbench/workbench.web.api').IServerWorkbenchConstructionOptions}
493- */
494- async function handleRootFromServer ( req , res , webConfigJSON ) {
495- if ( args . verbose ) {
496- fancyLog ( `${ ansiColors . magenta ( 'BuiltIn extensions' ) } ${ dedupedBuiltInExtensions . map ( e => path . basename ( e . extensionPath ) ) . join ( ', ' ) } ) ;
497- fancyLog ( `${ ansiColors . magenta ( 'Additional extensions' ) } ${ additionalBuiltinExtensions . map ( e => path . basename ( e . extensionLocation . path ) ) . join ( ', ' ) || 'None' } ) ;
498- }
499-
500- if ( req . headers [ 'x-forwarded-host' ] ) {
501- // support for running in codespace => no iframe wrapping
502- delete webConfigJSON . webWorkerExtensionHostIframeSrc ;
503- }
504- const authSessionInfo = undefined ;
505-
506- const data = ( await readFile ( WEB_MAIN ) ) . toString ( )
507- . replace ( '{{WORKBENCH_WEB_CONFIGURATION}}' , ( ) => escapeAttribute ( JSON . stringify ( webConfigJSON ) ) ) // use a replace function to avoid that regexp replace patterns ($&, $0, ...) are applied
508- . replace ( '{{WORKBENCH_AUTH_SESSION}}' , ( ) => authSessionInfo ? escapeAttribute ( JSON . stringify ( authSessionInfo ) ) : '' )
509- . replace ( '{{WEBVIEW_ENDPOINT}}' , '' ) ;
510-
511- const headers = {
512- 'Content-Type' : 'text/html' ,
513- 'Content-Security-Policy' : 'require-trusted-types-for \'script\';'
514- } ;
515-
516- res . writeHead ( 200 , headers ) ;
517- return res . end ( data ) ;
518- }
519-
520460/**
521461 * Handle HTTP requests for /callback
522462 * @param {import('http').IncomingMessage } req
@@ -676,7 +616,7 @@ const mapExtToMediaMimes = {
676616function getMediaMime ( forPath ) {
677617 const ext = path . extname ( forPath ) ;
678618
679- return mapExtToMediaMimes [ ext . toLowerCase ( ) ] || 'text/plain' ;
619+ return mapExtToMediaMimes [ ext . toLowerCase ( ) ] ;
680620}
681621
682622/**
@@ -717,6 +657,4 @@ async function serveFile(req, res, filePath, responseHeaders = Object.create(nul
717657
718658if ( args . launch !== false ) {
719659 opn ( `${ SCHEME } ${ HOST } ${ PORT } ) ;
720- }
721-
722- exports . requestHandler = requestHandler ;
660+ }
0 commit comments