BOT-2003 use javascript to get dictate.js urls

Author: botium-build

Diff for: dictate/.dockerignore

@@ -1,2 +1,2 @@
 node_modules
-dictate.js
+dictate.js-master

Diff for: dictate/.gitignore

@@ -1,4 +1,4 @@
 node_modules
 package-lock.json
 *.local
-dictate.js
+dictate.js-master

Diff for: dictate/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "Unified Speech Processing",
   "scripts": {
+    "prepare": "rm -rf ./dictate.js-master && curl -L -o dicatejs.zip \"https://github.com/Kaljurand/dictate.js/archive/master.zip\" && unzip dicatejs.zip && rm dicatejs.zip",
     "start": "node server.js"
   },
   "author": "Botium GmbH",

Diff for: dictate/server.js

@@ -2,25 +2,26 @@ const fs = require('fs')
 const express = require('express')
 
 const app = express()
-app.disable('etag')
-app.set('trust proxy', true)
 const port = process.env.PORT || 56100
-const dictateDir = process.env.DICTATEDIR || './dictate.js'
+const dictateDir = process.env.DICTATEDIR || './dictate.js-master'
+
+const wsScript = `
+  var sttUrlDe = new URL('/stt-de', window.location.href);
+  sttUrlDe.protocol = sttUrlDe.protocol.replace('http', 'ws');
+  var sttUrlEn = new URL('/stt-en', window.location.href);
+  sttUrlEn.protocol = sttUrlEn.protocol.replace('http', 'ws');
+  
+  var serversElement = document.getElementById('servers')
+  serversElement.options[0] = new Option("English", sttUrlEn.href + "/client/ws/speech|" + sttUrlEn.href + "/client/ws/status", true, false)
+  serversElement.options[1] = new Option("German", sttUrlDe.href + "/client/ws/speech|" + sttUrlDe.href + "/client/ws/status", false, false)
+`
 
 app.get('/demos/mob.html', (req, res) => {
   let mobHtml = fs.readFileSync(`${dictateDir}/demos/mob.html`, { encoding: 'utf-8' })
 
-  const wsProtocol = (req.protocol === 'https' ? 'wss:' : 'ws:')
-  const sttUrlDe = process.env.STT_URL_DE || `${wsProtocol}//${req.hostname}/stt-de`
-  const sttUrlEn = process.env.STT_URL_EN || `${wsProtocol}//${req.hostname}/stt-en`
-
-  mobHtml = mobHtml.replace(
-    '<option value="wss://bark.phon.ioc.ee:8443/dev/duplex-speech-api/ws/speech|wss://bark.phon.ioc.ee:8443/dev/duplex-speech-api/ws/status">eesti keel</option>',
-    `<option value="${sttUrlDe}/client/ws/speech|${sttUrlDe}/client/ws/status">German</option>`
-  )
   mobHtml = mobHtml.replace(
-    '<option value="wss://bark.phon.ioc.ee:8443/english/duplex-speech-api/ws/speech|wss://bark.phon.ioc.ee:8443/english/duplex-speech-api/ws/status" selected="selected">English</option>',
-    `<option value="${sttUrlEn}/client/ws/speech|${sttUrlEn}/client/ws/status" selected="selected">English</option>`
+    '<script src="mob.js"></script>',
+    `<script src="mob.js"></script><script>${wsScript}</script>`
   )
 
   res.header('Content-Type', 'text/html')

Diff for: docker-compose.override.template.yml

@@ -2,9 +2,4 @@ version: '3'
 services:
   frontend:
     environment:
-      BOTIUM_SPEECH_URL: https://speech.botiumbox.com
-  dictate:
-    image: botium/botium-speech-dictate:develop
-    environment:
-      STT_URL_DE: wss://speech.botiumbox.com/stt-de
-      STT_URL_EN: wss://speech.botiumbox.com/stt-en
+      BOTIUM_SPEECH_URL: https://speech.botiumbox.com