From 2b1197880d06e7279052fd88c6a023ad36f89ba4 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Mon, 15 Jul 2019 22:26:32 +0300 Subject: [PATCH] Merge network/channel objects when reconnecting --- client/js/lounge.js | 4 +- client/js/socket-events/init.js | 121 +++++++++++++++++++++----------- 2 files changed, 83 insertions(+), 42 deletions(-) diff --git a/client/js/lounge.js b/client/js/lounge.js index a0624b34..30df1698 100644 --- a/client/js/lounge.js +++ b/client/js/lounge.js @@ -91,7 +91,7 @@ window.vueMounted = () => { }); }); - const openWindow = function openWindow(e, {keepSidebarOpen, pushState, replaceHistory} = {}) { + const openWindow = function openWindow(e, {pushState, replaceHistory} = {}) { const self = $(this); const target = self.attr("data-target"); @@ -133,7 +133,7 @@ window.vueMounted = () => { socket.emit("open", channel ? channel.channel.id : null); - if (!keepSidebarOpen && $(window).outerWidth() <= utils.mobileViewportPixels) { + if ($(window).outerWidth() <= utils.mobileViewportPixels) { slideoutMenu.toggle(false); } } diff --git a/client/js/socket-events/init.js b/client/js/socket-events/init.js index e4b1669f..80f86585 100644 --- a/client/js/socket-events/init.js +++ b/client/js/socket-events/init.js @@ -16,46 +16,7 @@ socket.on("init", function(data) { const previousActive = vueApp.activeChannel && vueApp.activeChannel.channel.id; - const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed"))); - - for (const network of data.networks) { - network.isCollapsed = networks.has(network.uuid); - network.channels.forEach(initChannel); - - const currentNetwork = vueApp.networks.find((n) => n.uuid === network.uuid); - - // If we are reconnecting, merge existing state variables because they don't exist on the server - if (!currentNetwork) { - network.isJoinChannelShown = false; - - continue; - } - - network.isJoinChannelShown = currentNetwork.isJoinChannelShown; - - for (const channel of network.channels) { - const currentChannel = currentNetwork.channels.find((c) => c.id === channel.id); - - if (!currentChannel) { - continue; - } - - channel.scrolledToBottom = currentChannel.scrolledToBottom; - channel.pendingMessage = currentChannel.pendingMessage; - - // Reconnection only sends new messages, so merge it on the client - // Only concat if server sent us less than 100 messages so we don't introduce gaps - if (currentChannel.messages && channel.messages.length < 100) { - channel.messages = currentChannel.messages.concat(channel.messages); - } - - if (currentChannel.moreHistoryAvailable) { - channel.moreHistoryAvailable = true; - } - } - } - - vueApp.networks = data.networks; + vueApp.networks = mergeNetworkData(data.networks); vueApp.isConnected = true; vueApp.currentUserVisibleError = null; @@ -139,3 +100,83 @@ function openCorrectChannel(clientActive, serverActive) { pushState: false, }); } + +function mergeNetworkData(newNetworks) { + const collapsedNetworks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed"))); + + for (let n = 0; n < newNetworks.length; n++) { + const network = newNetworks[n]; + const currentNetwork = vueApp.networks.find((net) => net.uuid === network.uuid); + + // If this network is new, set some default variables and initalize channel variables + if (!currentNetwork) { + network.isJoinChannelShown = false; + network.isCollapsed = collapsedNetworks.has(network.uuid); + network.channels.forEach(initChannel); + + continue; + } + + // Merge received network object into existing network object on the client + // so the object reference stays the same (e.g. for vueApp.currentChannel) + for (const key in network) { + if (!Object.prototype.hasOwnProperty.call(network, key)) { + continue; + } + + // Channels require extra care to be merged correctly + if (key === "channels") { + currentNetwork.channels = mergeChannelData(currentNetwork.channels, network.channels); + } else { + currentNetwork[key] = network[key]; + } + } + + newNetworks[n] = currentNetwork; + } + + return newNetworks; +} + +function mergeChannelData(oldChannels, newChannels) { + for (let c = 0; c < newChannels.length; c++) { + const channel = newChannels[c]; + const currentChannel = oldChannels.find((chan) => chan.id === channel.id); + + // This is a new channel that was joined while client was disconnected, initialize it + if (!currentChannel) { + initChannel(channel); + + continue; + } + + // Merge received channel object into existing currentChannel + // so the object references are exactly the same (e.g. in vueApp.activeChannel) + for (const key in channel) { + if (!Object.prototype.hasOwnProperty.call(channel, key)) { + continue; + } + + // Server sends an empty users array, client requests it whenever needed + if (key === "users") { + if (channel.type === "channel") { + channel.usersOutdated = true; + } + + continue; + } + + // Reconnection only sends new messages, so merge it on the client + // Only concat if server sent us less than 100 messages so we don't introduce gaps + if (key === "messages" && currentChannel.messages && channel.messages.length < 100) { + currentChannel.messages = currentChannel.messages.concat(channel.messages); + } else { + currentChannel[key] = channel[key]; + } + } + + newChannels[c] = currentChannel; + } + + return newChannels; +}