studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 63 Pull Requests 5 Releases Wiki Activity

Fix #99410: SocketIO Reconnect Web Interface #104235

Merged
Sybren A. Stüvel merged 8 commits from Evelinealy/flamenco:socketio-web-interface into main 2023-07-21 17:16:51 +02:00
Conversation 3 Commits 8 Files Changed 1 +11 -10
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09333db822 - Show all commits

19
web/app/src/App.vue
View File

@ -49,15 +49,16 @@ export default {
flamencoVersion: DEFAULT_FLAMENCO_VERSION, flamencoVersion: DEFAULT_FLAMENCO_VERSION,
backendURL: backendURL, backendURL: backendURL,
}), }),
mounted() { mounted() {
window.app = this; window.app = this;
this.fetchManagerInfo(); this.fetchManagerInfo();
const sockStatus = useSocketStatus(); const sockStatus = useSocketStatus();
this.$watch(() => sockStatus.isConnected, (isConnected) => { this.$watch(() => sockStatus.isConnected, (isConnected) => {
dr.sybren marked this conversation as resolved
Sybren A. Stüvel commented 2023-07-20 11:32:50 +02:00
Review
Copy Link

This should also check sockStatus.wasEverDisconnected, otherwise it'll also respond to the initial connection.

This should also check `sockStatus.wasEverDisconnected`, otherwise it'll also respond to the initial connection.
if (isConnected) { if (!isConnected) return;
if (!sockStatus.wasEverDisconnected) return;
this.socketIOReconnect(); this.socketIOReconnect();
}
}); });
}, },
@ -72,14 +73,14 @@ export default {
}, },
socketIOReconnect() { socketIOReconnect() {
this.fetchManagerInfo() const metaAPI = new API.MetaApi(getAPIClient())
if (this.flamencoVersion !== DEFAULT_FLAMENCO_VERSION || this.flamencoName !== DEFAULT_FLAMENCO_NAME ) { metaAPI.getVersion().then((version) => {
console.log(`Upgraded Flamenco Version: ${this.flamencoVersion}`); if (version.name === this.flamencoName && version.version == this.flamencoVersion)
return;
// Reload the page console.log(`Updated from ${this.flamencoVersion} to ${version.version}`);
location.reload(); location.reload();
} });
} },
}, },
} }
</script> </script>