Skip to content

Prevent from using variables before initialization on connection #3702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haiodo merged 2 commits into from
Sep 15, 2023
Merged

Prevent from using variables before initialization on connection #3702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f099278
Prevent from using variables before initialization
ThetaDR Sep 15, 2023
fa2c93a
remove unnecessary check operator for undefined
ThetaDR Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions plugins/workbench-resources/src/connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export async function connect (title: string): Promise<Client | undefined> {
let clientSet = false

let version: Version | undefined

let serverEndpoint = endpoint.replace(/^ws/g, 'http')
if (serverEndpoint.endsWith('/')) {
serverEndpoint = serverEndpoint.substring(0, serverEndpoint.length - 1)
}
const clientFactory = await getResource(client.function.GetClient)
_client = await clientFactory(
token,
Expand All @@ -87,24 +90,28 @@ export async function connect (title: string): Promise<Client | undefined> {
}

void (async () => {
const newVersion = await _client?.findOne<Version>(core.class.Version, {})
console.log('Reconnect Model version', newVersion)

const currentVersionStr = versionToString(version as Version)
const reconnectVersionStr = versionToString(newVersion as Version)

if (currentVersionStr !== reconnectVersionStr) {
// It seems upgrade happened
location.reload()
}
const serverVersion: { version: string } = await (await fetch(serverEndpoint + '/api/v1/version', {})).json()

console.log('Server version', serverVersion.version)
if (serverVersion.version !== '' && serverVersion.version !== currentVersionStr) {
versionError = `${currentVersionStr} => ${serverVersion.version}`
setTimeout(() => {
window.location.reload()
}, 5000)
if (_client !== undefined) {
const newVersion = await _client.findOne<Version>(core.class.Version, {})
console.log('Reconnect Model version', newVersion)

const currentVersionStr = versionToString(version as Version)
const reconnectVersionStr = versionToString(newVersion as Version)

if (currentVersionStr !== reconnectVersionStr) {
// It seems upgrade happened
location.reload()
}
const serverVersion: { version: string } = await (
await fetch(serverEndpoint + '/api/v1/version', {})
).json()

console.log('Server version', serverVersion.version)
if (serverVersion.version !== '' && serverVersion.version !== currentVersionStr) {
versionError = `${currentVersionStr} => ${serverVersion.version}`
setTimeout(() => {
window.location.reload()
}, 5000)
}
}
})()
} catch (err) {
Expand All @@ -131,12 +138,6 @@ export async function connect (title: string): Promise<Client | undefined> {
clientSet = true
return
}

let serverEndpoint = endpoint.replace(/^ws/g, 'http')
if (serverEndpoint.endsWith('/')) {
serverEndpoint = serverEndpoint.substring(0, serverEndpoint.length - 1)
}

try {
version = await _client.findOne<Version>(core.class.Version, {})
console.log('Model version', version)
Expand Down