Revert "fix: delayed webview resource loading due to sw controller changes (#249114)"

This reverts commit 64f6c3d.

Author: RomanNikitenko

code/src/vs/workbench/contrib/webview/browser/pre/index.html

@@ -36,8 +36,6 @@
 		const onElectron = searchParams.get('platform') === 'electron';
 		const disableServiceWorker = searchParams.has('disableServiceWorker');
 		const expectedWorkerVersion = parseInt(searchParams.get('swVersion'));
-		/** @type {MessageChannel | undefined} */
-		let outerIframeMessageChannel;
 
 		/**
 		 * Use polling to track focus of main webview and iframes within the webview
@@ -238,7 +236,7 @@
 				return reject(new Error('Service Workers are not enabled. Webviews will not work. Try disabling private/incognito mode.'));
 			}
 
-			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
+			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&id=${ID}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
 			navigator.serviceWorker.register(swPath, { type: 'module' })
 				.then(async registration => {
 					/**
@@ -267,8 +265,7 @@
 					navigator.serviceWorker.addEventListener('message', versionHandler);
 
 					const postVersionMessage = (/** @type {ServiceWorker} */ controller) => {
-						outerIframeMessageChannel = new MessageChannel();
-						controller.postMessage({ channel: 'version' }, [outerIframeMessageChannel.port2]);
+						controller.postMessage({ channel: 'version' });
 					};
 
 					// At this point, either the service worker is ready and
@@ -1212,17 +1209,6 @@
 
 					unloadMonitor.onIframeLoaded(newFrame);
 				}
-
-				if (!disableServiceWorker && outerIframeMessageChannel) {
-					outerIframeMessageChannel.port1.onmessage = event => {
-						switch (event.data.channel) {
-							case 'load-resource':
-							case 'load-localhost':
-								hostMessaging.postMessage(event.data.channel, event.data);
-								return;
-						}
-					};
-				}
 			});
 
 			// propagate vscode-context-menu-visible class

code/src/vs/workbench/contrib/webview/browser/pre/service-worker.ts

@@ -16,7 +16,7 @@ const searchParams = new URL(location.toString()).searchParams;
 
 const remoteAuthority = searchParams.get('remoteAuthority');
 
-let outerIframeMessagePort: MessagePort | undefined;
+const ID = searchParams.get('id');
 
 /**
  * Origin used for resources
@@ -103,7 +103,6 @@ sw.addEventListener('message', async (event: ExtendableMessageEvent) => {
 	const source = event.source as Client;
 	switch (event.data.channel) {
 		case 'version': {
-			outerIframeMessagePort = event.ports[0];
 			sw.clients.get(source.id).then(client => {
 				if (client) {
 					client.postMessage({
@@ -203,24 +202,21 @@ async function processResourceRequest(
 	event: FetchEvent,
 	requestUrlComponents: ResourceRequestUrlComponents
 ): Promise<Response> {
-	let client = await sw.clients.get(event.clientId);
+	const client = await sw.clients.get(event.clientId);
+	let webviewId: string | null | undefined;
 	if (!client) {
-		client = await getWorkerClientForId(event.clientId);
-		if (!client) {
+		const workerClient = await getWorkerClientForId(event.clientId);
+		if (!workerClient) {
 			console.error('Could not find inner client for request');
 			return notFound();
+		} else {
+			webviewId = getWebviewIdForClient(workerClient);
 		}
+	} else {
+		webviewId = getWebviewIdForClient(client);
 	}
 
-	const webviewId = getWebviewIdForClient(client);
-
-	// Refs https://github.com/microsoft/vscode/issues/244143
-	// With PlzDedicatedWorker, worker subresources and blob wokers
-	// will use clients different from the window client.
-	// Since we cannot different a worker main resource from a worker subresource
-	// we will use message channel to the outer iframe provided at the time
-	// of service worker controller version initialization.
-	if (!webviewId && client.type !== 'worker' && client.type !== 'sharedworker') {
+	if (!webviewId) {
 		console.error('Could not resolve webview id');
 		return notFound();
 	}
@@ -325,6 +321,12 @@ async function processResourceRequest(
 		return response.clone();
 	};
 
+	const parentClients = await getOuterIframeClient(webviewId);
+	if (!parentClients.length) {
+		console.log('Could not find parent client for request');
+		return notFound();
+	}
+
 	let cached: Response | undefined;
 	if (shouldTryCaching) {
 		const cache = await caches.open(resourceCacheName);
@@ -333,26 +335,8 @@ async function processResourceRequest(
 
 	const { requestId, promise } = resourceRequestStore.create();
 
-	if (webviewId) {
-		const parentClients = await getOuterIframeClient(webviewId);
-		if (!parentClients.length) {
-			console.log('Could not find parent client for request');
-			return notFound();
-		}
-
-		for (const parentClient of parentClients) {
-			parentClient.postMessage({
-				channel: 'load-resource',
-				id: requestId,
-				scheme: requestUrlComponents.scheme,
-				authority: requestUrlComponents.authority,
-				path: requestUrlComponents.path,
-				query: requestUrlComponents.query,
-				ifNoneMatch: cached?.headers.get('ETag'),
-			});
-		}
-	} else if (client.type === 'worker' || client.type === 'sharedworker') {
-		outerIframeMessagePort?.postMessage({
+	for (const parentClient of parentClients) {
+		parentClient.postMessage({
 			channel: 'load-resource',
 			id: requestId,
 			scheme: requestUrlComponents.scheme,
@@ -377,13 +361,7 @@ async function processLocalhostRequest(
 		return fetch(event.request);
 	}
 	const webviewId = getWebviewIdForClient(client);
-	// Refs https://github.com/microsoft/vscode/issues/244143
-	// With PlzDedicatedWorker, worker subresources and blob wokers
-	// will use clients different from the window client.
-	// Since we cannot different a worker main resource from a worker subresource
-	// we will use message channel to the outer iframe provided at the time
-	// of service worker controller version initialization.
-	if (!webviewId && client.type !== 'worker' && client.type !== 'sharedworker') {
+	if (!webviewId) {
 		console.error('Could not resolve webview id');
 		return fetch(event.request);
 	}
@@ -407,22 +385,15 @@ async function processLocalhostRequest(
 		});
 	};
 
+	const parentClients = await getOuterIframeClient(webviewId);
+	if (!parentClients.length) {
+		console.log('Could not find parent client for request');
+		return notFound();
+	}
+
 	const { requestId, promise } = localhostRequestStore.create();
-	if (webviewId) {
-		const parentClients = await getOuterIframeClient(webviewId);
-		if (!parentClients.length) {
-			console.log('Could not find parent client for request');
-			return notFound();
-		}
-		for (const parentClient of parentClients) {
-			parentClient.postMessage({
-				channel: 'load-localhost',
-				origin: origin,
-				id: requestId,
-			});
-		}
-	} else if (client.type === 'worker' || client.type === 'sharedworker') {
-		outerIframeMessagePort?.postMessage({
+	for (const parentClient of parentClients) {
+		parentClient.postMessage({
 			channel: 'load-localhost',
 			origin: origin,
 			id: requestId,
@@ -433,6 +404,15 @@ async function processLocalhostRequest(
 }
 
 function getWebviewIdForClient(client: Client): string | null {
+	// Refs https://github.com/microsoft/vscode/issues/244143
+	// With PlzDedicatedWorker, worker subresources and blob wokers
+	// will use clients different from the window client.
+	// Since we cannot different a worker main resource from a worker subresource
+	// we will use the global webview ID passed in at the time of
+	// service worker registration.
+	if (client.type === 'worker' || client.type === 'sharedworker') {
+		return ID;
+	}
 	const requesterClientUrl = new URL(client.url);
 	return requesterClientUrl.searchParams.get('id');
 }