From bf4a1a5d2cb7ac9342e03c8ebde03f1deb08fd24 Mon Sep 17 00:00:00 2001 From: tgodzik Date: Wed, 7 Dec 2022 13:54:55 +0100 Subject: [PATCH] feature: Detect coursier if it's available locally This should help with cases, where downloading coursier automatically is problematic. Next step would be to also download it automatically when needed. --- src/fetchMetals.ts | 112 +++++++++++++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 39 deletions(-) diff --git a/src/fetchMetals.ts b/src/fetchMetals.ts index 1092a42..67ed485 100644 --- a/src/fetchMetals.ts +++ b/src/fetchMetals.ts @@ -1,6 +1,9 @@ import * as semver from "semver"; +import path from "path"; +import fs from "fs"; import { ChildProcessPromise, spawn } from "promisify-child-process"; import { JavaConfig } from "./getJavaConfig"; +import { OutputChannel } from "./interfaces/OutputChannel"; interface FetchMetalsOptions { serverVersion: string; @@ -8,49 +11,80 @@ interface FetchMetalsOptions { javaConfig: JavaConfig; } -export function fetchMetals({ - serverVersion, - serverProperties, - javaConfig: { javaPath, javaOptions, extraEnv, coursierPath }, -}: FetchMetalsOptions): ChildProcessPromise { +export function fetchMetals( + { + serverVersion, + serverProperties, + javaConfig: { javaPath, javaOptions, extraEnv, coursierPath }, + }: FetchMetalsOptions, + output: OutputChannel +): ChildProcessPromise { const fetchProperties = serverProperties.filter( (p) => !p.startsWith("-agentlib") ); - const serverDependency = calcServerDependency(serverVersion); - return spawn( - javaPath, - [ - ...javaOptions, - ...fetchProperties, - "-Dfile.encoding=UTF-8", - "-jar", - coursierPath, - "fetch", - "-p", - "--ttl", - // Use infinite ttl to avoid redunant "Checking..." logs when using SNAPSHOT - // versions. Metals SNAPSHOT releases are effectively immutable since we - // never publish the same version twice. - "Inf", - serverDependency, - "-r", - "bintray:scalacenter/releases", - "-r", - "sonatype:public", - "-r", - "sonatype:snapshots", - "-p", - ], - { - env: { - COURSIER_NO_TERM: "true", - ...extraEnv, - ...process.env, - }, - stdio: ["ignore"], // Due to Issue: #219 - } - ); + + const coursierArgs = [ + "fetch", + "-p", + "--ttl", + // Use infinite ttl to avoid redunant "Checking..." logs when using SNAPSHOT + // versions. Metals SNAPSHOT releases are effectively immutable since we + // never publish the same version twice. + "Inf", + serverDependency, + "-r", + "bintray:scalacenter/releases", + "-r", + "sonatype:public", + "-r", + "sonatype:snapshots", + "-p", + ]; + + let possibleCoursier = process.env["PATH"] + ?.split(path.delimiter) + .flatMap((p) => { + if (fs.statSync(p).isDirectory()) { + return fs.readdirSync(p).map((sub) => path.resolve(p, sub)); + } else return [p]; + }) + .find( + (p) => p.endsWith(path.sep + "cs") || p.endsWith(path.sep + "coursier") + ); + + function spawnDefault(): ChildProcessPromise { + return spawn( + javaPath, + [ + ...javaOptions, + ...fetchProperties, + "-Dfile.encoding=UTF-8", + "-jar", + coursierPath, + ].concat(coursierArgs), + { + env: { + COURSIER_NO_TERM: "true", + ...extraEnv, + ...process.env, + }, + } + ); + } + if (possibleCoursier) { + let coursier: string = possibleCoursier; + console.debug(`Using coursier located at ${coursier}`); + output.appendLine(`Using coursier located at ${coursier}`); + spawn(coursier, ["version"]) + .then((_out) => spawn(coursier, coursierArgs)) + .catch((err: Error) => { + output.appendLine(err.message); + console.debug(err); + return spawnDefault(); + }); + } + return spawnDefault(); } export function calcServerDependency(serverVersion: string): string {