From 1bed93a4cd6d78e313a92c97c0de65cc34201b0b Mon Sep 17 00:00:00 2001 From: alalamav <2132122+alalamav@users.noreply.github.com> Date: Tue, 3 Apr 2018 13:49:26 -0400 Subject: [PATCH 1/4] Prepare for macOS release (#64) --- .travis.yml | 6 ++++++ src/server_manager/electron_app/config.json | 2 +- src/server_manager/package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d71344de..025d97a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,6 +101,12 @@ jobs: electronuserland/builder:wine /bin/bash -c "yarn do server_manager/electron_app/package_only_windows" || travis_terminate $? + - stage: deploy + env: + - DESC=macos manager + os: osx + script: yarn do server_manager/electron_app/package_macos + # Note that because we cannot currently sign Windows binaries on Travis, # these must be manually built and uploaded to the releases page. - stage: release diff --git a/src/server_manager/electron_app/config.json b/src/server_manager/electron_app/config.json index 514568a1..302300db 100644 --- a/src/server_manager/electron_app/config.json +++ b/src/server_manager/electron_app/config.json @@ -1,4 +1,4 @@ { - "version": "1.0.3", + "version": "1.0.4", "releaseDataUrl": "https://raw.githubusercontent.com/Jigsaw-Code/outline-server/master/release/release_data.json" } diff --git a/src/server_manager/package.json b/src/server_manager/package.json index bf108a63..a64e1773 100644 --- a/src/server_manager/package.json +++ b/src/server_manager/package.json @@ -1,7 +1,7 @@ { "name": "outline-manager", "productName": "Outline Manager", - "version": "1.0.3", + "version": "1.0.4", "description": "Create and manage access to Outline servers", "homepage": "https://getoutline.org/", "author": { From 3e8ceb1898e239758c31d0657a9ba0af66d6f0a4 Mon Sep 17 00:00:00 2001 From: Daniel Borkan Date: Thu, 5 Apr 2018 15:51:40 -0400 Subject: [PATCH 2/4] Add confirmation before automatically deleting server on failed installs --- src/server_manager/web_app/app.ts | 48 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts index d53ab502..46515bb4 100644 --- a/src/server_manager/web_app/app.ts +++ b/src/server_manager/web_app/app.ts @@ -397,27 +397,25 @@ export class App { // it again. return; } - if (managedServer.isInstallCompleted()) { - // This server has already been successfully installed, however - // we may have failed to reach it - this could be due to bad wifi, - // firewalls, etc. Notify the user and only delete if the user requests it. - this.appRoot.showModalDialog( - null, // Don't display any title. - 'We are unable to reach your Outline server at the moment.', - ['Delete this server', 'Try again']) - .then((clickedButtonIndex: number) => { - if (clickedButtonIndex === 0) { // user clicked 'Delete this server' - this.cancelServerCreation(managedServer); - } else if (clickedButtonIndex === 1) { // user clicked 'Try again'. - this.showManagedServer(managedServer, true); - } - }); - return; - } - // An error occured while installing this server. - // Show an error and cancel the server creation (e.g. delete the droplet). - this.handleServerCreationFailure('Got an error while waiting on server installation', e); - this.cancelServerCreation(managedServer); + // This server has already been successfully installed, however + // we may have failed to reach it - this could be due to bad wifi, + // firewalls, etc. Notify the user and only delete if the user requests it. + const errorMessage = managedServer.isInstallCompleted() + ? 'We are unable to connect to your Outline server at the moment. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.' + : 'There was an error creating your Outline server. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.'; + this.appRoot.showModalDialog( + null, // Don't display any title. + errorMessage, + ['Delete this server', 'Try again']) + .then((clickedButtonIndex: number) => { + if (clickedButtonIndex === 0) { // user clicked 'Delete this server' + managedServer.getHost().delete().then(() => { + this.showCreateServer(); + }); + } else if (clickedButtonIndex === 1) { // user clicked 'Try again'. + this.showManagedServer(managedServer, true); + } + }); }); } @@ -432,10 +430,10 @@ export class App { this.showManagedServer(managedServer); }) .catch((e) => { - // Don't show a dialog on the login screen. - if (!(e instanceof digitalocean_api.XhrError)) { - this.handleServerCreationFailure('Failed to create DigitalOcean server', e); - } + // Sanity check - this error is not expected to occur, as showManagedServer + // has it's own error handling. + console.error('error from showManagedServer', e); + return Promise.reject(e); }); } From c3a1bdbe9871ce93d5d3c9ddd9d6f96b8d0a91c3 Mon Sep 17 00:00:00 2001 From: Daniel Borkan Date: Thu, 5 Apr 2018 15:58:45 -0400 Subject: [PATCH 3/4] cleanup comment, adding sentry logging --- src/server_manager/web_app/app.ts | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts index 46515bb4..43926dfa 100644 --- a/src/server_manager/web_app/app.ts +++ b/src/server_manager/web_app/app.ts @@ -397,25 +397,25 @@ export class App { // it again. return; } - // This server has already been successfully installed, however - // we may have failed to reach it - this could be due to bad wifi, - // firewalls, etc. Notify the user and only delete if the user requests it. - const errorMessage = managedServer.isInstallCompleted() - ? 'We are unable to connect to your Outline server at the moment. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.' - : 'There was an error creating your Outline server. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.'; - this.appRoot.showModalDialog( - null, // Don't display any title. - errorMessage, - ['Delete this server', 'Try again']) - .then((clickedButtonIndex: number) => { - if (clickedButtonIndex === 0) { // user clicked 'Delete this server' - managedServer.getHost().delete().then(() => { - this.showCreateServer(); + const errorMessage = managedServer.isInstallCompleted() ? + 'We are unable to connect to your Outline server at the moment. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.' : + 'There was an error creating your Outline server. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.'; + SentryErrorReporter.logError(errorMessage); + this.appRoot + .showModalDialog( + null, // Don't display any title. + errorMessage, ['Delete this server', 'Try again']) + .then((clickedButtonIndex: number) => { + if (clickedButtonIndex === 0) { // user clicked 'Delete this server' + SentryErrorReporter.logInfo('Deleting unreachable server'); + managedServer.getHost().delete().then(() => { + this.showCreateServer(); + }); + } else if (clickedButtonIndex === 1) { // user clicked 'Try again'. + SentryErrorReporter.logInfo('Retrying unreachable server'); + this.showManagedServer(managedServer, true); + } }); - } else if (clickedButtonIndex === 1) { // user clicked 'Try again'. - this.showManagedServer(managedServer, true); - } - }); }); } From 2538453c4207b450adc0fe46e20f136066b18ff0 Mon Sep 17 00:00:00 2001 From: Daniel Borkan Date: Thu, 5 Apr 2018 16:10:11 -0400 Subject: [PATCH 4/4] Adding more sentry logging for connecting to digitalocean servers --- src/server_manager/web_app/digitalocean_server.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server_manager/web_app/digitalocean_server.ts b/src/server_manager/web_app/digitalocean_server.ts index 60a5626d..6dcb4a46 100644 --- a/src/server_manager/web_app/digitalocean_server.ts +++ b/src/server_manager/web_app/digitalocean_server.ts @@ -129,6 +129,7 @@ class DigitaloceanServer extends ShadowboxServer implements server.ManagedServer // Server has been installed (Api Url and Certificate have been) // set, but is not healthy. This could occur if the server // is behind a firewall. + SentryErrorReporter.logError('digitalocean_server: Server is unreachable, possibly due to firewall.'); reject(new errors.UnreachableServerError()); } }); @@ -154,11 +155,16 @@ class DigitaloceanServer extends ShadowboxServer implements server.ManagedServer // State is already known, so it cannot be changed. return; } - if (this.getTagValue(INSTALL_ERROR_TAG) || Date.now() - startTimestamp >= TIMEOUT_MS) { + if (this.getTagValue(INSTALL_ERROR_TAG)) { + SentryErrorReporter.logError('digitalocean_server: Got error tag ' + this.getTagValue(INSTALL_ERROR_TAG)); + this.installState = InstallState.ERROR; + } else if (Date.now() - startTimestamp >= TIMEOUT_MS) { + SentryErrorReporter.logError('digitalocean_server: hit timeout while waiting for installation'); this.installState = InstallState.ERROR; } else if (this.setApiUrlAndCertificate()) { // API Url and Certificate have been set, so we have successfully // installed the server and can now make API calls. + SentryErrorReporter.logInfo('digitalocean_server: Successfully found API and cert tags'); this.installState = InstallState.SUCCESS; } };