Merge pull request #14 from andywer/feature/make-web-workers-work

andywer · web-flow · commit c9cd85536a5d · 2019-05-08T06:07:18.000+02:00
Make web workers work
diff --git a/src/cli.ts b/src/cli.ts
@@ -8,7 +8,7 @@ import serveBundle from "./bundle"
 import { copyFiles } from "./fs"
 import { isPluginArgument, loadPlugin, printPluginHelp } from "./plugins"
 import { spawnPuppet } from "./puppeteer"
-import { clearTemporaryFileCache, createTemporaryFileCache } from "./temporary"
+import { clearTemporaryFileCache, createTemporaryFileCache, writeBlankHtmlPage } from "./temporary"
 
 const cli = meow(`
   Usage
@@ -18,7 +18,6 @@ const cli = meow(`
   Options
     --help                            Show this help.
     --inspect                         Run in actual Chrome window and keep it open.
-    --secure-origin                   Give the Chrome page a secure origin
     --p <port>, --port <port>         Serve on this port. Defaults to random port.
     --serve <./file>[:</serve/here>]  Serve additional files next to bundle.
 
@@ -65,7 +64,6 @@ async function run () {
   const entrypoint = process.argv[firstArgumentIndex]
 
   const headless = runnerOptionArgs.indexOf("--inspect") > -1 ? false : true
-  const secureOrigin = runnerOptionArgs.indexOf("--secure-origin") > -1
   const port = runnerOptions.p || runnerOptions.port
     ? parseInt(runnerOptions.p || runnerOptions.port, 10)
     : await getPort()
@@ -83,10 +81,11 @@ async function run () {
 
   try {
     const serverURL = `http://localhost:${port}/`
+    writeBlankHtmlPage(path.join(temporaryCache, "index.html"))
 
     const { bundle, server } = await serveBundle(scriptPaths, temporaryCache, port)
     await copyFiles(additionalFilesToServe, temporaryCache)
-    const puppet = await spawnPuppet(bundle, serverURL, { headless, secureOrigin })
+    const puppet = await spawnPuppet(bundle, serverURL, { headless })
     await puppet.run(scriptArgs, plugin)
 
     exitCode = await puppet.waitForExit()
diff --git a/src/fs.ts b/src/fs.ts
@@ -17,7 +17,7 @@ export function copyFile (from: string, to: string) {
   })
 }
 
-export async function copyFiles (filesToServe: Array<FileToServe>, destinationDirectory: string) {
+export async function copyFiles (filesToServe: FileToServe[], destinationDirectory: string) {
   return Promise.all(filesToServe.map(
     async ({ servingPath, sourcePath }) => {
       const destinationFilePath = path.resolve(destinationDirectory, servingPath.replace(/^\//, ""))
diff --git a/src/puppeteer.ts b/src/puppeteer.ts
@@ -109,7 +109,8 @@ function createExitPromise (page: Page) {
   })
 }
 
-export async function spawnPuppet(bundle: ParcelBundle, serverURL: string, options: { headless?: boolean, secureOrigin?: boolean }): Promise<Puppet> {
+export async function spawnPuppet(bundle: ParcelBundle, serverURL: string, options: { headless?: boolean }): Promise<Puppet> {
+  let puppetExit: Promise<number>
   const { headless = true } = options
 
   const browser = await launch({
@@ -119,12 +120,8 @@ export async function spawnPuppet(bundle: ParcelBundle, serverURL: string, optio
 
   const [ page ] = await browser.pages()
 
-  if (options.secureOrigin) {
-    // https://github.com/GoogleChrome/puppeteer/issues/2301
-    await page.goto("file:///")
-  }
-
-  let puppetExit: Promise<number>
+  // Navigate to a secure origin first. See <https://github.com/GoogleChrome/puppeteer/issues/2301>
+  await page.goto(serverURL + "index.html")
 
   capturePuppetConsole(page)
 
diff --git a/src/script-error.ts b/src/script-error.ts
@@ -3,7 +3,7 @@ interface ScriptError extends Error { }
 
 // tslint:disable-next-line:no-shadowed-variable
 const ScriptError = function ScriptError(this: ScriptError, error: Error, stack?: string) {
-  Error.call(this, <any>error)
+  Error.call(this, error as any)
   Object.defineProperty(this, "message", {
     enumerable: false,
     value: error.message
diff --git a/src/temporary.ts b/src/temporary.ts
@@ -12,3 +12,14 @@ export function createTemporaryFileCache (): TemporaryFileCache {
 export function clearTemporaryFileCache (cache: TemporaryFileCache) {
   rimraf.sync(cache)
 }
+
+export function writeBlankHtmlPage (filePath: string) {
+  const content = `
+    <!doctype html>
+    <html>
+      <head></head>
+      <body><!-- Blank page as a launch pad to inject JS scripts into --></body>
+    </html>
+  `.trim()
+  fs.writeFileSync(filePath, content, "utf8")
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export function copyFile (from: string, to: string) {`
`17`	`17`	`})`
`18`	`18`	`}`
`19`	`19`
`20`		`-export async function copyFiles (filesToServe: Array<FileToServe>, destinationDirectory: string) {`
	`20`	`+export async function copyFiles (filesToServe: FileToServe[], destinationDirectory: string) {`
`21`	`21`	`return Promise.all(filesToServe.map(`
`22`	`22`	`async ({ servingPath, sourcePath }) => {`
`23`	`23`	`const destinationFilePath = path.resolve(destinationDirectory, servingPath.replace(/^\//, ""))`