Merge PR #403, adding google as default TTS

When no other TTS provider is configured, use Google TTS
Allow VoiceId spec in URL for AWS Polly

Author: jishi

README.md

@@ -365,7 +365,7 @@ Experimental support for TTS. Today the following providers are available:
 * voicerss
 * Microsoft Cognitive Services (Bing Text to Speech API)
 * AWS Polly
-* Google
+* Google (default)
 
 It will use the one you configure in settings.json. If you define settings for multiple TTS services, it will not be guaranteed which one it will choose!
 
@@ -488,7 +488,21 @@ If you have your credentials elsewhere and want to stick with the default voice,
 	}
 ```
 
-This is the current list of voice names and their corresponding language and accent
+Action is:
+
+	/[Room name]/say/[phrase][/[name]][/[announce volume]]
+	/sayall/[phrase][/[name]][/[announce volume]]
+
+Example:
+
+	/Office/say/Hello, dinner is ready
+	/Office/say/Hej, maten är klar/Joanna
+	/sayall/Hello, dinner is ready
+	/Office/say/Hello, dinner is ready/90
+	/Office/say/Hej, maten är klar/Russell/90
+
+This is the current list of voice names and their corresponding language and accent (as of Dec 2016).
+To get a current list of voices, you would need to use the AWS CLI and invoke the describe-voices command.
 
 | Language | Code | Gender | Name |
 | --------- | ---- | ------ | ---- |
@@ -538,11 +552,11 @@ This is the current list of voice names and their corresponding language and acc
 | US Spanish | es-US | Female | Penelope |
 | US Spanish | es-US | Male | Miguel |
 | Welsh | cy-GB | Female | Gwyneth |
-| Welsh | English | en-GB-WLS | Male | Geraint |
+| Welsh English | en-GB-WLS | Male | Geraint |
 
-#### Google
+#### Google (default if no other has been configured)
 
-Does not require any API keys. Please note that Google has been known in the past to change the requirements for its Text-to-Speech API, and this may stop working in the future.
+Does not require any API keys. Please note that Google has been known in the past to change the requirements for its Text-to-Speech API, and this may stop working in the future. There is also limiations to have many request one is allowed to do in a specific time period.
 
 The following language codes are supported
 

lib/actions/say.js

@@ -18,9 +18,9 @@ function say(player, values) {
   if (/^\d+$/i.test(values[1])) {
     // first parameter is volume
     announceVolume = values[1];
-    language = 'en-gb';
+    // language = 'en-gb';
   } else {
-    language = values[1] || 'en-gb';
+    language = values[1];
     announceVolume = values[2] || settings.announceVolume || 40;
   }
 

lib/actions/sayall.js

@@ -14,9 +14,9 @@ function sayAll(player, values) {
   if (/^\d+$/i.test(values[1])) {
     // first parameter is volume
     announceVolume = values[1];
-    language = 'en-gb';
+    // language = 'en-gb';
   } else {
-    language = values[1] || 'en-gb';
+    language = values[1];
     announceVolume = values[2] || settings.announceVolume || 40;
   }
 

lib/helpers/try-download-tts.js

@@ -7,6 +7,8 @@ requireDir(path.join(__dirname, '../tts-providers'), (provider) => {
   providers.push(provider);
 });
 
+providers.push(require('../tts-providers/default/google'));
+
 function tryDownloadTTS(phrase, language) {
   let path;
   return providers.reduce((promise, provider) => {

lib/tts-providers/aws-polly.js

@@ -12,18 +12,22 @@ const DEFAULT_SETTINGS = {
   TextType: 'text'
 };
 
-function polly(phrase, language) {
+function polly(phrase, voiceName) {
   if (!settings.aws) {
     return Promise.resolve();
 
   }
 
   // Construct a filesystem neutral filename
   const dynamicParameters = { Text: phrase };
+  const synthesizeParameters = Object.assign({}, DEFAULT_SETTINGS, dynamicParameters);
   if (settings.aws.name) {
-    dynamicParameters.VoiceId = settings.aws.name;
+    synthesizeParameters.VoiceId = settings.aws.name;
   }
-  const synthesizeParameters = Object.assign({}, DEFAULT_SETTINGS, dynamicParameters);
+  if (voiceName) {
+    synthesizeParameters.VoiceId = voiceName;
+  }
+
   const phraseHash = crypto.createHash('sha1').update(phrase).digest('hex');
   const filename = `polly-${phraseHash}-${synthesizeParameters.VoiceId}.mp3`;
   const filepath = path.resolve(settings.webroot, 'tts', filename);

lib/tts-providers/google.js renamed to lib/tts-providers/default/google.js

@@ -3,11 +3,15 @@ const crypto = require('crypto');
 const fs = require('fs');
 const http = require('http');
 const path = require('path');
-const settings = require('../../settings');
+const settings = require('../../../settings');
 
 function google(phrase, language) {
+  if (!language) {
+    language = 'en';
+  }
+
   // Use Google tts translation service to create a mp3 file
-  const ttsRequestUrl = 'http://translate.google.com/translate_tts?client=tw-ob&tl=' + language + '&q=' + phrase;
+  const ttsRequestUrl = 'http://translate.google.com/translate_tts?client=tw-ob&tl=' + language + '&q=' + encodeURIComponent(phrase);
 
   // Construct a filesystem neutral filename
   const phraseHash = crypto.createHash('sha1').update(phrase).digest('hex');

lib/tts-providers/voicerss.js

@@ -10,6 +10,10 @@ function voicerss(phrase, language) {
     return Promise.resolve();
 
   }
+
+  if (!language) {
+    language = 'en-gb';
+  }
   // Use voicerss tts translation service to create a mp3 file
   const ttsRequestUrl = `http://api.voicerss.org/?key=${settings.voicerss}&f=22khz_16bit_mono&hl=${language}&src=${encodeURIComponent(phrase)}`;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonos-http-api",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A simple node app for controlling a Sonos system with basic HTTP requests",
   "scripts": {
     "start": "node server.js"