Remove redundant FileReaders

    Don't create new FileReader for each binary message to service (doesn't
    seem to work well on Safari, either readers are not gc-ed fast enough
    or there's a limit on how many can be created). Also, no need to use
    use fancy async ops to convert a string to byte array.

Author: Alexey Reznichenko

package-lock.json

@@ -15,6 +15,7 @@ for (let j = 0; j < process.argv.length; j++) {
 var keyFile = __dirname+'/speech.key';
 if (fs.existsSync(keyFile)) {
     var key = fs.readFileSync(keyFile, 'utf8');
+    key = key.replace(/\s/g, "");
     if (!!key) {
         var before = "value=\"YOUR_BING_SPEECH_API_KEY\"";
         var after = " disabled value=\"Using token-based auth mechanism.\"";

samples/browser/sample-server.js

@@ -79,6 +79,7 @@ export class WebsocketMessageAdapter {
         this.connectionState = ConnectionState.Connecting;
 
         this.websocketClient = new WebSocket(this.uri);
+        this.websocketClient.binaryType = "arraybuffer";
         this.receivingMessageQueue = new Queue<ConnectionMessage>();
         this.disconnectDeferral = new Deferred<boolean>();
         this.sendMessageQueue = new Queue<ISendItem>();
@@ -118,26 +119,17 @@ export class WebsocketMessageAdapter {
                 const deferred = new Deferred<ConnectionMessage>();
                 // let id = ++this.idCounter;
                 this.receivingMessageQueue.EnqueueFromPromise(deferred.Promise());
-                if (e.data instanceof Blob) {
-                    const fileReader = new FileReader();
-                    fileReader.onload = (le: Event) => {
-                        const rawMessage = new RawWebsocketMessage(MessageType.Binary, fileReader.result);
-                        this.messageFormatter
-                            .ToConnectionMessage(rawMessage)
-                            .On((connectionMessage: ConnectionMessage) => {
-                                this.OnEvent(new ConnectionMessageReceivedEvent(this.connectionId, networkReceivedTime, connectionMessage));
-                                deferred.Resolve(connectionMessage);
-                            }, (error: string) => {
-                                // TODO: Events for these ?
-                                deferred.Reject(`Invalid binary message format. Error: ${error}`);
-                            });
-                    };
-                    fileReader.onerror = (ev: Event) => {
-                        // TODO: Events for these ?
-                        deferred.Reject("Binary message parse error");
-                    };
-
-                    fileReader.readAsArrayBuffer(e.data);
+                if (e.data instanceof ArrayBuffer) {
+                    const rawMessage = new RawWebsocketMessage(MessageType.Binary, e.data);
+                    this.messageFormatter
+                        .ToConnectionMessage(rawMessage)
+                        .On((connectionMessage: ConnectionMessage) => {
+                            this.OnEvent(new ConnectionMessageReceivedEvent(this.connectionId, networkReceivedTime, connectionMessage));
+                            deferred.Resolve(connectionMessage);
+                        }, (error: string) => {
+                            // TODO: Events for these ?
+                            deferred.Reject(`Invalid binary message format. Error: ${error}`);
+                        });
                 } else {
                     const rawMessage = new RawWebsocketMessage(MessageType.Text, e.data);
                     this.messageFormatter

src/common.browser/WebsocketMessageAdapter.ts

@@ -81,35 +81,25 @@ export class WebsocketMessageFormatter implements IWebsocketMessageFormatter {
                 const headersString = this.MakeHeaders(message);
                 const content = message.BinaryBody;
 
-                const fr = new FileReader();
+                const headerInt8Array = new Int8Array(this.StringToArrayBuffer(headersString));
 
-                fr.onload = () => {
-                    const headerInt8Array = new Int8Array(fr.result);
+                const payload = new ArrayBuffer(2 + headerInt8Array.byteLength + (content ? content.byteLength : 0));
+                const dataView = new DataView(payload);
 
-                    const payload = new ArrayBuffer(2 + headerInt8Array.byteLength + (content ? content.byteLength : 0));
-                    const dataView = new DataView(payload);
+                dataView.setInt16(0, headerInt8Array.length);
 
-                    dataView.setInt16(0, headerInt8Array.length);
+                for (let i = 0; i < headerInt8Array.byteLength; i++) {
+                    dataView.setInt8(2 + i, headerInt8Array[i]);
+                }
 
-                    for (let i = 0; i < headerInt8Array.byteLength; i++) {
-                        dataView.setInt8(2 + i, headerInt8Array[i]);
+                if (content) {
+                    const bodyInt8Array = new Int8Array(content);
+                    for (let i = 0; i < bodyInt8Array.byteLength; i++) {
+                        dataView.setInt8(2 + headerInt8Array.byteLength + i, bodyInt8Array[i]);
                     }
+                }
 
-                    if (content) {
-                        const bodyInt8Array = new Int8Array(content);
-                        for (let i = 0; i < bodyInt8Array.byteLength; i++) {
-                            dataView.setInt8(2 + headerInt8Array.byteLength + i, bodyInt8Array[i]);
-                        }
-                    }
-
-                    deferral.Resolve(new RawWebsocketMessage(MessageType.Binary, payload, message.Id));
-                };
-
-                fr.onerror = () => {
-                    deferral.Reject("failed to load headers into file reader");
-                };
-
-                fr.readAsArrayBuffer(new Blob([headersString]));
+                deferral.Resolve(new RawWebsocketMessage(MessageType.Binary, payload, message.Id));
             }
         } catch (e) {
             deferral.Reject(`Error formatting the message. ${e}`);
@@ -155,4 +145,13 @@ export class WebsocketMessageFormatter implements IWebsocketMessageFormatter {
 
         return headers;
     }
+
+    private StringToArrayBuffer = (str: string): ArrayBuffer => {
+        const buffer = new ArrayBuffer(str.length);
+        const view = new DataView(buffer);
+        for (let i = 0; i < str.length; i++) {
+            view.setUint8(i, str.charCodeAt(i));
+        }
+        return buffer;
+    }
 }