Merge pull request #388 from uProxy/trevj-arraybuffers-converters

move to latest Buffer typings, update ArrayBuffer <-> Buffer converters

Author: trevj

src/arraybuffers/arraybuffers.ts

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

src/cloud/install/installer.ts

@@ -113,9 +113,11 @@ class CloudInstaller {
                 message: 'invitation URL not found'
               });
             }).on('data', (data: Buffer) => {
-              stdoutRaw.handle(arraybuffers.bufferToArrayBuffer(data));
+              // Make a copy before passing to the async queue.
+              stdoutRaw.handle(arraybuffers.bufferToArrayBuffer(new Buffer(data)));
             }).stderr.on('data', (data: Buffer) => {
-              stderrRaw.handle(arraybuffers.bufferToArrayBuffer(data));
+              // Make a copy before passing to the async queue.
+              stderrRaw.handle(arraybuffers.bufferToArrayBuffer(new Buffer(data)));
             });
           });
         }).on('error', (e: Error) => {

src/cloud/social/provider.ts

@@ -524,7 +524,8 @@ class Connection {
 
             this.tunnel_ = tunnel;
             tunnel.on('data', (buffer: Buffer) => {
-              bufferQueue.handle(arraybuffers.bufferToArrayBuffer(buffer));
+              // Make a copy before passing to the async queue.
+              bufferQueue.handle(arraybuffers.bufferToArrayBuffer(new Buffer(buffer)));
             }).on('end', () => {
               log.debug('%1: tunnel end', this.name_);
             }).on('close', (hadError: boolean) => {
@@ -603,7 +604,8 @@ class Connection {
         });
 
         stream.on('data', (data: Buffer) => {
-          stdoutRaw.handle(arraybuffers.bufferToArrayBuffer(data));
+          // Make a copy before passing to the async queue.
+          stdoutRaw.handle(arraybuffers.bufferToArrayBuffer(new Buffer(data)));
         }).stderr.on('data', (data: Buffer) => {
           R({
             message: 'output received on STDERR: ' + data.toString()

third_party/typings.json

@@ -7,7 +7,7 @@
     "es6-promise": "registry:dt/es6-promise#0.0.0+20160317120654",
     "freedom": "registry:dt/freedom#0.6.26+20160317120654",
     "jasmine": "registry:dt/jasmine#2.2.0+20160317120654",
-    "node": "registry:dt/node#4.0.0+20160330064709",
+    "node": "registry:dt/node#4.0.0+20160412142033",
     "ssh2": "registry:dt/ssh2#0.0.0+20160316155526"
   }
 }