Commitfc24b7d

authored

fix: simplify and improve error handling during workspace polling (#86)

- detect if there is an os wake-up for all types of errors- if there is an os wake-up we try to re-init the http client.- if that doesn't work out, the polling stops and redirects to theautologin screen.- the autologin screen will display an error and stop the authenticationif errors are encountered.

1 parentdb3ea7d commitfc24b7dCopy full SHA for fc24b7d

File tree

2 files changed

-25

lines changed

CHANGELOG.md
src/main/kotlin/com/coder/toolbox
- CoderRemoteProvider.kt

2 files changed

-25

lines changed

`‎CHANGELOG.md‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@`
`6`	`6`
`7`	`7`	`- login screen is shown instead of an empty list of workspaces when token expired`
`8`	`8`
	`9`	`+###Changed`
	`10`	`+`
	`11`	`+- improved error handling during workspace polling`
	`12`	`+`
`9`	`13`	`##0.1.4 - 2025-04-11`
`10`	`14`
`11`	`15`	`###Fixed`

`‎src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt‎`

Lines changed: 5 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package com.coder.toolbox`
`2`	`2`
`3`	`3`	`importcom.coder.toolbox.cli.CoderCLIManager`
`4`	`4`	`importcom.coder.toolbox.sdk.CoderRestClient`
`5`		`-importcom.coder.toolbox.sdk.ex.APIResponseException`
`6`	`5`	`importcom.coder.toolbox.sdk.v2.models.WorkspaceStatus`
`7`	`6`	`importcom.coder.toolbox.util.CoderProtocolHandler`
`8`	`7`	`importcom.coder.toolbox.util.DialogUi`
`@@ -30,7 +29,6 @@ import kotlinx.coroutines.isActive`
`30`	`29`	`importkotlinx.coroutines.launch`
`31`	`30`	`importkotlinx.coroutines.selects.onTimeout`
`32`	`31`	`importkotlinx.coroutines.selects.select`
`33`		`-importjava.net.SocketTimeoutException`
`34`	`32`	`importjava.net.URI`
`35`	`33`	`importkotlin.coroutines.cancellation.CancellationException`
`36`	`34`	`importkotlin.time.Duration.Companion.seconds`
`@@ -58,11 +56,6 @@ class CoderRemoteProvider(`
`58`	`56`	`// The REST client, if we are signed in`
`59`	`57`	`privatevar client:CoderRestClient?=null`
`60`	`58`
`61`		`-// If we have an error in the polling we store it here before going back to`
`62`		`-// sign-in page, so we can display it there. This is mainly because there`
`63`		`-// does not seem to be a mechanism to show errors on the environment list.`
`64`		`-privatevar errorBuffer= mutableListOf<Throwable>()`
`65`		`-`
`66`	`59`	`// On the first load, automatically log in if we can.`
`67`	`60`	`privatevar firstRun=true`
`68`	`61`	`privateval isInitialized:MutableStateFlow<Boolean>=MutableStateFlow(false)`
`@@ -135,29 +128,17 @@ class CoderRemoteProvider(`
`135`	`128`	`}catch (_:CancellationException) {`
`136`	`129`	`context.logger.debug("${client.url} polling loop canceled")`
`137`	`130`	`break`
`138`		`- }catch (ex:SocketTimeoutException) {`
	`131`	`+ }catch (ex:Exception) {`
`139`	`132`	`val elapsed= lastPollTime.elapsedNow()`
`140`	`133`	`if (elapsed>POLL_INTERVAL*2) {`
`141`	`134`	`context.logger.info("wake-up from an OS sleep was detected, going to re-initialize the http client...")`
`142`	`135`	`client.setupSession()`
`143`	`136`	`}else {`
`144`		`- context.logger.error(ex,"workspace polling error encountered")`
`145`		`-errorBuffer.add(ex)`
`146`		`-logout()`
	`137`	`+ context.logger.error(ex,"workspace polling error encountered, trying to auto-login")`
	`138`	`+close()`
	`139`	`+goToEnvironmentsPage()`
`147`	`140`	`break`
`148`	`141`	`}`
`149`		`- }catch (ex:APIResponseException) {`
`150`		`- context.logger.error(ex,"error in contacting${client.url} while polling the available workspaces")`
`151`		`- errorBuffer.add(ex)`
`152`		`- logout()`
`153`		`- goToEnvironmentsPage()`
`154`		`-break`
`155`		`- }catch (ex:Exception) {`
`156`		`- context.logger.error(ex,"workspace polling error encountered")`
`157`		`- errorBuffer.add(ex)`
`158`		`- logout()`
`159`		`- goToEnvironmentsPage()`
`160`		`-break`
`161`	`142`	`}`
`162`	`143`
`163`	`144`	`// TODO: Listening on a web socket might be better?`
`@@ -306,6 +287,7 @@ class CoderRemoteProvider(`
`306`	`287`	`overridefungetOverrideUiPage():UiPage? {`
`307`	`288`	`// Show sign in page if we have not configured the client yet.`
`308`	`289`	`if (client==null) {`
	`290`	`+val errorBuffer= mutableListOf<Throwable>()`
`309`	`291`	`// When coming back to the application, authenticate immediately.`
`310`	`292`	`val autologin= shouldDoAutoLogin()`
`311`	`293`	`context.secrets.lastToken.let { lastToken->`
`@@ -329,7 +311,6 @@ class CoderRemoteProvider(`
`329`	`311`	`authWizard.notify("Error encountered", it)`
`330`	`312`	`}`
`331`	`313`	`// and now reset the errors, otherwise we show it every time on the screen`
`332`		`- errorBuffer.clear()`
`333`	`314`	`return authWizard`
`334`	`315`	`}`
`335`	`316`	`returnnull`
`@@ -344,7 +325,6 @@ class CoderRemoteProvider(`
`344`	`325`	`// Currently we always remember, but this could be made an option.`
`345`	`326`	`context.secrets.rememberMe=true`
`346`	`327`	`this.client= client`
`347`		`- errorBuffer.clear()`
`348`	`328`	`pollJob?.cancel()`
`349`	`329`	`pollJob= poll(client, cli)`
`350`	`330`	`goToEnvironmentsPage()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfc24b7d

File tree

2 files changed

2 files changed

`‎CHANGELOG.md‎`

`‎src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt‎`

0 commit comments