Query all enabled sources

Author: ids

dist/tools/libs/tools.mjs

@@ -333,48 +333,58 @@ class DotnetTool {
     }
     return path.normalize(workDir);
   }
-  async getQueryService() {
+  async getQueryServices() {
     const builder = new ArgumentsBuilder().addArgument("nuget").addArgument("list").addArgument("source").addKeyValue("format", "short");
     const result = await this.execute("dotnet", builder.build());
-    const defaultNugetSource = /E (?<index>.+)/.exec(result.stdout ?? "")?.groups?.index;
-    if (!defaultNugetSource) {
+    const nugetSources = [
+      ...(result.stdout ?? "").matchAll(/^E (?<index>.+)/gm)
+    ].map((m) => m.groups.index);
+    if (!nugetSources.length) {
       this.buildAgent.error("Failed to fetch an enabled package source for dotnet.");
-      return null;
-    }
-    const nugetIndex = await fetch(defaultNugetSource);
-    if (!nugetIndex?.ok) {
-      this.buildAgent.error(`Failed to fetch data from NuGet source ${defaultNugetSource}.`);
-      return null;
+      return [];
     }
-    const resources = (await nugetIndex.json())?.resources;
-    const serviceUrl = resources?.find((s) => s["@type"].startsWith(NugetServiceType.SearchQueryService))?.["@id"];
-    if (!serviceUrl) {
-      this.buildAgent.error(`Could not find a ${NugetServiceType.SearchQueryService} in NuGet source ${defaultNugetSource}`);
-      return null;
+    const sources = [];
+    for (const nugetSource of nugetSources) {
+      const nugetIndex = await fetch(nugetSource);
+      if (!nugetIndex?.ok) {
+        this.buildAgent.warn(`Failed to fetch data from NuGet source ${nugetSource}.`);
+        continue;
+      }
+      const resources = (await nugetIndex.json())?.resources;
+      const serviceUrl = resources?.find((s) => s["@type"].startsWith(NugetServiceType.SearchQueryService))?.["@id"];
+      if (!serviceUrl) {
+        this.buildAgent.warn(`Could not find a ${NugetServiceType.SearchQueryService} in NuGet source ${nugetSource}`);
+        continue;
+      }
+      sources.push(serviceUrl);
     }
-    return serviceUrl;
+    return sources;
   }
-  async queryLatestMatch(toolName, versionSpec, includePrerelease) {
-    this.buildAgent.info(
-      `Querying tool versions for ${toolName}${versionSpec ? `@${versionSpec}` : ""} ${includePrerelease ? "including pre-releases" : ""}`
-    );
-    const queryService = await this.getQueryService();
-    if (!queryService) {
-      return null;
-    }
+  async queryVersionsFromNugetSource(serviceUrl, toolName, includePrerelease) {
     const toolNameParam = encodeURIComponent(toolName.toLowerCase());
     const prereleaseParam = includePrerelease ? "true" : "false";
-    const downloadPath = `${queryService}?q=${toolNameParam}&prerelease=${prereleaseParam}&semVerLevel=2.0.0&take=1`;
+    const downloadPath = `${serviceUrl}?q=${toolNameParam}&prerelease=${prereleaseParam}&semVerLevel=2.0.0&take=1`;
     const response = await fetch(downloadPath);
     if (!response || !response.ok) {
-      this.buildAgent.info(`failed to query latest version for ${toolName} from ${downloadPath}. Status code: ${response ? response.status : "unknown"}`);
-      return null;
+      this.buildAgent.warn(`failed to query latest version for ${toolName} from ${downloadPath}. Status code: ${response ? response.status : "unknown"}`);
+      return [];
     }
     const { data } = await response.json();
     const versions = data[0].versions.map((x) => x.version);
-    if (!versions || !versions.length) {
+    return versions ?? [];
+  }
+  async queryLatestMatch(toolName, versionSpec, includePrerelease) {
+    this.buildAgent.info(
+      `Querying tool versions for ${toolName}${versionSpec ? `@${versionSpec}` : ""} ${includePrerelease ? "including pre-releases" : ""}`
+    );
+    const queryServices = await this.getQueryServices();
+    if (!queryServices.length) {
       return null;
     }
+    let versions = (await Promise.all(
+      queryServices.map(async (service) => await this.queryVersionsFromNugetSource(service, toolName, includePrerelease))
+    )).flat();
+    versions = [...new Set(versions)];
     this.buildAgent.debug(`got versions: ${versions.join(", ")}`);
     const version = semverExports.maxSatisfying(versions, versionSpec, { includePrerelease });
     if (version) {

dist/tools/libs/tools.mjs.map

@@ -226,65 +226,74 @@ export abstract class DotnetTool implements IDotnetTool {
         return path.normalize(workDir)
     }
 
-    private async getQueryService(): Promise<string | null> {
+    private async getQueryServices(): Promise<string[]> {
         // Use dotnet tool to get the first enabled nuget source.
         const builder = new ArgumentsBuilder().addArgument('nuget').addArgument('list').addArgument('source').addKeyValue('format', 'short')
         const result = await this.execute('dotnet', builder.build())
 
         // Each line of the output starts with either E (enabled) or D (disabled), followed by a space and index url.
-        const defaultNugetSource = /E (?<index>.+)/.exec(result.stdout ?? '')?.groups?.index
+        const nugetSources = [...(result.stdout ?? '').matchAll(/^E (?<index>.+)/gm)].map(m => m.groups!.index)
 
-        if (!defaultNugetSource) {
+        if (!nugetSources.length) {
             this.buildAgent.error('Failed to fetch an enabled package source for dotnet.')
-            return null
+            return []
         }
 
-        // Fetch the nuget source index to obtain the query service
-        const nugetIndex = await fetch(defaultNugetSource)
-        if (!nugetIndex?.ok) {
-            this.buildAgent.error(`Failed to fetch data from NuGet source ${defaultNugetSource}.`)
-            return null
-        }
+        const sources: string[] = []
+        for (const nugetSource of nugetSources) {
+            // Fetch the nuget source index to obtain the query service
+            const nugetIndex = await fetch(nugetSource)
+            if (!nugetIndex?.ok) {
+                this.buildAgent.warn(`Failed to fetch data from NuGet source ${nugetSource}.`)
+                continue
+            }
 
-        // Parse the nuget service index and get the (first / primary) query service
-        const resources = ((await nugetIndex.json()) as NugetServiceIndex)?.resources
-        const serviceUrl = resources?.find(s => s['@type'].startsWith(NugetServiceType.SearchQueryService))?.['@id']
+            // Parse the nuget service index and get the (first / primary) query service
+            const resources = ((await nugetIndex.json()) as NugetServiceIndex)?.resources
+            const serviceUrl = resources?.find(s => s['@type'].startsWith(NugetServiceType.SearchQueryService))?.['@id']
 
-        if (!serviceUrl) {
-            this.buildAgent.error(`Could not find a ${NugetServiceType.SearchQueryService} in NuGet source ${defaultNugetSource}`)
-            return null
+            if (!serviceUrl) {
+                this.buildAgent.warn(`Could not find a ${NugetServiceType.SearchQueryService} in NuGet source ${nugetSource}`)
+                continue
+            }
+            sources.push(serviceUrl)
         }
-        return serviceUrl
+        return sources
     }
 
-    private async queryLatestMatch(toolName: string, versionSpec: string, includePrerelease: boolean): Promise<string | null> {
-        this.buildAgent.info(
-            `Querying tool versions for ${toolName}${versionSpec ? `@${versionSpec}` : ''} ${includePrerelease ? 'including pre-releases' : ''}`
-        )
-
-        const queryService = await this.getQueryService()
-        if (!queryService) {
-            return null
-        }
-
+    private async queryVersionsFromNugetSource(serviceUrl: string, toolName: string, includePrerelease: boolean): Promise<string[]> {
         const toolNameParam = encodeURIComponent(toolName.toLowerCase())
         const prereleaseParam = includePrerelease ? 'true' : 'false'
-        const downloadPath = `${queryService}?q=${toolNameParam}&prerelease=${prereleaseParam}&semVerLevel=2.0.0&take=1`
+        const downloadPath = `${serviceUrl}?q=${toolNameParam}&prerelease=${prereleaseParam}&semVerLevel=2.0.0&take=1`
 
         const response = await fetch(downloadPath)
 
         if (!response || !response.ok) {
-            this.buildAgent.info(`failed to query latest version for ${toolName} from ${downloadPath}. Status code: ${response ? response.status : 'unknown'}`)
-            return null
+            this.buildAgent.warn(`failed to query latest version for ${toolName} from ${downloadPath}. Status code: ${response ? response.status : 'unknown'}`)
+            return []
         }
-
         const { data } = (await response.json()) as NugetVersions
 
         const versions = data[0].versions.map(x => x.version)
-        if (!versions || !versions.length) {
+
+        return versions ?? []
+    }
+
+    private async queryLatestMatch(toolName: string, versionSpec: string, includePrerelease: boolean): Promise<string | null> {
+        this.buildAgent.info(
+            `Querying tool versions for ${toolName}${versionSpec ? `@${versionSpec}` : ''} ${includePrerelease ? 'including pre-releases' : ''}`
+        )
+
+        const queryServices = await this.getQueryServices()
+        if (!queryServices.length) {
             return null
         }
 
+        let versions = (
+            await Promise.all(queryServices.map(async service => await this.queryVersionsFromNugetSource(service, toolName, includePrerelease)))
+        ).flat()
+        versions = [...new Set(versions)] // remove duplicates
+
         this.buildAgent.debug(`got versions: ${versions.join(', ')}`)
 
         const version = semver.maxSatisfying(versions, versionSpec, { includePrerelease })