chore: updated clients to esm

.github/workflows/load-test.yml

@@ -42,7 +42,7 @@ jobs:
         run: pnpm install --frozen-lockfile
       -
         name: Install etherpad-load-test
-        run: sudo npm install -g etherpad-load-test-socket-io
+        run: sudo npm install -g etherpad-load-test
       -
         name: Run load test
         run: src/tests/frontend/travis/runnerLoadTest.sh 25 50
@@ -73,7 +73,7 @@ jobs:
           run_install: false
       -
         name: Install etherpad-load-test
-        run:  sudo npm install -g etherpad-load-test-socket-io
+        run:  sudo npm install -g etherpad-load-test
       -
         name: Install etherpad plugins
         run: >
@@ -135,7 +135,7 @@ jobs:
         run: pnpm install --frozen-lockfile
       -
         name: Install etherpad-load-test
-        run: sudo npm install -g etherpad-load-test-socket-io
+        run: sudo npm install -g etherpad-load-test
       -
         name: Run load test
         run: src/tests/frontend/travis/runnerLoadTest.sh 5000 5

src/package.json

@@ -120,7 +120,7 @@
     "chokidar": "^5.0.0",
     "eslint": "^10.2.1",
     "eslint-config-etherpad": "^4.0.5",
-    "etherpad-cli-client": "^3.0.5",
+    "etherpad-cli-client": "^4.0.2",
     "mocha": "^11.7.5",
     "mocha-froth": "^0.2.10",
     "nodeify": "^1.0.1",

src/tests/ratelimit/Dockerfile.anotherip

@@ -1,4 +1,4 @@
 FROM node:latest
 WORKDIR /tmp
-RUN npm i etherpad-cli-client
-COPY ./src/tests/ratelimit/send_changesets.js /tmp/send_changesets.js
+RUN npm i etherpad-cli-client@^4.0.2
+COPY ./src/tests/ratelimit/send_changesets.mjs /tmp/send_changesets.mjs

src/tests/ratelimit/send_changesets.js → src/tests/ratelimit/send_changesets.mjs

@@ -1,13 +1,11 @@
-'use strict';
+import {connect} from 'etherpad-cli-client';
 
-const etherpad = require('etherpad-cli-client');
-
-const pad = etherpad.connect(process.argv[2]);
+const pad = connect(process.argv[2]);
 pad.on('connected', () => {
   setTimeout(() => {
     setInterval(() => {
       pad.append('1');
-    }, process.argv[3]);
+    }, Number(process.argv[3]));
   }, 500); // wait because CLIENT_READY message is included in ratelimit
 
   setTimeout(() => {

src/tests/ratelimit/testlimits.sh

@@ -1,25 +1,25 @@
 #!/usr/bin/env bash
 
 #sending changesets every 101ms should not trigger ratelimit
-node send_changesets.js http://127.0.0.1:8081/p/BACKEND_TEST_ratelimit_101ms 101
+node send_changesets.mjs http://127.0.0.1:8081/p/BACKEND_TEST_ratelimit_101ms 101
 if [[ $? -ne 0 ]];then
   echo "FAILED: ratelimit was triggered when sending every 101 ms"
   exit 1
 fi
 
 #sending changesets every 99ms should trigger ratelimit
-node send_changesets.js http://127.0.0.1:8081/p/BACKEND_TEST_ratelimit_99ms 99
+node send_changesets.mjs http://127.0.0.1:8081/p/BACKEND_TEST_ratelimit_99ms 99
 if [[ $? -ne 1 ]];then
   echo "FAILED: ratelimit was not triggered when sending every 99 ms"
   exit 1
 fi
 
 #sending changesets every 101ms via proxy
-node send_changesets.js http://127.0.0.1:8081/p/BACKEND_TEST_ratelimit_101ms 101 &
+node send_changesets.mjs http://127.0.0.1:8081/p/BACKEND_TEST_ratelimit_101ms 101 &
 pid1=$!
 
 #sending changesets every 101ms via second IP and proxy
-docker exec anotherip node /tmp/send_changesets.js http://172.23.42.1:80/p/BACKEND_TEST_ratelimit_101ms_via_second_ip 101 &
+docker exec anotherip node /tmp/send_changesets.mjs http://172.23.42.1:80/p/BACKEND_TEST_ratelimit_101ms_via_second_ip 101 &
 pid2=$!
 
 wait $pid1