Skip to content

fix(amazonq): prefer user-specified node executable over bundled #5946

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 1 commit into from
Aug 7, 2025
Merged

fix(amazonq): prefer user-specified node executable over bundled #5946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 37 additions & 34 deletions ...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,21 +633,23 @@ private class AmazonQServerInstance(private val project: Project, private val cs
}
}

if (Files.exists(nodePath) && Files.isExecutable(nodePath)) {
resolveNodeMetric(true, true)
return nodePath
}

// use alternative node runtime if it is not found
LOG.warn { "Node Runtime download failed. Fallback to user specified node runtime " }
// attempt to use user provided node runtime path
val nodeRuntime = LspSettings.getInstance().getNodeRuntimePath()
if (!nodeRuntime.isNullOrEmpty()) {
LOG.info { "Using node from $nodeRuntime " }

resolveNodeMetric(false, true)
return Path.of(nodeRuntime)
}

// attempt to use bundled node
if (Files.exists(nodePath) && Files.isExecutable(nodePath) && validateNode(nodePath) != null) {
resolveNodeMetric(true, true)
return nodePath
} else {
// use alternative node runtime if it is not found
LOG.warn { "Node Runtime download failed. Fallback to user environment search" }

val localNode = locateNodeCommand()
if (localNode != null) {
LOG.info { "Using node from ${localNode.toAbsolutePath()}" }
Expand Down Expand Up @@ -689,34 +691,35 @@ private class AmazonQServerInstance(private val project: Project, private val cs
.asSequence()
.map { it.toPath() }
.filter { Files.isRegularFile(it) && Files.isExecutable(it) }
.firstNotNullOfOrNull { path ->
try {
val process = ProcessBuilder(path.toString(), "--version")
.redirectErrorStream(true)
.start()

if (!process.waitFor(5, TimeUnit.SECONDS)) {
process.destroy()
null
} else if (process.exitValue() == 0) {
val version = process.inputStream.bufferedReader().readText().trim()
val majorVersion = version.removePrefix("v").split(".")[0].toIntOrNull()

if (majorVersion != null && majorVersion >= 18) {
path.toAbsolutePath()
} else {
LOG.debug { "Node version < 18 found at: $path (version: $version)" }
null
}
} else {
LOG.debug { "Failed to get version from node at: $path" }
null
}
} catch (e: Exception) {
LOG.debug(e) { "Failed to check version for node at: $path" }
null
}
.firstNotNullOfOrNull(::validateNode)
}

/** @return null if node is not suitable **/
private fun validateNode(path: Path) = try {
val process = ProcessBuilder(path.toString(), "--version")
.redirectErrorStream(true)
.start()

if (!process.waitFor(5, TimeUnit.SECONDS)) {
process.destroy()
null
} else if (process.exitValue() == 0) {
val version = process.inputStream.bufferedReader().readText().trim()
val majorVersion = version.removePrefix("v").split(".")[0].toIntOrNull()

if (majorVersion != null && majorVersion >= 18) {
path.toAbsolutePath()
} else {
LOG.debug { "Node version < 18 found at: $path (version: $version)" }
null
}
} else {
LOG.debug { "Failed to get version from node at: $path" }
null
}
} catch (e: Exception) {
LOG.debug(e) { "Failed to check version for node at: $path" }
null
}

override fun dispose() {
Expand Down
Loading