mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 09:56:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixed frontend tests. (#6210)

Browse source 
* Fixed frontend tests.

* Use old socket io syntax.

* uSE ESM:

* Remove padvar.

* Remove cypress.
This commit is contained in:
SamTV12345 2024-03-08 18:50:29 +01:00 • committed by GitHub
parent 2fa2d5bd17
commit d34b964cc2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/node/hooks/express/socketio.ts
View file

@ -2,12 +2,12 @@
import {ArgsExpressType} from "../../types/ArgsExpressType";
const events = require('events');
import events from 'events';
const express = require('../express');
const log4js = require('log4js');
import log4js from 'log4js';
const proxyaddr = require('proxy-addr');
const settings = require('../../utils/Settings');
import {Server} from 'socket.io'
import {Server, Socket} from 'socket.io'
const socketIORouter = require('../../handler/SocketIORouter');
const hooks = require('../../../static/js/pluginfw/hooks');
const padMessageHandler = require('../../handler/PadMessageHandler');
@ -17,7 +17,7 @@ const logger = log4js.getLogger('socket.io');
const sockets = new Set();
const socketsEvents = new events.EventEmitter();
exports.expressCloseServer = async () => {
export const expressCloseServer = async () => {
if (io == null) return;
logger.info('Closing socket.io engine...');
// Close the socket.io engine to disconnect existing clients and reject new clients. Don't call
@ -48,7 +48,7 @@ exports.expressCloseServer = async () => {
logger.info('All socket.io clients have disconnected');
};
exports.socketSessionMiddleware = (args: any) => (socket: any, next: Function) => {
const 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) {
@ -65,19 +65,16 @@ exports.socketSessionMiddleware = (args: any) => (socket: any, next: Function) =
express.sessionMiddleware(req, {}, next);
};
exports.expressCreateServer = (hookName:string, args:ArgsExpressType, cb:Function) => {
export const 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 = new Server({
io = new Server(args.server,{
transports: settings.socketTransportProtocols,
})
io.attach(args.server, {
cookie: false,
maxHttpBufferSize: settings.socketIo.maxHttpBufferSize,
});
})
io.on('connection', (socket:any) => {
sockets.add(socket);
@ -92,11 +89,11 @@ exports.expressCreateServer = (hookName:string, args:ArgsExpressType, cb:Functio
});
});
io.use(exports.socketSessionMiddleware(args));
io.use(socketSessionMiddleware(args));
// Temporary workaround so all clients go through middleware and handle connection
io.of('/pluginfw/installer').use(exports.socketSessionMiddleware(args))
io.of('/settings').use(exports.socketSessionMiddleware(args))
io.of('/pluginfw/installer').use(socketSessionMiddleware(args))
io.of('/settings').use(socketSessionMiddleware(args))
io.use((socket:any, next:Function) => {
socket.conn.on('packet', (packet:string) => {