Merge branch 'master' into gitlaura-cancel-cloud-install

Author: gitlaura

Gruntfile.coffee

@@ -314,9 +314,8 @@ config =
         # with a couple of fixes.
         './src/cloud/social/shim/net.js:net'
         './src/cloud/social/shim/dns.js:dns'
-        # Subset of ssh2-streams (all except SFTP) which works well in
-        # the browser.
-        './src/cloud/social/alias/ssh2-streams.js:ssh2-streams'
+        # Alternative that works for freedomjs modules.
+        './src/cloud/social/alias/brorand.js:brorand'
         # Fallback for crypto-browserify's randombytes, for Firefox.
         './src/cloud/social/alias/randombytes.js:randombytes'
       ]
@@ -327,9 +326,8 @@ config =
         # with a couple of fixes.
         './src/cloud/social/shim/net.js:net'
         './src/cloud/social/shim/dns.js:dns'
-        # Subset of ssh2-streams (all except SFTP) which works well in
-        # the browser.
-        './src/cloud/social/alias/ssh2-streams.js:ssh2-streams'
+        # Alternative that works for freedomjs modules.
+        './src/cloud/social/alias/brorand.js:brorand'
         # Fallback for crypto-browserify's randombytes, for Firefox.
         './src/cloud/social/alias/randombytes.js:randombytes'
       ]

package.json

@@ -60,8 +60,7 @@
     "lodash": "^3.10.1",
     "request": "^2.53.0",
     "socks5-http-client": "^1.0.2",
-    "ssh2": "0.4.12",
-    "ssh2-streams": "0.0.18",
+    "ssh2": "0.5.0",
     "tslint": "^3.3.0",
     "typescript": "~1.8.2",
     "typings": "^0.7.12",

src/cloud/install/installer.ts

@@ -1,5 +1,7 @@
 /// <reference path='../../../../third_party/typings/browser.d.ts' />
 
+require('../social/monkey/process');
+
 import arraybuffers = require('../../arraybuffers/arraybuffers');
 import linefeeder = require('../../net/linefeeder');
 import logging = require('../../logging/logging');

src/cloud/social/alias/brorand.js

@@ -0,0 +1,18 @@
+// brorand alias which works in a freedomjs module context.
+// Uses randombytes, for which we have an alias which works
+// for Firefox.
+
+const randombytes = require('randombytes');
+
+module.exports = function rand(len) {
+  return randombytes(len);
+};
+
+function Rand(fallback) {
+  // no-op: always use randombytes
+}
+module.exports.Rand = Rand;
+
+Rand.prototype.generate = function generate(len) {
+  return randombytes(len);
+};

src/cloud/social/alias/randombytes.js

@@ -14,7 +14,7 @@ try {
   cryptoAvailable = false;
 }
 
-module.exports = function(size) {
+module.exports = function(size, cb) {
   var buffer = new Buffer(size);
   if (cryptoAvailable) {
     // Although this looks weird, it's how crypto-browserify does it too:
@@ -25,5 +25,9 @@ module.exports = function(size) {
       buffer[i] = Math.floor(Math.random() * 256);
     }
   }
-  return buffer;
+  if (cb) {
+    cb(undefined, buffer);
+  } else {
+    return buffer;
+  }
 }

src/cloud/social/alias/ssh2-streams.js

@@ -0,0 +1,9 @@
+// Monkey patch for browserify's process shim, for ssh2-streams.
+
+// Node.js 4.2 is an LTS release and, very roughly, is what the
+// browserify shims, e.g. Buffer, provide.
+process.version = '4.2.0';
+
+process.binding = function() {
+ return {};
+};

src/cloud/social/monkey/process.js

@@ -1,5 +1,7 @@
 /// <reference path='../../../../third_party/typings/browser.d.ts' />
 
+require('../social/monkey/process');
+
 import arraybuffers = require('../../arraybuffers/arraybuffers');
 import linefeeder = require('../../net/linefeeder');
 import logging = require('../../logging/logging');

src/cloud/social/provider.ts

@@ -33,9 +33,9 @@ function slowTestDescription(useChurn:boolean) {
     testerFactoryManager.close();
   });
 
-  // The default TCP SYN timeout is two minutes, so to be safe we
-  // set a test timeout of four minutes.
-  jasmine.DEFAULT_TIMEOUT_INTERVAL = 240000;
+  // 100 MB download through CHURN takes about 10 minutes.
+  // Set the limit to 20 minutes for safety.
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 20 * 60 * 1000;
 
   // Opens 200 connections, sends 1 KB on each, and receives 250 KB on each
   it('download load test', (done) => {
@@ -51,26 +51,29 @@ function slowTestDescription(useChurn:boolean) {
       }
       return Promise.all(connectionPromises);
     }).then((connectionIds:string[]) => {
-      var completions = connectionIds.map((connectionId:string) : Promise<void> => {
-        var resolve :Function;
-        var result :Promise<void> = new Promise<void>((F, R) => { resolve = F; });
-        var isDone = false;
-        var outputString = '';
-        testModule.on('receivedData', (event:ReceivedDataEvent) => {
-          if (event.connectionId != connectionId) {
-            return;
+      // Maps connectionIds to the number of bytes received so far.  Counters
+      // start at 0, and entries are deleted when all data has been received
+      // for a connection.  When all entries have been deleted, the test passes.
+      let counters :{[id:string]: number} = {};
+      testModule.on('receivedData', (event:ReceivedDataEvent) => {
+        const id = event.connectionId;
+        if (id in counters) {
+          counters[id] += event.response.byteLength;
+        } else {
+          throw new Error('Unexpected connectionId ' + id);
+        }
+        if (counters[id] === repeat * blockSize) {
+          delete counters[id];
+          // Check if we have deleted the last id.
+          if (Object.keys(counters).length === 0) {
+            done();
           }
-          expect(isDone).toBe(false);
-          if (event.response.byteLength === repeat * blockSize) {
-            isDone = true;
-            resolve();
-          }
-        });
-        return testModule.sendData(connectionId, testBlock).then(() => {
-          return result;
-        });
+        }
+      });
+      connectionIds.map((id:string) => {
+        counters[id] = 0;
+        testModule.sendData(id, testBlock);
       });
-      Promise.all(completions).then(done);
     });
   });