WIP - Add a npm run serve script to serve integration pages

integration-test/helpers/harness.js

@@ -1,9 +1,9 @@
 import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
-import * as http from 'http'
 import puppeteer from 'puppeteer'
-import { spawnSync } from 'child_process'
+import { fork, spawnSync } from 'child_process'
+import { join } from 'path'
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000
 if (process.env.KEEP_OPEN) {
@@ -35,7 +35,7 @@ export async function setup (ops = {}) {
     }
 
     const browser = await puppeteer.launch(puppeteerOps)
-    const servers = []
+    const cleanups = []
 
     async function teardown () {
         if (process.env.KEEP_OPEN) {
@@ -51,7 +51,7 @@ export async function setup (ops = {}) {
     }
 
     async function teardownInternal () {
-        await Promise.all(servers.map(server => server.close()))
+        await Promise.all(cleanups.map((fn) => fn()))
         await browser.close()
 
         // necessary so e.g. local storage
@@ -61,27 +61,12 @@ export async function setup (ops = {}) {
 
     /**
      * @param {number|string} [port]
-     * @returns {http.Server}
+     * @returns {{address: string}}
      */
-    function setupServer (port) {
-        const server = http.createServer(function (req, res) {
-            const url = new URL(req.url, `http://${req.headers.host}`)
-            const importUrl = new URL(import.meta.url)
-            const dirname = importUrl.pathname.replace(/\/[^/]*$/, '')
-            const pathname = path.join(dirname, '../pages', url.pathname)
-
-            fs.readFile(pathname, (err, data) => {
-                if (err) {
-                    res.writeHead(404)
-                    res.end(JSON.stringify(err))
-                    return
-                }
-                res.writeHead(200)
-                res.end(data)
-            })
-        }).listen(port)
-        servers.push(server)
-        return server
+    async function setupServer (port) {
+        const { address, close } = await forkServer(port)
+        cleanups.push(close)
+        return { address }
     }
 
     /**
@@ -122,3 +107,42 @@ export async function setup (ops = {}) {
 
     return { browser, teardown, setupServer, gotoAndWait }
 }
+
+/**
+ * @returns {Promise<{address: any, close: ()=>void}>}
+ */
+function forkServer (port) {
+    const cwd = new URL('../../', import.meta.url)
+    const script = join(cwd.pathname, 'scripts', 'serve-pages.js')
+    return new Promise((resolve) => {
+        const server = fork(script, {
+            stdio: 'inherit',
+            cwd,
+            env: {
+                PORT: port
+            }
+        })
+        function close () {
+            return new Promise((resolve, reject) => {
+                server.on('close', (code) => {
+                    if (code === null || code === 0) {
+                        resolve(code)
+                    } else {
+                        reject(new Error(`server closed with none-zero exit code ${code}`))
+                    }
+                })
+                server.kill()
+            })
+        }
+        server.on('message', (msg) => {
+            if (msg.kind !== 'server-listening') {
+                console.log('unknown message', msg)
+                return
+            }
+            resolve({
+                address: msg.address,
+                close
+            })
+        })
+    })
+}

integration-test/test-fingerprint.js

@@ -34,8 +34,8 @@ describe('Fingerprint Defense Tests', () => {
     beforeAll(async () => {
         ({ browser, teardown, setupServer } = await setup())
 
-        setupServer('8080')
-        setupServer('8383')
+        await setupServer('8080')
+        await setupServer('8383')
     })
     afterAll(async () => {
         await teardown()
@@ -76,8 +76,8 @@ describe('First Party Fingerprint Randomization', () => {
     beforeAll(async () => {
         ({ browser, setupServer, teardown } = await setup())
 
-        setupServer('8080')
-        setupServer('8383')
+        await setupServer('8080')
+        await setupServer('8383')
     })
     afterAll(async () => {
         await teardown()
@@ -144,9 +144,8 @@ describe('Verify injected script is not visible to the page', () => {
     let setupServer
     beforeAll(async () => {
         ({ browser, setupServer, teardown } = await setup())
-
-        setupServer('8080')
-        setupServer('8383')
+        await setupServer('8080')
+        await setupServer('8383')
     })
     afterAll(async () => {
         await teardown()

integration-test/test-navigator-interface.js

@@ -11,17 +11,15 @@ describe('Ensure navigator interface is injected', () => {
     let gotoAndWait
     beforeAll(async () => {
         ({ browser, setupServer, teardown, gotoAndWait } = await setup({ withExtension: true }))
-        server = setupServer()
+        server = await setupServer()
     })
     afterAll(async () => {
-        await server?.close()
         await teardown()
     })
 
     it('should expose navigator.navigator.isDuckDuckGo(): Promise<boolean> and platform === "extension"', async () => {
-        const port = server.address().port
         const page = await browser.newPage()
-        await gotoAndWait(page, `http://localhost:${port}/blank.html`, { platform: { name: 'extension' } })
+        await gotoAndWait(page, `${server.address}/blank.html`, { platform: { name: 'extension' } })
         const isDuckDuckGoResult = await page.evaluate(
             () => {
                 const fn = navigator.duckduckgo?.isDuckDuckGo