grover 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1de71127ef3e7173bce45deeec104ec9c876dea335ad73dfc80016da64c64f7
-  data.tar.gz: 50dce7d9aa7ef01e12144f303868667e4d6587d0dc9a7be337c34d9679e483c0
+  metadata.gz: 7bfcdc3d84dade94866bbb29eca6c1e91b9459a5f020ebd175341f740dfdd585
+  data.tar.gz: 539a10195c08de66249983fccdf3f5314f1adec83b400d6058f87d127e731f86
 SHA512:
-  metadata.gz: '084b8e564818202eead00cb7faef9c181e5bd394e41113fb4b87233fa9fe44ed434318240034a375f20799af909a647fc8dd816f9d74aa79ad101efaa329387f'
-  data.tar.gz: 5f03611f7f945dac5b75424bc879f90e639f4a97430759028f3cf36727c4c490813dc15fc68271767b1996716278484eae0d7383a42741fbd24f2d572124d4e2
+  metadata.gz: 6322c7cd633f776d58bb2fcad105d067a3df4782dcbc2fb15aff4fe60dcc2e8e1a58075e4972bb9f65362075eebe973e51f8aa385bd651d89ad41078e00fd4ca
+  data.tar.gz: e9431f9a613f4b40f5d836616ad2e8afd6470a606a8daf80ad5553e248a461035228c62e290f0778e742aa2f2a9b663fe23f0590600cdda592cd8a26339ba391

data/lib/grover/configuration.rb

@@ -7,7 +7,7 @@ class Grover
   class Configuration
     attr_accessor :options, :meta_tag_prefix, :ignore_path, :ignore_request,
                   :root_url, :use_pdf_middleware, :use_png_middleware,
-                  :use_jpeg_middleware
+                  :use_jpeg_middleware, :node_env_vars
 
     def initialize
       @options = {}
@@ -18,6 +18,7 @@ class Grover
       @use_pdf_middleware = true
       @use_png_middleware = false
       @use_jpeg_middleware = false
+      @node_env_vars = {}
     end
   end
 end

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
@@ -78,6 +100,7 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
     }
 
     // Setup timeout option (if provided)
+    if (options.timeout === null) delete options.timeout;
     let requestOptions = {};
     let requestTimeout = options.requestTimeout; delete options.requestTimeout;
     if (requestTimeout === undefined) requestTimeout = options.timeout;
@@ -261,7 +284,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/processor.rb

@@ -32,6 +32,7 @@ class Grover
 
     def spawn_process
       @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(
+        Grover.configuration.node_env_vars,
         'node',
         File.expand_path(File.join(__dir__, 'js/processor.cjs')),
         chdir: app_root

data/lib/grover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -38,180 +38,6 @@ 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
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.12'
-- !ruby/object:Gem::Dependency
-  name: pdf-reader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.43'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.43'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
 description: Transform HTML into PDF/PNG/JPEG using Google Puppeteer/Chromium
 email:
 - abromwich@studiosity.com