improved 'notify' action and TTS one-time-language

Author: fquirin

www/scripts/sepiaFW.local.js

@@ -119,6 +119,8 @@ function sepiaFW_build_strings(){
 	StringsDE.clearHistory = 'Verlauf löschen';
 	StringsDE.history = 'Verlauf';
 	StringsDE.newMessages = 'Neue Nachrichten';
+	StringsDE.message = 'Nachricht';
+	StringsDE.notification = 'Benachrichtigung';
 	StringsDE.reload = 'Neu laden';
 	StringsDE.newWindow = 'Neues Fenster';
 	StringsDE.mySepiaClients = 'My Clients';
@@ -168,7 +170,8 @@ function sepiaFW_build_strings(){
 	StringsDE.opening_link = "Link wird geöffnet.";
 	StringsDE.no_music_playing = "Kannst du was hören? Wahrscheinlich wurde keine Musik gefunden.";
 	StringsDE.remote_action = "Remote-Zugriff";
-	StringsDE.remote_action_audio_stream = "Habe einen Audio Stream via Remote-Zugriff empfangen. Stream wird gestartet.";
+	StringsDE.remote_action_audio_stream = "ich habe einen Audio Stream via Remote-Zugriff empfangen. Stream wird gestartet.";
+	StringsDE.remote_action_notify = "ich habe eine Benachrichtigung für dich.";
 	StringsDE.read_article = "Artikel lesen";
 	StringsDE.choose_device_for_music = "Wähle ein Gerät auf dem du die Musik abspielen willst";
 	StringsDE.choose_device_for_action = "Auf welchem Gerät soll die Aktion ausgeführt werden?";
@@ -327,6 +330,8 @@ function sepiaFW_build_strings(){
 	StringsEN.clearHistory = 'Clear history';
 	StringsEN.history = 'History';
 	StringsEN.newMessages = "New messages";
+	StringsEN.message = 'Message';
+	StringsEN.notification = 'Notification';
 	StringsEN.reload = 'Reload';
 	StringsEN.newWindow = 'New window';
 	StringsEN.mySepiaClients = 'Meine Clients';
@@ -377,6 +382,7 @@ function sepiaFW_build_strings(){
 	StringsEN.no_music_playing = "Can you hear something? Probably no music found.";
 	StringsEN.remote_action = "Remote access";
 	StringsEN.remote_action_audio_stream = "I've received an audio stream via remote access. Starting now.";
+	StringsEN.remote_action_notify = "I have a message for you.";
 	StringsEN.read_article = "Read article";
 	StringsEN.choose_device_for_music = "Choose a device to play your music on";
 	StringsEN.choose_device_for_action = "On which device should the action be executed?";
@@ -427,17 +433,19 @@ function sepiaFW_build_strings(){
 	var StringsLocale = {};
 
 	//get string
-	StringsLocale.g = function(name){
-		if (SepiaFW.config.appLanguage.toLowerCase() === "de"){
+	StringsLocale.g = function(name, lang){
+		var langCode = (lang || SepiaFW.config.appLanguage).toLowerCase();
+		if (langCode == "de"){
 			return StringsDE[name];
 		}else{
 			return StringsEN[name];
 		}
 	}
 
 	//write string
-	StringsLocale.w = function(name){
-		if (SepiaFW.config.appLanguage.toLowerCase() === "de"){
+	StringsLocale.w = function(name, lang){
+		var langCode = (lang || SepiaFW.config.appLanguage).toLowerCase();
+		if (langCode == "de"){
 			document.write(StringsDE[name]);
 		}else{
 			document.write(StringsEN[name]);

www/scripts/sepiaFW.speechSynthesis.js

@@ -285,7 +285,7 @@ function sepiaFW_build_speech_synthesis(Speech, sepiaSessionId){
 	//set a voice
 	Speech.setVoice = function(newVoice){
 		//console.error("TRACE SET VOICE - v: " + newVoice);		//DEBUG
-		if (!voices || !voices.length || !voices.filter(function(v){ return v.name = newVoice; })){
+		if (!voices || !voices.length || !voices.filter(function(v){ return v.name == newVoice; })){
 			//console.error("VOICE NOT FOUND, setting empty");		//DEBUG
 			newVoice = "";
 		}
@@ -774,13 +774,20 @@ function sepiaFW_build_speech_synthesis(Speech, sepiaSessionId){
 
 	//get audio URL
 	Speech.sepiaTTS.getURL = function(message, successCallback, errorCallback, options){
-		//TODO: implement 'options.oneTimeVoice' and 'options.oneTimeLanguage'
+		if (!options) options = {};
+		var lang = Speech.getLanguage();
+		var voice = Speech.sepiaTTS.settings.voice;
+		//use 'options.oneTimeVoice' and 'options.oneTimeLanguage'?
+		if (options.oneTimeVoice && options.oneTimeVoice.name){
+			voice = options.oneTimeVoice.name;
+			lang = options.oneTimeLanguage;
+		}
 		var apiUrl = SepiaFW.config.assistAPI + "tts";
 		var submitData = {
 			text: message,
-			lang: Speech.getLanguage(),
+			lang: lang,
 			mood: ((SepiaFW.assistant)? SepiaFW.assistant.getMood() : Speech.sepiaTTS.settings.mood),
-			voice: Speech.sepiaTTS.settings.voice,
+			voice: voice,
 			gender: Speech.sepiaTTS.settings.gender,
 			speed: Speech.sepiaTTS.settings.speed,
 			tone: Speech.sepiaTTS.settings.tone,
@@ -883,7 +890,7 @@ function sepiaFW_build_speech_synthesis(Speech, sepiaSessionId){
 	}
 
 	Speech.maryTTS.getURL = function(message, successCallback, errorCallback, options){
-		//TODO: implement 'options.oneTimeVoice' and 'options.oneTimeLanguage'
+		if (!options) options = {};
 		if (!Speech.voiceCustomServer){
 			var err = {name: "MissingServerInfo", message: "Custom Mary-TTS API is missing server URL."};
 			SepiaFW.debug.error("Speech.maryTTS - getURL ERROR: " + JSON.stringify(err));
@@ -915,11 +922,18 @@ function sepiaFW_build_speech_synthesis(Speech, sepiaSessionId){
 			}
 		}
 		//console.error("Speech.maryTTS.settings.voice", Speech.maryTTS.settings.voice);		//DEBUG
-		var voiceInfo = Speech.maryTTS.settings.voice.split(/\s+/g);		//example: "dfki-spike-hsmm en_GB male hmm"
+		var voiceName;
+		//use 'options.oneTimeVoice' and 'options.oneTimeLanguage'?
+		if (options.oneTimeVoice && options.oneTimeVoice.name){
+			voiceName = options.oneTimeVoice.name;
+		}else{
+			voiceName = Speech.maryTTS.settings.voice;
+		}
+		var voiceInfo = voiceName.split(/\s+/g);  				//example: "dfki-spike-hsmm en_GB male hmm"
 		var apiUrl = Speech.voiceCustomServer.replace(/\/$/, "") + "/process" 
 			+ "?INPUT_TYPE=TEXT" + "&OUTPUT_TYPE=AUDIO" + "&AUDIO=WAVE_FILE"
 			+ "&LOCALE=" + encodeURIComponent(voiceInfo[1])
-			+ "&VOICE=" + encodeURIComponent(voiceInfo[0])		//Larynx special: + ";hifi_gan:vctk_small"
+			+ "&VOICE=" + encodeURIComponent(voiceInfo[0])		//TODO: Larynx special: + ";hifi_gan:vctk_small"
 			+ "&INPUT_TEXT=" + encodeURIComponent(message)
 		;
 		SepiaFW.debug.info("Speech.maryTTS - getURL SUCCESS: " + apiUrl);
@@ -958,7 +972,7 @@ function sepiaFW_build_speech_synthesis(Speech, sepiaSessionId){
 							voicesArray.push({
 								//default webSpeech voice format:
 								default: true,
-								lang: vInfo[1],
+								lang: vInfo[1].replace(/[_]/g, "-"),	//make sure this has correct format xx-XX
 								localService: false,
 								name: vString,
 								voiceURI: vString

www/scripts/sepiaFW.webSocket.js

@@ -2314,9 +2314,29 @@ function sepiaFW_build_webSocket_client(sepiaSessionId){
 						//handle
 						if (action.type == "assistant_message"){
 							if (action.text){
+								if (!action.language) action.language = SepiaFW.speech.getLanguage();
+								action.text = action.text.replace(/\.$/, "") + ".";		//make sure we end with "." (important for some TTS)
+								var orgMsg = action.text;
+								if (!action.skipIntro){
+									action.text = SepiaFW.account.getUserName() + ", " 
+										+ SepiaFW.local.g('remote_action_notify', action.language).trim() + " " 
+										+ action.text;
+								}
+								var actionFun = function(){
+									SepiaFW.ui.showCustomChatMessage(orgMsg, {
+										sender: SepiaFW.local.g("notification"), //SepiaFW.assistant.name,
+										//senderType: 'assistant',
+										channelId: 'info'
+									});
+								}
 								SepiaFW.assistant.waitForOpportunitySayLocalTextAndRunAction(
 									//localizedText, actionFun, fallbackAction, maxWait, speakOptions:
-									action.text, function(){}, undefined, 10000, {oneTimeLanguage: action.language}
+									action.text, function(){
+										actionFun();
+									}, function(){
+										SepiaFW.ui.showInfo(SepiaFW.local.g("notification"), false);
+										actionFun();
+									}, 15000, {oneTimeLanguage: action.language}
 								);
 								//use instead? SepiaFW.events.setProActiveBackgroundNotification(action)
 								//TODO: add intro text? add notification? add something in the chat!