- Notifications
You must be signed in to change notification settings - Fork1
fix: NPE during error reporting#186
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
4 changes: 4 additions & 0 deletionsCHANGELOG.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -6,6 +6,10 @@ | ||
| - improved diagnose support | ||
| ### Fixed | ||
| - NPE during error reporting | ||
| ## 0.6.3 - 2025-08-25 | ||
| ### Added | ||
1 change: 0 additions & 1 deletionsrc/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
47 changes: 7 additions & 40 deletionssrc/main/kotlin/com/coder/toolbox/views/CoderCliSetupWizardPage.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
25 changes: 15 additions & 10 deletionssrc/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
9 changes: 7 additions & 2 deletionssrc/main/kotlin/com/coder/toolbox/views/DeploymentUrlStep.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletionssrc/main/kotlin/com/coder/toolbox/views/ErrorReporter.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package com.coder.toolbox.views | ||
| import com.coder.toolbox.CoderToolboxContext | ||
| import com.coder.toolbox.sdk.ex.APIResponseException | ||
| import com.jetbrains.toolbox.api.remoteDev.ProviderVisibilityState | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.launch | ||
| import java.util.UUID | ||
| sealed class ErrorReporter { | ||
| /** | ||
| * Logs and show errors as popups. | ||
| */ | ||
| abstract fun report(message: String, ex: Throwable) | ||
| /** | ||
| * Processes any buffered errors when the application becomes visible. | ||
| */ | ||
| abstract fun flush() | ||
| companion object { | ||
| fun create( | ||
| context: CoderToolboxContext, | ||
| visibilityState: StateFlow<ProviderVisibilityState>, | ||
| callerClass: Class<*> | ||
| ): ErrorReporter = ErrorReporterImpl(context, visibilityState, callerClass) | ||
| } | ||
| } | ||
| private class ErrorReporterImpl( | ||
| private val context: CoderToolboxContext, | ||
| private val visibilityState: StateFlow<ProviderVisibilityState>, | ||
| private val callerClass: Class<*> | ||
| ) : ErrorReporter() { | ||
| private val errorBuffer = mutableListOf<Throwable>() | ||
| override fun report(message: String, ex: Throwable) { | ||
| context.logger.error(ex, "[${callerClass.simpleName}] $message") | ||
| if (!visibilityState.value.applicationVisible) { | ||
| context.logger.debug("Toolbox is not yet visible, scheduling error to be displayed later") | ||
| errorBuffer.add(ex) | ||
| return | ||
| } | ||
| showError(ex) | ||
| } | ||
| private fun showError(ex: Throwable) { | ||
| val textError = if (ex is APIResponseException) { | ||
| if (!ex.reason.isNullOrBlank()) { | ||
| ex.reason | ||
| } else ex.message | ||
| } else ex.message ?: ex.toString() | ||
| context.cs.launch { | ||
| context.ui.showSnackbar( | ||
| UUID.randomUUID().toString(), | ||
| context.i18n.ptrl("Error encountered while setting up Coder"), | ||
| context.i18n.pnotr(textError ?: ""), | ||
| context.i18n.ptrl("Dismiss") | ||
| ) | ||
| } | ||
| } | ||
| override fun flush() { | ||
| if (errorBuffer.isNotEmpty() && visibilityState.value.applicationVisible) { | ||
| errorBuffer.forEach { | ||
| showError(it) | ||
| } | ||
| errorBuffer.clear() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.