Merge pull request #100 from the-markup/http-fix

HTTP2 bug fix

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+#### What does this PR do?
+
+#### Why are we doing this? How does it help us?
+
+#### How/where should this be tested?
+
+#### What are potential areas for future improvement? Are there any dependencies (especially on 3rd party code)?
+
+#### What are the relevant tickets, tasks, or documents?
+
+#### Have you done the following, if applicable:
+***(optional: add explanation between parentheses)***
+
+* [ ] Tested manually
+* [ ] Checked for performance implications? *( )*
+* [ ] Checked for security vulnerabilities? *( )*
+* [ ] Added/updated documentation? *( )*
+* [ ] Added/updated tests
+
+#### TODOs / next steps:
+
+* [ ] *TODOs here*

__tests__/cookies.ts

@@ -2,7 +2,7 @@ import puppeteer, { Page } from "puppeteer";
 
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
 import { reportCookieEvents } from "../src/parser";
-import { setupBlacklightInspector } from "../src/inspector";
+import { setupBlacklightInspector } from "../src/inspectors/inspector";
 import { loadEventData } from "../src/utils";
 import { join } from "path";
 import {

__tests__/fingerprinting.ts

@@ -1,7 +1,7 @@
 import puppeteer, { Browser } from "puppeteer";
 import { Global, JsInstrumentEvent } from "../src/types";
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
-import { setupBlacklightInspector } from "../src/inspector";
+import { setupBlacklightInspector } from "../src/inspectors/inspector";
 import { getScriptUrl } from "../src/utils";
 declare var global: Global;
 let browser = {} as Browser;

__tests__/js-instrument.ts

@@ -1,7 +1,7 @@
 import puppeteer, { Browser } from "puppeteer";
 import { Global } from "../src/types";
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
-import { setupBlacklightInspector } from "../src/inspector";
+import { setupBlacklightInspector } from "../src/inspectors/inspector";
 declare var global: Global;
 const GETS_AND_SETS = [
   ["prop1", "get", "prop1"],

__tests__/key-logging.ts

@@ -2,7 +2,7 @@
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
 import { fillForms } from "../src/pptr-utils/interaction-utils";
 import puppeteer, { Browser } from "puppeteer";
-import { setupKeyLoggingInspector } from "../src/key-logging";
+import { setupKeyLoggingInspector } from "../src/inspectors/key-logging";
 import { Global } from "../src/types";
 
 declare var global: Global;

__tests__/parser.ts

@@ -4,8 +4,8 @@ import { loadEventData } from "../src/utils";
 import puppeteer from "puppeteer";
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
 import { Global } from "../src/types";
-import { setUpThirdPartyTrackersInspector } from "../src/third-party-trackers";
-import { setupBlacklightInspector } from "../src/inspector";
+import { setUpThirdPartyTrackersInspector } from "../src/inspectors/third-party-trackers";
+import { setupBlacklightInspector } from "../src/inspectors/inspector";
 declare var global: Global;
 it("can parse AddEventlistener events", async () => {
   const browser = await puppeteer.launch(defaultPuppeteerBrowserOptions);

__tests__/session-recording.ts

@@ -1,19 +1,21 @@
-import { launch, devices } from "puppeteer";
+import { launch, KnownDevices } from "puppeteer";
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
-import { setupSessionRecordingInspector } from "../src/session-recording";
+import { setupSessionRecordingInspector } from "../src/inspectors/session-recording";
 import { autoScroll } from "../src/pptr-utils/interaction-utils";
-// jest.setTimeout(30000);
-it.skip("checks network requests for known session recorders", async () => {
+import { BlacklightEvent } from "../src/types";
+
+jest.setTimeout(30000); // This is a long-running test
+it("checks network requests for known session recorders", async () => {
   const browser = await launch({
     ...defaultPuppeteerBrowserOptions,
     headless: true,
   });
 
   const page = (await browser.pages())[0];
-  await page.emulate(devices["iPhone 13 Mini"]);
-  const rows = [];
+  await page.emulate(KnownDevices["iPhone 13 Mini"]);
+  const rows: BlacklightEvent[] = [];
   await setupSessionRecordingInspector(page, (e) => rows.push(e));
-  await page.goto(`https://www.jetblue.com`, {
+  await page.goto(`https://www.hotjar.com`, {
     waitUntil: "networkidle2",
   });
   await autoScroll(page);

__tests__/stack.ts

@@ -2,7 +2,7 @@ import puppeteer from "puppeteer";
 
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
 import { Global, BlacklightEvent } from "../src/types";
-import { setupBlacklightInspector } from "../src/inspector";
+import { setupBlacklightInspector } from "../src/inspectors/inspector";
 import { getDomain } from "tldts";
 import { getStackType, getScriptUrl } from "../src/utils";
 declare var global: Global;

__tests__/third-party-trackers.ts

@@ -1,6 +1,6 @@
 import puppeteer from "puppeteer";
 import { defaultPuppeteerBrowserOptions } from "../src/pptr-utils/default";
-import { setUpThirdPartyTrackersInspector } from "../src/third-party-trackers";
+import { setUpThirdPartyTrackersInspector } from "../src/inspectors/third-party-trackers";
 import { generateReport } from "../src/parser";
 import { getDomain } from "tldts";