blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #99410: SocketIO Reconnect Web Interface (#104235)

Browse Source 
Fix #99410: Web: fetch version on SocketIO reconnect (and maybe reload)

After losing the SocketIO connection and subsequently reconnecting, the
webapp should re-fetch the Flamenco Manager version and display it in
the top-right corner. If it's different from before, then it will log a
notification about the upgrade and refresh the entire page to ensure the
new version is loaded properly.

Reviewed-on: https://projects.blender.org/studio/flamenco/pulls/104235
This commit is contained in:
Eveline Anderson 2023-07-21 17:16:49 +02:00 committed by Sybren A. Stüvel
parent ef68f71d54
commit cdf1cff41b
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,9 @@
import * as API from '@/manager-api';
import { getAPIClient } from "@/api-client";
import { backendURL } from '@/urls';
import { useSocketStatus } from '@/stores/socket-status';
import ApiSpinner from '@/components/ApiSpinner.vue'
import ApiSpinner from '@/components/ApiSpinner.vue';
const DEFAULT_FLAMENCO_NAME = "Flamenco";
const DEFAULT_FLAMENCO_VERSION = "unknown";
@ -47,6 +48,14 @@ export default {
mounted() {
window.app = this;
this.fetchManagerInfo();
const sockStatus = useSocketStatus();
this.$watch(() => sockStatus.isConnected, (isConnected) => {
if (!isConnected) return;
if (!sockStatus.wasEverDisconnected) return;
this.socketIOReconnect();
});
},
methods: {
// TODO: also call this when SocketIO reconnects.
@ -57,6 +66,16 @@ export default {
this.flamencoVersion = version.version;
})
},
socketIOReconnect() {
const metaAPI = new API.MetaApi(getAPIClient())
metaAPI.getVersion().then((version) => {
if (version.name === this.flamencoName && version.version == this.flamencoVersion)
return;
console.log(`Updated from ${this.flamencoVersion} to ${version.version}`);
location.reload();
});
},
},
}
</script>