Merge pull request #3491 from cloudflare/dominik/check-fetch-status

Check HTTP status code when fetching Py pkg/bundle.

src/pyodide/internal/loadPackage.ts

@@ -58,6 +58,14 @@ async function loadBundleFromR2(requirement: string): Promise<Reader> {
     // we didn't find it in the disk cache, continue with original fetch
     const url = new URL(WORKERD_INDEX_URL + filename);
     const response = await fetch(url);
+    if (response.status != 200) {
+      throw new Error(
+        'Could not fetch package at url ' +
+          url +
+          ' received status ' +
+          response.status
+      );
+    }
 
     original = await response.arrayBuffer();
     DiskCache.put(filename, original);

src/workerd/server/workerd-api.c++

@@ -183,7 +183,7 @@ kj::Maybe<jsg::Bundle::Reader> fetchPyodideBundle(
   }
 
   {
-    KJ_LOG(INFO, "Loading Pyodide package from internet...");
+    KJ_LOG(INFO, "Loading Pyodide bundle from internet...");
     kj::Thread([&]() {
       kj::AsyncIoContext io = kj::setupAsyncIo();
       kj::HttpHeaderTable table;
@@ -200,13 +200,17 @@ kj::Maybe<jsg::Bundle::Reader> fetchPyodideBundle(
 
       kj::HttpHeaders headers(table);
 
+      // TODO: Point this at our production R2 bucket.
       kj::String url =
           kj::str("https://pyodide.runtime-playground.workers.dev/pyodide-capnp-bin/pyodide_",
               version, ".capnp.bin");
 
       auto req = client->request(kj::HttpMethod::GET, url.asPtr(), headers);
 
       auto res = req.response.wait(io.waitScope);
+      KJ_ASSERT(res.statusCode == 200,
+          kj::str(
+              "Request for Pyodide bundle at ", url, " failed with HTTP status ", res.statusCode));
       auto body = res.body->readAllBytes().wait(io.waitScope);
 
       writePyodideBundleFileToDisk(pyConfig.pyodideDiskCacheRoot, version, body);