non-working tts

nfriedly · nfriedly · commit 36c7049cc237 · 2016-02-16T10:30:02.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ node_modules/
 npm-debug.log.*
 .DS_store
 Thumbs.db
-test/resources/auth.json
+test/resources/stt-auth.json
+test/resources/tts-auth.json
 doc/
 *-auth.json
diff --git a/README.md b/README.md
@@ -138,7 +138,7 @@ For use with `.recognizeBlob({play: true})` - slows the results down to match th
 ## todo
 
 * Solidify API
-* add text-to-speech support - may require service improvements
+* support objectMode instead of having random events
 * add an example that includes alternatives and word confidence scores
 * enable eslint - https://github.ibm.com/fed/javascript-style-guides
 * break components into standalone npm modules where it makes sense
diff --git a/dist/watson-speech.js b/dist/watson-speech.js
diff --git a/examples/package.json b/examples/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "express": "^4.13.3",
     "vcap_services": "^0.1.7",
-    "watson-developer-cloud": "^1.2.0"
+    "watson-developer-cloud": "^1.2.0",
+    "watson-speech": "*"
   }
 }
diff --git a/examples/public/index.html b/examples/public/index.html
@@ -5,6 +5,8 @@
     <title>Watson Speech to Text client example</title>
 </head>
 <body>
+<h1>IBM Watson Speech JavaScript SDK Examples</h1>
+<h2>Speech to Text</h2>
 <ul>
     <li><a href="microphone-streaming.html">Transcribe from Microphone, Streaming</a></li>
     <li><a href="microphone-streaming-auto-stop.html">Transcribe from Microphone, Streaming, automatically stop at first pause</a></li>
@@ -15,5 +17,9 @@
     <li><a href="audio-element-programmatic.html">Transcribe from <code>new Audio()</code>, Streaming</a></li>
 </ul>
 
+<h2>Text to Speech</h2>
+<ul>
+    <li><a href="text-to-speech.html">Basic Example</a></li>
+</ul>
 </body>
 </html>
diff --git a/examples/public/text-to-speech.html b/examples/public/text-to-speech.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Basic Example - Watson Text to Speech</title>
+</head>
+<body>
+
+<section>
+    <h2>Basic Text to Speech Example</h2>
+    <input id="text" value="Hello from IBM Watson"/> <button id="button">Synthesize Text</button>
+</section>
+
+<script src="watson-speech.js"></script>
+<script src="http://code.jquery.com/jquery-2.2.0.min.js"></script>
+
+<h2>Code for this demo:</h2>
+<pre><code><script style="display: block;">
+    $(function() {
+        $('#button').click(function () {
+            $.get('/api/text-to-speech/token').then(function (token) {
+                WatsonSpeech.TextToSpeech.synthesize({
+                    text: $('#text').val(),
+                    token: token
+                })
+            });
+        });
+    });
+</script></code></pre>
+</body>
+</html>
diff --git a/examples/token-server.js b/examples/token-server.js
@@ -26,24 +26,25 @@ app.use(express.static(__dirname + '/public'));
 app.use(express.static(__dirname + '/../dist')); // normally these files would also go into public/ but this way the example always has the latest code
 
 
+// set up an endpoint to serve speech-to-text auth tokens
+
 // For local development, replace username and password
-var config = extend({
+var sttConfig = extend({
     version: 'v1',
     url: 'https://stream.watsonplatform.net/speech-to-text/api',
     username: '<username>',
     password: '<password>'
 }, vcapServices.getCredentials('speech_to_text'));
 
 // quick hack to make development easier
-try { extend(config, require('../test/resources/stt-auth.json')) } catch (ex) {}
-
-var authService = watson.authorization(config);
+try { extend(sttConfig, require('../test/resources/stt-auth.json')) } catch (ex) {}
 
+var sttAuthService = watson.authorization(sttConfig);
 
 // Get token using your credentials
-// **Warning**: this endpoint should be guarded with additional authentication & authorization for production use
-app.get('/token', function(req, res, next) {
-    authService.getToken({url: config.url}, function(err, token) {
+// **Warning**: these endpoints should be guarded with additional authentication & authorization for production use
+app.get('/api/speech-to-text/token', function(req, res) {
+    sttAuthService.getToken({url: sttConfig.url}, function(err, token) {
         if (err) {
             console.log('Error retrieving token: ', err);
             return res.status(500).send('Error retrieving token')
@@ -52,12 +53,35 @@ app.get('/token', function(req, res, next) {
     });
 });
 
+// and, do it all again for the text to speech service
+var ttsConfig = extend({
+  version: 'v1',
+  url: 'https://stream.watsonplatform.net/text-to-speech/api',
+  username: '<username>',
+  password: '<password>'
+}, vcapServices.getCredentials('text_to_speech'));
+
+// quick hack to make development easier
+try { extend(ttsConfig, require('../test/resources/tts-auth.json')) } catch (ex) {}
+
+var ttsAuthService = watson.authorization(ttsConfig);
+
+app.get('/api/text-to-speech/token', function(req, res) {
+  ttsAuthService.getToken({url: ttsConfig.url}, function(err, token) {
+    if (err) {
+      console.log('Error retrieving token: ', err);
+      return res.status(500).send('Error retrieving token')
+    }
+    res.send(token);
+  });
+});
+
 var port = process.env.VCAP_APP_PORT || 3000;
 app.listen(port, function() {
-   console.log('Example IBM Watson STT client app & server live at http://localhost:%s/', port);
+   console.log('Example IBM Watson Speech JS SDK client app & token server live at http://localhost:%s/', port);
 });
 
-// chrome requires https to access the user's mic
+// chrome requires https to access the user's mic unless it's a localhost url
 if (!process.env.VCAP_APP_PORT) {
     var fs = require("fs"),
         https = require("https"),
@@ -68,6 +92,6 @@ if (!process.env.VCAP_APP_PORT) {
         cert: fs.readFileSync(__dirname + '/keys/localhost.cert')
     };
     https.createServer(options, app).listen(HTTPS_PORT, function () {
-        console.log('Secure example IBM Watson STT client app & server live at https://localhost:%s/', port)
+        console.log('Secure server live at https://localhost:%s/', port)
     });
 }
diff --git a/index.js b/index.js
@@ -18,4 +18,4 @@ exports.version = process.env.TRAVIS_BRANCH;
  */
 exports.SpeechToText = require('./speech-to-text');
 
-// todo: add text-to-speech
+exports.TextToSpeech = require('./text-to-speech');
diff --git a/text-to-speech/index.js b/text-to-speech/index.js
@@ -0,0 +1,15 @@
+"use strict";
+var qs = require('querystring');
+
+module.exports.synthesize = function(options) {
+  if (!options || !options.token) {
+    throw new Error("Watson TextToSpeech: missing required parameter: options.token");
+  }
+  options['watson-token'] = options.token;
+  delete options.token;
+  var audio = new Audio();
+  audio.crossOrigin = true;
+  audio.src = 'https://stream.watsonplatform.net/text-to-speech/api/synthesize?' + qs.stringify(options);
+  audio.play();
+  return audio;
+};

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`"dependencies": {`
`10`	`10`	`"express": "^4.13.3",`
`11`	`11`	`"vcap_services": "^0.1.7",`
`12`		`- "watson-developer-cloud": "^1.2.0"`
	`12`	`+ "watson-developer-cloud": "^1.2.0",`
	`13`	`+ "watson-speech": "*"`
`13`	`14`	`}`
`14`	`15`	`}`