Skip to content

Commit 3d755a1

Browse files
committed
fixed a bug in wake-word settings page and error handling
1 parent e3b9c11 commit 3d755a1

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

www/scripts/sepiaFW.wakeTriggers.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,19 @@ function sepiaFW_build_wake_triggers() {
222222
}
223223
function defaultPpErrorCallback(ex){
224224
ppIsListening = false;
225-
var errMsg = ex.toString();
226-
SepiaFW.debug.error("Porcupine: " + errMsg);
227225
SepiaFW.animate.wakeWord.inactive();
228-
alert("Porcupine: " + errMsg);
226+
var errMsg = "?";
227+
if (ex && typeof ex == "string"){
228+
errMsg = ex;
229+
}else if (ex && typeof ex == "object" && (ex.error || ex.message || ex.msg)){
230+
errMsg = ex.error || ex.message || ex.msg;
231+
}else if (ex && typeof ex == "object"){
232+
try {
233+
errMsg = JSON.stringify(ex);
234+
}catch(err){}
235+
}
236+
SepiaFW.debug.error("Porcupine: " + errMsg);
237+
SepiaFW.ui.showPopup("Porcupine error: " + errMsg);
229238
};
230239

231240
//-------------------------------------------------

www/scripts/sepiaFW.wakeWordSettings.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ function sepiaFW_build_wake_word_settings() {
141141

142142
//check button states
143143
if (SepiaFW.wakeTriggers.engineLoaded){
144-
if (SepiaFW.wakeTriggers.isListening()){
144+
isListening = SepiaFW.wakeTriggers.isListening();
145+
if (isListening){
145146
document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "STOP";
146147
}else{
147148
document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "START";

www/xtensions/picovoice/picovoiceAudioManager.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,21 @@ let PicovoiceAudioManager = (function() {
111111
SepiaFW.audioRecorder.start(function(activeAudioContext, audioRec){
112112
//Started
113113
logInfo('STARTED recorder');
114+
}, function(err){
115+
//Error
116+
logInfo('ERROR: ' + err);
117+
if (errorCallback) errorCallback(err);
114118
});
115119
//audioRecorder.start(); //note: uses internal global audio-recorder
116120

117-
}, function(err){
121+
}, function(ex){
118122
//Failed
119-
logInfo('ERROR: ' + err);
120-
if (errorCallback) errorCallback(err);
123+
var errMsg = ex;
124+
if (ex && (typeof ex == "object") && (ex.error || ex.message || ex.msg)){
125+
errMsg = ex.error || ex.message || ex.msg;
126+
}
127+
logInfo('ERROR: ' + errMsg);
128+
if (errorCallback) errorCallback(ex);
121129
});
122130
};
123131

0 commit comments

Comments
 (0)