Skip to content

impl: support for Toolbox 2.6.3 #124

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
merged 16 commits into from
Jun 10, 2025
Merged

impl: support for Toolbox 2.6.3 #124

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
111cd39
chore: update the minimum API requirement
fioan89 May 26, 2025
2558180
fix: use new env state API
fioan89 May 26, 2025
a901281
fix: use the new ssh disconnect callback
fioan89 May 26, 2025
0df5319
fix: use the new delete callback API
fioan89 May 26, 2025
5e19a7d
impl: finish support for URI handling
fioan89 May 27, 2025
7f74048
chore: simplify uri handling implementation (1)
fioan89 May 28, 2025
bb4b643
chore: simplify uri handling implementation (2)
fioan89 May 28, 2025
a6c2eb6
chore: simplify uri handling implementation (3)
fioan89 May 28, 2025
32b3911
chore: simplify uri handling implementation (4)
fioan89 May 28, 2025
122db33
chore: simplify uri handling implementation (5)
fioan89 May 29, 2025
5bac965
chore: simplify uri handling implementation (6)
fioan89 May 29, 2025
e3c76f6
doc: update README with attention note
fioan89 May 29, 2025
4044e0d
fix: resolve agent only after workspace was resolved
fioan89 May 29, 2025
048ab31
fix: wait for plugin to fully initialize
fioan89 May 29, 2025
823e2e7
chore: remove redundant call to showWindow
fioan89 May 29, 2025
63af2ae
chore: next version is 0.3.0
fioan89 Jun 2, 2025
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
Prev Previous commit
Next Next commit
chore: simplify uri handling implementation (3) 
Refactored code around cli initialization.
  • Loading branch information
@fioan89
fioan89 committed May 28, 2025
commit a6c2eb6cf4267b57a73db6923980c85348d244ab
179 changes: 101 additions & 78 deletions src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,95 +65,22 @@ open class CoderProtocolHandler(
if (!prepareWorkspace(workspace, restClient, workspaceName, deploymentURL)) return
if (!ensureAgentIsReady(workspace, agent)) return

val cli = ensureCLI(
context,
deploymentURL.toURL(),
restClient.buildInfo().version
)

// We only need to log in if we are using token-based auth.
if (restClient.token != null) {
context.logger.info("Authenticating Coder CLI...")
cli.login(restClient.token)
}

context.logger.info("Configuring Coder CLI...")
cli.configSsh(restClient.workspacesByAgents())
val cli = configureCli(deploymentURL, restClient)

if (shouldWaitForAutoLogin) {
isInitialized.waitForTrue()
}
reInitialize(restClient, cli)

val environmentId = "${workspace.name}.${agent.name}"
context.popupPluginMainPage()
context.envPageManager.showEnvironmentPage(environmentId, false)
context.showEnvironmentPage(environmentId)

val productCode = params.ideProductCode()
val buildNumber = params.ideBuildNumber()
val projectFolder = params.projectFolder()
if (!productCode.isNullOrBlank() && !buildNumber.isNullOrBlank()) {
var selectedIde = "$productCode-$buildNumber"
context.cs.launch {
val installedIdes = context.remoteIdeOrchestrator.getInstalledRemoteTools(environmentId, productCode)
val alreadyInstalled = installedIdes.firstOrNull { it.contains(buildNumber) } != null
if (alreadyInstalled) {
context.logger.info("$productCode-$buildNumber is already on $environmentId. Going to launch JBClient")
} else {
val availableVersions =
context.remoteIdeOrchestrator.getAvailableRemoteTools(environmentId, productCode)
if (availableVersions.isEmpty()) {
val error = IllegalArgumentException("$productCode is not available on $environmentId")
context.logger.error(error, "Error encountered while handling Coder URI")
context.ui.showSnackbar(
UUID.randomUUID().toString(),
context.i18n.ptrl("Error encountered while handling Coder URI"),
context.i18n.pnotr("$productCode is not available on $environmentId"),
context.i18n.ptrl("OK")
)
return@launch
}

val matchingBuildNumber = availableVersions.firstOrNull { it.contains(buildNumber) } != null
if (!matchingBuildNumber) {
selectedIde = availableVersions.maxOf { it }
val msg =
"$productCode-$buildNumber is not available, we've selected the latest $selectedIde"
context.logger.info(msg)
context.ui.showSnackbar(
UUID.randomUUID().toString(),
context.i18n.pnotr("$productCode-$buildNumber not available"),
context.i18n.pnotr(msg),
context.i18n.ptrl("OK")
)
}

// needed otherwise TBX will install it again
if (!installedIdes.contains(selectedIde)) {
context.logger.info("Installing $selectedIde on $environmentId...")
context.remoteIdeOrchestrator.installRemoteTool(environmentId, selectedIde)
if (context.remoteIdeOrchestrator.waitForIdeToBeInstalled(environmentId, selectedIde)) {
context.logger.info("Successfully installed $selectedIde on $environmentId...")
} else {
context.ui.showSnackbar(
UUID.randomUUID().toString(),
context.i18n.pnotr("$selectedIde could not be installed"),
context.i18n.pnotr("$selectedIde could not be installed on time. Check the logs for more details"),
context.i18n.ptrl("OK")
)
}
} else {
context.logger.info("$selectedIde is already present on $environmentId...")
}
}

val job = context.cs.launch {
context.logger.info("Downloading and installing JBClient counterpart to $selectedIde locally")
context.jbClientOrchestrator.prepareClient(environmentId, selectedIde)
}
job.join()
context.logger.info("Launching $selectedIde on $environmentId")
context.jbClientOrchestrator.connectToIde(environmentId, selectedIde, projectFolder)
}
if (!productCode.isNullOrBlank() && !buildNumber.isNullOrBlank()) {
launchIde(productCode, buildNumber, environmentId, projectFolder)
}
}

Expand Down Expand Up @@ -354,6 +281,97 @@ open class CoderProtocolHandler(
return true
}

private suspend fun configureCli(
deploymentURL: String,
restClient: CoderRestClient
): CoderCLIManager {
val cli = ensureCLI(
context,
deploymentURL.toURL(),
restClient.buildInfo().version
)

// We only need to log in if we are using token-based auth.
if (restClient.token != null) {
context.logger.info("Authenticating Coder CLI...")
cli.login(restClient.token)
}

context.logger.info("Configuring Coder CLI...")
cli.configSsh(restClient.workspacesByAgents())
return cli
}

private fun launchIde(
productCode: String,
buildNumber: String,
environmentId: String,
projectFolder: String?
) {
var selectedIde = "$productCode-$buildNumber"
context.cs.launch {
val installedIdes = context.remoteIdeOrchestrator.getInstalledRemoteTools(environmentId, productCode)
val alreadyInstalled = installedIdes.firstOrNull { it.contains(buildNumber) } != null
if (alreadyInstalled) {
context.logger.info("$productCode-$buildNumber is already on $environmentId. Going to launch JBClient")
} else {
val availableVersions =
context.remoteIdeOrchestrator.getAvailableRemoteTools(environmentId, productCode)
if (availableVersions.isEmpty()) {
val error = IllegalArgumentException("$productCode is not available on $environmentId")
context.logger.error(error, "Error encountered while handling Coder URI")
context.ui.showSnackbar(
UUID.randomUUID().toString(),
context.i18n.ptrl("Error encountered while handling Coder URI"),
context.i18n.pnotr("$productCode is not available on $environmentId"),
context.i18n.ptrl("OK")
)
return@launch
}

val matchingBuildNumber = availableVersions.firstOrNull { it.contains(buildNumber) } != null
if (!matchingBuildNumber) {
selectedIde = availableVersions.maxOf { it }
val msg =
"$productCode-$buildNumber is not available, we've selected the latest $selectedIde"
context.logger.info(msg)
context.ui.showSnackbar(
UUID.randomUUID().toString(),
context.i18n.pnotr("$productCode-$buildNumber not available"),
context.i18n.pnotr(msg),
context.i18n.ptrl("OK")
)
}

// needed otherwise TBX will install it again
if (!installedIdes.contains(selectedIde)) {
context.logger.info("Installing $selectedIde on $environmentId...")
context.remoteIdeOrchestrator.installRemoteTool(environmentId, selectedIde)
if (context.remoteIdeOrchestrator.waitForIdeToBeInstalled(environmentId, selectedIde)) {
context.logger.info("Successfully installed $selectedIde on $environmentId...")
} else {
context.ui.showSnackbar(
UUID.randomUUID().toString(),
context.i18n.pnotr("$selectedIde could not be installed"),
context.i18n.pnotr("$selectedIde could not be installed on time. Check the logs for more details"),
context.i18n.ptrl("OK")
)
}
} else {
context.logger.info("$selectedIde is already present on $environmentId...")
}
}

val job = context.cs.launch {
context.logger.info("Downloading and installing JBClient counterpart to $selectedIde locally")
context.jbClientOrchestrator.prepareClient(environmentId, selectedIde)
}
job.join()
context.logger.info("Launching $selectedIde on $environmentId")
context.jbClientOrchestrator.connectToIde(environmentId, selectedIde, projectFolder)
}
}

private suspend fun CoderRestClient.waitForReady(workspace: Workspace): Boolean {
var status = workspace.latestBuild.status
try {
Expand Down Expand Up @@ -440,4 +458,9 @@ private fun CoderToolboxContext.popupPluginMainPage() {
this.envPageManager.showPluginEnvironmentsPage(true)
}

private suspend fun CoderToolboxContext.showEnvironmentPage(envId: String) {
this.ui.showWindow()
this.envPageManager.showEnvironmentPage(envId, false)
}

class MissingArgumentException(message: String, ex: Throwable? = null) : IllegalArgumentException(message, ex)
Loading