ep_webrtc 2.3.18 → 2.5.3

package/.github/workflows/backend-tests.yml

@@ -1,7 +1,8 @@
-name: "Backend tests"
+name: Backend Tests
 
 # any branch is useful for testing before a PR is submitted
-on: [push, pull_request]
+on:
+  workflow_call:
 
 jobs:
   withplugins:
@@ -12,66 +13,58 @@ jobs:
       || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
     name: with Plugins
     runs-on: ubuntu-latest
-
     steps:
       -
         name: Install libreoffice
-        run: |
-          sudo add-apt-repository -y ppa:libreoffice/ppa
-          sudo apt update
-          sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
+        uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+        with:
+          packages: libreoffice libreoffice-pdfimport
+          version: 1.0
       -
         name: Install etherpad core
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ether/etherpad-lite
-      -
-        name: Checkout plugin repository
-        uses: actions/checkout@v3
+          path: etherpad-lite
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
         with:
-          path: ./node_modules/__tmp
-      -
-        name: Determine plugin name
-        id: plugin_name
-        run: |
-          cd ./node_modules/__tmp
-          npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
-      -
-        name: Rename plugin directory
+          version: 10
+          run_install: false
+      - name: Get pnpm store directory
+        shell: bash
         run: |
-          mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-      -
-        uses: actions/setup-node@v3
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
         with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            src/package-lock.json
-            src/bin/doc/package-lock.json
-            node_modules/${{ steps.plugin_name.outputs.plugin_name }}/package-lock.json
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       -
-        name: Install plugin dependencies
-        run: |
-          cd ./node_modules/"${PLUGIN_NAME}"
-          npm ci
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-      # 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: Checkout plugin repository
+        uses: actions/checkout@v4
+        with:
+          path: plugin
+      - name: Remove tests
+        working-directory: ./etherpad-lite
+        run: rm -rf ./src/tests/backend/specs
       -
         name: Install Etherpad core dependencies
-        run: src/bin/installDeps.sh
+        working-directory: ./etherpad-lite
+        run: bin/installDeps.sh
+      - name: Install plugin
+        working-directory: ./etherpad-lite
+        run: |
+          pnpm run plugins i --path  ../../plugin
       -
         name: Run the backend tests
-        run: cd src && npm test
+        working-directory: ./etherpad-lite/src
+        run: |
+          res=$(find ./plugin_packages -path "*/static/tests/backend/specs/*" 2>/dev/null | wc -l)
+          if [ $res -eq 0 ]; then
+          echo "No backend tests found"
+          else
+          npx cross-env NODE_ENV=production mocha --import=tsx --timeout 120000 --recursive node_modules/ep_*/static/tests/backend/specs/**
+          fi

package/.github/workflows/codeql.yml

@@ -8,34 +8,9 @@ on:
   schedule:
     - cron: "48 0 * * 2"
 
+
 jobs:
   analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ javascript ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: ether/ether-pipelines/.github/workflows/codeql-plugins.yml@main
+        secrets: inherit
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:${{ matrix.language }}"

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

@@ -1,38 +1,39 @@
 # Publicly credit Sauce Labs because they generously support open source
 # projects.
-name: "frontend tests powered by Sauce Labs"
+name: Frontend Tests
 
-on: [push]
+on:
+  workflow_call:
 
 jobs:
-  test:
+  test-frontend:
     runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
+
     steps:
-      -
-        name: Generate Sauce Labs strings
-        id: sauce_strings
-        run: |
-          printf %s\\n '::set-output name=name::${{github.event.repository.name}} ${{ github.workflow }} - ${{ github.job }}'
-          printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
       -
         name: Check out Etherpad core
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ether/etherpad-lite
-      -
-        uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
         with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            src/package-lock.json
-            src/bin/doc/package-lock.json
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
+          version: 10
+          run_install: false
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       -
         name: Check out the plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ./node_modules/__tmp
       -
@@ -59,7 +60,7 @@ jobs:
           PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
         run: |
           cd ./node_modules/"${PLUGIN_NAME}"
-          npm ci
+          pnpm i
       # 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
@@ -71,31 +72,23 @@ jobs:
       # rules.
       -
         name: Install Etherpad core dependencies
-        run: src/bin/installDeps.sh
-      -
-        name: Create settings.json
-        run: cp settings.json.template settings.json
-      -
-        name: Disable import/export rate limiting
-        run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
-      -
-        name: Remove standard frontend test files
-        run: rm -rf src/tests/frontend/specs
-      -
-        uses: saucelabs/sauce-connect-action@v2.1.1
-        with:
-          username: ${{ secrets.SAUCE_USERNAME }}
-          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-          tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
-      -
-        name: Run the frontend tests
+        run: bin/installDeps.sh
+      - name: Create settings.json
+        run: cp ./src/tests/settings.json settings.json
+      - name: Run the frontend 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/runner.sh
+          pnpm run dev &
+          connected=false
+          can_connect() {
+          curl -sSfo /dev/null http://localhost:9001/ || return 1
+          connected=true
+          }
+          now() { date +%s; }
+          start=$(now)
+          while [ $(($(now) - $start)) -le 15 ] && ! can_connect; do
+          sleep 1
+          done
+          cd src
+          pnpm exec playwright install chromium  --with-deps
+          pnpm run test-ui --project=chromium

package/.github/workflows/npmpublish.yml

@@ -4,92 +4,40 @@
 name: Node.js Package
 
 on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - master
+  workflow_call:
 
 jobs:
-  test:
+  publish-npm:
     runs-on: ubuntu-latest
     steps:
-      # Clone ether/etherpad-lite to ../etherpad-lite so that ep_etherpad-lite
-      # can be "installed" in this plugin's node_modules. The checkout v2 action
-      # doesn't support cloning outside of $GITHUB_WORKSPACE (see
-      # https://github.com/actions/checkout/issues/197), so the repo is first
-      # cloned to etherpad-lite then moved to ../etherpad-lite. To avoid
-      # conflicts with this plugin's clone, etherpad-lite must be cloned and
-      # moved out before this plugin's repo is cloned to $GITHUB_WORKSPACE.
-      -
-        uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org/
+      - name: Check out Etherpad core
+        uses: actions/checkout@v4
         with:
           repository: ether/etherpad-lite
-          path: etherpad-lite
-      -
-        run: mv etherpad-lite ..
-      # etherpad-lite has been moved outside of $GITHUB_WORKSPACE, so it is now
-      # safe to clone this plugin's repo to $GITHUB_WORKSPACE.
-      -
-        uses: actions/checkout@v3
-      # This is necessary for actions/setup-node because '..' can't be used in
-      # cache-dependency-path.
-      -
-        name: Create ep_etherpad-lite symlink
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+      - name: Get pnpm store directory
+        shell: bash
         run: |
-          mkdir -p node_modules
-          ln -s ../../etherpad-lite/src node_modules/ep_etherpad-lite
-      -
-        uses: actions/setup-node@v3
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
         with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            node_modules/ep_etherpad-lite/package-lock.json
-            node_modules/ep_etherpad-lite/bin/doc/package-lock.json
-            package-lock.json
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
-      # All of ep_etherpad-lite's devDependencies are installed because the
-      # plugin might do `require('ep_etherpad-lite/node_modules/${devDep}')`.
-      # Eventually it would be nice to create an ESLint plugin that prohibits
-      # Etherpad plugins from piggybacking off of ep_etherpad-lite's
-      # devDependencies. If we had that, we could change this line to only
-      # install production dependencies.
-      -
-        run: cd ../etherpad-lite/src && npm ci
-      -
-        run: npm ci
-      # This runs some sanity checks and creates a symlink at
-      # node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src.
-      # This step must be done after `npm ci` installs the plugin's dependencies
-      # because npm "helpfully" cleans up such symlinks. :( Installing
-      # ep_etherpad-lite in the plugin's node_modules prevents lint errors and
-      # unit test failures if the plugin does `require('ep_etherpad-lite/foo')`.
-      -
-        run: npm install --no-save ep_etherpad-lite@file:../etherpad-lite/src
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       -
-        run: npm test
-      -
-        run: npm run lint
-
-  publish-npm:
-    if: github.event_name == 'push'
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org/
-          cache: 'npm'
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
       -
         name: Bump version (patch)
         run: |
@@ -98,13 +46,13 @@ jobs:
           [ "${NEW_COMMITS}" -gt 0 ] || exit 0
           git config user.name 'github-actions[bot]'
           git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          npm ci
-          npm version patch
+          pnpm i
+          pnpm version patch
           git push --follow-tags
       # This is required if the package has a prepare script that uses something
       # in dependencies or devDependencies.
       -
-        run: npm ci
+        run: pnpm i
       # `npm publish` must come after `git push` otherwise there is a race
       # condition: If two PRs are merged back-to-back then master/main will be
       # updated with the commits from the second PR before the first PR's
@@ -116,11 +64,11 @@ jobs:
       # back-to-back merges will cause the first merge's workflow to fail but
       # the second's will succeed.
       -
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-      -
-        name: Add package to etherpad organization
-        run: npm access grant read-write etherpad:developers
+        run: pnpm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+      #-
+      #  name: Add package to etherpad organization
+      #  run: pnpm access grant read-write etherpad:developers
+      #  env:
+      #    NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/.github/workflows/test-and-release.yml

@@ -0,0 +1,18 @@
+name: Node.js Package
+on: [push]
+
+
+jobs:
+  backend:
+    uses: ./.github/workflows/backend-tests.yml
+    secrets: inherit
+  frontend:
+    uses: ./.github/workflows/frontend-tests.yml
+    secrets: inherit
+  release:
+    if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
+    needs:
+      - backend
+      - frontend
+    uses: ./.github/workflows/npmpublish.yml
+    secrets: inherit

package/index.js

@@ -66,15 +66,18 @@ const addContextToError = (err, pfx) => {
 
 // Copied from:
 // https://github.com/ether/etherpad-lite/blob/f95b09e0b6752a0d226d58d8b246831164dc9533/src/node/handler/PadMessageHandler.js#L1411-L1420
-const _getRoomSockets = (padId) => {
+const _getRoomSockets = (padID) => {
   const ns = socketio.sockets; // Default namespace.
-  const adapter = ns.adapter;
   // We could call adapter.clients(), but that method is unnecessarily asynchronous. Replicate what
   // it does here, but synchronously to avoid a race condition. This code will have to change when
   // we update to socket.io v3.
-  const room = adapter.rooms[padId];
+  const room = ns.adapter.rooms?.get(padID);
+
   if (!room) return [];
-  return Object.keys(room.sockets).map((id) => ns.connected[id]).filter((s) => s);
+
+  return Array.from(room)
+      .map((socketId) => ns.sockets.get(socketId))
+      .filter((socket) => socket);
 };
 
 /**
@@ -98,12 +101,12 @@ const handleRTCMessage = (socket, payload) => {
     },
   };
   if (payload.to == null) {
-    socket.to(padId).json.send(msg);
+    socket.to(padId).emit('message', msg);
   } else {
     for (const socket of _getRoomSockets(padId)) {
       const session = sessioninfos[socket.id];
       if (session && session.author === payload.to) {
-        socket.json.send(msg);
+        socket.emit('message', msg);
         break;
       }
     }

package/locales/da.json

@@ -0,0 +1,16 @@
+{
+	"@metadata": {
+		"authors": [
+			"Peterleth"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "Aktivér lyd-/videochat",
+	"ep_webrtc_error_ssl": "TLS (https) er påkrævet for at bruge WebRTC.",
+	"ep_webrtc_error_permission_cam": "Kunne ikke få adgang til dit kamera.",
+	"ep_webrtc_error_permission_mic": "Kunne ikke få adgang til din mikrofon.",
+	"ep_webrtc_error_permission_cammic": "Kunne ikke få adgang til dit kamera og din mikrofon.",
+	"ep_webrtc_error_permission_screen": "Kunne ikke få adgang til din skærm.",
+	"ep_webrtc_error_notFound_cam": "Kunne ikke få adgang til dit kamera.",
+	"ep_webrtc_error_notFound_mic": "Kunne ikke få adgang til din mikrofon.",
+	"ep_webrtc_error_notFound_cammic": "Kunne ikke få adgang til dit kamera og din mikrofon."
+}

package/locales/diq.json

@@ -1,11 +1,20 @@
 {
 	"@metadata": {
 		"authors": [
-			"1917 Ekim Devrimi"
+			"1917 Ekim Devrimi",
+			"GolyatGeri"
 		]
 	},
 	"ep_webrtc_settings_enablertc": "Vengın/Videoyın mewbeti aktiv ke",
 	"ep_webrtc_error_ssl": "Malesef , misalê Etherpad de karnayışê WebRTC'yi re sertifikay SSL barkerdış ganiyo.",
+	"ep_webrtc_error_permission_cam": "Mısade resayışê kameray nêgeriyao.",
+	"ep_webrtc_error_permission_mic": "Mısade resayışê mikrofoni nêgeriyao.",
+	"ep_webrtc_error_permission_cammic": "Mısade resayışê kameray u mikrofoni nêgeriyao.",
+	"ep_webrtc_error_permission_screen": "Mısade resayışê ekrani nêgeriyao.",
+	"ep_webrtc_error_notFound_cam": "Nêreseyao kamera",
+	"ep_webrtc_error_notFound_mic": "Nêreseyao mikrofoni",
+	"ep_webrtc_error_notFound_cammic": "Nêreseyao kamera u mikrofoni",
+	"ep_webrtc_error_notFound_screen": "Nêreseyao ekran",
 	"ep_webrtc_error_notReadable": "Malesef, kamera u/yana mikrofoni resayışi vındarnen yew xetay hardwarey veciyê:",
 	"ep_webrtc_error_otherCantAccess": "Malesef, resayışê browseri ra kamera u mikrofoni rê çıniyo. Kerem kerê eyaranê browserê ho de mısadeyan kontrol kerê. Gerek ke xetay hardwarey nêbo:",
 	"ep_webrtc_settings_audioenabledonstart": "Sıftekerdış de veng AKERDE",

package/locales/es.json

@@ -2,10 +2,22 @@
 	"@metadata": {
 		"authors": [
 			"Fewasser Traduce",
-			"Jackiezelaya"
+			"Jackiezelaya",
+			"Ovruni"
 		]
 	},
+	"ep_webrtc_settings_enablertc": "Habilitar chat de audio/video",
 	"ep_webrtc_error_ssl": "TLS (https) es necesario para utilizar WebRTC.",
+	"ep_webrtc_error_permission_cam": "No se pudo obtener permiso para acceder a su cámara.",
+	"ep_webrtc_error_permission_mic": "No se pudo obtener permiso para acceder a su micrófono.",
+	"ep_webrtc_error_permission_cammic": "No se pudo obtener permiso para acceder a su cámara y micrófono.",
 	"ep_webrtc_error_permission_screen": "Error al conseguir permiso para acceder a tu pantalla.",
-	"ep_webrtc_error_notFound_screen": "Error al acceder a tu pantalla."
+	"ep_webrtc_error_notFound_cam": "No se pudo acceder a su cámara.",
+	"ep_webrtc_error_notFound_mic": "No se pudo acceder a su micrófono.",
+	"ep_webrtc_error_notFound_cammic": "No se pudo acceder a su cámara ni al micrófono.",
+	"ep_webrtc_error_notFound_screen": "Error al acceder a tu pantalla.",
+	"ep_webrtc_error_notReadable": "Lo sentimos, se produjo un error de hardware que impidió el acceso a su cámara y/o micrófono:",
+	"ep_webrtc_error_otherCantAccess": "Lo sentimos, el navegador no tiene acceso a tu cámara ni a tu micrófono. Revisa los permisos en la configuración de tu navegador. Probablemente no se trate de un error de hardware.",
+	"ep_webrtc_settings_audioenabledonstart": "Audio encendido al inicio",
+	"ep_webrtc_settings_videoenabledonstart": "Vídeo encendido al inicio"
 }

package/locales/fa.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Darafsh"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "فعال‌سازی چت صوتی/تصویری",
+	"ep_webrtc_error_ssl": "برای استفاده از WebRTC نیاز به TLS (https) است.",
+	"ep_webrtc_error_permission_cam": "دریافت اجازه برای دسترسی به دوربین شما ناموفق بود.",
+	"ep_webrtc_error_permission_mic": "دریافت اجازه برای دسترسی به میکروفون شما ناموفق بود.",
+	"ep_webrtc_error_permission_cammic": "دریافت اجازه برای دسترسی به دوربین و میکروفون شما ناموفق بود.",
+	"ep_webrtc_error_permission_screen": "دریافت اجازه برای دسترسی به صفحه‌نمایش شما ناموفق بود.",
+	"ep_webrtc_error_notFound_cam": "دسترسی به دوربین شما ناموفق بود.",
+	"ep_webrtc_error_notFound_mic": "دسترسی به میکروفون شما ناموفق بود.",
+	"ep_webrtc_error_notFound_cammic": "دسترسی به دوربین و میکروفون شما ناموفق بود.",
+	"ep_webrtc_error_notFound_screen": "دسترسی به صفحه‌نمایش شما ناموفق بود.",
+	"ep_webrtc_error_notReadable": "متأسفیم، خطای سخت‌افزاری‌ای رخ داد که مانع دسترسی به دوربین و/یا میکروفون شما شد:",
+	"ep_webrtc_error_otherCantAccess": "متأسفیم، مرورگر به دوربین و/یا میکروفون شما دسترسی ندارد. لطفاً مجوزها را در تنظیمات مرورگر خود بررسی کنید. این مشکل به‌احتمال زیاد خطای سخت‌افزاری نیست:",
+	"ep_webrtc_settings_audioenabledonstart": "روشن بودن صدا در شروع",
+	"ep_webrtc_settings_videoenabledonstart": "روشن بودن ویدئو در شروع"
+}

package/locales/ga.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Aindriu80"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "Cumasaigh Comhrá Fuaime/Físe",
+	"ep_webrtc_error_ssl": "Tá TLS (https) ag teastáil chun WebRTC a úsáid.",
+	"ep_webrtc_error_permission_cam": "Theip ar chead a fháil chun rochtain a fháil ar do cheamara.",
+	"ep_webrtc_error_permission_mic": "Theip ar chead a fháil chun rochtain a fháil ar do mhicreafón.",
+	"ep_webrtc_error_permission_cammic": "Theip ar chead a fháil chun rochtain a fháil ar do cheamara agus do mhicreafón.",
+	"ep_webrtc_error_permission_screen": "Theip ar chead a fháil chun rochtain a fháil ar do scáileán.",
+	"ep_webrtc_error_notFound_cam": "Theip ar rochtain a fháil ar do cheamara.",
+	"ep_webrtc_error_notFound_mic": "Theip ar rochtain a fháil ar do mhicreafón.",
+	"ep_webrtc_error_notFound_cammic": "Theip ar rochtain a fháil ar do cheamara agus do mhicreafón.",
+	"ep_webrtc_error_notFound_screen": "Theip ar rochtain a fháil ar do scáileán.",
+	"ep_webrtc_error_notReadable": "Ár leithscéal, tharla earráid crua-earraí a chuir cosc ​​ar rochtain ar do cheamara agus/nó micreafón:",
+	"ep_webrtc_error_otherCantAccess": "Ár leithscéal, níl rochtain ag an mbrabhsálaí ar do cheamara agus/nó micreafón. Seiceáil ceadanna i socruithe do bhrabhsálaí le do thoil. Is dócha nach earráid crua-earraí atá ann:",
+	"ep_webrtc_settings_audioenabledonstart": "Fuaim AR SIÚL ag an Tosach",
+	"ep_webrtc_settings_videoenabledonstart": "Físeán AR SIÚL ag an Tosach"
+}

package/locales/id.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Atriwidada"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "Fungsikan Obrolan Audio/Video",
+	"ep_webrtc_error_ssl": "TLS (https) diperlukan untuk memakai WebRTC.",
+	"ep_webrtc_error_permission_cam": "Gagal mendapatkan izin untuk mengakses kamera Anda.",
+	"ep_webrtc_error_permission_mic": "Gagal mendapatkan izin untuk mengakses mikrofon Anda.",
+	"ep_webrtc_error_permission_cammic": "Gagal mendapat izin untuk mengakses kamera dan mikrofon Anda.",
+	"ep_webrtc_error_permission_screen": "Gagal mendapatkan izin untuk mengakses layar Anda.",
+	"ep_webrtc_error_notFound_cam": "Gagal mengakses kamera Anda.",
+	"ep_webrtc_error_notFound_mic": "Gagal mengakses mikrofon Anda.",
+	"ep_webrtc_error_notFound_cammic": "Gagal mengakses kamera dan mikrofon Anda.",
+	"ep_webrtc_error_notFound_screen": "Gagal mengakses layar Anda.",
+	"ep_webrtc_error_notReadable": "Maaf, suatu galat perangkat keras terjadi yang mencegah akses ke kamera dan/atau mikrofon Anda.",
+	"ep_webrtc_error_otherCantAccess": "Maaf, peramban tidak memiliki akses ke kamera dan/atau mikrofon Anda. Harap periksa izin dalam pengaturan peramban Anda. Ini sangat boleh jadi bukan suatu galat perangkat keras.",
+	"ep_webrtc_settings_audioenabledonstart": "Audio HIDUP saat Start",
+	"ep_webrtc_settings_videoenabledonstart": "Video HIDUP saat Start"
+}

package/locales/kaa.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Inabat Allanova"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "Audio/Video sáwbetti jaǵıw",
+	"ep_webrtc_error_ssl": "WebRTC dan paydalanıw ushın TLS (https) talap etiledi.",
+	"ep_webrtc_error_permission_cam": "Kamerańızdı qosıwǵa ruxsat berilmedi.",
+	"ep_webrtc_error_permission_mic": "Mikrofonıńızdı qosıwǵa ruxsat berilmedi.",
+	"ep_webrtc_error_permission_cammic": "Kamera hám mikrofonıńızdı qosıwǵa ruxsat berilmedi.",
+	"ep_webrtc_error_permission_screen": "Ekranıńızdı qosıwǵa ruxsat berilmedi.",
+	"ep_webrtc_error_notFound_cam": "Kamerańızdı qosıwda qátelik júz berdi.",
+	"ep_webrtc_error_notFound_mic": "Mikrofonıńızdı qosıwda qátelik júz berdi.",
+	"ep_webrtc_error_notFound_cammic": "Kamera hám mikrofonıńızdı qosıwda qátelik júz berdi.",
+	"ep_webrtc_error_notFound_screen": "Ekranıńızdı qosıwda qátelik júz berdi.",
+	"ep_webrtc_error_notReadable": "Keshirińiz, kamerańız yamasa mikrofonıńızdı qosıwda apparat qátesi júz berdi:",
+	"ep_webrtc_error_otherCantAccess": "Keshirińiz, brauzerińiz kamerańız yamasa mikrofonıńızǵa kire almay atır. Ótinish, brauzerińiz sazlamalarında ruqsatlardı tekseriń. Bul, itimal, apparat qátesi bolmawı múmkin.",
+	"ep_webrtc_settings_audioenabledonstart": "Audio qosıldı",
+	"ep_webrtc_settings_videoenabledonstart": "Video qosıldı"
+}

package/locales/lt.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Nokeoo"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "Įgalinti garso / vaizdo pokalbius",
+	"ep_webrtc_error_ssl": "Norint naudoti WebRTC, reikalingas TLS (https).",
+	"ep_webrtc_error_permission_cam": "Nepavyko gauti leidimo pasiekti jūsų kamerą.",
+	"ep_webrtc_error_permission_mic": "Nepavyko gauti leidimo pasiekti jūsų mikrofoną.",
+	"ep_webrtc_error_permission_cammic": "Nepavyko gauti leidimo pasiekti jūsų kamerą ir mikrofoną.",
+	"ep_webrtc_error_permission_screen": "Nepavyko gauti leidimo pasiekti jūsų ekraną.",
+	"ep_webrtc_error_notFound_cam": "Nepavyko pasiekti jūsų kameros.",
+	"ep_webrtc_error_notFound_mic": "Nepavyko pasiekti jūsų mikrofono.",
+	"ep_webrtc_error_notFound_cammic": "Nepavyko pasiekti jūsų kameros ir mikrofono.",
+	"ep_webrtc_error_notFound_screen": "Nepavyko pasiekti jūsų ekrano.",
+	"ep_webrtc_error_notReadable": "Atsiprašau, įvyko techninė klaida, dėl kurios nepavyko pasiekti jūsų kameros ir (ar) mikrofono:",
+	"ep_webrtc_error_otherCantAccess": "Atsiprašome, naršyklė neturi prieigos prie jūsų kameros ir (ar) mikrofono. Patikrinkite leidimus naršyklės nustatymuose. Greičiausiai tai nėra įrangos klaida:",
+	"ep_webrtc_settings_audioenabledonstart": "Garsas ĮJUNGTAS pradžioje",
+	"ep_webrtc_settings_videoenabledonstart": "Vaizdas ĮJUNGTAS pradžioje"
+}

package/locales/nl.json

@@ -1,21 +1,22 @@
 {
 	"@metadata": {
 		"authors": [
+			"McDutchie",
 			"Spinster"
 		]
 	},
 	"ep_webrtc_settings_enablertc": "Audio-/videochat inschakelen",
 	"ep_webrtc_error_ssl": "TLS (https) is vereist om WebRTC te gebruiken.",
-	"ep_webrtc_error_permission_cam": "Kan geen toestemming krijgen om toegang te krijgen tot je camera.",
-	"ep_webrtc_error_permission_mic": "Kan geen toestemming krijgen om toegang te krijgen tot je microfoon.",
-	"ep_webrtc_error_permission_cammic": "Kan geen toestemming krijgen voor toegang tot je camera en microfoon.",
-	"ep_webrtc_error_permission_screen": "Kan geen toestemming krijgen om toegang te krijgen tot je scherm.",
-	"ep_webrtc_error_notFound_cam": "Kan geen toegang krijgen tot je camera.",
-	"ep_webrtc_error_notFound_mic": "Kan geen toegang krijgen tot je microfoon.",
-	"ep_webrtc_error_notFound_cammic": "Kan geen toegang krijgen tot je camera en microfoon.",
-	"ep_webrtc_error_notFound_screen": "Kan geen toegang krijgen tot je scherm.",
-	"ep_webrtc_error_notReadable": "Sorry, er is een hardwarefout opgetreden waardoor de toegang tot je camera en/of microfoon is verhinderd:",
-	"ep_webrtc_error_otherCantAccess": "Sorry, de browser heeft geen toegang tot je camera en/of microfoon. Controleer de permissies in de instellingen van je browser. Dit is hoogstwaarschijnlijk geen hardwarefout:",
-	"ep_webrtc_settings_audioenabledonstart": "Audio AAN bij Start",
-	"ep_webrtc_settings_videoenabledonstart": "Video AAN bij Start"
+	"ep_webrtc_error_permission_cam": "De toegang tot uw camera is geweigerd.",
+	"ep_webrtc_error_permission_mic": "De toegang tot uw microfoon is geweigerd.",
+	"ep_webrtc_error_permission_cammic": "De toegang tot uw camera en microfoon is geweigerd.",
+	"ep_webrtc_error_permission_screen": "De toegang tot uw scherm is geweigerd.",
+	"ep_webrtc_error_notFound_cam": "De toegang tot uw camera is mislukt.",
+	"ep_webrtc_error_notFound_mic": "De toegang tot uw microfoon is mislukt.",
+	"ep_webrtc_error_notFound_cammic": "De toegang tot uw camera en microfoon is mislukt.",
+	"ep_webrtc_error_notFound_screen": "De toegang tot uw scherm is mislukt.",
+	"ep_webrtc_error_notReadable": "Helaas is er een hardwarefout opgetreden waardoor de toegang tot uw camera en/of microfoon is verhinderd:",
+	"ep_webrtc_error_otherCantAccess": "De browser heeft geen toegang tot uw camera en/of microfoon. Controleer de toestemmingen in de instellingen van uw browser. Dit is hoogstwaarschijnlijk geen hardwarefout:",
+	"ep_webrtc_settings_audioenabledonstart": "Audio AAN bij opstarten",
+	"ep_webrtc_settings_videoenabledonstart": "Video AAN bij opstarten"
 }

package/locales/pl.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Usagi.02808"
+		]
+	},
+	"ep_webrtc_settings_enablertc": "Włącz czat audio/wideo",
+	"ep_webrtc_error_ssl": "TLS (https) jest wymagany do korzystania z WebRTC.",
+	"ep_webrtc_error_permission_cam": "Nie udało się uzyskać pozwolenia na dostęp do kamery.",
+	"ep_webrtc_error_permission_mic": "Nie udało się uzyskać pozwolenia na dostęp do mikrofonu.",
+	"ep_webrtc_error_permission_cammic": "Nie udało się uzyskać pozwolenia na dostęp do kamery i mikrofonu.",
+	"ep_webrtc_error_permission_screen": "Nie udało się uzyskać pozwolenia na dostęp do ekranu.",
+	"ep_webrtc_error_notFound_cam": "Nie udało się uzyskać dostępu do aparatu.",
+	"ep_webrtc_error_notFound_mic": "Nie udało się uzyskać dostępu do mikrofonu.",
+	"ep_webrtc_error_notFound_cammic": "Nie udało się uzyskać dostępu do kamery i mikrofonu.",
+	"ep_webrtc_error_notFound_screen": "Nie udało się uzyskać dostępu do ekranu.",
+	"ep_webrtc_error_notReadable": "Przepraszamy, wystąpił błąd sprzętowy, który uniemożliwił dostęp do kamery i/lub mikrofonu:",
+	"ep_webrtc_error_otherCantAccess": "Przeglądarka nie ma dostępu do kamery i/lub mikrofonu. Sprawdź uprawnienia w ustawieniach przeglądarki. Najprawdopodobniej nie jest to błąd sprzętowy:",
+	"ep_webrtc_settings_audioenabledonstart": "Dźwięk włączony na początku",
+	"ep_webrtc_settings_videoenabledonstart": "Wideo włączone na początku"
+}

package/locales/pms.json

@@ -6,6 +6,14 @@
 	},
 	"ep_webrtc_settings_enablertc": "Ativé la conversassion sonora/filmà",
 	"ep_webrtc_error_ssl": "An dëspias, a l'ha damanca d'anstalé dij sertificà SSL për soa istansa Etherpad për dovré WebRTC.",
+	"ep_webrtc_error_permission_cam": "Falì a oten-e ël përmess d'acede a soa telecàmera.",
+	"ep_webrtc_error_permission_mic": "Falì a oten-e ël përmess d'acede a sò micròfon.",
+	"ep_webrtc_error_permission_cammic": "Falì a oten-e ël përmess d'acede a sò telecàmera e micròfon.",
+	"ep_webrtc_error_permission_screen": "Falì a oten-e ël përmess d'acede a sò scren.",
+	"ep_webrtc_error_notFound_cam": "Falì a acede a soa telecàmera.",
+	"ep_webrtc_error_notFound_mic": "Falì a acede a sò micròfon.",
+	"ep_webrtc_error_notFound_cammic": "Falì a acede a sò telecàmera e micròfon.",
+	"ep_webrtc_error_notFound_screen": "Falì a acede a sò scren.",
 	"ep_webrtc_error_notReadable": "An dëspias, a-i é staje n'eror material che a l'ha ampedì l'acess a sò telecàmera o micròfon:",
 	"ep_webrtc_error_otherCantAccess": "An dëspias, ël navigador a l'ha nen acess a sò telecàmera o micròfon. Për piasì, ch'a contròla j'autorisassion ant ij paràmeter ëd sò navigador. Probabilman a l'é nen n'eror material:",
 	"ep_webrtc_settings_audioenabledonstart": "Sonor ativà a la partensa",

package/locales/pt.json

@@ -1,13 +1,14 @@
 {
 	"@metadata": {
 		"authors": [
-			"Guilha"
+			"Guilha",
+			"Hamilton Abreu"
 		]
 	},
 	"ep_webrtc_settings_enablertc": "Ativar videochamada",
 	"ep_webrtc_error_ssl": "Aviso, é necessária a instalação de certificados SSL para o Etherpad usar o WebRTC.",
 	"ep_webrtc_error_notReadable": "Lamentamos, mas ocorreu um erro de hardware que impediu o acesso à câmara e/ou microfone:",
-	"ep_webrtc_error_otherCantAccess": "O navegador não tem acesso à câmera e/ou microfone. Verifica as permissões nas configurações do teu navegador. Provavelmente não é um erro de hardware:",
+	"ep_webrtc_error_otherCantAccess": "O navegador não tem acesso à câmara e/ou microfone. Verifica as permissões nas configurações do teu navegador. Provavelmente não é um erro de hardware:",
 	"ep_webrtc_settings_audioenabledonstart": "Ligar áudio ao iníciar",
 	"ep_webrtc_settings_videoenabledonstart": "Ligar vídeo ao iníciar"
 }

package/locales/zh-hans.json

@@ -3,11 +3,12 @@
 		"authors": [
 			"Crowley666",
 			"GuoPC",
+			"HellojoeAoPS",
 			"Zhang8569"
 		]
 	},
 	"ep_webrtc_settings_enablertc": "启用音频/视频聊天",
-	"ep_webrtc_error_ssl": "TLS（https）要求使用WebRTC。",
+	"ep_webrtc_error_ssl": "使用 WebRTC 需要 TLS (https)。",
 	"ep_webrtc_error_permission_cam": "无法获取访问摄像头的权限。",
 	"ep_webrtc_error_permission_mic": "无法获取访问麦克风的权限。",
 	"ep_webrtc_error_permission_cammic": "无法获取访问摄像头和麦克风的权限。",

package/package.json

@@ -5,34 +5,31 @@
     "url": "git@github.com:ether/ep_webrtc.git",
     "type": "git"
   },
-  "version": "2.3.18",
+  "version": "2.5.3",
   "description": "WebRTC based audio/video chat to Etherpad",
   "author": "John McLear <john@mclear.co.uk>",
   "contributors": [],
   "engines": {
-    "node": ">=12.17.0"
+    "node": ">=18.0.0"
   },
   "dependencies": {
     "abort-controller": "^3.0.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^3.2.3"
+    "node-fetch": "^3.3.2"
   },
   "funding": {
     "type": "individual",
     "url": "https://etherpad.org/"
   },
   "devDependencies": {
-    "eslint": "^8.11.0",
-    "eslint-config-etherpad": "^3.0.9",
-    "mocha": "^9.2.2",
-    "typescript": "^4.6.2"
+    "eslint": "^8.57.0",
+    "eslint-config-etherpad": "^4.0.4",
+    "mocha": "^10.2.0",
+    "typescript": "^5.4.2"
   },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "test": "mocha --recursive static/tests/backend/specs"
-  },
-  "peerDependencies": {
-    "ep_etherpad-lite": ">=1.8.7"
   }
-}
+}

package/static/js/index.js

@@ -1208,7 +1208,7 @@ exports.rtc = new class {
       type: 'STATS',
       data: {statName, type: 'RTC_MESSAGE'},
     };
-    this._pad.socket.json.send(msg);
+    this._pad.socket.emit('message', msg);
   }
 
   sendMessage(to, data) {

package/static/tests/backend/specs/sharding.js

@@ -8,7 +8,7 @@ const settings = require('ep_etherpad-lite/node/utils/Settings');
 
 describe(__filename, function () {
   let agent;
-  const backup = {settings: {...settings}};
+  const backup = {settings: {requireAuthentication: settings.requireAuthentication}};
   const iceServers = [...Array(1000).keys()].map((i) => ({urls: [`turn:turn${i}.example.com`]}));
 
   const reload = async (settings = {}) => {
@@ -49,7 +49,7 @@ describe(__filename, function () {
   });
 
   after(async function () {
-    Object.assign(settings, backup.settings);
+    settings.requireAuthentication = backup.settings.requireAuthentication;
     await plugin.loadSettings('loadSettings', {settings});
   });