Merge branch 'master' into trevj-remove-cloud-installer-timeout

Author: trevj

src/cloud/digitalocean/provisioner.ts

@@ -72,7 +72,8 @@ class Provisioner {
     }).then((keys: KeyPair) => {
        // Get SSH keys
       this.state_.ssh = keys;
-      return this.getDroplet_(name).then((unused :any) => {
+
+      return this.getDropletByName_(name).then((unused :any) => {
         // Droplet exists so raise error
         return Promise.reject({
           'errcode': 'VM_AE',
@@ -85,23 +86,25 @@ class Provisioner {
       });
     }).then(() => {
       // Get the droplet's configuration
-      return this.doRequest_('GET', 'droplets/' + this.state_.cloud.vm.id);
-    }).then((resp: any) => {
+      return this.getDropletByName_(name);
+    }).then((droplet:any) => {
       this.sendStatus_('CLOUD_DONE_VM');
-      this.state_.cloud.vm = resp.droplet;
+      this.state_.cloud.vm = droplet;
       this.state_.network = {
         'ssh_port': 22
       };
       // Retrieve public IPv4 address
-      for (var i = 0; i < resp.droplet.networks.v4.length; i++) {
-        if (resp.droplet.networks.v4[i].type === 'public') {
-          this.state_.network['ipv4'] = resp.droplet.networks.v4[i].ip_address;
+      for (var i = 0; i < droplet.networks.v4.length; i++) {
+        if (droplet.networks.v4[i].type === 'public') {
+          this.state_.network['ipv4'] = droplet.networks.v4[i].ip_address;
+          break;
         }
       }
       // Retrieve public IPv6 address
-      for (var i = 0; i < resp.droplet.networks.v6.length; i++) {
-        if (resp.droplet.networks.v6[i].type === 'public') {
-          this.state_.network['ipv6'] = resp.droplet.networks.v6[i].ip_address;
+      for (var i = 0; i < droplet.networks.v6.length; i++) {
+        if (droplet.networks.v6[i].type === 'public') {
+          this.state_.network['ipv6'] = droplet.networks.v6[i].ip_address;
+          break;
         }
       }
       console.log(this.state_);
@@ -132,10 +135,10 @@ class Provisioner {
   private destroyServer_ = (name: string): Promise<void> => {
     return this.doRequest_('GET', 'droplets').then((resp: any) => {
       // Find and delete the server with the same name
-      return this.getDroplet_(name);
-    }).then((resp: any) => {
+      return this.getDropletByName_(name);
+    }).then((droplet: any) => {
       this.state_.cloud = this.state_.cloud || {};
-      this.state_.cloud.vm = this.state_.cloud.vm || resp.droplet;
+      this.state_.cloud.vm = this.state_.cloud.vm || droplet;
       // Make sure there are no actions in progress before deleting
       this.sendStatus_('CLOUD_WAITING_VM');
       return this.waitDigitalOceanActions_();
@@ -169,10 +172,10 @@ class Provisioner {
     return this.doOAuth_().then((oauthObj: any) => {
       this.state_.oauth = oauthObj;
     }).then(() => {
-      return this.getDroplet_(name);
-    }).then((resp: any) => {
+      return this.getDropletByName_(name);
+    }).then((droplet: any) => {
       this.state_.cloud = this.state_.cloud || {};
-      this.state_.cloud.vm = this.state_.cloud.vm || resp.droplet;
+      this.state_.cloud.vm = this.state_.cloud.vm || droplet;
       // Make sure there are no actions in progress before rebooting
       this.sendStatus_('CLOUD_WAITING_VM');
       return this.waitDigitalOceanActions_();
@@ -188,20 +191,12 @@ class Provisioner {
     });
   }
 
-  /**
-   * Finds a droplet with this name
-   * @param {String} droplet name, as a string
-   * @return {Promise.<Object>}, resolves with {droplet: droplet_with_name}
-   * or rejects if droplet doesn't exist
-   */
-  private getDroplet_ = (name: string) : Promise<Object> => {
+  // Resolves with the (de-serialised) droplet, rejecting if not found.
+  private getDropletByName_ = (name: string) : Promise<Object> => {
     return this.doRequest_('GET', 'droplets').then((resp: any) => {
-      // Find and delete the server with the same name
-      for (var i = 0; i < resp.droplets.length; i++) {
+      for (let i = 0; i < resp.droplets.length; i++) {
         if (resp.droplets[i].name === name) {
-          return Promise.resolve({
-            droplet: resp.droplets[i]
-          });
+          return Promise.resolve(resp.droplets[i]);
         }
       }
       return Promise.reject({

src/cloud/install/installer.ts

@@ -29,6 +29,13 @@ const STATUS_PREFIX = 'CLOUD_INSTALL_STATUS';
 const INITIAL_CONNECTION_INTERVAL_MS = 500;
 const MAX_CONNECTION_INTERVAL_MS = 10000;
 
+// Timeouts for established SSH connections.
+// We define these chiefly so that the installer fails quickly
+// in case the server is destroyed during installation, e.g.
+// when the user cancels install.
+const KEEPALIVE_INTERVAL_MS = 1000;
+const KEEPALIVE_MAX_FAILURES = 5;
+
 // Installs uProxy on a server, via SSH.
 // The process is as close as possible to a manual install
 // so that we have fewer paths to test.
@@ -48,6 +55,8 @@ class CloudInstaller {
       port: port,
       username: username,
       privateKey: key,
+      keepaliveInterval: KEEPALIVE_INTERVAL_MS,
+      keepaliveCountMax: KEEPALIVE_MAX_FAILURES,
       // Remaining fields only for type-correctness.
       tryKeyboard: false,
       debug: undefined

src/promises/promises.ts

@@ -1,15 +1,15 @@
 /// <reference path='../../../third_party/typings/browser.d.ts' />
 
 // Invokes f up to maxAttempts number of times, resolving with its result
-// on the first success and rejecting on maxAttempts-th failure.
-export const retry = <T>(f: () => Promise<T>, maxAttempts: number): Promise<T> => {
-  return f().catch((e:Error) => {
-    --maxAttempts;
-    if (maxAttempts > 0) {
-      return retry(f, maxAttempts);
-    } else {
-      return Promise.reject(e);
-    }
+// on the first success and rejecting on the maxAttempts-th failure, waiting,
+// if specified, intervalMs ms between each attempt.
+export const retry = <T>(f: () => Promise<T>, maxAttempts: number, intervalMs = 0): Promise<T> => {
+  return f().catch((e: Error) => {
+    return maxAttempts <= 1 ? Promise.reject(e) : new Promise<T>((F, R) => {
+      setTimeout(() => {
+        retry(f, maxAttempts - 1, intervalMs).then(F, R);
+      }, intervalMs);
+    });
   });
 };
 

src/samples/deployer-chromeapp/manifest.json

@@ -27,5 +27,5 @@
       "send": "*"
     }
   },
-  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArOOsgNK52HYy9483rhgsofyHTp/NbmXkpHNLoarN027kqKVPS3U36/L2XyPJOAtvy+DDR+kCro1JmdFWBwPAk5AqvSKvfLzuXkO+98T/3ZhqfAl4KIqc0C+PsWIYsANTAbKkXlP4bATEK6O5Mq0aItAHGLSmKoNrAAVrtxmETXaumcrq78amOpAZz7XrPdJVhrHd6uQbR90WeFEe8LBOqdnA4iKeuMI9IQdDLKGSizhYFZP78HKSk0ZY2uYeJFpya0iXAvbcuHRGY9/c7pP5UDo+FExdyrgJnIt7H1W5LWfy/mAMnR77dvCSfGX1vCD7faWntYvzZO4FlISh+h21+QIDAQAB"
+  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk6KrQptZchMYwQN8CsbRVmhV/COoR0lxansERcz+OrkPctUBSTQVYJw3t17+6JyMPnKYR2DMKCTeYQGrmXzm2U0KpujEKN3WSTtZI4ynTzKbGhWIYo6exaHufcslJngEG91ua/q1fJz3e5Mla8+tIsT9bVdVf4NLfODNbky/Uo0M6KpOLO9r2zJoiO0yg4ThBH+TkNwH8icvHJbt2LzZVRSZtQ1Wl1uT15vnwJPOEYVQkpnEMY5yMBPxyOZ1AmUx714YAas80pSZ7+BlM9ReIirYB7lxeY6hAqs4u8iP5SDh5bg6YFXeYecwQyvnKglLdHq6djy9QyVLKUKxFzMH/wIDAQAB"
 }