haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

explain the relationship of global and bundle 'onopen' handlers 

Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I5cba504273d4fd035a918839001ccb91976ccb16
pull/9055/head
Caolán McNamara 2024-05-14 20:24:22 +01:00 committed by Michael Meeks
parent 96e6eec12f
commit 30e064907d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/js/global.js
View File

@ -1184,6 +1184,8 @@ window.app = {
global.LANG = lang;
if (global.socket && global.socket.readyState !== 3) {
global.socket.onopen = function () {
// Note there are two socket "onopen" handlers, this one and the other in browser/src/core/Socket.js.
// See the notes there for explanation.
if (global.socket.readyState === 1) {
var ProtocolVersionNumber = '0.1';
var timestamp = encodeURIComponent(global.coolParams.get('timestamp'));

14
browser/src/core/Socket.js
View File

@ -199,11 +199,15 @@ app.definitions.Socket = L.Class.extend({
// Always send the protocol version number.
// TODO: Move the version number somewhere sensible.
// Note that there is code also in global.socket.onopen() in global.js to send the
// exact same 'coolclient' message and a slightly different 'load' message. At least
// in a "make run" scenario it is that code that sends the 'coolclient' and 'load'
// messages. Not this code. But at least currently in the "WASM app" case, it is
// this code that gets invoked. Oh well.
// Note there are two socket "onopen" handlers, this one which ends up as part of
// bundle.js and the other in browser/js/global.js. The global.js one attempts to
// set up the connection early while bundle.js is still loading. If bundle.js
// starts before global.js has connected, then this _onSocketOpen will do the
// connection instead, after taking over the socket in "connect"
// Typically in a "make run" scenario it is the global.js case that sends the
// 'coolclient' and 'load' messages while currently in the "WASM app" case it is
// this code that gets invoked.
// Also send information about our performance timer epoch
var now0 = Date.now();