grover 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2409cbc42fc0fcb80876e1d4238f08cfbeae1d7fc7dada4cb958e8178bafc95
-  data.tar.gz: 8189bc362f4979028340f17095c0e9aade0d7950f605fb2062740452316e2b60
+  metadata.gz: c3d4e3648c63a1906a953202433b88805bd2d602d2d96d871debd4d251fc415e
+  data.tar.gz: 7756206771af66e2483c97933601bf74aa57bd2ac3cf8c2e2031c9c4cc0cc0fb
 SHA512:
-  metadata.gz: 0ed3057d89a650c43dbd5c606edcef96e31702cde46a18896af692aaa0b000c2824df2cc90d33e2a8767486940cc4063a2c28bdd609b459579d698fb282465b4
-  data.tar.gz: 23ede80fa749b4095cf94733690d398fd5027c33a1d11adccc63fa3300dbc2cf89e466c6ff8e8b63be6f67a3a00eff91d9c3c9124ea98d37ef4ab86df439fb3d
+  metadata.gz: 398afda3dd93724ef5699f1b2304eecee81ec5e1c1cbc2ca03ff5562c8506d2bb660848995c153ff652ad29b798a2156334d1963e3aa7e0a61a07df0d2860f48
+  data.tar.gz: 9c6d8a6641c6a0c3a193abd34b50f28086b9aecb78c661c186566c684543a0c8c4cce23c96b093739d44598d41db1613b483c8bc19f74a36cffefb140e01420a

data/lib/grover/js/processor.js

@@ -91,7 +91,7 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
     // Emulate the media features, if specified
     const mediaFeatures = options.mediaFeatures; delete options.mediaFeatures;
     if (Array.isArray(mediaFeatures)) {
-      page.emulateMediaFeatures(mediaFeatures);
+      await page.emulateMediaFeatures(mediaFeatures);
     }
 
     // Emulate timezone (if provided)
@@ -100,34 +100,28 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       await page.emulateTimezone(timezone);
     }
 
-    // Emulate vision deficiency (if provided)
-    const visionDeficiency = options.visionDeficiency; delete options.visionDeficiency;
-    if (visionDeficiency !== undefined) {
-      page.emulateVisionDeficiency(type);
-    }
-
     // Bypass CSP (content security policy), if provided
     const bypassCSP = options.bypassCSP; delete options.bypassCSP;
     if (bypassCSP !== undefined) {
-      page.setBypassCSP(bypassCSP);
+      await page.setBypassCSP(bypassCSP);
     }
 
     // Add extra HTTP headers (if provided)
     const extraHTTPHeaders = options.extraHTTPHeaders; delete options.extraHTTPHeaders;
     if (extraHTTPHeaders !== undefined) {
-      page.setExtraHTTPHeaders(extraHTTPHeaders);
+      await page.setExtraHTTPHeaders(extraHTTPHeaders);
     }
 
     // Set geolocation (if provided)
     const geolocation = options.geolocation; delete options.geolocation;
     if (geolocation !== undefined) {
-      page.setGeolocation(geolocation);
+      await page.setGeolocation(geolocation);
     }
 
     const raiseOnRequestFailure = options.raiseOnRequestFailure; delete options.raiseOnRequestFailure;
     if (raiseOnRequestFailure) {
       page.on('requestfinished', (request) => {
-        if (request.response() && !request.response().ok() && !request.redirectChain().length > 0) {
+        if (request.response() && !(request.response().ok() || request.response().status() == 304) && !request.redirectChain().length > 0) {
           errors.push(request);
         }
       });
@@ -145,11 +139,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);
@@ -184,12 +182,25 @@ 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) {
       await page.waitForTimeout(waitForTimeout);
     }
 
+    // Emulate vision deficiency (if provided)
+    const visionDeficiency = options.visionDeficiency; delete options.visionDeficiency;
+    if (visionDeficiency !== undefined) {
+      await page.emulateVisionDeficiency(visionDeficiency);
+    }
+
     // If specified, focus on the specified selector
     const focusSelector = options.focus; delete options.focus;
     if (focusSelector !== undefined) {

data/lib/grover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf