Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-01 13:14:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Tweak: Mac autoupdate module passes Error, unwrap in hanlder for Win/Linux too

Browse source
This commit is contained in:
Ben Gotow 2017-10-16 10:04:14 -07:00
parent abe2a3ccdc
commit abafecd1d4
2 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/src/browser/autoupdate-impl-base.es6
View file

@ -19,8 +19,8 @@ export default class AutoupdateImplBase extends EventEmitter {
this.lastRetrievedUpdateURL = null;
}
emitError = err => {
this.emit('error', err.message);
emitError = error => {
this.emit('error', error);
};
manuallyQueryUpdateServer(successCallback) {
@ -29,32 +29,34 @@ export default class AutoupdateImplBase extends EventEmitter {
// Hit the feed URL ourselves and see if an update is available.
// On linux we can't autoupdate, but we can still show the "update available" bar.
https.get({ host: feedHost, path: feedPath }, res => {
console.log(`Manual update check (${feedHost}${feedPath}) returned ${res.statusCode}`);
https
.get({ host: feedHost, path: feedPath }, res => {
console.log(`Manual update check (${feedHost}${feedPath}) returned ${res.statusCode}`);
if (res.statusCode === 204) {
successCallback(false);
return;
}
let data = '';
res.on('error', this.emitError);
res.on('data', chunk => {
data += chunk;
});
res.on('end', () => {
try {
const json = JSON.parse(data);
if (!json.url) {
this.emitError(new Error(`Autoupdater response did not include URL: ${data}`));
return;
}
successCallback(json);
} catch (err) {
this.emitError(err);
if (res.statusCode === 204) {
successCallback(false);
return;
}
});
}).on('error', this.emitError);
let data = '';
res.on('error', this.emitError);
res.on('data', chunk => {
data += chunk;
});
res.on('end', () => {
try {
const json = JSON.parse(data);
if (!json.url) {
this.emitError(new Error(`Autoupdater response did not include URL: ${data}`));
return;
}
successCallback(json);
} catch (err) {
this.emitError(err);
}
});
})
.on('error', this.emitError);
}
/* Public: Check for updates and emit events if an update is available. */

4
app/src/browser/autoupdate-manager.es6
View file

@ -62,9 +62,9 @@ export default class AutoUpdateManager extends EventEmitter {
autoUpdater = require('electron').autoUpdater;
}
autoUpdater.on('error', (message) => {
autoUpdater.on('error', error => {
if (this.specMode) return;
console.error(`Error Downloading Update: ${message}`);
console.error(`Error Downloading Update: ${error.message}`);
this.setState(ErrorState);
});