ALVINN/ALVINN_f7
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Improve request error handling (#87)

Browse Source 
Closes: #79

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>

Reviewed-on: Georgi_Lab/ALVINN_f7#87
This commit is contained in:
Justin Georgi
2024-02-05 15:16:41 -07:00
parent 8f4984e543
commit 741a59f5c5
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pages/detect.vue
View File

@@ -342,10 +342,13 @@
var xhr = new XMLHttpRequest() var xhr = new XMLHttpRequest()
xhr.open("GET", modelURL) xhr.open("GET", modelURL)
xhr.setRequestHeader('Content-Type', 'application/json') xhr.setRequestHeader('Content-Type', 'application/json')
xhr.timeout = 10000
xhr.ontimeout = this.remoteTimeout
xhr.onload = function () { xhr.onload = function () {
if (this.status !== 200) { if (this.status !== 200) {
//this.response.text().then(function(message){alert(message)})
console.log(xhr.response) console.log(xhr.response)
const errorResponse = JSON.parse(xhr.response)
f7.dialog.alert(`ALVINN has encountered an error: ${errorResponse.error}`)
return; return;
} }
var detectors = JSON.parse(xhr.response).detectors var detectors = JSON.parse(xhr.response).detectors
@@ -355,6 +358,7 @@
.map( l => { return {'name': l, 'detect': true} } ) .map( l => { return {'name': l, 'detect': true} } )
self.detectorLabels = findLabel || [] self.detectorLabels = findLabel || []
} }
xhr.send() xhr.send()
} }
window.onresize = (e) => { this.selectChip('redraw') } window.onresize = (e) => { this.selectChip('redraw') }
@@ -398,17 +402,19 @@
var modelURL = `http://${this.serverSettings.address}:${this.serverSettings.port}/detect` var modelURL = `http://${this.serverSettings.address}:${this.serverSettings.port}/detect`
var xhr = new XMLHttpRequest() var xhr = new XMLHttpRequest()
xhr.open("POST", modelURL) xhr.open("POST", modelURL)
xhr.timeout = 10000
xhr.ontimeout = this.remoteTimeout
xhr.setRequestHeader('Content-Type', 'application/json') xhr.setRequestHeader('Content-Type', 'application/json')
xhr.onload = function () { xhr.onload = function () {
if (this.status !== 200) {
//this.response.text().then(function(message){alert(message)})
console.log(xhr.response)
self.detecting = false self.detecting = false
if (this.status !== 200) {
console.log(xhr.response)
const errorResponse = JSON.parse(xhr.response)
f7.dialog.alert(`ALVINN has encountered an error: ${errorResponse.error}`)
return; return;
} }
self.resultData = JSON.parse(xhr.response) self.resultData = JSON.parse(xhr.response)
self.uploadDirty = true self.uploadDirty = true
self.detecting = false
} }
var doodsData = { var doodsData = {
@@ -425,6 +431,10 @@
f7.dialog.alert('Using built-in model') f7.dialog.alert('Using built-in model')
} }
}, },
remoteTimeout () {
this.detecting = false
f7.dialog.alert('No connection to remote ALVINN instance. Please check app settings.')
},
selectAll (ev) { selectAll (ev) {
if (ev.target.checked) { if (ev.target.checked) {
this.detectorLabels.forEach( s => s.detect = true ) this.detectorLabels.forEach( s => s.detect = true )