Migrate Socket.IO from Version 2 to Version 3 🚀 (#6152)

* feat :migrate socket.io 2 -> 3

* fix: backend test

* fix: ts error

* rm

* reset the test timeout

* Updated cli client.

* Updated lock file.

* Use updated load tester.

---------

Co-authored-by: SamTV12345 <40429738+samtv12345@users.noreply.github.com>

.github/workflows/load-test.yml

@@ -46,7 +46,7 @@ jobs:
         run: src/bin/installDeps.sh
       -
         name: Install etherpad-load-test
-        run: sudo npm install -g etherpad-load-test
+        run: sudo npm install -g etherpad-load-test-socket-io
       -
         name: Run load test
         run: src/tests/frontend/travis/runnerLoadTest.sh 25 50
@@ -87,7 +87,7 @@ jobs:
         run: pnpm config set auto-install-peers false
       -
         name: Install etherpad-load-test
-        run:  pnpm install -g etherpad-load-test
+        run:  pnpm install -g etherpad-load-test-socket-io
       -
         name: Install etherpad plugins
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
@@ -161,7 +161,7 @@ jobs:
         run: src/bin/installDeps.sh
       -
         name: Install etherpad-load-test
-        run: sudo npm install -g etherpad-load-test
+        run: sudo npm install -g etherpad-load-test-socket-io
       -
         name: Run load test
         run: src/tests/frontend/travis/runnerLoadTest.sh 5000 5

settings.json.docker

@@ -527,7 +527,7 @@
   /*
    * Restrict socket.io transport methods
    */
-  "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
+  "socketTransportProtocols" : ["websocket", "polling"],
 
   "socketIo": {
     /*

settings.json.template

@@ -527,7 +527,7 @@
   /*
    * Restrict socket.io transport methods
    */
-  "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
+  "socketTransportProtocols" : ["websocket", "polling"],
 
   "socketIo": {
     /*

src/node/handler/PadMessageHandler.js

@@ -83,7 +83,7 @@ exports.socketio = () => {
 const sessioninfos = {};
 exports.sessioninfos = sessioninfos;
 
-stats.gauge('totalUsers', () => socketio ? Object.keys(socketio.sockets.sockets).length : 0);
+stats.gauge('totalUsers', () => socketio ? socketio.sockets.size : 0);
 stats.gauge('activePads', () => {
   const padIds = new Set();
   for (const {padId} of Object.values(sessioninfos)) {
@@ -155,13 +155,13 @@ exports.handleConnect = (socket) => {
  * Kicks all sessions from a pad
  */
 exports.kickSessionsFromPad = (padID) => {
-  if (typeof socketio.sockets.clients !== 'function') return;
+  if (typeof socketio.sockets.clients !== 'object') return;
 
   // skip if there is nobody on this pad
   if (_getRoomSockets(padID).length === 0) return;
 
   // disconnect everyone from this pad
-  socketio.sockets.in(padID).json.send({disconnect: 'deleted'});
+  socketio.in(padID).emit('message', {disconnect: 'deleted'});
 };
 
 /**
@@ -183,7 +183,7 @@ exports.handleDisconnect = async (socket) => {
                     ` authorID:${session.author}` +
                     (user && user.username ? ` username:${user.username}` : ''));
   /* eslint-enable prefer-template */
-  socket.broadcast.to(session.padId).json.send({
+  socket.broadcast.to(session.padId).emit('message', {
     type: 'COLLABROOM',
     data: {
       type: 'USER_LEAVE',
@@ -216,7 +216,7 @@ exports.handleMessage = async (socket, message) => {
       messageLogger.warn(`Rate limited IP ${socket.request.ip}. To reduce the amount of rate ` +
                          'limiting that happens edit the rateLimit values in settings.json');
       stats.meter('rateLimited').mark();
-      socket.json.send({disconnect: 'rateLimited'});
+      socket.emit('message', {disconnect: 'rateLimited'});
       throw err;
     }
   }
@@ -267,11 +267,11 @@ exports.handleMessage = async (socket, message) => {
   const {accessStatus, authorID} =
       await securityManager.checkAccess(auth.padID, auth.sessionID, auth.token, user);
   if (accessStatus !== 'grant') {
-    socket.json.send({accessStatus});
+    socket.emit('message', {accessStatus});
     throw new Error('access denied');
   }
   if (thisSession.author != null && thisSession.author !== authorID) {
-    socket.json.send({disconnect: 'rejected'});
+    socket.emit('message', {disconnect: 'rejected'});
     throw new Error([
       'Author ID changed mid-session. Bad or missing token or sessionID?',
       `socket:${socket.id}`,
@@ -393,10 +393,10 @@ exports.handleCustomObjectMessage = (msg, sessionID) => {
   if (msg.data.type === 'CUSTOM') {
     if (sessionID) {
       // a sessionID is targeted: directly to this sessionID
-      socketio.sockets.socket(sessionID).json.send(msg);
+      socketio.sockets.socket(sessionID).emit('message', msg);
     } else {
       // broadcast to all clients on this pad
-      socketio.sockets.in(msg.data.payload.padId).json.send(msg);
+      socketio.sockets.in(msg.data.payload.padId).emit('message', msg);
     }
   }
 };
@@ -416,7 +416,7 @@ exports.handleCustomMessage = (padID, msgString) => {
       time,
     },
   };
-  socketio.sockets.in(padID).json.send(msg);
+  socketio.sockets.in(padID).emit('message', msg);
 };
 
 /**
@@ -453,7 +453,7 @@ exports.sendChatMessageToPadClients = async (mt, puId, text = null, padId = null
   // authorManager.getAuthorName() to resolve before saving the message to the database.
   const promise = pad.appendChatMessage(message);
   message.displayName = await authorManager.getAuthorName(message.authorId);
-  socketio.sockets.in(padId).json.send({
+  socketio.sockets.in(padId).emit('message', {
     type: 'COLLABROOM',
     data: {type: 'CHAT_MESSAGE', message},
   });
@@ -483,7 +483,7 @@ const handleGetChatMessages = async (socket, {data: {start, end}}) => {
   };
 
   // send the messages back to the client
-  socket.json.send(infoMsg);
+  socket.emit('message', infoMsg);
 };
 
 /**
@@ -500,7 +500,7 @@ const handleSuggestUserName = (socket, message) => {
   _getRoomSockets(padId).forEach((socket) => {
     const session = sessioninfos[socket.id];
     if (session && session.author === unnamedId) {
-      socket.json.send(message);
+      socket.emit('message', message);
     }
   });
 };
@@ -539,7 +539,7 @@ const handleUserInfoUpdate = async (socket, {data: {userInfo: {name, colorId}}})
   };
 
   // Send the other clients on the pad the update message
-  socket.broadcast.to(padId).json.send(infoMsg);
+  socket.broadcast.to(padId).emit('message',infoMsg);
 
   // Block until the authorManager has stored the new attributes.
   await p;
@@ -654,12 +654,12 @@ const handleUserChanges = async (socket, message) => {
     // The client assumes that ACCEPT_COMMIT and NEW_CHANGES messages arrive in order. Make sure we
     // have already sent any previous ACCEPT_COMMIT and NEW_CHANGES messages.
     assert.equal(thisSession.rev, r);
-    socket.json.send({type: 'COLLABROOM', data: {type: 'ACCEPT_COMMIT', newRev}});
+    socket.emit('message', {type: 'COLLABROOM', data: {type: 'ACCEPT_COMMIT', newRev}});
     thisSession.rev = newRev;
     if (newRev !== r) thisSession.time = await pad.getRevisionDate(newRev);
     await exports.updatePadClients(pad);
   } catch (err) {
-    socket.json.send({disconnect: 'badChangeset'});
+    socket.emit('message', {disconnect: 'badChangeset'});
     stats.meter('failedChangesets').mark();
     messageLogger.warn(`Failed to apply USER_CHANGES from author ${thisSession.author} ` +
                        `(socket ${socket.id}) on pad ${thisSession.padId}: ${err.stack || err}`);
@@ -716,7 +716,7 @@ exports.updatePadClients = async (pad) => {
         },
       };
       try {
-        socket.json.send(msg);
+        socket.emit('message', msg);
       } catch (err) {
         messageLogger.error(`Failed to notify user of new revision: ${err.stack || err}`);
         return;
@@ -833,7 +833,7 @@ const handleClientReady = async (socket, message) => {
       // fix user's counter, works on page refresh or if user closes browser window and then rejoins
       sessioninfos[otherSocket.id] = {};
       otherSocket.leave(sessionInfo.padId);
-      otherSocket.json.send({disconnect: 'userdup'});
+      otherSocket.emit('message', {disconnect: 'userdup'});
     }
   }
 
@@ -899,7 +899,7 @@ const handleClientReady = async (socket, message) => {
           apool: forWire.pool,
           author: changesets[r].author,
           currentTime: changesets[r].timestamp}};
-      socket.json.send(wireMsg);
+      socket.emit('message', wireMsg);
     }
 
     if (startNum === endNum) {
@@ -907,7 +907,7 @@ const handleClientReady = async (socket, message) => {
         data: {type: 'CLIENT_RECONNECT',
           noChanges: true,
           newRev: pad.getHeadRevisionNumber()}};
-      socket.json.send(Msg);
+      socket.emit('message', Msg);
     }
   } else {
     // This is a normal first connect
@@ -921,7 +921,7 @@ const handleClientReady = async (socket, message) => {
       atext.attribs = attribsForWire.translated;
     } catch (e) {
       messageLogger.error(e.stack || e);
-      socket.json.send({disconnect: 'corruptPad'}); // pull the brakes
+      socket.emit('message', {disconnect: 'corruptPad'}); // pull the brakes
       throw new Error('corrupt pad');
     }
 
@@ -1005,14 +1005,14 @@ const handleClientReady = async (socket, message) => {
     socket.join(sessionInfo.padId);
 
     // Send the clientVars to the Client
-    socket.json.send({type: 'CLIENT_VARS', data: clientVars});
+    socket.emit('message', {type: 'CLIENT_VARS', data: clientVars});
 
     // Save the current revision in sessioninfos, should be the same as in clientVars
     sessionInfo.rev = pad.getHeadRevisionNumber();
   }
 
   // Notify other users about this new user.
-  socket.broadcast.to(sessionInfo.padId).json.send({
+  socket.broadcast.to(sessionInfo.padId).emit('message', {
     type: 'COLLABROOM',
     data: {
       type: 'USER_NEWINFO',
@@ -1062,7 +1062,7 @@ const handleClientReady = async (socket, message) => {
       },
     };
 
-    socket.json.send(msg);
+    socket.emit('message', msg);
   }));
 
   await hooks.aCallAll('userJoin', {
@@ -1092,7 +1092,7 @@ const handleChangesetRequest = async (socket, {data: {granularity, start, reques
     start = headRev;
   const data = await getChangesetInfo(pad, start, end, granularity);
   data.requestID = requestID;
-  socket.json.send({type: 'CHANGESET_REQ', data});
+  socket.emit('message', {type: 'CHANGESET_REQ', data});
 };
 
 /**
@@ -1236,13 +1236,16 @@ const composePadChangesets = async (pad, startNum, endNum) => {
 
 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);
 };
 
 /**

src/node/hooks/express/socketio.ts

@@ -7,7 +7,7 @@ const express = require('../express');
 const log4js = require('log4js');
 const proxyaddr = require('proxy-addr');
 const settings = require('../../utils/Settings');
-const socketio = require('socket.io');
+const {Server} = require('socket.io');
 const socketIORouter = require('../../handler/SocketIORouter');
 const hooks = require('../../../static/js/pluginfw/hooks');
 const padMessageHandler = require('../../handler/PadMessageHandler');
@@ -48,12 +48,29 @@ exports.expressCloseServer = async () => {
   logger.info('All socket.io clients have disconnected');
 };
 
+exports.socketSessionMiddleware = (args: any) => (socket: any, next: Function) => {
+  const req = socket.request;
+  // Express sets req.ip but socket.io does not. Replicate Express's behavior here.
+  if (req.ip == null) {
+    if (settings.trustProxy) {
+      req.ip = proxyaddr(req, args.app.get('trust proxy fn'));
+    } else {
+      req.ip = socket.handshake.address;
+    }
+  }
+  if (!req.headers.cookie) {
+    // socketio.js-client on node.js doesn't support cookies, so pass them via a query parameter.
+    req.headers.cookie = socket.handshake.query.cookie;
+  }
+  express.sessionMiddleware(req, {}, next);
+};
+
 exports.expressCreateServer = (hookName:string, args:ArgsExpressType, cb:Function) => {
   // init socket.io and redirect all requests to the MessageHandler
   // there shouldn't be a browser that isn't compatible to all
   // transports in this list at once
   // e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling
-  io = socketio({
+  io = new Server(args.server, {
     transports: settings.socketTransportProtocols,
   }).listen(args.server, {
     /*
@@ -79,33 +96,20 @@ exports.expressCreateServer = (hookName:string, args:ArgsExpressType, cb:Functio
     maxHttpBufferSize: settings.socketIo.maxHttpBufferSize,
   });
 
-  io.on('connect', (socket:any) => {
+  io.on('connection', (socket:any) => {
     sockets.add(socket);
     socketsEvents.emit('updated');
+    // https://socket.io/docs/v3/faq/index.html
+    const session = socket.request.session;
+    session.connections++;
+    session.save();
     socket.on('disconnect', () => {
       sockets.delete(socket);
       socketsEvents.emit('updated');
     });
   });
 
-  io.use((socket:any, next: Function) => {
-    const req = socket.request;
-    // Express sets req.ip but socket.io does not. Replicate Express's behavior here.
-    if (req.ip == null) {
-      if (settings.trustProxy) {
-        req.ip = proxyaddr(req, args.app.get('trust proxy fn'));
-      } else {
-        req.ip = socket.handshake.address;
-      }
-    }
-    if (!req.headers.cookie) {
-      // socketio.js-client on node.js doesn't support cookies (see https://git.io/JU8u9), so the
-      // token and express_sid cookies have to be passed via a query parameter for unit tests.
-      req.headers.cookie = socket.handshake.query.cookie;
-    }
-    // See: https://socket.io/docs/faq/#Usage-with-express-session
-    express.sessionMiddleware(req, {}, next);
-  });
+  io.use(exports.socketSessionMiddleware(args));
 
   io.use((socket:any, next:Function) => {
     socket.conn.on('packet', (packet:string) => {

src/node/utils/Settings.js

@@ -126,7 +126,7 @@ exports.ssl = false;
 /**
  * socket.io transport methods
  **/
-exports.socketTransportProtocols = ['xhr-polling', 'jsonp-polling', 'htmlfile'];
+exports.socketTransportProtocols = ['websocket', 'polling'];
 
 exports.socketIo = {
   /**

src/package.json

@@ -36,7 +36,7 @@
     "cookie-parser": "^1.4.6",
     "cross-spawn": "^7.0.3",
     "ejs": "^3.1.9",
-    "etherpad-require-kernel": "^1.0.15",
+    "etherpad-require-kernel": "^1.0.16",
     "etherpad-yajsml": "0.0.12",
     "express": "4.18.2",
     "express-rate-limit": "^7.1.5",
@@ -62,12 +62,13 @@
     "resolve": "1.22.8",
     "security": "1.0.0",
     "semver": "^7.6.0",
-    "socket.io": "^2.5.0",
+    "socket.io": "^3.1.2",
+    "socket.io-client": "^3.1.3",
     "superagent": "^8.1.2",
     "terser": "^5.27.1",
     "threads": "^1.7.0",
     "tinycon": "0.6.8",
-    "tsx": "^4.7.0",
+    "tsx": "^4.7.1",
     "ueberdb2": "^4.2.56",
     "underscore": "1.13.6",
     "unorm": "1.6.0",
@@ -78,14 +79,14 @@
     "etherpad-lite": "node/server.ts"
   },
   "devDependencies": {
-    "cypress": "^13.6.4",
     "@types/async": "^3.2.24",
     "@types/express": "^4.17.21",
     "@types/node": "^20.11.19",
     "@types/underscore": "^1.11.15",
+    "cypress": "^13.6.4",
     "eslint": "^8.56.0",
     "eslint-config-etherpad": "^3.0.22",
-    "etherpad-cli-client": "^2.0.2",
+    "etherpad-cli-client": "^3.0.1",
     "mocha": "^10.3.0",
     "mocha-froth": "^0.2.10",
     "nodeify": "^1.0.1",

src/static/js/collab_client.js

@@ -156,7 +156,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
   };
 
   const sendMessage = (msg) => {
-    getSocket().json.send(
+    getSocket().emit('message',
         {
           type: 'COLLABROOM',
           component: 'pad',

src/static/js/pad.js

@@ -207,7 +207,7 @@ const sendClientReady = (isReconnect) => {
     msg.reconnect = true;
   }
 
-  socket.json.send(msg);
+  socket.emit("message", msg);
 };
 
 const handshake = async () => {

src/static/js/timeslider.js

@@ -95,7 +95,7 @@ const init = () => {
 
 // sends a message over the socket
 const sendSocketMsg = (type, data) => {
-  socket.json.send({
+  socket.emit("message", {
     component: 'pad', // FIXME: Remove this stupidity!
     type,
     data,

src/templates/pad.html

@@ -442,7 +442,7 @@
   <% e.begin_block("scripts"); %>
 
   <script type="text/javascript" src="../static/js/require-kernel.js?v=<%=settings.randomVersionString%>"></script>
-  <script type="text/javascript" src="../socket.io/socket.io.js?v=<%=settings.randomVersionString%>"></script>
+  <script type="text/javascript" src="../socket.io/socket.io.js"></script>
 
   <!-- Include base packages manually (this help with debugging) -->
   <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>

src/templates/timeslider.html

@@ -250,7 +250,7 @@
 <!----------------------------->
 
 <script type="text/javascript" src="../../static/js/require-kernel.js?v=<%=settings.randomVersionString%>"></script>
-<script type="text/javascript" src="../../socket.io/socket.io.js?v=<%=settings.randomVersionString%>"></script>
+<script type="text/javascript" src="../../socket.io/socket.io.js"></script>
 
 <!-- Include base packages manually (this help with debugging) -->
 <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>

src/tests/backend/common.js

@@ -147,7 +147,6 @@ exports.connect = async (res = null) => {
   }
   const socket = io(`${exports.baseUrl}/`, {
     forceNew: true, // Different tests will have different query parameters.
-    path: '/socket.io',
     // socketio.js-client on node.js doesn't support cookies (see https://git.io/JU8u9), so the
     // express_sid cookie must be passed as a query parameter.
     query: {cookie: reqCookieHdr, padId},
@@ -172,7 +171,7 @@ exports.connect = async (res = null) => {
  */
 exports.handshake = async (socket, padId, token = padutils.generateAuthorToken()) => {
   logger.debug('sending CLIENT_READY...');
-  socket.send({
+  socket.emit('message', {
     component: 'pad',
     type: 'CLIENT_READY',
     padId,
@@ -189,7 +188,7 @@ exports.handshake = async (socket, padId, token = padutils.generateAuthorToken()
  * Convenience wrapper around `socket.send()` that waits for acknowledgement.
  */
 exports.sendMessage = async (socket, message) => await new Promise((resolve, reject) => {
-  socket.send(message, (errInfo) => {
+  socket.emit('message', message, (errInfo) => {
     if (errInfo != null) {
       const {name, message} = errInfo;
       const err = new Error(message);

src/tests/backend/specs/chat.js

@@ -32,7 +32,7 @@ const checkHook = async (hookName, checkFn) => {
 };
 
 const sendMessage = (socket, data) => {
-  socket.send({
+  socket.emit('message', {
     type: 'COLLABROOM',
     component: 'pad',
     data,

src/tests/backend/specs/messages.js

@@ -38,6 +38,7 @@ describe(__filename, function () {
     res = await agent.get(`/p/${roPadId}`).expect(200);
     roSocket = await common.connect(res);
     await common.handshake(roSocket, roPadId);
+    await new Promise(resolve => setTimeout(resolve, 1000));
   });
 
   afterEach(async function () {

src/tests/backend/specs/socketio.js

@@ -390,7 +390,7 @@ describe(__filename, function () {
         handleMessage(socket, message) { assert.fail('wrong handler called'); }
       }());
       socket = await common.connect();
-      socket.send(want);
+      socket.emit('message', want);
       assert.deepEqual(await got, want);
     });
 
@@ -398,7 +398,7 @@ describe(__filename, function () {
       const AckErr = class extends Error {
         constructor(name, ...args) { super(...args); this.name = name; }
       };
-      socket.send(message,
+      socket.emit('message', message,
           (errj, val) => errj != null ? reject(new AckErr(errj.name, errj.message)) : resolve(val));
     });