grover 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec752a494049fb8bfeeb78aec6a5a553f3c6502e869163492556d2bf386b7340
-  data.tar.gz: 8886bbe696f7f6b8510e8cf209c334c67540e560741162e503fb2505da18cc8c
+  metadata.gz: 49f70f988f01666e9141fc0ad9584468d3efb06e6a82042460b3d403b94966e3
+  data.tar.gz: 3a87cb41b36398d56f48930da0df266cc87435d85aa41c520de0759175793131
 SHA512:
-  metadata.gz: 1f0e2c7d80edc1a037b863ecc14cc117671d030602d1ff243114efd81ccae8e3dbbf31bc98a61b3f63158c68eb87097aaa7feb86215eaff007e336defe9efd5e
-  data.tar.gz: 97aa4ad8721ea2f689af1cb9cbcbeb429c663f35942ebcfcd5007c6e51df66def829965dac16a4a0ec002d93885c8a88a2515784abb024fb097edac922cbcea8
+  metadata.gz: a24f664083b90c1e5666c6800a7b8ed8fce43c27c91763c1f2c5ffac797d8c29c77fe37489186ea1567ef0667da88d85d8519fefea31b2bd4ae583af4832d1cb
+  data.tar.gz: 9a90bd6c19b5f09e1a90b9b998df5a7446e87915abe326e94ae4e75ddefa5bd592460dbad406e25dbc2c6714899ea77122ceea938cc294e46f447fcbc64cafa0

data/lib/grover/js/processor.js

@@ -11,7 +11,7 @@ try {
 process.stdout.write("[\"ok\"]\n");
 
 const _processPage = (async (convertAction, urlOrHtml, options) => {
-  let browser;
+  let browser, errors = [];
   try {
     const launchParams = {
       args: process.env.GROVER_NO_SANDBOX === 'true' ? ['--no-sandbox', '--disable-setuid-sandbox'] : []
@@ -124,6 +124,18 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       page.setGeolocation(geolocation);
     }
 
+    const raiseOnRequestFailure = options.raiseOnRequestFailure; delete options.raiseOnRequestFailure;
+    if (raiseOnRequestFailure) {
+      page.on('requestfinished', (request) => {
+        if (request.response() && !(request.response().ok() || request.response().status() == 304) && !request.redirectChain().length > 0) {
+          errors.push(request);
+        }
+      });
+      page.on('requestfailed', (request) => {
+        errors.push(request);
+      });
+    }
+
     const waitUntil = options.waitUntil; delete options.waitUntil;
     if (urlOrHtml.match(/^http/i)) {
       // Request is for a URL, so request it
@@ -133,11 +145,15 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       // Request is some HTML content. Use request interception to assign the body
       requestOptions.waitUntil = waitUntil || 'networkidle0';
       await page.setRequestInterception(true);
-      page.once('request', request => {
-        request.respond({ body: urlOrHtml === '' ? ' ' : urlOrHtml });
-        // Reset the request interception
-        // (we only want to intercept the first request - ie our HTML)
-        page.on('request', request => request.continue());
+      let htmlIntercepted = false;
+      page.on('request', request => {
+        // We only want to intercept the first request - ie our HTML
+        if (htmlIntercepted)
+          request.continue();
+        else {
+          htmlIntercepted = true
+          request.respond({ body: urlOrHtml === '' ? ' ' : urlOrHtml });
+        }
       });
       const displayUrl = options.displayUrl; delete options.displayUrl;
       await page.goto(displayUrl || 'http://example.com', requestOptions);
@@ -172,6 +188,13 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       await page.waitForSelector(waitForSelector, waitForSelectorOptions);
     }
 
+    // If specified, wait for function
+    const waitForFunction = options.waitForFunction; delete options.waitForFunction;
+    const waitForFunctionOptions = options.waitForFunctionOptions; delete options.waitForFunctionOptions;
+    if (waitForFunction !== undefined) {
+      await page.waitForFunction(waitForFunction, waitForFunctionOptions);
+    }
+
     // If specified, wait for timeout
     const waitForTimeout = options.waitForTimeout; delete options.waitForTimeout;
     if (waitForTimeout !== undefined) {
@@ -190,6 +213,23 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       await page.hover(hoverSelector);
     }
 
+    if (errors.length > 0) {
+      function RequestFailedError(errors) {
+        this.name = "RequestFailedError";
+        this.message = errors.map(e => {
+          if (e.failure()) {
+            return e.failure().errorText + " at " + e.url();
+          } else if (e.response() && e.response().status()) {
+            return e.response().status() + " " + e.url();
+          } else {
+            return "UnknownError " + e.url()
+          }
+        }).join("\n");
+      }
+      RequestFailedError.prototype = Error.prototype;
+      throw new RequestFailedError(errors);
+    }
+
     // If we're running puppeteer in headless mode, return the converted PDF
     if (debug === undefined || (typeof debug === 'object' && (debug.headless === undefined || debug.headless))) {
       return await page[convertAction](options);

data/lib/grover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Grover
-  VERSION = '1.0.0'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf