Merge branch 'master' into trevj-remove-accumulator

Author: trevj

.gitignore

@@ -11,3 +11,4 @@ build/*
 node_modules/*
 npm-debug.log
 tmp/*
+third_party/typings

Dockerfile

@@ -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'
       ]

Gruntfile.coffee

@@ -1,7 +1,7 @@
 {
   "name": "uproxy-lib",
   "description": "Shared libraries for uProxy projects.",
-  "version": "37.1.1",
+  "version": "37.1.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/uProxy/uproxy-lib"
@@ -60,11 +60,10 @@
     "lodash": "^3.10.1",
     "request": "^2.53.0",
     "socks5-http-client": "^1.0.2",
-    "ssh2": "0.4.12",
-    "ssh2-streams": "0.0.18",
-    "tsd": "^0.6.5",
+    "ssh2": "0.5.0",
     "tslint": "^3.3.0",
     "typescript": "~1.8.2",
+    "typings": "^0.7.12",
     "yargs": "^3.0.4"
   },
   "scripts": {

bin/connect-pair.py

@@ -43,7 +43,7 @@ if "%1" NEQ "third_party" if "%1" NEQ "clean" (
 	%~1
 goto:eof
 
-:: On Windows, npm, bower, tsd, and grunt are batch files
+:: On Windows, npm, bower, typings, and grunt are batch files
 :: So we have to explicitly call then with "call"
 :: These also happen to be the commands that we want to assert, 
 :: or exit on failure for, so there is an additional "exit /b"
@@ -72,13 +72,10 @@ goto:eof
 	call :runCmd "copy build\dev\uproxy-lib\build-tools\*.js build\tools\"
 goto:eof
 
-:: Note: The "tsd reinstall" command seems to create a third_party/third_party folder 
-:: on Windows, so we manually delete this after
 :thirdParty
 	call :runAndAssertCmdArgs "%NPM_BIN_DIR%bower" install --allow-root
 	call :runCmd "mkdir build\third_party"
-	call :runAndAssertCmdArgs "%NPM_BIN_DIR%tsd" reinstall --config .\third_party\tsd.json
-	call :runCmd "rmdir third_party\third_party /s /q"
+	call :runAndAssertCmdArgs cd third_party; "%NPM_BIN_DIR%tsd" reinstall --config .\third_party\tsd.json; cd ..
 	call :runCmd "robocopy third_party\ build\third_party\ /s /e > nul 2>&1"
 	call :runCmd "mkdir build\third_party\freedom-pgp-e2e"
 	call :runCmd "copy node_modules\freedom-pgp-e2e\dist build\third_party\freedom-pgp-e2e\"

package.json

@@ -39,7 +39,7 @@ function thirdParty ()
 {
   runAndAssertCmd "$NPM_BIN_DIR/bower install --allow-root --config.interactive=false"
   runAndAssertCmd "mkdir -p build/third_party"
-  runAndAssertCmd "$NPM_BIN_DIR/tsd reinstall --config ./third_party/tsd.json"
+  runAndAssertCmd "pushd third_party && $NPM_BIN_DIR/typings install && popd"
   runAndAssertCmd "cp -r third_party/* build/third_party/"
   runAndAssertCmd "mkdir -p build/third_party/freedom-pgp-e2e"
   runAndAssertCmd "cp -r node_modules/freedom-pgp-e2e/dist build/third_party/freedom-pgp-e2e/"

setup.cmd

@@ -1,4 +1,4 @@
-/// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import logging = require('../logging/logging');
 

setup.sh

@@ -1,4 +1,4 @@
-/// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import arraybuffers = require('./arraybuffers');
 

src/aqm/aqm.ts

@@ -1,4 +1,4 @@
-/// <reference path='../../../third_party/typings/node/node.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 // Byte-wise equality check of array buffers by comparison of each byte's
 // value.
@@ -121,24 +121,16 @@ export function stringToUtf8EncodedArrayBuffer(str:string) :ArrayBuffer {
   return ab.buffer;
 }
 
-// Converts a node.js Buffer to an ArrayBuffer
-export function bufferToArrayBuffer(buffer:Buffer) :ArrayBuffer {
-    var ab = new ArrayBuffer(buffer.length);
-    var bytes = new Uint8Array(ab);
-    for (var i = 0; i < buffer.length; ++i) {
-        bytes[i] = buffer[i];
-    }
-    return bytes.buffer;
+// Returns an ArrayBuffer backed by the same memory as the supplied
+// Node.js Buffer.
+export function bufferToArrayBuffer(buffer: Buffer): ArrayBuffer {
+  return buffer.buffer;
 }
 
-// Converts an ArrayBuffer to a node.js Buffer
-export function arrayBufferToBuffer(ab:ArrayBuffer) :Buffer {
-    var buffer = new Buffer(ab.byteLength);
-    var bytes = new Uint8Array(ab);
-    for (var i = 0; i < buffer.length; ++i) {
-        buffer[i] = bytes[i];
-    }
-    return buffer;
+// Returns a Node.js Buffer backed by the same memory as the supplied
+// ArrayBuffer.
+export function arrayBufferToBuffer(ab: ArrayBuffer): Buffer {
+  return new Buffer(ab);
 }
 
 // Splits an ArrayBuffer into two at a given offset