Fix samm cli selection on network errors

Author: andreas-wirth

extension/src/extension.ts

@@ -116,15 +116,12 @@ type SammCliQuickPickItem = vscode.QuickPickItem & {
 };
 
 async function selectSammCliExecutable(): Promise<void> {
-    const releases = await sammCliDownloader.getRecentSammCliReleaseTags(10);
+    const releases = await sammCliDownloader.getRecentSammCliReleaseTags(10).catch(error => {
+        outputChannel.error(`Failed to fetch SAMM-CLI releases for quick pick: ${error instanceof Error ? error.message : String(error)}`);
+        return [];
+    });
     const currentSelection = settings.getSammCliSelection();
 
-    const releaseItems: SammCliQuickPickItem[] = releases.map(releaseTag => ({
-        label: releaseTag,
-        detail: currentSelection?.kind === 'release' && currentSelection.releaseTag === releaseTag ? 'Currently selected' : 'Download and use this GitHub release',
-        selection: { kind: 'release', releaseTag },
-    }));
-
     const customPathItem: SammCliQuickPickItem = {
         label: '$(folder-opened) Use custom SAMM CLI executable or jar. Jar requires Java to be installed',
         detail: currentSelection?.kind === 'customPath' ? `Currently selected: ${currentSelection.path}` : 'Choose an executable from your file system',
@@ -137,13 +134,33 @@ async function selectSammCliExecutable(): Promise<void> {
         selection: { kind: 'noSammCli' },
     };
 
-    const pick = await vscode.window.showQuickPick([customPathItem, noSammCliItem, ...releaseItems], {
+    const separator: SammCliQuickPickItem = {
+        label: 'GitHub Releases',
+        kind: vscode.QuickPickItemKind.Separator,
+        selection: { kind: 'release', releaseTag: 'this is not clickable, so does not matter' },
+    };
+
+    const releaseItems: SammCliQuickPickItem[] = releases.map(releaseTag => ({
+        label: releaseTag,
+        detail: currentSelection?.kind === 'release' && currentSelection.releaseTag === releaseTag ? 'Currently selected' : 'Download and use this GitHub release',
+        selection: { kind: 'release', releaseTag },
+    }));
+
+    if (releaseItems.length === 0) {
+        releaseItems.push({
+            label: '$(error) No GitHub releases available',
+            detail: 'Failed to fetch releases from GitHub. Check output channel for details.',
+            selection: { kind: 'release', releaseTag: '' },
+        });
+    }
+
+    const pick = await vscode.window.showQuickPick([customPathItem, noSammCliItem, separator, ...releaseItems], {
         title: 'Select SAMM-CLI executable',
         placeHolder: 'Choose a recent release or select a custom executable path',
         matchOnDetail: true,
     });
 
-    if (!pick) {
+    if (!pick || (pick.selection.kind === 'release' && !pick.selection.releaseTag)) {
         return;
     }
 

extension/src/sammCliDownloader.ts

@@ -5,7 +5,7 @@ import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import extractZip = require('extract-zip');
 import * as tar from 'tar';
-import {TurtleExtensionSettings, SammCliSelection } from './settings';
+import { TurtleExtensionSettings, SammCliSelection } from './settings';
 import type { ExtensionLogger } from './outputChannel';
 
 interface GitHubReleaseAsset {
@@ -37,7 +37,9 @@ export class SammCliDownloader {
         }
 
         const configuredVersion = selection.releaseTag;
-        const latestVersion = await this.getLatestAvailabeSammCliReleaseTag();
+        const latestVersion = await this.getLatestAvailabeSammCliReleaseTag().catch(error => {
+            throw new Error(`Failed to check for latest SAMM-CLI release: ${error instanceof Error ? error.message : String(error)}`);
+        });
         if (configuredVersion !== latestVersion) {
             vscode.window.showInformationMessage(`There is a new SAMM-CLI release available: ${configuredVersion} -> ${latestVersion}`, 'Download & Use').then(async (selection) => {
                 if (selection === 'Download & Use') {
@@ -74,15 +76,15 @@ export class SammCliDownloader {
         });
 
         if (!response.ok) {
-            throw new Error(`Failed to fetch samm-cli releases: ${response.status} ${response.statusText}`);
+            return Promise.reject(new Error(`Failed to fetch SAMM-CLI releases from GitHub: ${response.status} ${response.statusText}`));
         }
 
         const fetchedReleases = response.json() as Promise<Array<GitHubRelease>>;
         return fetchedReleases.then(releases => releases
             .filter(release => !release.draft && !release.prerelease)
             .map(release => release.tag_name));
     }
-    
+
     async getSammCli(): Promise<string> {
         const releaseSelection = this.settings.getSammCliSelection();
         if (releaseSelection.kind === 'customPath') {
@@ -109,7 +111,7 @@ export class SammCliDownloader {
         }
 
         await mkdir(targetDirectory.fsPath, { recursive: true });
-        this.outputChannel.info(`Downloading ${asset.name} (${release.tag_name})...`);
+        this.outputChannel.info(`Downloading ${asset.name}(${release.tag_name})...`);
         await this.downloadAndExtractAsset(asset.browser_download_url, targetDirectory.fsPath, platform);
         await this.ensureExecutableIsReady(targetPath.fsPath, platform, release.tag_name);
 
@@ -118,7 +120,7 @@ export class SammCliDownloader {
 
     private async fetchRelease(releaseVersion: string): Promise<GitHubRelease> {
         const releasePath = releaseVersion && releaseVersion !== 'latest'
-            ? `releases/tags/${encodeURIComponent(releaseVersion)}`
+            ? `releases / tags / ${encodeURIComponent(releaseVersion)}`
             : 'releases/latest';
 
         const response = await fetch(`https://api.github.com/repos/${GITHUB_RELEASE_REPOSITORY}/${releasePath}`, {