krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

pusher: onlkeopenaximum 1 connection per brorowser

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-07-08 17:48:39 +02:00
parent 485deb1a70
commit 1ab8dab9a3
1 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
website/client/js/services/pusherService.js
View File

@@ -1,8 +1,8 @@
'use strict'; 'use strict';
angular.module('habitrpg') angular.module('habitrpg')
.factory('Pusher', ['$rootScope', 'STORAGE_SETTINGS_ID', 'Groups', .factory('Pusher', ['$rootScope', 'STORAGE_SETTINGS_ID', 'Groups', 'Shared',
function($rootScope, STORAGE_SETTINGS_ID, Groups) { function($rootScope, STORAGE_SETTINGS_ID, Groups, Shared) {
var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID)); var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID));
var IS_PUSHER_ENABLED = window.env['PUSHER:ENABLED'] === 'true'; var IS_PUSHER_ENABLED = window.env['PUSHER:ENABLED'] === 'true';
@@ -10,19 +10,13 @@ angular.module('habitrpg')
pusher: undefined, pusher: undefined,
socketId: undefined, // when defined the user is connected socketId: undefined, // when defined the user is connected
}; };
var tabIdKey = 'habitica-active-tab';
// Setup chat channels once app is ready, only for parties for now function connectToPusher (partyId) {
var clearAppLoadedListener = $rootScope.$watch('appLoaded', function (after) { localStorage.setItem(tabIdKey, Shared.uuid());
if (!after) return; window.onbeforeunload = function () {
clearAppLoadedListener(); // clean the event listerner localStorage.removeItem(tabIdKey);
}
if (!IS_PUSHER_ENABLED) return;
var user = $rootScope.user;
// Connect the user to Pusher and to the party's chat channel
var partyId = user && $rootScope.user.party && $rootScope.user.party._id;
if (!partyId) return;
api.pusher = new Pusher(window.env['PUSHER:KEY'], { api.pusher = new Pusher(window.env['PUSHER:KEY'], {
encrypted: true, encrypted: true,
@@ -88,6 +82,37 @@ angular.module('habitrpg')
// Groups.data.party.chat.splice(200); // Groups.data.party.chat.splice(200);
}); });
}); });
};
// Setup chat channels once app is ready, only for parties for now
var clearAppLoadedListener = $rootScope.$watch('appLoaded', function (after) {
if (!after) return;
clearAppLoadedListener(); // clean the event listerner
if (!IS_PUSHER_ENABLED) return;
var user = $rootScope.user;
// Connect the user to Pusher and to the party's chat channel
var partyId = user && $rootScope.user.party && $rootScope.user.party._id;
if (!partyId) return;
// See if another tab is already connected to Pusher
if (!localStorage.getItem(tabIdKey)) {
connectToPusher(partyId);
}
// when a tab is closed, connect the next one
// wait between 100 and 500ms to avoid two tabs connecting at the same time
window.addEventListener('storage', function(e) {
if (e.key === tabIdKey && e.newValue === null) {
setTimeout(function () {
if (!localStorage.getItem(tabIdKey)) {
connectToPusher(partyId);
}
}, Math.floor(Math.random() * 501) + 100);
}
});
}); });
return api; return api;