suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WebSocket reconnect delay

Browse Source 
Only reset delay generator after regular message, not on connect,
because a subscription failure happens after a connect. Also cancel
reconnect if auto-sync is disabled during the failure delay.
This commit is contained in:
Dan Stillman 2017-07-02 01:44:22 -04:00
parent 2efd7121b8
commit c867b3bb85
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chrome/content/zotero/xpcom/sync/syncStreamer.js
View File

@ -52,8 +52,7 @@ Zotero.Sync.Streamer_Module.prototype = {
_retry: null, _retry: null,
init: Zotero.Promise.coroutine(function* () { init: Zotero.Promise.coroutine(function* () {
// Connect to the streaming server if (!this._isEnabled()) {
if (!Zotero.Prefs.get('sync.autoSync') || !Zotero.Prefs.get('sync.streaming.enabled')) {
return this.disconnect(); return this.disconnect();
} }
@ -71,7 +70,15 @@ Zotero.Sync.Streamer_Module.prototype = {
} }
}), }),
_isEnabled: function () {
return Zotero.Prefs.get('sync.autoSync') && Zotero.Prefs.get('sync.streaming.enabled');
},
_connect: function (url, apiKey) { _connect: function (url, apiKey) {
if (!this._isEnabled()) {
return;
}
Zotero.debug(`Connecting to streaming server at ${url}`); Zotero.debug(`Connecting to streaming server at ${url}`);
var window = Cc["@mozilla.org/appshell/appShellService;1"] var window = Cc["@mozilla.org/appshell/appShellService;1"]
@ -83,7 +90,6 @@ Zotero.Sync.Streamer_Module.prototype = {
this._socket.onopen = () => { this._socket.onopen = () => {
Zotero.debug("WebSocket connection opened"); Zotero.debug("WebSocket connection opened");
this._reconnectGenerator = null;
}; };
this._socket.onerror = event => { this._socket.onerror = event => {
@ -105,18 +111,24 @@ Zotero.Sync.Streamer_Module.prototype = {
this._socket.send(data); this._socket.send(data);
} }
else if (data.event == "subscriptionsCreated") { else if (data.event == "subscriptionsCreated") {
this._reconnectGenerator = null;
for (let error of data.errors) { for (let error of data.errors) {
Zotero.logError(this._hideAPIKey(JSON.stringify(error))); Zotero.logError(this._hideAPIKey(JSON.stringify(error)));
} }
} }
// Library added or removed // Library added or removed
else if (data.event == 'topicAdded' || data.event == 'topicRemoved') { else if (data.event == 'topicAdded' || data.event == 'topicRemoved') {
this._reconnectGenerator = null;
yield Zotero.Sync.Runner.sync({ yield Zotero.Sync.Runner.sync({
background: true background: true
}); });
} }
// Library modified // Library modified
else if (data.event == 'topicUpdated') { else if (data.event == 'topicUpdated') {
this._reconnectGenerator = null;
let library = Zotero.URI.getPathLibrary(data.topic); let library = Zotero.URI.getPathLibrary(data.topic);
if (library) { if (library) {
// Ignore if skipped library // Ignore if skipped library