Bladeren bron

added browserWaitUntil option for puppeteer

Gildas 7 jaren geleden
bovenliggende
commit
08d927cb38
2 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 1 1
      cli/back-ends/puppeteer.js
  2. 3 0
      cli/single-file.js

+ 1 - 1
cli/back-ends/puppeteer.js

@@ -86,7 +86,7 @@ exports.getPageData = async options => {
 		scripts += "\nlazyLoader.getScriptContent = " + (function (path) { return (RESOLVED_CONTENTS)[path]; }).toString().replace("RESOLVED_CONTENTS", JSON.stringify(RESOLVED_CONTENTS)) + ";";
 		await page.evaluateOnNewDocument(scripts);
 		await page.goto(options.url, {
-			waitUntil: "networkidle0"
+			waitUntil: options.browserWaitUntil || "networkidle0"
 		});
 		return await page.evaluate(async options => {
 			options.insertSingleFileComment = true;

+ 3 - 0
cli/single-file.js

@@ -37,6 +37,7 @@ const args = require("yargs")
 		"browser-executable-path": "chrome",
 		"browser-width": 1280,
 		"browser-height": 720,
+		"browser-wait-until": "networkidle0",
 		"compress-CSS": true,
 		"compress-HTML": true,
 		"group-duplicate-images": true,
@@ -67,6 +68,8 @@ const args = require("yargs")
 	.number("browser-width")
 	.options("browser-height", { description: "Height of the browser viewport in pixels" })
 	.number("browser-height")
+	.options("browser-wait-until", { description: "When to consider the page is loaded (puppeteer)" })
+	.choices("browser-wait-until", ["networkidle0", "networkidle2", "load", "domcontentloaded"])
 	.options("compress-CSS", { description: "Compress CSS stylesheets" })
 	.boolean("compress-CSS")
 	.options("compress-HTML", { description: "Compress HTML content" })