@@ -25,7 +25,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
2525// eslint-disable-next-line code-import-patterns
2626import type { IWorkbenchConstructionOptions } from 'vs/workbench/workbench.web.api' ;
2727import { editorBackground , editorForeground } from 'vs/platform/theme/common/colorRegistry' ;
28- import { ClientTheme , getPathPrefix , HTTPNotFoundError , WebManifest } from 'vs/server/common/net' ;
28+ import { ClientTheme , getOriginalUrl , HTTPNotFoundError , relativePath , relativeRoot , WebManifest } from 'vs/server/common/net' ;
2929import { IServerThemeService } from 'vs/server/serverThemeService' ;
3030import { isFalsyOrWhitespace } from 'vs/base/common/strings' ;
3131
@@ -193,17 +193,13 @@ export class WebClientServer {
193193 * PWA manifest file. This informs the browser that the app may be installed.
194194 */
195195 private async _handleManifest ( req : http . IncomingMessage , res : http . ServerResponse , parsedUrl : url . UrlWithParsedQuery ) : Promise < void > {
196- const pathPrefix = getPathPrefix ( parsedUrl . pathname ! ) ;
196+ // The manifest URL is used as the base when resolving URLs so we can just
197+ // use . without having to check the depth since we serve it at the root.
197198 const clientTheme = await this . fetchClientTheme ( ) ;
198- const startUrl = pathPrefix . substring (
199- 0 ,
200- pathPrefix . lastIndexOf ( '/' ) + 1
201- ) ;
202-
203199 const webManifest : WebManifest = {
204200 name : this . _productService . nameLong ,
205201 short_name : this . _productService . nameShort ,
206- start_url : normalize ( startUrl ) ,
202+ start_url : '.' ,
207203 display : 'fullscreen' ,
208204 'background-color' : clientTheme . backgroundColor ,
209205 description : 'Run editors on a remote server.' ,
@@ -319,6 +315,8 @@ export class WebClientServer {
319315 scopes : [ [ 'user:email' ] , [ 'repo' ] ]
320316 } : undefined ;
321317
318+ const base = relativeRoot ( getOriginalUrl ( req ) )
319+ const vscodeBase = relativePath ( getOriginalUrl ( req ) )
322320 const data = ( await util . promisify ( fs . readFile ) ( filePath ) ) . toString ( )
323321 . replace ( '{{WORKBENCH_WEB_CONFIGURATION}}' , escapeAttribute ( JSON . stringify ( < IWorkbenchConstructionOptions > {
324322 productConfiguration : {
@@ -329,17 +327,18 @@ export class WebClientServer {
329327
330328 // Service Worker
331329 serviceWorker : {
332- scope : '. /',
333- url : `./ ${ this . _environmentService . serviceWorkerFileName } `
330+ scope : vscodeBase + ' /',
331+ url : vscodeBase + '/' + this . _environmentService . serviceWorkerFileName ,
334332 } ,
335333
336334 // Endpoints
337- logoutEndpointUrl : './logout' ,
338- webEndpointUrl : './static' ,
339- webEndpointUrlTemplate : './static' ,
340- webviewContentExternalBaseUrlTemplate : './webview/{{uuid}}/' ,
335+ base,
336+ logoutEndpointUrl : base + '/logout' ,
337+ webEndpointUrl : vscodeBase + '/static' ,
338+ webEndpointUrlTemplate : vscodeBase + '/static' ,
339+ webviewContentExternalBaseUrlTemplate : vscodeBase + '/webview/{{uuid}}/' ,
341340
342- updateUrl : '. /update/check'
341+ updateUrl : base + ' /update/check'
343342 } ,
344343 folderUri : ( workspacePath && isFolder ) ? transformer . transformOutgoing ( URI . file ( workspacePath ) ) : undefined ,
345344 workspaceUri : ( workspacePath && ! isFolder ) ? transformer . transformOutgoing ( URI . file ( workspacePath ) ) : undefined ,
@@ -355,7 +354,8 @@ export class WebClientServer {
355354 } ) ) )
356355 . replace ( / { { CLIENT_ B A C K G R O U N D _ C O L O R } } / g, ( ) => backgroundColor )
357356 . replace ( / { { CLIENT_ F O R E G R O U N D _ C O L O R } } / g, ( ) => foregroundColor )
358- . replace ( '{{WORKBENCH_AUTH_SESSION}}' , ( ) => authSessionInfo ? escapeAttribute ( JSON . stringify ( authSessionInfo ) ) : '' ) ;
357+ . replace ( '{{WORKBENCH_AUTH_SESSION}}' , ( ) => authSessionInfo ? escapeAttribute ( JSON . stringify ( authSessionInfo ) ) : '' )
358+ . replace ( / { { BASE} } / g, ( ) => vscodeBase ) ;
359359
360360 const cspDirectives = [
361361 'default-src \'self\';' ,
@@ -504,7 +504,7 @@ export class WebClientServer {
504504 return res . end ( JSON . stringify ( knownCallbackUri ) ) ;
505505 }
506506
507- serveError = async ( _req : http . IncomingMessage , res : http . ServerResponse , code : number , message : string , parsedUrl ?: url . UrlWithParsedQuery ) : Promise < void > => {
507+ serveError = async ( req : http . IncomingMessage , res : http . ServerResponse , code : number , message : string , parsedUrl ?: url . UrlWithParsedQuery ) : Promise < void > => {
508508 const { applicationName, commit = 'development' , version } = this . _productService ;
509509
510510 res . statusCode = code ;
@@ -532,7 +532,8 @@ export class WebClientServer {
532532 . replace ( / { { ERROR_ M E S S A G E } } / g, ( ) => message )
533533 . replace ( / { { ERROR_ F O O T E R } } / g, ( ) => `${ version } ${ commit } )
534534 . replace ( / { { CLIENT_ B A C K G R O U N D _ C O L O R } } / g, ( ) => clientTheme . backgroundColor )
535- . replace ( / { { CLIENT_ F O R E G R O U N D _ C O L O R } } / g, ( ) => clientTheme . foregroundColor ) ;
535+ . replace ( / { { CLIENT_ F O R E G R O U N D _ C O L O R } } / g, ( ) => clientTheme . foregroundColor )
536+ . replace ( / { { BASE} } / g, ( ) => relativePath ( getOriginalUrl ( req ) ) ) ;
536537
537538 res . end ( data ) ;
538539 } ;
0 commit comments