Merge pull request #28 from SEPIA-Framework/dev

final v2.5.0 fixes

Author: fquirin

www/scripts/clexi-0.8.2.js

@@ -35,7 +35,7 @@ var ClexiJS = (function(){
 
 	Clexi.availableXtensions = {}; 	//TODO: we should update this somehow (will only update once at welcome event)
 
-	Clexi.pingAndConnect = function(host, onPingOrIdError, onOpen, onClose, onError, onConnecting){
+	Clexi.pingAndConnect = function(host, onPingOrIdError, onOpen, onClose, onError, onConnecting, onWelcome){
 		var url;
 		if (!host) url = location.origin;
 		else url = host.replace(/^wss/, 'https').replace(/^ws/, 'http');
@@ -47,7 +47,7 @@ var ClexiJS = (function(){
 			//console.log(data);
 			//check ID
 			if (data.id && (data.id == Clexi.serverId || (data.id == "[SECRET]" && Clexi.serverId))){
-				Clexi.connect(host, onOpen, onClose, onError, onConnecting);
+				Clexi.connect(host, onOpen, onClose, onError, onConnecting, onWelcome);
 			}else{
 				if (onPingOrIdError) onPingOrIdError({
 					code: 418,
@@ -168,7 +168,7 @@ var ClexiJS = (function(){
 			if (!requestedClose){
 				//try reconnect?
 				if (Clexi.doAutoReconnect){
-					autoReconnect(host, onOpen, onClose, onError, onConnecting);
+					autoReconnect(host, onOpen, onClose, onError, onConnecting, onWelcome);
 				}
 			}else{
 				if (reconnectTimer) clearTimeout(reconnectTimer);
@@ -185,15 +185,15 @@ var ClexiJS = (function(){
 		}
 	}
 
-	function autoReconnect(host, onOpen, onClose, onError, onConnecting){
+	function autoReconnect(host, onOpen, onClose, onError, onConnecting, onWelcome){
 		reconnectTry++;
 		var delay = Math.min(reconnectTry*reconnectTry*reconnectBaseDelay, reconnectMaxDelay);
 		//TODO: we could/should check navigator.onLine here ...
 		if (reconnectTimer) clearTimeout(reconnectTimer);
 		reconnectTimer = setTimeout(function(){
 			if (!isConnected && !requestedClose){
 				if (Clexi.onLog) Clexi.onLog('CLEXI reconnecting after unexpected close. Try: ' + reconnectTry);
-				Clexi.connect(host, onOpen, onClose, onError, onConnecting);
+				Clexi.connect(host, onOpen, onClose, onError, onConnecting, onWelcome);
 			}
 		}, delay);
 	}

www/scripts/sepiaFW.account.js

@@ -530,10 +530,10 @@ function sepiaFW_build_account(sepiaSessionId){
 	//Setup login-box
 	Account.setupLoginBox = function(){
 		//demo login?
-		var isDemoLogin = SepiaFW.data.get('isDemoLogin');
-		if (isDemoLogin){
-			userRoles = [isDemoLogin];
-			skipLogin();
+		var demoLogin = SepiaFW.data.get('isDemoLogin');
+		if (demoLogin){
+			userRoles = [demoLogin];
+			skipLogin(demoLogin);
 			return;
 		}
 		//try restore from data-storage to avoid login popup - refresh required after e.g. 1 day = 1000*60*60*24
@@ -659,7 +659,13 @@ function sepiaFW_build_account(sepiaSessionId){
 			//$('#sepiaFW-login-extend-box').hide();
 		});
 	}
-	function skipLogin(){
+	function skipLogin(demoId){
+		if (demoId && demoId == "setup"){
+			//temporarily disabled
+			SepiaFW.speech.skipTTS = true;
+			SepiaFW.wakeTriggers.useWakeWord = false;
+			SepiaFW.debug.log("Deactivated for setup: TTS, Wake-Word");
+		}
 		Account.toggleLoginBox();
 		broadcastEnterWithoutLogin();
 		Account.afterLogin();
@@ -896,7 +902,7 @@ function sepiaFW_build_account(sepiaSessionId){
 			SepiaFW.data.set('isDemoLogin', userId);
 			userRoles = [userId];
 			SepiaFW.ui.hideLoader();
-			skipLogin();
+			skipLogin(userId);
 			return;
 		}
 		//hash password

www/scripts/sepiaFW.inputControls.cmdl.js

@@ -44,6 +44,11 @@ function sepiaFW_build_input_controls_cmdl() {
             }else{
                 document.removeEventListener('sepia_speech_event', speechBroadcaster);
             }
+            if (Cmdl.broadcasters.wakeWord){
+                document.addEventListener('sepia_wake_word', wakeWordBroadcaster);
+            }else{
+                document.removeEventListener('sepia_wake_word', wakeWordBroadcaster);
+            }
 
             //say hello
             broadcastEvent("event", {
@@ -56,14 +61,16 @@ function sepiaFW_build_input_controls_cmdl() {
             document.removeEventListener('sepia_state_change', stateBroadcaster);
             document.removeEventListener('sepia_login_event', loginBroadcaster);
             document.removeEventListener('sepia_speech_event', speechBroadcaster);
+            document.removeEventListener('sepia_wake_word', wakeWordBroadcaster);
         }
     }
 
     //Broadcasters to use, usually overwritten by headless settings
     Cmdl.broadcasters = {
         state: false,
         login: false,
-        speech: false
+        speech: false,
+        wakeWord: false
     };
     function stateBroadcaster(ev){
         if (Cmdl.broadcasters.state && ev.detail && ev.detail.state){
@@ -87,6 +94,20 @@ function sepiaFW_build_input_controls_cmdl() {
             });
         }
     }
+    function wakeWordBroadcaster(ev){
+        if (Cmdl.broadcasters.wakeWord && ev.detail && ev.detail.state){
+            var d = {
+                state: ev.detail.state
+            }
+            if (ev.detail.keyword){
+                d.word = ev.detail.keyword;
+            }
+            if (ev.detail.msg){
+                d.msg = ev.detail.msg;
+            }
+            broadcastEvent("sepia-wake-word", d);
+        }
+    }
 
     function handleClientBroadcastEvents(ev){
         //console.log(ev);            //DEBUG
@@ -148,6 +169,23 @@ function sepiaFW_build_input_controls_cmdl() {
 
     Cmdl.set = {};
 
+    Cmdl.set.wakeword = function(ev){
+        if (ev.state){
+            if (ev.state == "on" || ev.state == "active" || ev.state == "activate"){
+                SepiaFW.wakeTriggers.useWakeWord = true;
+                if (!SepiaFW.wakeTriggers.engineLoaded){
+                    SepiaFW.wakeTriggers.setupWakeWords();      //will auto-start after setup
+                }else if (!SepiaFW.wakeTriggers.isListening()){
+                    SepiaFW.wakeTriggers.listenToWakeWords();
+                }
+            }else if (ev.state == "off" || ev.state == "inactive" || ev.state == "deactivate"){
+                if (SepiaFW.wakeTriggers.engineLoaded && SepiaFW.wakeTriggers.isListening()){
+                    SepiaFW.wakeTriggers.stopListeningToWakeWords();
+                }
+            }
+        }
+    }
+
     //---------- GET ------------
 
     Cmdl.get = {};

www/scripts/sepiaFW.ui.animate.js

@@ -195,9 +195,19 @@ function sepiaFW_build_animate(){
 
 	Animate.wakeWord.active = function(){
 		$('#sepiaFW-nav-label-online-status').addClass("wake-word-active");
+		//dispatch event
+		var event = new CustomEvent('sepia_wake_word', { detail: {
+			state: "active"
+		}});
+		document.dispatchEvent(event);
 	}
 	Animate.wakeWord.inactive = function(){
 		$('#sepiaFW-nav-label-online-status').removeClass("wake-word-active");
+		//dispatch event
+		var event = new CustomEvent('sepia_wake_word', { detail: {
+			state: "inactive"
+		}});
+		document.dispatchEvent(event);
 	}
 
 	//channel animations for missed off-channel messages:

www/scripts/sepiaFW.wakeTriggers.js

@@ -18,7 +18,8 @@ function sepiaFW_build_wake_triggers() {
 
 		//dispatch event
 		var event = new CustomEvent('sepia_wake_word', { detail: {
-			keyword: keyword
+			keyword: keyword,
+			state: "triggered"
 		}});
 		document.dispatchEvent(event);
 
@@ -33,6 +34,15 @@ function sepiaFW_build_wake_triggers() {
 			});
 		}
 	}
+	function broadcastWakeWordError(error){
+		//dispatch event
+		var event = new CustomEvent('sepia_wake_word', { detail: {
+			msg: error,
+			state: "error"
+		}});
+		document.dispatchEvent(event);
+	}
+	//NOTE: active, inactive: see ui.animate.wakeWord...
 
 	//Interface 
 
@@ -399,6 +409,7 @@ function sepiaFW_build_wake_triggers() {
 		}
 		SepiaFW.debug.error("Porcupine: " + errMsg);
 		SepiaFW.ui.showPopup("Porcupine error: " + errMsg);
+		broadcastWakeWordError(errMsg);
     };
 
 	//-------------------------------------------------

www/settings.js

@@ -39,7 +39,8 @@ SepiaFW.settings = {
 		broadcast: {
 			"state": true,
 			"login": true,
-			"speech": true
+			"speech": true,
+			"wakeWord": true
 		}
 	}
 };