Merge pull request #372 from uProxy/trevj-install-progress

emit install progress events

Author: trevj

src/cloud/deployer/freedom-module.ts

@@ -22,6 +22,11 @@ provisioner.start('test').then((serverInfo: any) => {
   log.info('server provisioned: %1', serverInfo);
 
   const installer = freedom['cloudinstall']();
+
+  installer.on('progress', (progress: number) => {
+    log.info('install progress: %1', progress);
+  });
+
   log.info('installing...');
   installer.install(serverInfo.network.ipv4, serverInfo.network.ssh_port,
   	  'root', serverInfo.ssh.private).then((invitation: string) => {

src/cloud/install/freedom-module.json

@@ -17,6 +17,14 @@
       },
       "err": {
         "message": "string"
+      },
+      "progress": {
+        "type": "event",
+        "value": "number"
+      },
+      "status": {
+        "type": "event",
+        "value": "string"
       }
     }
   },

src/cloud/install/installer.ts

@@ -20,6 +20,12 @@ const INSTALL_COMMAND = 'curl -sSL https://raw.githubusercontent.com/uProxy/upro
 // Prefix for invitation URLs.
 const INVITATION_PREFIX = 'CLOUD_INSTANCE_DETAILS_JSON:';
 
+// Prefix for progress updates.
+const PROGRESS_PREFIX = 'CLOUD_INSTALL_PROGRESS';
+
+// Prefix for status updates.
+const STATUS_PREFIX = 'CLOUD_INSTALL_STATUS';
+
 // 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.
@@ -65,6 +71,16 @@ class CloudInstaller {
                 message: 'could not parse invite: ' + inviteJson
               });
             }
+          } else if (line.indexOf(PROGRESS_PREFIX) === 0) {
+            const tokens = line.split(' ');
+            if (tokens.length < 2) {
+              log.warn('could not parse progress update');
+            } else {
+              const progress = parseInt(tokens[1], 10);
+              this.dispatchEvent_('progress', progress);
+            }
+          } else if (line.indexOf(STATUS_PREFIX) === 0) {
+            this.dispatchEvent_('status', line);
           }
         });