Merge branch 'master' of github.com:uproxy/uproxy-lib into dborkan-cloud-invites

Author: Daniel Borkan

src/cloud/install/installer.ts

@@ -3,7 +3,10 @@
 /// <reference path='../../../../third_party/typings/node/node.d.ts' />
 /// <reference path='../../../../third_party/typings/ssh2/ssh2.d.ts' />
 
+import arraybuffers = require('../../arraybuffers/arraybuffers');
+import linefeeder = require('../../net/linefeeder');
 import logging = require('../../logging/logging');
+import queue = require('../../handler/queue');
 
 // https://github.com/borisyankov/DefinitelyTyped/blob/master/ssh2/ssh2-tests.ts
 import * as ssh2 from 'ssh2';
@@ -45,6 +48,23 @@ class CloudInstaller {
     return new Promise<string>((F, R) => {
       connection.on('ready', () => {
         log.debug('logged into server');
+
+        var stdout = new queue.Queue<ArrayBuffer, void>();
+        new linefeeder.LineFeeder(stdout).setSyncHandler((line: string) => {
+          log.debug('STDOUT: %1', line);
+          // Search for the URL anywhere in the line so we will
+          // continue to work in the face of minor changes
+          // to the install script.
+          if (line.indexOf(INVITATION_URL_PREFIX) === 0) {
+            F(line.substring(INVITATION_URL_PREFIX.length));
+          }
+        });
+
+        var stderr = new queue.Queue<ArrayBuffer, void>();
+        new linefeeder.LineFeeder(stderr).setSyncHandler((line: string) => {
+          log.error('STDERR: %1', line);
+        });
+
         connection.exec(INSTALL_COMMAND, (e: Error, stream: ssh2.Channel) => {
           if (e) {
             connection.end();
@@ -58,17 +78,10 @@ class CloudInstaller {
             R({
               message: 'invitation URL not found'
             });
-          }).on('data', function(data: Buffer) {
-            const output = data.toString();
-            log.debug('STDOUT: %1', output);
-            // Search for the URL anywhere in the line so we will
-            // continue to work in the face of minor changes
-            // to the install script.
-            if (output.indexOf(INVITATION_URL_PREFIX) === 0) {
-              F(output.substring(INVITATION_URL_PREFIX.length));
-            }
-          }).stderr.on('data', function(data: Buffer) {
-            log.error(data.toString());
+          }).on('data', (data:Buffer) => {
+            stdout.handle(arraybuffers.bufferToArrayBuffer(data));
+          }).stderr.on('data', (data: Buffer) => {
+            stderr.handle(arraybuffers.bufferToArrayBuffer(data));
           });
         });
       }).on('error', (e: Error) => {

src/cloud/social/provider.ts

@@ -546,9 +546,11 @@ class Connection {
     return this.exec_('cat /banner');
   }
 
-  // Executes a command, fulfilling with the command's stdout
-  // or rejecting if output is received on stderr.
-  private exec_ = (command:string): Promise<string> => {
+  // Executes a command, fulfilling with the first line of the command's
+  // output on stdout or rejecting if any output is received on stderr.
+  // TODO: There is a close event with a return code which
+  //       is probably a better indication of success.
+  private exec_ = (command: string): Promise<string> => {
     log.debug('%1: execute command: %2', this.name_, command);
     if (this.state_ !== ConnectionState.ESTABLISHED) {
       return Promise.reject(new Error('can only execute commands in ESTABLISHED state'));
@@ -562,13 +564,16 @@ class Connection {
           return;
         }
 
-        // TODO: There is a close event with a return code which
-        //       is probably a better indication of success.
+        var stdout = new queue.Queue<ArrayBuffer, void>();
+        new linefeeder.LineFeeder(stdout).setSyncHandler((line: string) => {
+          F(line);
+        });
+
         stream.on('data', (data: Buffer) => {
-          F(data.toString());
+          stdout.handle(arraybuffers.bufferToArrayBuffer(data));
         }).stderr.on('data', (data: Buffer) => {
           R({
-            message: 'command output to STDERR: ' + data.toString()
+            message: 'output received on STDERR: ' + data.toString()
           });
         }).on('end', () => {
           log.debug('%1: exec stream end', this.name_);