bidi2pdf 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d71c88a5941411b13770993de9b38f6321c263765ffce1a9bbd347fb960855ac
-  data.tar.gz: aa64333d4dc4de54f6e1b627287a5d11661634f3244a8e3a213428c243f155f1
+  metadata.gz: 134f35256652da3e5e6c8e383e97c98779a1e2665798dbfa5d133bc85130b8cc
+  data.tar.gz: dd106af3e757d26ba3d935bbe54d0249402280a84f1b1a8e27855d19b4cd155c
 SHA512:
-  metadata.gz: 1d598fe002552f46e53f803f46577adceeeb087b377a40b486d5d2ef7bf713463f429aa26b2687fb7d0b865d73aacf3262be71e17db154794ac82e1e4a245986
-  data.tar.gz: 3b7cb02b0e857e551c720a665ac31d3669a9a27e8c9e3e5c1cdc497517b8fbcd3e917d6b0735113e3b956b23ded042b44c72bfff637cfdbf2431642bd98aaa2b
+  metadata.gz: 15d9df827cefb697a44f78945f5fc20866319c7fc6a403f5ad58817f239deca9857fc0923e0a7faf582dac6d7f0770236310cca8bd58aab138ab6499749c6d37
+  data.tar.gz: '09b043e8da1b79a4cc95c708c32afa78b00fa3f6edbedd2e0dacfdd562aff1a385be50f36cc78951a771b1b63c775eac11980dec07d1998476b9b247d6114377'

data/CHANGELOG.md

@@ -1,5 +1,4 @@
 <!-- generated by git-cliff start -->
-
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -7,10 +6,93 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-[unreleased]: https://github.com/dieter-medium/bidi2pdf/compare/v0.1.8..HEAD
+[unreleased]: https://github.com///compare/v0.1.10..HEAD
 
 <!-- generated by git-cliff end -->
 
+## [0.1.10] - 2025-06-18
+
+### 💄 Style
+
+- Improve readability of conditional statements
+
+### 📝 Docs
+
+- Update README with Quick Start section
+- Add Table of Contents and architecture diagram
+- Add high level overview diagram to README
+- Update example URLs in README for clarity
+
+### 🔄 Changed
+
+- Merge pull request #19 from dieter-medium/enhance-docs
+- Merge pull request #18 from dieter-medium/enhance-docs
+- Merge pull request #13 from dieter-medium/dependabot/bundler/main/base64-0.3.0
+- Merge branch 'main' into dependabot/bundler/main/base64-0.3.0
+- Merge pull request #14 from dieter-medium/dependabot/bundler/main/rake-13.3.0
+- Merge branch 'main' into dependabot/bundler/main/rake-13.3.0
+- Merge pull request #12 from dieter-medium/dependabot/bundler/main/rspec-3.13.1
+- Merge pull request #11 from dieter-medium/dependabot/bundler/main/rubocop-1.75.7
+- Merge branch 'main' into dependabot/bundler/main/rubocop-1.75.7
+- Merge pull request #10 from dieter-medium/dependabot/bundler/main/json-2.12.2
+- Merge branch 'main' into dependabot/bundler/main/json-2.12.2
+- Merge pull request #9 from dieter-medium/dependabot/bundler/main/diff-lcs-1.6.2
+- Merge pull request #7 from dieter-medium/dependabot/bundler/main/rubocop-1.75.6
+- Merge pull request #8 from dieter-medium/dependabot/bundler/main/json-2.12.0
+- Merge pull request #6 from dieter-medium/dependabot/bundler/main/rbs-3.9.4
+- Merge pull request #5 from dieter-medium/dependabot/bundler/main/chromedriver-binary-0.1.3
+- Merge pull request #4 from dieter-medium/add-more-default-chrome-args
+- Merge pull request #3 from dieter-medium/make-configuration-rw
+- Merge pull request #2 from dieter-medium/add-test-helpers
+- Merge pull request #1 from dieter-medium/testing-vips
+
+### 🔧 Build
+
+- Bump rspec from 3.13.0 to 3.13.1
+- Bump rake from 13.2.1 to 13.3.0
+- Update base64 requirement from ~> 0.2.0 to >= 0.2, < 0.4
+- Bump rubocop from 1.75.3 to 1.76.2
+- Bump diff-lcs from 1.6.1 to 1.6.2
+- Bump json from 2.10.2 to 2.12.2
+- Bump rbs from 3.9.2 to 3.9.4
+- Bump chromedriver-binary from 0.1.2 to 0.1.3
+
+### 🚀 Added
+
+- Add CDP session handling for PDF generation
+- Expand default Chrome arguments for sessions
+- Add configuration setter for TestHelpers
+- Add test helpers for PDF testing and handling
+- Add image extraction and similarity checking
+
+## [0.1.9] - 2025-05-04
+
+### 🎨 Refactored
+
+- Enhance reader thread management in Chromedriver by @dieter-medium
+- Improve event listener logging by @dieter-medium
+- Improve event listener management by @dieter-medium
+- Centralize chromedriver test helpers for reuse in other projects by @dieter-medium
+
+### 🐛 Fixed
+
+- Close event socket during session cleanup by @dieter-medium
+- Add test for generating PDFs in parallel by @dieter-medium
+
+### 💄 Style
+
+- Update Bootstrap stylesheet link by @dieter-medium
+
+### 🔧 Build
+
+- Update Ruby version in action.yml by @dieter-medium
+- Update Dockerfile.chromedriver and chromedriver.yml for enhancements by @dieter-medium
+- Update Dockerfile.chromedriver for improved environment setup and vnc support by @dieter-medium
+
+### 🚀 Added
+
+- Enhance testcontainers with shared network support by @dieter-medium
+
 ## [0.1.8] - 2025-04-22
 
 ### 🎨 Refactored
@@ -172,8 +254,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
+## Changelog
 
-- [unreleased](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.8..HEAD)
+- [unreleased](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.10..HEAD)
+- [0.1.10](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.9..V0.1.10)
+- [0.1.9](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.8..v0.1.9)
 - [0.1.8](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.7..v0.1.8)
 - [0.1.7](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.6..v0.1.7)
 - [0.1.6](https://github.com/dieter-medium/bidi2pdf/compare/v0.1.5..v0.1.6)

data/README.md

@@ -14,6 +14,23 @@ Bidi2pdf gives you **precision, flexibility, and full control**.
 
 ---
 
+## 📚 Table of Contents
+
+1. [Key Features](#key-features)
+2. [Quick Start](#quick-start)
+3. [Why BiDi?](#why-bidi-instead-of-cdp)
+4. [Installation](#installation)
+5. [CLI Usage](#cli-usage)
+6. [Library API](#library-api)
+7. [Architecture](#architecture)
+8. [Docker](#docker)
+9. [Configuration Options](#configuration-options)
+10. [Rails Integration](#rails-integration)
+11. [Test Helpers](#test-helpers)
+12. [Development](#development)
+13. [Contributing](#contributing)
+14. [License](#license)
+
 ## ✨ Key Features
 
 ✅ **One-liner CLI** – From URL to PDF in a single command  
@@ -27,6 +44,25 @@ Bidi2pdf gives you **precision, flexibility, and full control**.
 
 ---
 
+## ⚡ Quick Start
+
+Get up and running in three easy steps:
+
+```bash
+# 1. Install the gem (system-wide)
+gem install bidi2pdf
+
+# 2. Render any page to PDF
+bidi2pdf render --url https://example.com --output example.pdf
+
+# 3. Open the PDF (macOS shown; use xdg-open on Linux)
+open example.pdf
+```
+
+> **Bundler users** – Add it to your project with `bundle add bidi2pdf`.
+
+---
+
 ## 🚀 Installation
 
 ### Bundler
@@ -54,14 +90,14 @@ gem install bidi2pdf
 ### Command-line
 
 ```bash
-bidi2pdf render --url https://example.com --output example.pdf
+bidi2pdf render --url https://example.com/invoice/14432423 --output example.pdf
 ```
 
 ### Advanced CLI Options
 
 ```bash
 bidi2pdf render \
-  --url https://example.com \
+  --url https://example.com/invoice/14432423 \
   --output example.pdf \
   --cookie session=abc123 \
   --header X-API-KEY=token \
@@ -81,7 +117,7 @@ bidi2pdf render \
 require 'bidi2pdf'
 
 launcher = Bidi2pdf::Launcher.new(
-  url: 'https://example.com',
+  url: 'https://example.com/invoice/14432423',
   output: 'example.pdf',
   cookies: { 'session' => 'abc123' },
   headers: { 'X-API-KEY' => 'token' },
@@ -99,7 +135,7 @@ launcher.launch
 require "bidi2pdf"
 
 Bidi2pdf::DSL.with_tab(headless: true) do |tab|
-  tab.navigate_to("https://example.com")
+  tab.navigate_to("https://example.com/invoice/14432423")
   tab.wait_until_network_idle
   tab.print("example.pdf")
 end
@@ -145,7 +181,7 @@ tab.basic_auth(url_patterns: [{ type: "pattern", protocol: "https", hostname: "e
                username: "username", password: "secret")
 
 # 4. Render PDF
-tab.navigate_to "https://example.com"
+tab.navigate_to "https://example.com/invoice/14432423"
 
 # Alternative: send html code to the browser
 # tab.render_html_content("<html>...</html>")
@@ -176,6 +212,48 @@ session.close
 
 ---
 
+## 🌐 Architecture
+
+```mermaid
+%%{  init: {
+      "theme": "base",
+      "themeVariables": {
+        "primaryColor":  "#E0E7FF",
+        "secondaryColor":"#FEF9C3",
+        "edgeLabelBackground":"#FFFFFF",
+        "fontSize":"14px",
+        "nodeBorderRadius":"6"
+      }
+    }
+}%%
+flowchart LR
+%% ----- Ruby side ---------
+    A["fa:fa-gem Ruby Application"]
+    B["fa:fa-gem bidi2pdf<br/>Library"]
+%% ----Chrome environment -----------
+    subgraph C["fa:fa-chrome Chrome Environment"]
+        direction TB
+        C1["fa:fa-chrome Local Chrome<br/>(sub-process)"]
+        C2["fa:fa-docker Docker Chrome<br/>(remote)"]
+    end
+
+    D[[PDF File]]
+%% ---- Data / control flows ------
+    A -- " HTML / URL + JS / CSS " --> B
+    B -- " WebDriver BiDi " --> C1
+    B -- " WebDriver BiDi " --> C2
+    C1 -- " PDF bytes " --> B
+    C2 -- " PDF bytes " --> B
+    B -- " PDF " --> D
+%% --- Optional extra styling classes (for future tweaks) ---
+    classDef ruby fill:#E0E7FF,stroke:#6366F1,color:#1E1B4B;
+    classDef chrome fill:#FEF9C3,stroke:#F59E0B,color:#78350F;
+    class A,B ruby;
+    class C1,C2 chrome;
+```
+
+---
+
 ## 🐳 Docker Support
 
 ### 🛠️ Build & Run Locally
@@ -191,7 +269,7 @@ docker build -t bidi2pdf -f docker/Dockerfile .
 docker run -it --rm \
   -v ./output:/reports \
   bidi2pdf \
-  bidi2pdf render --url=https://example.com --output /reports/example.pdf
+  bidi2pdf render --url=https://example.com/invoice/14432423 --output /reports/example.pdf
 
 ```
 
@@ -203,7 +281,7 @@ Grab it directly from [Docker Hub](https://hub.docker.com/r/dieters877565/bidi2p
 docker run -it --rm \
   -v ./output:/reports \
   dieters877565/bidi2pdf:main-slim \
-  bidi2pdf render --url=https://example.com --output /reports/example.pdf
+  bidi2pdf render --url=https://example.com/invoice/14432423 --output /reports/example.pdf
 ```
 
 ✅ Tip: Mount your local directory (e.g. ./output) to /reports in the container to easily access the generated PDFs.
@@ -271,6 +349,67 @@ visit: [https://github.com/dieter-medium/bidi2pdf-rails](https://github.com/diet
 
 ---
 
+## 🧪 Test Helpers
+
+Bidi2pdf provides a suite of RSpec helpers (activated with `pdf: true`) to
+simplify PDF-related testing:
+
+### SpecPathsHelper
+
+– `spec_dir` → returns your spec directory  
+– `tmp_dir` → returns your tmp directory  
+– `tmp_file(*parts)` → builds a tmp file path  
+– `random_tmp_dir(*dirs, prefix:)` → builds a random tmp directory
+
+- `fixture_file(*parts)` → returns the path to a fixture file
+
+### PdfFileHelper
+
+– `with_pdf_debug(pdf_data) { |data| … }` → on failure, writes PDF to disk  
+– `store_pdf_file(pdf_data, filename_prefix = "test")` → saves PDF and returns path
+
+### Rspec Matchers
+
+- `have_pdf_page_count` → checks if the PDF has a specific number of pages
+- `match_pdf_text` → checks if the PDF equals a specific text, after stripping whitespace and normalizing characters
+- `contains_pdf_text` → checks if the PDF contains a specific text, after stripping whitespace and normalizing
+  characters, supporting regex
+- `contains_pdf_image` → checks if the PDF contains a specific image
+
+### ChromedriverContainer
+
+`require "bidi2pdf/test_helpers/testcontainers"` you can use the `chromedriver_container` helper to
+start a ChromeDriver container for your tests. This is useful if you don't want to run ChromeDriver locally
+or if you want to ensure a clean environment for your tests.
+
+This also provides the helper methods:
+
+- `session_url` → returns the session URL for the ChromeDriver container
+- `chromedriver_container` → returns the Testcontainers container object
+- `create_session` -> creates a `Bidi2pdf::Bidi::Session` object for the ChromeDriver container
+
+With the environment variable `DISABLE_CHROME_SANDBOX` set to `true`, the container will run Chrome without
+the sandbox. This is useful for CI environments where the sandbox may cause issues.
+
+#### Example
+
+```ruby
+require "bidi2pdf/test_helpers"
+require "bidi2pdf/test_helpers/images" # <= for image matching, requires lib-vips
+require "bidi2pdf/test_helpers/testcontainers" # <= requires testcontainers gem
+
+RSpec.describe "PDF generation", :pdf, :chromedriver do
+  it "generates a PDF with the correct content" do
+    pdf_data = generate_pdf("https://example.com/invoice/14432423")
+    expect(pdf_data).to have_pdf_page_count(1)
+    expect(pdf_data).to match_pdf_text("Hello, world!")
+    expect(pdf_data).to contain_pdf_image(fixture_file("logo.png"))
+  end
+end
+```
+
+---
+
 ## 🛠 Development
 
 ```bash

data/docker/Dockerfile.chromedriver

@@ -1,13 +1,16 @@
-FROM ruby:3.3
+FROM debian:bookworm-slim
 
 ARG CHROMEDRIVER_PORT=3000
 
 ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG=en_US.UTF-8
 
 # Install dependencies
-RUN apt-get update && apt-get upgrade -y && \
+RUN echo "deb http://deb.debian.org/debian bookworm contrib non-free" > /etc/apt/sources.list.d/contrib.list &&\
+    echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections &&\
+    apt-get update && apt-get upgrade -y && \
     apt-get install -y --no-install-recommends\
-    chromium chromium-driver\
+    chromium chromium-driver chromium-l10n chromium-sandbox\
     libglib2.0-0 \
     libnss3 \
     libxss1 \
@@ -18,10 +21,21 @@ RUN apt-get update && apt-get upgrade -y && \
     curl \
     unzip \
     xvfb \
+    x11vnc \
+    fluxbox \
+    xterm \
+    wmctrl \
+    net-tools xauth \
+    fonts-liberation fonts-dejavu-core  fonts-noto-core fonts-noto-cjk fonts-noto-color-emoji fonts-symbola fontconfig ttf-mscorefonts-installer\
+    libnss3 libatk1.0-0 \
+    libx11-6 libxss1 libgtk-3-0 libgbm1 \
+    locales sed \
+    && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
+    && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user
-RUN groupadd -r appuser && useradd -r -g appuser -m -d /home/appuser appuser
+RUN groupadd -r appuser && useradd -r -g appuser -G audio,video -m -d /home/appuser appuser
 
 COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
@@ -36,12 +50,16 @@ RUN mkdir -p /home/appuser/.webdrivers && ln -s /usr/bin/chromedriver /home/appu
 # Set working directory
 WORKDIR /app
 
+RUN mkdir -p /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix
+
 # Switch to non-root user
 USER appuser
 
-RUN gem install chromedriver-binary && ruby -e 'require "chromedriver/binary"; puts Chromedriver::Binary::ChromedriverDownloader.update'
+# RUN gem install chromedriver-binary && ruby -e 'require "chromedriver/binary"; puts Chromedriver::Binary::ChromedriverDownloader.update'
 
 ENV CHROMEDRIVER_PORT=${CHROMEDRIVER_PORT}
 EXPOSE ${CHROMEDRIVER_PORT}
+# VNC
+EXPOSE 5900
 
 CMD ["/usr/local/bin/entrypoint.sh"]

data/docker/entrypoint.sh

@@ -3,6 +3,47 @@
 USER_DATA_DIR=/home/appuser/.cache
 mkdir -p ${USER_DATA_DIR}
 
+if [ "$ENABLE_XVFB" = "true" ]; then
+  rm -rf /tmp/.X99-lock
+
+  export DISPLAY=:99
+  Xvfb :99 -screen 0 1920x1080x24 &
+
+  old_umask=$(umask)
+  umask 077
+
+  touch /home/appuser/.Xauthority
+  export XAUTHORITY=/home/appuser/.Xauthority
+
+  xauth generate :99 . trusted
+
+  umask $old_umask
+
+
+
+  until xdpyinfo -display ${DISPLAY} >/dev/null 2>&1; do
+      sleep 0.2
+  done
+
+  fluxbox &
+
+  until wmctrl -m > /dev/null 2>&1; do
+    sleep 0.2
+  done
+fi
+
+if [ "$ENABLE_VNC" = "true" ]; then
+  VNC_PASS=${VNC_PASS:-$(tr -dc A-Za-z0-9 </dev/urandom | head -c 12)}
+  echo "VNC password: $VNC_PASS"
+  old_umask=$(umask)
+  umask 077
+  mkdir -p /home/appuser/.vnc
+  x11vnc -storepasswd $VNC_PASS /home/appuser/.vnc/passwd
+  umask $old_umask
+  x11vnc -display WAIT:99 -xkb -noxrecord -noxfixes -noxdamage -forever -shared -noshm -usepw -rfbauth /home/appuser/.vnc/passwd &
+fi
+
+# DISPLAY=:99 /home/appuser/.webdrivers/chromedriver --port=33259 --whitelisted-ips=""  --allowed-origins="*" --disable-dev-shm-usage --disable-gpu  --verbose
 /home/appuser/.webdrivers/chromedriver --port=${CHROMEDRIVER_PORT} \
                                        --headless \
                                        --whitelisted-ips="" \

data/lib/bidi2pdf/bidi/auth_interceptor.rb

@@ -39,6 +39,7 @@ module Bidi2pdf
 
       private
 
+      # rubocop:disable Naming/PredicateMethod
       def handled_bad_credentials(navigation_id, network_id, url)
         return false unless network_ids.include?(network_id)
 
@@ -55,6 +56,8 @@ module Bidi2pdf
 
         true
       end
+
+      # rubocop:enable Naming/PredicateMethod
     end
   end
 end

data/lib/bidi2pdf/bidi/browser_tab.rb

@@ -141,7 +141,7 @@ module Bidi2pdf
         headers:,
         url_patterns:
       )
-        AddHeadersInterceptor.new(
+        @header_interceptor = AddHeadersInterceptor.new(
           context: browsing_context_id,
           url_patterns: url_patterns,
           headers: headers
@@ -155,7 +155,7 @@ module Bidi2pdf
       # @param [Array<String>] url_patterns The URL patterns to match.
       # @return [AuthInterceptor] The interceptor instance.
       def basic_auth(username:, password:, url_patterns:)
-        AuthInterceptor.new(
+        @basic_auth_interceptor = AuthInterceptor.new(
           context: browsing_context_id,
           url_patterns: url_patterns,
           username: username, password: password
@@ -371,13 +371,13 @@ module Bidi2pdf
       # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       def print(outputfile = nil, print_options: { background: true }, &block)
         Bidi2pdf.notification_service.instrument("print.bidi2pdf") do |instrumentation_payload|
-          cmd = Bidi2pdf::Bidi::Commands::BrowsingContextPrint.new context: browsing_context_id, print_options: print_options
+          cmd, extractor = build_command_and_extractor(print_options)
 
           instrumentation_payload[:cmd] = cmd
 
           client.send_cmd_and_wait(cmd) do |response|
             if response["result"]
-              pdf_base64 = response["result"]["data"]
+              pdf_base64 = extractor.call response
 
               instrumentation_payload[:pdf_base64] = pdf_base64
 
@@ -404,6 +404,36 @@ module Bidi2pdf
 
       private
 
+      def build_command_and_extractor(print_options)
+        cmd_type = (print_options.delete(:cmd_type) || :bidi).to_sym
+
+        if cmd_type == :bidi
+          cmd = Bidi2pdf::Bidi::Commands::BrowsingContextPrint.new(
+            context: browsing_context_id,
+            print_options: print_options
+          )
+          extractor = ->(response) { response.dig("result", "data") }
+        else
+          cmd = Bidi2pdf::Bidi::Commands::PagePrint.new(
+            cdp_session: cdp_session,
+            print_options: print_options
+          )
+          extractor = ->(response) { response.dig("result", "result", "data") }
+        end
+
+        [cmd, extractor]
+      end
+
+      def cdp_session
+        @cdp_session ||= begin
+                           cmd = Bidi2pdf::Bidi::Commands::CdpGetSession.new context: browsing_context_id
+                           client.send_cmd_and_wait(cmd) do |response|
+                             Bidi2pdf.logger.debug "CDP session: #{response.inspect}"
+                             response["result"]["session"]
+                           end
+                         end
+      end
+
       def navigate_with_listeners(url)
         register_event_listeners
 
@@ -430,14 +460,14 @@ module Bidi2pdf
         return if @event_handlers_registered
 
         @event_handlers_registered = true
+        @listener_refs ||= {}
 
-        client.on_event("network.beforeRequestSent", "network.responseStarted", "network.responseCompleted", "network.fetchError",
-                        &network_events.method(:handle_event))
+        @listener_refs[:network] = client.on_event("network.beforeRequestSent", "network.responseStarted", "network.responseCompleted", "network.fetchError",
+                                                   &network_events.method(:handle_event))
 
-        client.on_event("log.entryAdded",
-                        &logger_events.method(:handle_event))
+        @listener_refs[:logger] = client.on_event("log.entryAdded", &logger_events.method(:handle_event))
 
-        client.on_event("browsingContext.navigationFailed", &navigation_failed_events.method(:handle_event))
+        @listener_refs[:navigation_failed] = client.on_event("browsingContext.navigationFailed", &navigation_failed_events.method(:handle_event))
       end
 
       def handle_injection_exception(response, url, exception_class)
@@ -479,7 +509,7 @@ module Bidi2pdf
             const script = document.createElement('script');
             script.type = 'text/javascript';
 
-            #{content ? "script.text = #{content.to_json};" : ""}
+            #{"script.text = #{content.to_json};" if content}
 
             script.addEventListener(
               'error',
@@ -489,12 +519,12 @@ module Bidi2pdf
               {once: true},
             );
 
-            #{id ? "script.id = '#{id}';" : ""}
+            #{"script.id = '#{id}';" if id}
             #{js_src_part}
 
             document.head.appendChild(script);
 
-            #{url ? "" : "resolve(script);"}
+            #{"resolve(script);" unless url}
           });
         JS
       end
@@ -515,7 +545,7 @@ module Bidi2pdf
               link.type = 'text/css';
               link.href = '#{url}';
             #{"  "}
-              #{id ? "link.id = '#{id}';" : ""}
+              #{"link.id = '#{id}';" if id}
             #{"  "}
               link.addEventListener(
                 'load',
@@ -544,9 +574,9 @@ module Bidi2pdf
                 const style = document.createElement('style');
                 style.type = 'text/css';
             #{"    "}
-                #{id ? "style.id = '#{id}';" : ""}
+                #{"style.id = '#{id}';" if id}
             #{"    "}
-                #{content ? "style.textContent = #{content.to_json};" : ""}
+                #{"style.textContent = #{content.to_json};" if content}
             #{"    "}
                 document.head.appendChild(style);
                 resolve(style);
@@ -568,16 +598,27 @@ module Bidi2pdf
       end
 
       # Removes event listeners for the browser tab.
+      # rubocop:disable Metrics/AbcSize
       def remove_event_listeners
+        return if @listener_refs.nil? || @listener_refs.empty?
+
         Bidi2pdf.logger.debug2 "Network events: #{network_events.all_events.map(&:to_s)}"
 
-        client.remove_event_listener "network.responseStarted", "network.responseCompleted", "network.fetchError",
-                                     &network_events.method(:handle_event)
+        client.remove_event_listener("network.beforeRequestSent", "network.responseStarted", "network.responseCompleted", "network.fetchError",
+                                     @listener_refs[:network])
 
-        client.remove_event_listener("log.entryAdded",
-                                     &logger_events.method(:handle_event))
+        client.remove_event_listener("log.entryAdded", @listener_refs[:logger])
+
+        @header_interceptor&.unregister_with_client(client: client)
+        @basic_auth_interceptor&.unregister_with_client(client: client)
+
+        @header_interceptor = nil
+        @basic_auth_interceptor = nil
+        @listener_refs = {}
       end
 
+      # rubocop:enable Metrics/AbcSize
+
       # Closes all tabs associated with the browser tab.
       def close_tabs
         tabs.each do |tab|

data/lib/bidi2pdf/bidi/client.rb

@@ -125,23 +125,25 @@ module Bidi2pdf
       #
       # @param [Array<String>] names The names of the events to subscribe to.
       # @yield [event_data] A block to handle the event data.
-      def on_event(*names, &block)
-        names.each { |name| dispatcher.on_event(name, &block) }
+      def on_event(*names, &)
+        listener = dispatcher.on_event(*names, &)
         cmd = Bidi2pdf::Bidi::Commands::SessionSubscribe.new(events: names)
         send_cmd(cmd) if names.any?
+
+        listener
       end
 
       # Removes a message listener.
       #
       # @param [Proc] block The listener block to remove.
-      def remove_message_listener(block) = dispatcher.remove_message_listener(block)
+      def remove_message_listener(listener) = dispatcher.remove_message_listener(listener)
 
       # Removes event listeners for specific events.
       #
       # @param [Array<String>] names The names of the events to unsubscribe from.
       # @param [Proc] block The listener block to remove.
-      def remove_event_listener(*names, &block)
-        names.each { |event_name| dispatcher.remove_event_listener(event_name, block) }
+      def remove_event_listener(*names, listener)
+        names.each { |event_name| dispatcher.remove_event_listener(event_name, listener) }
       end
 
       # Closes the WebSocket connection.