fix: flush pending changesets immediately after reconnect

.github/workflows/backend-tests.yml

@@ -27,7 +27,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]
+        # PRs: test on latest Node only. Push to develop: full matrix.
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[">=24.0.0 <25.0.0"]') || fromJSON('[">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]') }}
     steps:
       -
         name: Checkout repository
@@ -83,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[">=24.0.0 <25.0.0"]') || fromJSON('[">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]') }}
     steps:
       -
         name: Checkout repository
@@ -124,29 +125,26 @@ jobs:
           ep_author_hover
           ep_cursortrace
           ep_font_size
-          ep_hash_auth
           ep_headings2
           ep_markdown
           ep_readonly_guest
           ep_set_title_on_pad
           ep_spellcheck
           ep_subscript_and_superscript
-          ep_table_of_contents   --runtimeVersion="${{ matrix.node }}"
+          ep_table_of_contents
       -
         name: Run the backend tests
         run: gnpm test   --runtimeVersion="${{ matrix.node }}"
       - name: Run the new vitest tests
         working-directory: src
         run: gnpm run test:vitest   --runtimeVersion="${{ matrix.node }}"
 
+  # Windows tests only run on push to develop/master, not on PRs
   withoutpluginsWindows:
     env:
       PNPM_HOME: ~\\.pnpm-store
-    # run on pushes to any branch
-    # run on PRs from external forks
     if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+      github.event_name != 'pull_request'
     strategy:
       fail-fast: false
       matrix:
@@ -194,11 +192,8 @@ jobs:
   withpluginsWindows:
     env:
       PNPM_HOME: ~\\.pnpm-store
-    # run on pushes to any branch
-    # run on PRs from external forks
     if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+      github.event_name != 'pull_request'
     strategy:
       fail-fast: false
       matrix:
@@ -232,22 +227,19 @@ jobs:
         run: gnpm build --runtimeVersion="${{ matrix.node }}"
       -
         name: Install Etherpad plugins
-        # The --legacy-peer-deps flag is required to work around a bug in npm
-        # v7: https://github.com/npm/cli/issues/2199
         run: >
           gnpm install --workspace-root
           ep_align
           ep_author_hover
           ep_cursortrace
           ep_font_size
-          ep_hash_auth
           ep_headings2
           ep_markdown
           ep_readonly_guest
           ep_set_title_on_pad
           ep_spellcheck
           ep_subscript_and_superscript
-          ep_table_of_contents   --runtimeVersion="${{ matrix.node }}"
+          ep_table_of_contents
       # Etherpad core dependencies must be installed after installing the
       # plugin's dependencies, otherwise npm will try to hoist common
       # dependencies by removing them from src/node_modules and installing them

.github/workflows/build-and-deploy-docs.yml

@@ -50,7 +50,7 @@ jobs:
         with:
           version: 0.0.12
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
       - name: Install dependencies
         run: gnpm install
       - name: Build app
@@ -65,4 +65,4 @@ jobs:
           path: './doc/.vitepress/dist'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/docker.yml

@@ -30,13 +30,13 @@ jobs:
       -
         name: Set up QEMU
         if: github.event_name == 'push'
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       -
         name: Build and export to Docker
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./etherpad
           target: production
@@ -82,7 +82,7 @@ jobs:
         name: Docker meta
         if: github.event_name == 'push'
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: etherpad/etherpad
           tags: |
@@ -93,15 +93,15 @@ jobs:
       -
         name: Log in to Docker Hub
         if: github.event_name == 'push'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: build-docker
         if: github.event_name == 'push'
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./etherpad
           target: production

.github/workflows/frontend-admin-tests.yml

@@ -1,13 +1,15 @@
-# Leave the powered by Sauce Labs bit in as this means we get additional concurrency
 name: "Frontend admin tests"
 
 on:
   push:
     paths-ignore:
       - 'doc/**'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: read
 
 jobs:
   withplugins:
@@ -19,15 +21,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [20, 22, 24]
+        # PRs: single Node version. Push: full matrix.
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[24]') || fromJSON('[20, 22, 24]') }}
 
     steps:
-      -
-        name: Generate Sauce Labs strings
-        id: sauce_strings
-        run: |
-          printf %s\\n '::set-output name=name::${{ github.workflow }} - ${{ github.job }} - Node ${{ matrix.node }}'
-          printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}-node${{ matrix.node }}'
       -
         name: Checkout repository
         uses: actions/checkout@v6
@@ -47,47 +44,26 @@ jobs:
         uses: SamTV12345/gnpm-setup@main
         with:
           version: 0.0.12
-      - name: Cache playwright binaries
-        uses: actions/cache@v5
-        id: playwright-cache
-        with:
-          path: |
-            ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
-      #-
-      #  name: Install etherpad plugins
-      #  # We intentionally install an old ep_align version to test upgrades to
-      #  # the minor version number. The --legacy-peer-deps flag is required to
-      #  # work around a bug in npm v7: https://github.com/npm/cli/issues/2199
-      #  run: pnpm install --workspace-root ep_align@0.2.27
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, otherwise npm will try to hoist common
-      # dependencies by removing them from src/node_modules and installing them
-      # in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
-      # to be buggy, because it sometimes removes dependencies from
-      # src/node_modules but fails to add them to the top-level node_modules.
-      # Even if npm correctly hoists the dependencies, the hoisting seems to
-      # confuse tools such as `npm outdated`, `npm update`, and some ESLint
-      # rules.
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
         run: gnpm i --runtimeVersion="${{ matrix.node }}"
-      #-
-      #  name: Install etherpad plugins
-      #  run: rm -Rf node_modules/ep_align/static/tests/*
-      -
-        name: export GIT_HASH to env
-        id: environment
-        run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
+      - name: Cache Playwright browsers
+        uses: actions/cache@v5
+        id: playwright-cache
+        with:
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('src/package.json') }}
+      - name: Install Playwright browsers
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        run: cd src && npx playwright install
+      - name: Install Playwright system dependencies
+        run: cd src && npx playwright install-deps
       -
         name: Create settings.json
         run: cp settings.json.template settings.json
       -
         name: Write custom settings.json that enables the Admin UI tests
         run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme1\",\"is_admin\":true}}/' settings.json"
-      -
-        name: increase maxHttpBufferSize
-        run: "sed -i 's/\"maxHttpBufferSize\": 50000/\"maxHttpBufferSize\": 10000000/' settings.json"
       -
         name: Disable import/export rate limiting
         run: |
@@ -96,37 +72,10 @@ jobs:
         working-directory: admin
         run: |
             gnpm run build --runtimeVersion="${{ matrix.node }}"
-      #  name: Run the frontend admin tests
-      #  shell: bash
-      #  env:
-      #    SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-      #    SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-      #    SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
-      #    TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
-      #   GIT_HASH: ${{ steps.environment.outputs.sha_short }}
-      #  run: |
-      #    src/tests/frontend/travis/adminrunner.sh
-      #-
-      #  uses: saucelabs/sauce-connect-action@v2.3.6
-      #  with:
-      #    username: ${{ secrets.SAUCE_USERNAME }}
-      #    accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-      #    tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
-      #-
-      #  name: Run the frontend admin tests
-      #  shell: bash
-      #  env:
-      #    SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-      #    SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-      #    SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
-      #    TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
-      #   GIT_HASH: ${{ steps.environment.outputs.sha_short }}
-      #  run: |
-      #    src/tests/frontend/travis/adminrunner.sh
       - name: Run the frontend admin tests
         shell: bash
         run: |
-          gnpm run prod --runtimeVersion="${{ matrix.node }}" &
+          gnpm run prod --runtimeVersion="${{ matrix.node }}" > /tmp/etherpad-server.log 2>&1 &
           connected=false
           can_connect() {
           curl -sSfo /dev/null http://localhost:9001/ || return 1
@@ -138,10 +87,15 @@ jobs:
           sleep 1
           done
           cd src
-          gnpm exec playwright install --runtimeVersion="${{ matrix.node }}"
-          gnpm exec playwright install-deps --runtimeVersion="${{ matrix.node }}"
           gnpm run test-admin --runtimeVersion="${{ matrix.node }}"
-      - uses: actions/upload-artifact@v6
+      - name: Upload server log on failure
+        uses: actions/upload-artifact@v7
+        if: failure()
+        with:
+          name: server-log-admin-${{ matrix.node }}
+          path: /tmp/etherpad-server.log
+          retention-days: 7
+      - uses: actions/upload-artifact@v7
         if: always()
         with:
           name: playwright-report-${{ matrix.node }}