mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-31 19:02:59 +01:00
collab_client: Delete unnecessary getSocket()
helper
This commit is contained in:
parent
f564e72792
commit
f26cc7f707
1 changed files with 5 additions and 11 deletions
|
@ -26,11 +26,6 @@ const chat = require('./chat').chat;
|
||||||
const hooks = require('./pluginfw/hooks');
|
const hooks = require('./pluginfw/hooks');
|
||||||
const browser = require('./vendors/browser');
|
const browser = require('./vendors/browser');
|
||||||
|
|
||||||
// Dependency fill on init. This exists for `pad.socket` only.
|
|
||||||
// TODO: bind directly to the socket.
|
|
||||||
let pad = undefined;
|
|
||||||
const getSocket = () => pad && pad.socket;
|
|
||||||
|
|
||||||
// Gate is a normal Promise that resolves when its open() method is called.
|
// Gate is a normal Promise that resolves when its open() method is called.
|
||||||
class Gate extends Promise {
|
class Gate extends Promise {
|
||||||
constructor(executor = null) {
|
constructor(executor = null) {
|
||||||
|
@ -46,9 +41,8 @@ class Gate extends Promise {
|
||||||
/** Call this when the document is ready, and a new Ace2Editor() has been created and inited.
|
/** Call this when the document is ready, and a new Ace2Editor() has been created and inited.
|
||||||
ACE's ready callback does not need to have fired yet.
|
ACE's ready callback does not need to have fired yet.
|
||||||
"serverVars" are from calling doc.getCollabClientVars() on the server. */
|
"serverVars" are from calling doc.getCollabClientVars() on the server. */
|
||||||
const getCollabClient = (ace2editor, serverVars, initialUserInfo, _pad) => {
|
const getCollabClient = (ace2editor, serverVars, initialUserInfo, pad) => {
|
||||||
const editor = ace2editor;
|
const editor = ace2editor;
|
||||||
pad = _pad; // Inject pad to avoid a circular dependency.
|
|
||||||
|
|
||||||
let rev = serverVars.rev;
|
let rev = serverVars.rev;
|
||||||
let committing = false;
|
let committing = false;
|
||||||
|
@ -99,7 +93,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, _pad) => {
|
||||||
}
|
}
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const connecting = ['CONNECTING', 'RECONNECTING'].includes(channelState);
|
const connecting = ['CONNECTING', 'RECONNECTING'].includes(channelState);
|
||||||
if (!getSocket() || connecting) {
|
if (!pad.socket || connecting) {
|
||||||
if (connecting && now - startConnectTime > 20000) {
|
if (connecting && now - startConnectTime > 20000) {
|
||||||
setChannelState('DISCONNECTED', 'initsocketfail');
|
setChannelState('DISCONNECTED', 'initsocketfail');
|
||||||
} else {
|
} else {
|
||||||
|
@ -169,7 +163,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, _pad) => {
|
||||||
|
|
||||||
const sendMessage = async (msg) => {
|
const sendMessage = async (msg) => {
|
||||||
await connectedGate;
|
await connectedGate;
|
||||||
getSocket().json.send(
|
pad.socket.json.send(
|
||||||
{
|
{
|
||||||
type: 'COLLABROOM',
|
type: 'COLLABROOM',
|
||||||
component: 'pad',
|
component: 'pad',
|
||||||
|
@ -193,7 +187,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, _pad) => {
|
||||||
}();
|
}();
|
||||||
|
|
||||||
const handleMessageFromServer = (evt) => {
|
const handleMessageFromServer = (evt) => {
|
||||||
if (!getSocket()) return;
|
if (!pad.socket) return;
|
||||||
if (!evt.data) return;
|
if (!evt.data) return;
|
||||||
const wrapper = evt;
|
const wrapper = evt;
|
||||||
if (wrapper.type !== 'COLLABROOM' && wrapper.type !== 'CUSTOM') return;
|
if (wrapper.type !== 'COLLABROOM' && wrapper.type !== 'CUSTOM') return;
|
||||||
|
@ -326,7 +320,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, _pad) => {
|
||||||
userInfo.userId = userId;
|
userInfo.userId = userId;
|
||||||
userSet[userId] = userInfo;
|
userSet[userId] = userInfo;
|
||||||
tellAceActiveAuthorInfo(userInfo);
|
tellAceActiveAuthorInfo(userInfo);
|
||||||
if (!getSocket()) return;
|
if (!pad.socket) return;
|
||||||
await sendMessage(
|
await sendMessage(
|
||||||
{
|
{
|
||||||
type: 'USERINFO_UPDATE',
|
type: 'USERINFO_UPDATE',
|
||||||
|
|
Loading…
Reference in a new issue