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

socket.io: Factor out client connection logic

Browse source
This commit is contained in:
Richard Hansen 2020-12-10 17:24:28 -05:00
parent 7eb0f996c3
commit 303964c51e
8 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/static/js/pad.js
View file

@ -29,6 +29,7 @@ let socket;
require('./jquery');
require('./farbtastic');
require('./excanvas');
require('./gritter');
const Cookies = require('./pad_utils').Cookies;
const chat = require('./chat').chat;
@ -44,7 +45,7 @@ const paduserlist = require('./pad_userlist').paduserlist;
const padutils = require('./pad_utils').padutils;
const colorutils = require('./colorutils').colorutils;
const randomString = require('./pad_utils').randomString;
require('./gritter'); // Mutates the jQuery object to make $.gritter available.
const socketio = require('./socketio');
const hooks = require('./pluginfw/hooks');
@ -218,15 +219,7 @@ const sendClientReady = (isReconnect, messageType) => {
};
const handshake = () => {
const loc = document.location;
// get the correct port
const port = loc.port === '' ? (loc.protocol === 'https:' ? 443 : 80) : loc.port;
// create the url
const url = `${loc.protocol}//${loc.hostname}:${port}/`;
// connect
socket = pad.socket = io.connect(url, {
// Allow deployers to host Etherpad on a non-root path
path: `${exports.baseURL}socket.io`,
socket = pad.socket = socketio.connect(exports.baseURL, '/', {
reconnectionAttempts: 5,
reconnection: true,
reconnectionDelay: 1000,