Update our repo with latest changes from Bryntum

.github/workflows/docker-test.js.yml

@@ -0,0 +1,37 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Build docker image
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - '__tests__/**'
+      - 'package.json'
+      - 'Dockerfile'
+      - 'app.config.js'
+      - 'babel.config.js'
+      - '.puppeteerrc.cjs'
+    branches: [ main ]
+  pull_request:
+    paths:
+      - 'src/**'
+      - '__tests__/**'
+      - 'package.json'
+      - 'Dockerfile'
+      - 'app.config.js'
+      - 'babel.config.js'
+      - '.puppeteerrc.cjs'
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build the Docker image
+        run: docker build . --file Dockerfile

.github/workflows/node.js.yml

@@ -24,7 +24,8 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        # MuhammaraJS does not have pre-built binaries for Node 25, skip this version for now, though docker uses it
+        node-version: [20.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

.github/workflows/release.yml

@@ -0,0 +1,141 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version_bump:
+        description: 'Version bump type'
+        required: true
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+      prerelease:
+        description: 'Mark as pre-release'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Bump version (local only)
+        id: bump
+        run: |
+          # Get current version
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          echo "Current version: $CURRENT_VERSION"
+
+          # Bump version using npm (doesn't create git tag)
+          npm version ${{ inputs.version_bump }} --no-git-tag-version
+
+          # Update package-lock.json
+          npm install --package-lock-only --ignore-scripts
+
+          # Get new version
+          NEW_VERSION=$(node -p "require('./package.json').version")
+          echo "New version: $NEW_VERSION"
+
+          # Set outputs
+          echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
+          echo "tag=v$NEW_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image (includes tests)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            bryntum/pdf-export-server:${{ steps.bump.outputs.new_version }}
+            bryntum/pdf-export-server:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      # Only commit/tag/release if Docker build succeeded
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Commit version bump
+        run: |
+          git add package.json package-lock.json
+          git commit -m "chore: bump version to ${{ steps.bump.outputs.new_version }}"
+          git push
+
+      - name: Create and push tag
+        run: |
+          git tag ${{ steps.bump.outputs.tag }}
+          git push origin ${{ steps.bump.outputs.tag }}
+
+      - name: Generate release notes
+        id: release_notes
+        run: |
+          # Get commits since last tag (exclude the version bump commit)
+          LAST_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
+
+          if [ -n "$LAST_TAG" ]; then
+            echo "Generating notes from $LAST_TAG to HEAD^"
+            COMMITS=$(git log $LAST_TAG..HEAD^ --pretty=format:"- %s (%h)" --no-merges)
+          else
+            echo "No previous tag found, using recent commits"
+            COMMITS=$(git log -20 --pretty=format:"- %s (%h)" --no-merges | grep -v "chore: bump version" || true)
+          fi
+
+          # Create release notes
+          NOTES="## What's Changed
+
+          $COMMITS
+
+          **Full Changelog**: https://github.com/${{ github.repository }}/compare/$LAST_TAG...${{ steps.bump.outputs.tag }}"
+
+          # Save to file for the release step
+          echo "$NOTES" > release_notes.md
+          cat release_notes.md
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.bump.outputs.tag }}
+          name: ${{ steps.bump.outputs.tag }}
+          body_path: release_notes.md
+          prerelease: ${{ inputs.prerelease }}
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Summary
+        run: |
+          echo "## Release Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Previous version:** ${{ steps.bump.outputs.current_version }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **New version:** ${{ steps.bump.outputs.new_version }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Tag:** ${{ steps.bump.outputs.tag }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Pre-release:** ${{ inputs.prerelease }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Docker image:** bryntum/pdf-export-server:${{ steps.bump.outputs.new_version }}" >> $GITHUB_STEP_SUMMARY

.gitignore

@@ -1,14 +1,14 @@
 .idea
+.claude
 
+dist
+dist/
 cert
 cert/
 log
 log/
 tmp
 tmp/
-bin/linux
-bin/win
-bin/mac
 node_modules/
 !log/config.json
 !.gitkeep

.puppeteerrc.cjs

@@ -0,0 +1,9 @@
+/**
+ * Puppeteer configuration
+ * @see https://pptr.dev/guides/configuration
+ */
+module.exports = {
+    // Use Chrome for Testing (has arm64 macOS builds since Chrome 115+)
+    // This is the default in puppeteer v21+
+    defaultProduct: 'chrome'
+};

.run/Build pdf image amd64.run.xml

@@ -0,0 +1,36 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build pdf image amd64" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="pdf-export-server:test" />
+        <option name="buildCliOptions" value="--platform=linux/amd64" />
+        <option name="containerName" value="pdf-export-server" />
+        <option name="entrypoint" value="node ./src/server.js -H 8081 -r host_resources" />
+        <option name="portBindings">
+          <list>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="8080" />
+              <option name="hostPort" value="8080" />
+            </DockerPortBindingImpl>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="8081" />
+              <option name="hostPort" value="8081" />
+            </DockerPortBindingImpl>
+          </list>
+        </option>
+        <option name="commandLineOptions" value="--platform=linux/amd64 -d" />
+        <option name="sourceFilePath" value="Dockerfile" />
+        <option name="volumeBindings">
+          <list>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/home/pptruser/host_resources" />
+              <option name="hostPath" value="$PROJECT_DIR$/.." />
+              <option name="readOnly" value="true" />
+            </DockerVolumeBindingImpl>
+          </list>
+        </option>
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

Dockerfile

@@ -1,34 +1,25 @@
-# Based on https://developers.google.com/web/tools/puppeteer/troubleshooting#running_puppeteer_in_docker
+# Based on https://pptr.dev/troubleshooting#running-puppeteer-in-docker
 
-FROM node:16.15.0
+FROM node:24-slim
 
+# Install system dependencies required for Chromium/Chrome to run
+# Puppeteer will download its own browser during npm install
 RUN apt-get update \
-    && apt-get install -y wget gnupg ca-certificates \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update \
-    # Chrome installation is required to get system dependencies. Puppeteer will download required version on its own.
-    && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf --no-install-recommends \
-# https://techoverflow.net/2018/06/05/how-to-fix-puppetteer-error-while-loading-shared-libraries-libx11-xcb-so-1-cannot-open-shared-object-file-no-such-file-or-directory/ \
-    gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 \
-    libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
-    libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 \
-    libnss3 lsb-release xdg-utils \
+    && apt-get install -y --no-install-recommends \
+    # Build tools for native modules
+    build-essential python3 make gcc g++ \
+    # Chromium dependencies
+    ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 \
+    libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 \
+    libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 \
+    libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
+    libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 \
+    libxss1 libxtst6 lsb-release xdg-utils wget \
+    # Fonts for international character support
+    fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
     && rm -rf /var/lib/apt/lists/*
 
-# If running Docker >= 1.13.0 use docker run's --init arg to reap zombie processes, otherwise
-# uncomment the following lines to have `dumb-init` as PID 1
-# ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 /usr/local/bin/dumb-init
-# RUN chmod +x /usr/local/bin/dumb-init
-# ENTRYPOINT ["dumb-init", "--"]
-
-# Uncomment to skip the chromium download when installing puppeteer. If you do,
-# you'll need to launch puppeteer with:
-#     browser.launch({executablePath: 'google-chrome-stable'})
-# ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-
-# Install puppeteer so it's available in the container.
-# Add user so we don't need --no-sandbox.
+# Add user so we don't need --no-sandbox
 RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
     && mkdir -p /home/pptruser/log \
     && mkdir /home/pptruser/cert \
@@ -41,15 +32,25 @@ RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
 # Run everything after as non-privileged user.
 USER pptruser
 
-COPY --chown=pptruser:pptruser ["src/", "/home/pptruser/src/"]
-COPY --chown=pptruser:pptruser ["app.config.js", "package.json", "/home/pptruser/"]
+COPY --chown=pptruser:pptruser ["package.json", "/home/pptruser/"]
 
 WORKDIR /home/pptruser
 
+# MuhammaraJS installs fixed dependency to tar 7.5.7 which fails security audit. Can be simplified to `npm i` after
+# this issue is fixed: https://github.com/julianhille/MuhammaraJS/issues/500
+# Run install to get muhammara
+RUN npm i
+# Install packages to muhammara submodule to get updated tar package
+RUN (cd node_modules/muhammara && rm -rf node_modules package-lock.json && npm i)
+# Run install again to update lock file
 RUN npm i
 
+COPY --chown=pptruser:pptruser src /home/pptruser/src
+COPY --chown=pptruser:pptruser __tests__ /home/pptruser/__tests__
+COPY --chown=pptruser:pptruser ["app.config.js", ".puppeteerrc.cjs", "babel.config.js", "/home/pptruser/"]
+
+RUN npm run test
+
 EXPOSE 8080 8081
 
 ENTRYPOINT [ "node", "./src/server.js", "-H", "8081" ]
-
-CMD ["bash"]