grover 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9685b557f5d1cdc200fe5806aadc59106ccb9d6572e4d57c1660964286b3f4c7
-  data.tar.gz: b0584418598e6ca66b097b8e9ffc87ad5bbd6ae64becf74966ceef4b4d894730
+  metadata.gz: e791010e46d99d4347edc987fc2a7b90b08d038a1449cf927b57b828e58f1d59
+  data.tar.gz: 62837cb867ec1728c000c91b33352f01a1c4beb5b0823647dff74946d09c0cbd
 SHA512:
-  metadata.gz: cfad1954989183edd8f9cd238085c6031ec9cfca25b61dbe6e83fd33bd733c4d60b97b64da59d9b6301b538aa26979e8e9813b40765fa34fd03a17f47f46897c
-  data.tar.gz: e06271f0ede0792519f7a6d1156b04e5d5465921b8b75d36438fffdf62a491c54029c73f070de6241cb4cb1654e548024115634fe27c80fa1ee1b056375d20c9
+  metadata.gz: 1471dda6f9817f921ae1f7ef88cbdf0ffab143448b1057ef1e3f71f5d91a9fce95b77fbece05f10c0823b51fbc181a4138ae5a6c6db437074c2d95143e90fa4d
+  data.tar.gz: fad1c63de120fb414aa23ffcf0b2adec6e419550ec2add1c5008ce3e1d855343934bbae4de1e9a14f8c74e974699ad7a74aad2a22bc2d6ef7ba1cd8850a73b36

data/lib/grover/js/processor.cjs

@@ -1,13 +1,25 @@
 // Setup imports
 try {
   const Module = require('module');
-  // resolve puppeteer from the CWD instead of where this script is located
-  var puppeteer = require(require.resolve('puppeteer', { paths: Module._nodeModulePaths(process.cwd()) }));
+
+  try {
+    // resolve puppeteer from the CWD instead of where this script is located
+    var puppeteer = require(require.resolve('puppeteer', { paths: Module._nodeModulePaths(process.cwd()) }));
+  } catch (puppeteerError) {
+    try {
+      // try resolve `puppeteer-core` library instead
+      var puppeteer = require(require.resolve('puppeteer-core', { paths: Module._nodeModulePaths(process.cwd()) }));
+    } catch (coreError) {
+      // raise the original puppeteer load issue so we don't send people don't the wrong rabbit hole by default.
+      throw puppeteerError;
+    }
+  }
 } catch (e) {
   process.stdout.write(JSON.stringify(['err', e.toString()]));
   process.stdout.write("\n");
   process.exit(1);
 }
+
 process.stdout.write("[\"ok\"]\n");
 
 const fs = require('fs');
@@ -15,7 +27,7 @@ const os = require('os');
 const path = require('path');
 
 const _processPage = (async (convertAction, urlOrHtml, options) => {
-  let browser, errors = [], tmpDir;
+  let browser, page, errors = [], tmpDir, wsConnection = false;
 
   try {
     // Configure puppeteer debugging options
@@ -25,8 +37,18 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       const connectParams = {
         browserWSEndpoint: browserWsEndpoint,
       };
-
-      browser = await puppeteer.connect(connectParams);
+      wsConnection = true;
+
+      try {
+        browser = await puppeteer.connect(connectParams);
+      } catch {
+        function WsConnectFailedError() {
+          this.name = "WsConnectFailedError";
+          this.message = `Failed to connect to browser WS endpoint: ${browserWsEndpoint}`;
+        }
+        WsConnectFailedError.prototype = Error.prototype;
+        throw new WsConnectFailedError();
+      }
     } else {
       tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'grover-'));
 
@@ -34,29 +56,29 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
         args: process.env.GROVER_NO_SANDBOX === 'true' ? ['--no-sandbox', '--disable-setuid-sandbox'] : [],
         userDataDir: tmpDir
       };
-  
+
       if (typeof debug === 'object' && !!debug) {
         if (debug.headless !== undefined) { launchParams.headless = debug.headless; }
         if (debug.devtools !== undefined) { launchParams.devtools = debug.devtools; }
       }
-  
+
       // Configure additional launch arguments
       const args = options.launchArgs; delete options.launchArgs;
       if (Array.isArray(args)) {
         launchParams.args = launchParams.args.concat(args);
       }
-  
+
       // Set executable path if given
       const executablePath = options.executablePath; delete options.executablePath;
       if (executablePath) {
         launchParams.executablePath = executablePath;
       }
-  
+
       // Launch the browser and create a page
       browser = await puppeteer.launch(launchParams);
     }
 
-    const page = await browser.newPage();
+    page = await browser.newPage();
 
     // Basic auth
     const username = options.username; delete options.username
@@ -261,7 +283,12 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
     }
   } finally {
     if (browser) {
-      await browser.close();
+      if (wsConnection) {
+        if (page) await page.close();
+        await browser.disconnect();
+      } else {
+        await browser.close();
+      }
     }
 
     try {

data/lib/grover/middleware.rb

@@ -70,7 +70,7 @@ class Grover
 
     def ignore_request?
       ignore_request = Grover.configuration.ignore_request
-      return unless ignore_request.is_a?(Proc)
+      return false unless ignore_request.is_a?(Proc)
 
       ignore_request.call @request
     end

data/lib/grover/options_builder.rb

@@ -9,6 +9,7 @@ class Grover
   #
   class OptionsBuilder < Hash
     def initialize(options, url)
+      super()
       @url = url
       combined = grover_configuration
       Utils.deep_merge! combined, Utils.deep_stringify_keys(options)

data/lib/grover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2024-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.18'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -208,14 +250,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A Ruby gem to transform HTML into PDF, PNG or JPEG by wrapping the NodeJS