improved reconnect; added experimental settings (STT language, webplayer)

Author: fquirin

www/css/sepiaFW-style.css

@@ -838,6 +838,10 @@ body {
 		font-size: 14px;
 	}
 }
+.sepiaFW-menu-experimental {
+	display: none;
+	margin-left: 16px !important;
+}
 #sepiaFW-chat-menu li span {
 	float: left;
 	padding-right: 8px;

www/scripts/sepiaFW.app.config.js

@@ -114,7 +114,7 @@ function sepiaFW_build_config(){
 		Config.appLanguage = language; 		//TODO: interface reload to set texts?
 		//speech
 		if (SepiaFW.speech){ 	
-			SepiaFW.speech.language = language;
+			SepiaFW.speech.setLanguage(language);
 			SepiaFW.speech.refreshVoice();
 		}
 		//geocoder

www/scripts/sepiaFW.audio.js

@@ -448,7 +448,7 @@ function sepiaFW_build_audio(){
 							"&format=" + encodeURIComponent(sound_format) +
 							//general stuff
 							"&env=" + encodeURIComponent(SepiaFW.config.environment) +
-							"&lang=" + encodeURIComponent((SepiaFW.speech)? SepiaFW.speech.language : SepiaFW.config.appLanguage) +
+							"&lang=" + encodeURIComponent((SepiaFW.speech)? SepiaFW.speech.getLanguage() : SepiaFW.config.appLanguage) +
 							"&KEY=" + encodeURIComponent(SepiaFW.account.getKey()) +
 							"&client=" + encodeURIComponent(SepiaFW.config.clientInfo),
 			timeout: 10000,

www/scripts/sepiaFW.client.controls.js

@@ -118,7 +118,7 @@ function sepiaFW_build_client_controls(){
     Controls.media = function(controlData){
         if (controlData && controlData.action){
             //STOP
-            if (controlData.action == "stop" || controlData.action == "pause"){
+            if (controlData.action == "stop" || controlData.action == "pause" || controlData.action == "close"){
                 //Stop internal player
                 var isInternalPlayerStreaming = SepiaFW.audio.isMusicPlayerStreaming() || SepiaFW.audio.isMainOnHold();
                 if (isInternalPlayerStreaming){

www/scripts/sepiaFW.local.js

@@ -37,6 +37,7 @@ function sepiaFW_build_strings(){
 	StringsDE.noConnectionToServer = 'Es tut mir leid, aber ich konnte keine Verbindung zum Server herstellen :-(';
 	StringsDE.noConnectionToAssistant = 'Dein Assistent macht gerade Kaffeepause, ist sicher gleich zurück! (hoffentlich)';
 	StringsDE.noConnectionOrNoCredentials = 'Verbindung ist verloren gegangen oder die Login Daten sind abgelaufen. Du kannst warten und es noch einmal versuchen, die App neu laden oder dich erneut einloggen.';
+	StringsDE.messageLost = 'Die letzte Nachricht konnte nicht zugestellt werden';
 	StringsDE.noAsrSupport = 'Es tut mir leid, aber dieser Client unterstütz die Spracherkennung leider nicht :-(';
 	StringsDE.asrMissingServer = 'Mir fehlen noch Server Informationen um diese Spracherkennungsengine nutzen zu können, check noch mal die Settings bitte (ASR server).';
 	StringsDE.asrSettingsProblem = 'Mikrofon nicht richtig erkannt oder Zugriff verweigert.';
@@ -53,6 +54,7 @@ function sepiaFW_build_strings(){
 	StringsDE.store = 'Speichern';
 	StringsDE.load = 'Laden';
 	StringsDE.tryAgain = 'Nochmal versuchen';
+	StringsDE.tryReconnect = 'Neu verbinden';
 	StringsDE.wait = 'Warten';
 	StringsDE.forget = 'Vergessen';
 	StringsDE.abort = 'Abbrechen';
@@ -119,6 +121,11 @@ function sepiaFW_build_strings(){
 	StringsDE.myNewsDemoBtn = 'Öffne meine persönlichen News';
 	StringsDE.myRadioDemoBtn = 'Starte mein Lieblingsradio';
 	StringsDE.myToDoDemoBtn = 'Öffne meine To-Do Liste';
+	//Connection status
+	StringsDE.status_connecting = "Wird verbunden...";
+	StringsDE.status_opened = "Online";
+	StringsDE.status_closed = "Offline";
+	StringsDE.status_error = "Error";
 	//Teach-UI
 	StringsDE.command = 'Befehl';
 	StringsDE.chooseCommand = 'Bitte wähle einen Befehl.';
@@ -154,6 +161,7 @@ function sepiaFW_build_strings(){
 	StringsEN.noConnectionToServer = 'I\'m sorry but I could not establish a connection to the server :-(';
 	StringsEN.noConnectionToAssistant = 'Your assistant is taking a coffee break, will be right back! (hopefully)';
 	StringsEN.noConnectionOrNoCredentials = 'Connection was lost or credentials became invalid. You can wait and try it again, reload the app or login again.';
+	StringsEN.messageLost = 'The last message could not be delivered';
 	StringsEN.noAsrSupport = 'I\'m sorry but this client does not support speech recognition :-(';
 	StringsEN.asrMissingServer = 'I\'m missing some server info to user this speech recognition engine, please check the settings again (ASR server).';
 	StringsEN.asrSettingsProblem = 'Microphone has not been recognized properly or access was denied.';
@@ -170,6 +178,7 @@ function sepiaFW_build_strings(){
 	StringsEN.store = 'Store';
 	StringsEN.load = 'Load';
 	StringsEN.tryAgain = 'Try again';
+	StringsEN.tryReconnect = 'Try reconnect';
 	StringsEN.wait = 'Wait';
 	StringsEN.forget = 'Forget';
 	StringsEN.abort = 'Abort';
@@ -237,6 +246,11 @@ function sepiaFW_build_strings(){
 	StringsEN.myNewsDemoBtn = 'Open my personal news';
 	StringsEN.myRadioDemoBtn = 'Start my favorite radio station';
 	StringsEN.myToDoDemoBtn = 'Open my to-do list';
+	//Connection status
+	StringsEN.status_connecting = "Connecting...";
+	StringsEN.status_opened = "Online";
+	StringsEN.status_closed = "Offline";
+	StringsEN.status_error = "Error";
 	//Teach-UI
 	StringsEN.command = 'Command';
 	StringsEN.chooseCommand = 'Please choose a command.';
@@ -259,6 +273,37 @@ function sepiaFW_build_strings(){
 	StringsLocale.w = function(name){
 		document.write(StringsLocale[name]);
 	}
+
+	//-------------- Languages --------------
+
+	StringsLocale.getSupportedAppLanguages = function(){
+		return [
+			{value:"de", name:" DE "},
+			{value:"en", name:" EN "},
+		];
+	}
+	StringsLocale.getExperimentalAsrLanguages = function(){
+		return [
+			{value:"", name:"Default (app lang.)"},
+			{value:"en-AU", name:"Australia (en-AU)"},
+			{value:"en-CA", name:"Canada (en-CA)"},
+			{value:"fr-FR", name:"France (fr-FR)"},
+			{value:"el-GR", name:"Greece (el-GR)"},
+			{value:"en-IE", name:"Ireland (en-IE)"},
+			{value:"it-IT", name:"Italy (it-IT)"},
+			{value:"ja-JP", name:"Japan (ja-JP)"},
+			{value:"nl-NL", name:"Netherlands (nl-NL)"},
+			{value:"en-NZ", name:"New Zealand (en-NZ)"},
+			{value:"pt-PT", name:"Portugal (pt-PT)"},
+			{value:"ru-RU", name:"Russia (ru-RU)"},
+			{value:"en-ZA", name:"South Africa (en-ZA)"},
+			{value:"af-ZA", name:"South Africa (af-ZA)"},
+			{value:"es-ES", name:"Spain (es-ES)"},
+			{value:"sv-SE", name:"Sweden (sv-SE)"},
+			{value:"tr-TR", name:"Turkey (tr-TR)"},
+			{value:"en-GB", name:"United Kingdom (en-GB)"}
+		];
+	}
 
 	return StringsLocale;
 }

www/scripts/sepiaFW.speech.js

@@ -6,7 +6,38 @@ function sepiaFW_build_speech(){
 	//Parameters and states
 
 	//Common
-	Speech.language = SepiaFW.config.appLanguage;
+	var speechLanguage = SepiaFW.config.appLanguage;
+	var speechCountryCode = "";
+	Speech.getLanguage = function(){
+		return speechLanguage;
+	}
+	Speech.setLanguage = function(newLang){
+		speechLanguage = newLang;
+	}
+	Speech.setCountryCode = function(countryCode){
+		speechCountryCode = countryCode;
+	}
+	//it might be necessary to use the long codes
+	function getLongLanguageCode(langCodeShort){
+		if (langCodeShort.length === 2){
+			if (langCodeShort.toLowerCase() === "de"){
+				return "de-DE";
+			}else{
+				return "en-US";
+			}
+		}
+	}
+	function getLanguageForASR(){
+		if (speechCountryCode){
+			return speechCountryCode;
+		}else if (speechLanguage === "de"){
+			return "de-DE";
+		}else{
+			return "en-US";
+		}
+	}
+	Speech.getLongLanguageCode = getLongLanguageCode;
+	Speech.getLanguageForASR = getLanguageForASR;
 
 	//ASR
 	Speech.testAsrSupport = function(){
@@ -363,18 +394,6 @@ function sepiaFW_build_speech(){
 	}
 
 	//----------helpers-----------
-	
-	//it might be necessary to use the long codes
-	function getLongLanguageCode(langCodeShort){
-		if (langCodeShort.length === 2){
-			if (langCodeShort.toLowerCase() === "de"){
-				return "de-DE";
-			}else{
-				return "en-US";
-			}
-		}
-	}
-	Speech.getLongLanguageCode = getLongLanguageCode;
 
 	//auto stopping of speech recognition after a period of no results
 	function autoStopASR(){
@@ -661,7 +680,7 @@ function sepiaFW_build_speech(){
 				callback_interim(interim_transcript);
 			};
 
-			recognition.lang = getLongLanguageCode(Speech.language);
+			recognition.lang = getLanguageForASR();
 			recognition.maxAlternatives = 1;
 			recognition.start();
 		}
@@ -770,7 +789,7 @@ function sepiaFW_build_speech(){
 				if (selectedVoiceObject.name){
 					$('#sepiaFW-menu-select-voice').val(selectedVoice);
 				}
-				SepiaFW.data.setPermanent(Speech.language + "-voice", selectedVoice);
+				SepiaFW.data.setPermanent(Speech.getLanguage() + "-voice", selectedVoice);
 			}
 		}
 	}
@@ -820,7 +839,7 @@ function sepiaFW_build_speech(){
 			onTtsStart(event, startedCallback, errorCallback);
 			TTS.speak({
 				text: text,
-				locale: getLongLanguageCode(Speech.language),
+				locale: getLongLanguageCode(Speech.getLanguage()),
 				rate: 1.00
 
 			}, function () {
@@ -839,7 +858,7 @@ function sepiaFW_build_speech(){
 			window.sepia_tts_utterances = []; 		//This is a bug-fix to prevent utterance from getting garbage collected
 			var utterance = new SpeechSynthesisUtterance();
 			utterance.text = text;
-			utterance.lang = getLongLanguageCode(Speech.language);
+			utterance.lang = getLongLanguageCode(Speech.getLanguage());
 			if (selectedVoice) utterance.voice = selectedVoiceObject;
 			utterance.pitch = 1.0;  	//accepted values: 0-2 inclusive, default value: 1
 			utterance.rate = 1.0; 		//accepted values: 0.1-10 inclusive, default value: 1
@@ -997,7 +1016,7 @@ function sepiaFW_build_speech(){
 	//set a preselected voice (e.g. in Edge)
 	function setVoiceOnce(){
 		//stored?
-		var storedVoice = SepiaFW.data.getPermanent(Speech.language + "-voice");
+		var storedVoice = SepiaFW.data.getPermanent(Speech.getLanguage() + "-voice");
 		if (storedVoice){
 			Speech.setVoice(storedVoice);
 

www/scripts/sepiaFW.speechWebSocket.js

@@ -178,7 +178,7 @@ function sepiaFW_build_speechWebSocket(){
 		//stopWebSocket();
 		//Speech.stopRecording();
 
-		var language = SepiaFW.speech.getLongLanguageCode(SepiaFW.speech.language);
+		var language = SepiaFW.speech.getLanguageForASR();
 
 		//WebSocket URI - TODO: handle parameters variable
 		var uri = Speech.socketURI + ('?language=' + language);

www/scripts/sepiaFW.ui.build.js

@@ -15,28 +15,40 @@ function sepiaFW_build_ui_build(){
 	}
 
 	//build reuseable language selector
-	Build.languageSelector = function(btnId, languageChangeAction){
+	Build.optionSelector = function(btnId, optionsObjectArray, selectedValue, optionChangeAction){
 		var ele = document.createElement("SELECT");
 		if (btnId) ele.id = btnId;
-		var code = ''
-			+ '<option value="de">&nbsp;DE&nbsp;</option>'
-			+ '<option value="en">&nbsp;EN&nbsp;</option>';
+		var code = "";
+		optionsObjectArray.forEach(function(option){
+			code += '<option value="' + option.value + '">' + option.name + '</option>';
+		});
 		ele.innerHTML = code;
 
+		//initialize selected value
 		for(var i, j = 0; i = ele.options[j]; j++) {
-			if(i.value == SepiaFW.config.appLanguage) {
+			if(i.value == selectedValue) {
 				ele.selectedIndex = j;
 				break;
 			}
 		}
-		
-		$(ele).off();
-		$(ele).on('change', function(){
-			SepiaFW.config.broadcastLanguage(this.value);
-			languageChangeAction(this.value);
+
+		//change listener
+		$(ele).off().on('change', function(){
+			if (optionChangeAction) optionChangeAction(ele);
 		});
 		return ele;
 	}
+	//build reuseable language selector
+	Build.languageSelector = function(btnId, languageChangeAction){
+		return Build.optionSelector(btnId, 
+			SepiaFW.local.getSupportedAppLanguages(), 
+			SepiaFW.config.appLanguage, 
+			function(ele){
+				SepiaFW.config.broadcastLanguage(ele.value);
+				languageChangeAction(ele.value);
+			}
+		);
+	}
 
 	//toggle button
 	Build.toggleButton = function(btnId, onCallback, offCallback, initialState){
@@ -510,21 +522,20 @@ function sepiaFW_build_ui_build(){
 			centerPage2.innerHTML = ""
 				+ "<ul class='sepiaFW-menu-settings-list'>"
 					+ "<li id='sepiaFW-menu-select-skin-li'><span>Skin: </span><select id='sepiaFW-menu-select-skin'><option disabled selected value>- select -</option></select></li>"
+					+ "<li id='sepiaFW-menu-assistant-host-li' title='Assistant hostname, e.g.: my.example.org/sepia, localhost or [IP]'>"
+						+ "<span>Hostname: </span>"
+						+ "<input id='sepiaFW-menu-assistant-host' type='url' placeholder='my.example.org/sepia' spellcheck='false'>"
+					+ "</li>"
 					+ "<li id='sepiaFW-menu-deviceId-li'><span>" + SepiaFW.local.g('deviceId') + ": </span><input id='sepiaFW-menu-deviceId' type='text' maxlength='24'></li>"
 					+ "<li id='sepiaFW-menu-toggle-GPS-li'><span>GPS: </span></li>"
 					+ "<li id='sepiaFW-menu-toggle-voice-li'><span>Voice output: </span></li>"
 					+ "<li id='sepiaFW-menu-select-voice-li'><span>Voice: </span></li>" 	//option: <i class='material-icons md-mnu'>&#xE5C6;</i>
 					+ "<li id='sepiaFW-menu-toggle-proactiveNotes-li' title='The assistant will remind you in a funny way to make a coffee break etc. :-)'><span>Well-being reminders: </span></li>"
-					+ "<li id='sepiaFW-menu-clear-app-cache-li'><span>Clear app data: </span></li>"
 					+ "<li id='sepiaFW-menu-toggle-channelMessages-li' title='Show status messages in chat like someone joined the channel?'><span>Channel status messages: </span></li>"
 					//NOTE: we show this only if battery status API supported:
 					+ "<li id='sepiaFW-menu-toggle-trackPowerStatus-li' title='Observe power plug and battery status?'><span>Track power status: </span></li>"
 					//---
 					+ "<li id='sepiaFW-menu-input-controls-li' title='Settings for remote input devices, e.g. gamepads'><span>Remote controls: </span></li>"
-					+ "<li id='sepiaFW-menu-assistant-host-li' title='Assistant hostname, e.g.: my.example.org/sepia, localhost or [IP]'>"
-						+ "<span>Hostname: </span>"
-						+ "<input id='sepiaFW-menu-assistant-host' type='url' placeholder='my.example.org/sepia' spellcheck='false'>"
-					+ "</li>"
 					//Android-only background connect:
 					+ "<li class='sepiaFW-android-settings' id='sepiaFW-menu-toggle-runBackgroundConnection-li' title='Try to keep connected in background?'><span>Allow background activity: </span></li>"
 					//---
@@ -547,6 +558,13 @@ function sepiaFW_build_ui_build(){
 					+ "<li id='sepiaFW-menu-select-music-app-li' title='Select default music app for search intents.'>"
 						+ "<span>Default music app: </span></li>"
 						//+ "<span id='sepiaFW-menu-toggle-music-cards-btn'><i class='material-icons'>art_track</i></span>"
+					+ "<li id='sepiaFW-menu-clear-app-cache-li'><span>Clear app data: </span></li>"
+					+ "<li id='sepiaFW-menu-experimental-settings-li'><span>Experimental settings </span></li>"
+						+ "<li class='sepiaFW-menu-experimental'><span><u>Note: Changes will not be permanent</u></span></li>"
+						+ "<li id='sepiaFW-menu-select-stt-language-li' class='sepiaFW-menu-experimental'><span>ASR country </span></li>"
+						+ "<li id='sepiaFW-menu-toggle-youtube-wp-li' class='sepiaFW-menu-experimental'><span>YouTube embedded </span></li>"
+						+ "<li id='sepiaFW-menu-toggle-spotify-wp-li' class='sepiaFW-menu-experimental'><span>Spotify embedded </span></li>"
+						+ "<li id='sepiaFW-menu-toggle-apple-music-wp-li' class='sepiaFW-menu-experimental'><span>Apple Music embedded </span></li>"
 					+ "<li id='sepiaFW-menu-administration-li'>"
 						+ "<button id='sepiaFW-menu-ui-dataprivacy-btn'>" + SepiaFW.local.g('data_privacy') + "</button>"
 						+ "<button id='sepiaFW-menu-ui-license-btn'>" + SepiaFW.local.g('license') + "</button>"
@@ -780,18 +798,7 @@ function sepiaFW_build_ui_build(){
 			SepiaFW.ui.onShortLongPress($('#sepiaFW-menu-select-music-app-li').find('span').first()[0], function(){
 				//Short press
 			}, function(){
-				//Long press
-				if (SepiaFW.ui.cards.canEmbedSpotify){
-					SepiaFW.ui.cards.canEmbedYouTube = false;
-					SepiaFW.ui.cards.canEmbedSpotify = false;
-					SepiaFW.ui.cards.canEmbedAppleMusic = false;
-					SepiaFW.ui.showPopup("All music cards deactivated");
-				}else{
-					SepiaFW.ui.cards.canEmbedYouTube = true;
-					SepiaFW.ui.cards.canEmbedSpotify = true;
-					SepiaFW.ui.cards.canEmbedAppleMusic = true;
-					SepiaFW.ui.showPopup("All music cards activated (for debugging)");
-				}				
+				//Long press - this hidden setting moved to "experimental" below
 			}, true);
 			//$('#sepiaFW-menu-toggle-music-cards-btn').off().on('click', function(){});
 
@@ -835,6 +842,42 @@ function sepiaFW_build_ui_build(){
 					SepiaFW.debug.info("Proactive notes are deactivated");
 				}, SepiaFW.assistant.isProActive)
 			);
+			//show/hide experimental settings
+			document.getElementById('sepiaFW-menu-experimental-settings-li').appendChild(Build.inlineActionButton('sepiaFW-menu-experimental-settings', "Toggle",
+				function(btn){
+					$('.sepiaFW-menu-experimental').toggle(300);
+				}
+			));
+			//ASR (STT) voice input language
+			document.getElementById('sepiaFW-menu-select-stt-language-li').appendChild(Build.optionSelector('sepiaFW-menu-select-stt-language', 
+				SepiaFW.local.getExperimentalAsrLanguages(), 
+				"", 
+				function(ele){
+					SepiaFW.speech.setCountryCode(ele.value);
+				}
+			));
+			//Toggle embedded web-players
+			document.getElementById('sepiaFW-menu-toggle-youtube-wp-li').appendChild(Build.toggleButton('sepiaFW-menu-toggle-youtube-wp', 
+				function(){
+					SepiaFW.ui.cards.canEmbedYouTube = true;
+				},function(){
+					SepiaFW.ui.cards.canEmbedYouTube = false;
+				}, SepiaFW.ui.cards.canEmbedYouTube)
+			);
+			document.getElementById('sepiaFW-menu-toggle-spotify-wp-li').appendChild(Build.toggleButton('sepiaFW-menu-toggle-spotify-wp', 
+				function(){
+					SepiaFW.ui.cards.canEmbedSpotify = true;
+				},function(){
+					SepiaFW.ui.cards.canEmbedSpotify = false;
+				}, SepiaFW.ui.cards.canEmbedSpotify)
+			);
+			document.getElementById('sepiaFW-menu-toggle-apple-music-wp-li').appendChild(Build.toggleButton('sepiaFW-menu-toggle-apple-music-wp', 
+				function(){
+					SepiaFW.ui.cards.canEmbedAppleMusic = true;
+				},function(){
+					SepiaFW.ui.cards.canEmbedAppleMusic = false;
+				}, SepiaFW.ui.cards.canEmbedAppleMusic)
+			);
 			//delete app cache
 			document.getElementById('sepiaFW-menu-clear-app-cache-li').appendChild(Build.inlineActionButton('sepiaFW-menu-clear-app-cache', "Clear",
 				function(btn){