@codingame/monaco-vscode-view-common-service-override 32.0.1 → 32.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "32.0.1",
+  "version": "32.0.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "32.0.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "32.0.1"
+    "@codingame/monaco-vscode-api": "32.0.2",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "32.0.2"
   },
   "main": "index.js",
   "module": "index.js",

package/service-override/vs/workbench/contrib/webview/browser/pre/index.html

@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-4iXnHx3puY8EO0djr5yXkmzShogiDoTzrjUeJjTZBmU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-2bgY7b4AY+EULl24tUGduYOHUHUBH5EuIHGYqk8TM+k=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -53,9 +53,6 @@
 
 		perfMark('scriptStart');
 
-		/** @type {MessageChannel | undefined} */
-		let outerIframeMessageChannel;
-
 		/**
 		 * Use polling to track focus of main webview and iframes within the webview
 		 *
@@ -201,7 +198,7 @@
 			::highlight(current-find-highlight) {
 				background-color: var(--vscode-editor-findMatchBackground);
 			}
-			}`;
+		}`;
 
 		/**
 		 * @param {boolean} allowMultipleAPIAcquire
@@ -258,65 +255,30 @@
 			}
 
 			const swPath = encodeURI(`${serviceWorkerUri}?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
-			navigator.serviceWorker.register(swPath, { type: 'module' })
+			navigator.serviceWorker.register(swPath, { type: 'module', updateViaCache: 'none' })
 				.then(async registration => {
-					/**
-					 * @param {MessageEvent} event
-					 */
-					const versionHandler = async (event) => {
-						if (event.data.channel !== 'version') {
-							return;
-						}
-
-						navigator.serviceWorker.removeEventListener('message', versionHandler);
-						if (event.data.version === expectedWorkerVersion) {
-							return resolve();
-						} else {
-							console.log(`Found unexpected service worker version. Found: ${event.data.version}. Expected: ${expectedWorkerVersion}`);
-							console.log(`Attempting to reload service worker`);
-
-							// If we have the wrong version, try once (and only once) to unregister and re-register
-							// Note that `.update` doesn't seem to work desktop electron at the moment so we use
-							// `unregister` and `register` here.
-							return registration.unregister()
-								.then(() => navigator.serviceWorker.register(swPath))
-								.finally(() => { resolve(); });
-						}
-					};
-					navigator.serviceWorker.addEventListener('message', versionHandler);
-
-					const postVersionMessage = (/** @type {ServiceWorker} */ controller) => {
-						outerIframeMessageChannel = new MessageChannel();
-						controller.postMessage({ channel: 'version' }, [outerIframeMessageChannel.port2]);
-					};
-
-					// At this point, either the service worker is ready and
-					// became our controller, or we need to wait for it.
-					// Note that navigator.serviceWorker.controller could be a
-					// controller from a previously loaded service worker.
-					const currentController = navigator.serviceWorker.controller;
-					if (currentController?.scriptURL.endsWith(swPath)) {
-						// service worker already loaded & ready to receive messages
-						postVersionMessage(currentController);
-					} else {
-						if (currentController) {
-							console.log(`Found unexpected service worker controller. Found: ${currentController.scriptURL}. Expected: ${swPath}. Waiting for controllerchange.`);
-						} else {
-							console.log(`No service worker controller found. Waiting for controllerchange.`);
-						}
+					if (navigator.serviceWorker.controller) {
+						// A previous SW is already controlling. Force an update
+						// check so we don't serve stale resources after a VS Code
+						// update. register() resolves before the update check
+						// completes, so we must call update() explicitly to wait
+						// for the download + byte-comparison to finish.
+						registration = await registration.update();
+					}
 
-						// Either there's no controlling service worker, or it's an old one.
-						// Wait for it to change before posting the message
-						const onControllerChange = () => {
-							navigator.serviceWorker.removeEventListener('controllerchange', onControllerChange);
-							if (navigator.serviceWorker.controller) {
-								postVersionMessage(navigator.serviceWorker.controller);
-							} else {
-								return reject(new Error('No controller found.'));
-							}
-						};
-						navigator.serviceWorker.addEventListener('controllerchange', onControllerChange);
+					// If a new worker was found, wait for it to take control via skipWaiting() + clients.claim() in the SW.
+					if (
+						// New worker
+						registration.installing || registration.waiting
+						// First ever load
+						|| !navigator.serviceWorker.controller
+					) {
+						await new Promise(r => {
+							navigator.serviceWorker.addEventListener('controllerchange', r, { once: true });
+						});
 					}
+
+					return resolve();
 				}).catch(error => {
 					if (!onElectron && error instanceof Error && error.message.includes('user denied permission')) {
 						return reject(new Error(`Could not register service worker. Please make sure third party cookies are enabled: ${error}`));
@@ -460,11 +422,21 @@
 
 		if (!disableServiceWorker) {
 			hostMessaging.onMessage('did-load-resource', (_event, data) => {
-				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource', data }, data.data?.buffer ? [data.data.buffer] : []);
+				const transfer = data.stream ? [data.stream] : [];
+				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource', data }, transfer);
 			});
 
-			hostMessaging.onMessage('did-load-localhost', (_event, data) => {
-				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-localhost', data });
+			for (const channel of [
+				'did-load-resource-end',
+				'did-load-localhost',
+			]) {
+				hostMessaging.onMessage(channel, (_event, data) => {
+					assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel, data });
+				});
+			}
+
+			hostMessaging.onMessage('did-load-resource-chunk', (_event, data) => {
+				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource-chunk', data }, data.data?.buffer ? [data.data.buffer] : []);
 			});
 
 			navigator.serviceWorker.addEventListener('message', event => {
@@ -711,7 +683,7 @@
 		 * @param {KeyboardEvent} e
 		 * @return {boolean}
 		 */
-		 function isHelp(e) {
+		function isHelp(e) {
 			// 112: keyCode of "F1"
 			return e.keyCode === 112;
 		}
@@ -1220,16 +1192,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