Use puppeteer request interception instead of server request blocking

Author: rtsao

fixtures/app/server.js

@@ -18,33 +18,21 @@ const routes = {
 };
 
 function createServer() {
-  let blockNetwork = Promise.resolve();
-  let unblock = () => {};
   const server = http.createServer((req, res) => {
-    blockNetwork.then(() => {
-      const script = routes[req.url];
-      if (script) {
-        res.setHeader("Content-Type", "text/html");
-        res.statusCode = 200;
-        return void res.end(template(script));
-      }
-      if (req.url === "/mappings.wasm") {
-        return wasm(req, res);
-      }
-      if (req.url === "/worker.js") {
-        return worker(req, res);
-      }
-      return assets(req, res);
-    });
+    const script = routes[req.url];
+    if (script) {
+      res.setHeader("Content-Type", "text/html");
+      res.statusCode = 200;
+      return void res.end(template(script));
+    }
+    if (req.url === "/mappings.wasm") {
+      return wasm(req, res);
+    }
+    if (req.url === "/worker.js") {
+      return worker(req, res);
+    }
+    return assets(req, res);
   });
-  server.blockAllRequests = () => {
-    blockNetwork = new Promise(resolve => {
-      unblock = resolve;
-    });
-  };
-  server.unblockAllRequests = () => {
-    unblock();
-  };
   return server;
 }
 

tests/index.js

@@ -105,8 +105,32 @@ test(`replaying requests after invalidation`, async t => {
       t.fail("recieved error");
     },
   );
-  server.blockAllRequests();
-  page.evaluate(() => {
+  await page.setRequestInterception(true);
+  let invalidated = false;
+  page.on("request", req => {
+    req.continue();
+    if (req._url.endsWith(".js.map")) {
+      // invalidate after first request
+      if (!invalidated) {
+        page.evaluate(() => {
+          window.worker.postMessage({
+            id: "invalidate",
+          });
+        });
+        invalidated = true;
+      } else {
+        t.pass("sourcemap fetched twice");
+        // end test
+        page.evaluate(() => {
+          window.worker.postMessage({
+            id: "set_render_interval",
+            interval: 60,
+          });
+        });
+      }
+    }
+  });
+  await page.evaluate(() => {
     window.worker.postMessage({
       id: "init_wasm",
       url: "/mappings.wasm",
@@ -117,16 +141,6 @@ test(`replaying requests after invalidation`, async t => {
       className: "__debug-1",
       stackIndex: 0,
     });
-    window.worker.postMessage({
-      id: "invalidate",
-    });
-  });
-  server.unblockAllRequests();
-  page.evaluate(() => {
-    window.worker.postMessage({
-      id: "set_render_interval",
-      interval: 60,
-    });
   });
 });