krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure Pusher cannot get stuck

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-09-16 15:12:32 +02:00
parent a38f524d62
commit 603226a084
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
website/client-old/js/services/pusherService.js
View File

@@ -16,14 +16,29 @@ angular.module('habitrpg')
var tabIdKey = 'habitica-active-tab-v1'; var tabIdKey = 'habitica-active-tab-v1';
var tabId = Shared.uuid(); var tabId = Shared.uuid();
var localStorageDateInterval;
function onDisconnect () {
localStorage.removeItem(tabIdKey);
localStorage.removeItem(tabIdKey + '-time');
clearInterval(localStorageDateInterval);
}
function connectToPusher (partyId, reconnecting) { function connectToPusher (partyId, reconnecting) {
console.log('Connecting to Pusher.'); console.log('Connecting to Pusher.');
// Limit 1 tab connected per user // Limit 1 tab connected per user
localStorage.setItem(tabIdKey, tabId); localStorage.setItem(tabIdKey, tabId);
window.onbeforeunload = function () { localStorage.setItem(tabIdKey + '-time', Date.now());
localStorage.removeItem(tabIdKey);
}; // Every 10 seconds log the current time to localstorage, so if for some reason
// localStorage.tabIdKey get stuck, the next time the user reconnect and
// the last logged date has been long ago
localStorageDateInterval = setInterval(function () {
localStorage.setItem(tabIdKey + '-time', Date.now());
}, 10000);
window.onbeforeunload = onDisconnect;
api.pusher = new Pusher(window.env['PUSHER:KEY'], { api.pusher = new Pusher(window.env['PUSHER:KEY'], {
encrypted: true, encrypted: true,
@@ -188,11 +203,14 @@ angular.module('habitrpg')
function disconnectPusher () { function disconnectPusher () {
console.log('Disconnecting from Pusher for inactivity.'); console.log('Disconnecting from Pusher for inactivity.');
api.pusher.disconnect(); api.pusher.disconnect();
localStorage.removeItem(tabIdKey); window.onbeforeunload = null; // TODO use addEventListener
onDisconnect();
var awaitActivity = function() { var awaitActivity = function() {
$(document).off('mousemove keydown mousedown touchstart', awaitActivity); $(document).off('mousemove keydown mousedown touchstart', awaitActivity);
if (!localStorage.getItem(tabIdKey) || localStorage.getItem(tabIdKey) === tabId) { var lastSavedDate = localStorage.getItem(tabIdKey + '-time') || 0;
if (!localStorage.getItem(tabIdKey) || localStorage.getItem(tabIdKey) === tabId || ((Date.now() - lastSavedDate) > 30000)) {
connectToPusher(partyId, true); connectToPusher(partyId, true);
} else { } else {
console.log('Cannot connect 2 tabs to Pusher.'); console.log('Cannot connect 2 tabs to Pusher.');
@@ -215,8 +233,10 @@ angular.module('habitrpg')
partyId = user && $rootScope.user.party && $rootScope.user.party._id; partyId = user && $rootScope.user.party && $rootScope.user.party._id;
if (!partyId) return; if (!partyId) return;
// See if another tab is already connected to Pusher // See if another tab is already connected to Pusher (or if it got stuck: last saved date more than 30 sec ago)
if (!localStorage.getItem(tabIdKey)) { var lastSavedDate = localStorage.getItem(tabIdKey + '-time') || 0;
if (!localStorage.getItem(tabIdKey) || ((Date.now() - lastSavedDate) > 30000)) {
connectToPusher(partyId); connectToPusher(partyId);
} else { } else {
console.log('Cannot connect 2 tabs to Pusher.'); console.log('Cannot connect 2 tabs to Pusher.');
@@ -227,7 +247,8 @@ angular.module('habitrpg')
window.addEventListener('storage', function(e) { window.addEventListener('storage', function(e) {
if (e.key === tabIdKey && e.newValue === null) { if (e.key === tabIdKey && e.newValue === null) {
setTimeout(function () { setTimeout(function () {
if (!localStorage.getItem(tabIdKey)) { var lastSavedDate = localStorage.getItem(tabIdKey + '-time') || 0;
if (!localStorage.getItem(tabIdKey) || ((Date.now() - lastSavedDate) > 30000)) {
connectToPusher(partyId, true); connectToPusher(partyId, true);
} else { } else {
console.log('Cannot connect 2 tabs to Pusher.'); console.log('Cannot connect 2 tabs to Pusher.');