Add support for middleware_config and memo audioserver params

src/Transcriber.js

@@ -1,4 +1,5 @@
 import 'core-js';
+import querystring from 'querystring';
 import EventEmitter from 'events';
 import uuid from 'uuid/v4';
 import Microphone from '@gkt/microphone';
@@ -10,8 +11,9 @@ class Transcriber extends EventEmitter {
     webSocket = window.WebSocket,
     audioContext = window.AudioContext || window.webkitAudioContext,
     microphone = Microphone,
-    interpreter = 'auto',
     maxFinalWait = 5000,
+    middlewareConfig = {},
+    memo = null,
   } = {}) {
     super();
     this.gkUrl = gkUrl;
@@ -21,9 +23,10 @@ class Transcriber extends EventEmitter {
     this.WebSocket = webSocket;
     this.AudioContext = audioContext;
     this.Microphone = microphone;
-    this.interpreter = interpreter;
     this.maxFinalWait = maxFinalWait;
     this.state = UNINITIALIZED;
+    this.middlewareConfig = middlewareConfig;
+    this.memo = memo;
   }
 
   init() {
@@ -56,11 +59,6 @@ class Transcriber extends EventEmitter {
     return this._initPromise;
   }
 
-  setInterpreter(interpreter) {
-    this.interpreter = interpreter;
-    return this;
-  }
-
   start() {
     if (this.state !== READY) {
       throw new Error('Transcriber#start: not ready');
@@ -150,7 +148,15 @@ class Transcriber extends EventEmitter {
 
   _openAudioSocket(sessionId) {
     return new Promise((resolve, reject) => {
-      const path = `${this.gkUrl}/audio/${sessionId}?interpreters=${this.interpreter}`;
+      const params = {
+        middleware_config: encodeURIComponent(JSON.stringify(this.middlewareConfig))
+      };
+
+      if (this.memo) {
+        params.memo = encodeURIComponent(this.memo);
+      }
+
+      const path = `${this.gkUrl}/audio/${sessionId}?${querystring.stringify(params)}`;
       const socket = new this.WebSocket(this._webSocketUrl(path));
       socket.onopen = () => resolve(socket);
       socket.onerror = e => reject(e);

src/Transcriber.test.js

@@ -12,12 +12,16 @@ let defaultOpts;
 let transcriber;
 
 beforeEach(() => {
+  MockWebSocket.clearConnections();
+
   defaultOpts = {
     getUserMedia,
     audioContext: MockAudioContext,
     webSocket: MockWebSocket,
     microphone: MockMicrophone,
     maxFinalWait: 0,
+    middlewareConfig: {discovery: {foo: 1}},
+    memo: 'hello world',
   };
 
   transcriber = new Transcriber(defaultOpts);
@@ -81,14 +85,6 @@ describe('#init', () => {
   });
 });
 
-describe('#setInterpreter', () => {
-  it('sets the interpreter prop', () => {
-    expect(transcriber.interpreter).toBe('auto');
-    transcriber.setInterpreter('foo');
-    expect(transcriber.interpreter).toBe('foo');
-  });
-});
-
 describe('#start', () => {
   describe('when not READY', () => {
     it('throws an exception', () => {
@@ -106,6 +102,28 @@ describe('#start', () => {
       await p;
     });
 
+    it('opens an audio websocket connection', async () => {
+      await transcriber.init();
+
+      const p = transcriber.start();
+      expect(MockWebSocket.connections.length).toBe(2);
+      const url = new URL(MockWebSocket.connections[0]);
+      expect(url.origin).toEqual('ws://audio');
+      expect(url.searchParams.get('middleware_config')).toEqual(encodeURIComponent(JSON.stringify({discovery: {foo: 1}})));
+      expect(url.searchParams.get('memo')).toEqual('hello%20world');
+      await p;
+    });
+
+    it('opens a relay websocket connection', async () => {
+      await transcriber.init();
+
+      const p = transcriber.start();
+      expect(MockWebSocket.connections.length).toBe(2);
+      const url = new URL(MockWebSocket.connections[1]);
+      expect(url.origin).toEqual('ws://relay');
+      await p;
+    });
+
     describe('when websocket connection succeeds', () => {
       it('goes to the RECORDING state', async () => {
         await transcriber.init();

src/transcriberMocks.js

@@ -22,7 +22,14 @@ export class MockAudioContext {
 }
 
 export class MockWebSocket {
-  constructor() {
+  static clearConnections() {
+    this.connections = [];
+  }
+
+  constructor(url) {
+    MockWebSocket.connections = MockWebSocket.connections || [];
+    MockWebSocket.connections.push(url);
+
     setTimeout(() => {
       this.onopen(this);
     });