Skip to content

feat: add option for user-provided URL in synthesize #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpopp07 merged 2 commits into from
Aug 16, 2018
Merged

feat: add option for user-provided URL in synthesize #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c92f295
feat: add option for user-provided URL in `synthesize`
dpopp07 Aug 16, 2018
42d9f1b
refactor: use string interpolation
dpopp07 Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ where the max length is around 1000 characters after the token is accounted for.

Options:
* text - the text to speak
* url - the Watson Text to Speech API URL (defaults to https://stream.watsonplatform.net/text-to-speech/api)
* voice - the desired playback voice's name - see .getVoices(). Note that the voices are language-specific.
* customization_id - GUID of a custom voice model - omit to use the voice with no customization.
* autoPlay - set to false to prevent the audio from automatically playing
Expand Down
7 changes: 4 additions & 3 deletions speech-to-text/get-models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

* @todo define format in @return statement
* @param {Object} options
* @param {String} options.url=https://stream.watsonplatform.net/speech-to-text/api URL for Watson Speech to Text API
* @param {String} options.token auth token for CF services
* @param {String} options.access_token IAM access token for RC services
* @return {Promise.<T>}
Expand All @@ -51,11 +52,11 @@ module.exports = function getModels(options) {
accept: 'application/json'
}
};
var url;
var url = options.url || 'https://stream.watsonplatform.net/speech-to-text/api';
if (options.access_token) {
url = 'https://stream.watsonplatform.net/speech-to-text/api/v1/models?access_token=' + options.access_token;
url = `${url}/v1/models?access_token=${options.access_token}`;
} else {
url = 'https://stream.watsonplatform.net/speech-to-text/api/v1/models?watson-token=' + options.token;
url = `${url}/v1/models?access_token=${options.token}`;
}
return fetch(url, reqOpts)
.then(function(response) {
Expand Down
7 changes: 4 additions & 3 deletions text-to-speech/get-voices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

* @todo define format in @return statement
* @param {Object} options
* @param {String} options.url=https://stream.watsonplatform.net/text-to-speech/api URL for Watson Text to Speech API
* @param {String} options.token auth token for CF services
* @param {String} options.access_token IAM access token for RC services
* @return {Promise.<T>}
Expand All @@ -52,11 +53,11 @@ module.exports = function getVoices(options) {
accept: 'application/json'
}
};
var url;
var url = options.url || 'https://stream.watsonplatform.net/text-to-speech/api';
if (options.access_token) {
url = 'https://stream.watsonplatform.net/text-to-speech/api/v1/voices?watson-token=' + options.access_token;
url = `${url}'/v1/voices?watson-token='${options.access_token}`;
} else {
url = 'https://stream.watsonplatform.net/text-to-speech/api/v1/voices?watson-token=' + options.token;
url = `${url}'/v1/voices?watson-token='${options.token}`;
}
return fetch(url, reqOpts)
.then(function(response) {
Expand Down
4 changes: 3 additions & 1 deletion text-to-speech/synthesize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var QUERY_PARAMS_ALLOWED = ['voice', 'X-WDC-PL-OPT-OUT', 'X-Watson-Learning-Opt-
* Creates and returns a HTML5 `<audio>` element
*
* @param {Object} options
* @param {String} options.url=https://stream.watsonplatform.net/text-to-speech/api URL for Watson Text to Speech API
* @param {String} [options.token] - Auth token for CF services
* @param {String} options.access_token - IAM Access Token for RC services
* @param {String} options.text text to speak
Expand All @@ -47,9 +48,10 @@ module.exports = function synthesize(options) {
}
options['watson-token'] = options.token;
delete options.token;
var url = options.url || 'https://stream.watsonplatform.net/text-to-speech/api';
var audio = options.element || new Audio();
audio.crossOrigin = 'anonymous';
audio.src = 'https://stream.watsonplatform.net/text-to-speech/api/v1/synthesize?' + qs.stringify(pick(options, QUERY_PARAMS_ALLOWED));
audio.src = `${url}/v1/synthesize?${qs.stringify(pick(options, QUERY_PARAMS_ALLOWED))}`;
if (options.autoPlay !== false) {
audio.play();
}
Expand Down