Handle 304s for remote resources

Now that we send along etag caching headers, the remote can return 304s. Make sure we forward these
microsoft · Feb 9, 2021 · 5180973 · 5180973
1 parent 29844a0
commit 5180973
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/vs/platform/webview/common/resourceLoader.ts b/src/vs/platform/webview/common/resourceLoader.ts
@@ -137,10 +137,16 @@ export async function loadLocalResource(
 
 		logService.debug(`loadLocalResource - Loaded over http(s). requestUri=${requestUri}, response=${response.res.statusCode}`);
 
-		if (response.res.statusCode === 200) {
-			return new WebviewResourceResponse.StreamSuccess(response.stream, response.res.headers['etag'], mime);
+		switch (response.res.statusCode) {
+			case 200:
+				return new WebviewResourceResponse.StreamSuccess(response.stream, response.res.headers['etag'], mime);
+
+			case 304: // Not modified
+				return new WebviewResourceResponse.NotModified(mime);
+
+			default:
+				return WebviewResourceResponse.Failed;
 		}
-		return WebviewResourceResponse.Failed;
 	}
 
 	try {

diff --git a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
@@ -224,7 +224,7 @@ export class WebviewProtocolProvider extends Disposable {
 				}, fileReader, this.requestService, this.logService, CancellationToken.None);
 
 				switch (result.type) {
-					case WebviewFileReadResponse.Type.Success:
+					case WebviewResourceResponse.Type.Success:
 						{
 							const cacheHeaders: Record<string, string> = result.etag ? {
 								'ETag': result.etag,