Use singleton VersionBundlesLoader

Author: will-v-pi

src/commands/switchBoard.mts

@@ -1,7 +1,7 @@
 import { Command } from "./command.mjs";
 import Logger from "../logger.mjs";
 import {
-  commands, ProgressLocation, window, workspace, type Uri
+  commands, ProgressLocation, window, workspace
 } from "vscode";
 import { existsSync, readdirSync, readFileSync } from "fs";
 import {
@@ -26,10 +26,10 @@ export default class SwitchBoardCommand extends Command {
   private _versionBundlesLoader: VersionBundlesLoader;
   public static readonly id = "switchBoard";
 
-  constructor(private readonly _ui: UI, extensionUri: Uri) {
+  constructor(private readonly _ui: UI) {
     super(SwitchBoardCommand.id);
 
-    this._versionBundlesLoader = new VersionBundlesLoader(extensionUri);
+    this._versionBundlesLoader = VersionBundlesLoader.getInstance();
   }
 
   public static async askBoard(sdkVersion: string):

src/commands/switchSDK.mts

@@ -1,7 +1,6 @@
 import { Command } from "./command.mjs";
 import {
   ProgressLocation,
-  type Uri,
   window,
   workspace,
   commands,
@@ -53,10 +52,10 @@ export default class SwitchSDKCommand extends Command {
 
   public static readonly id = "switchSDK";
 
-  constructor(private readonly _ui: UI, extensionUri: Uri) {
+  constructor(private readonly _ui: UI) {
     super(SwitchSDKCommand.id);
 
-    this._versionBundlesLoader = new VersionBundlesLoader(extensionUri);
+    this._versionBundlesLoader = VersionBundlesLoader.getInstance();
   }
 
   // TODO: maybe move into UI helper file or something

src/extension.mts

@@ -79,6 +79,7 @@ import SwitchBoardCommand from "./commands/switchBoard.mjs";
 import UninstallPicoSDKCommand from "./commands/uninstallPicoSDK.mjs";
 import FlashProjectSWDCommand from "./commands/flashProjectSwd.mjs";
 import ReleaseTagsLoader from "./utils/releaseTags.mjs";
+import VersionBundlesLoader from "./utils/versionBundles.mjs";
 // eslint-disable-next-line max-len
 import { NewMicroPythonProjectPanel } from "./webview/newMicroPythonProjectPanel.mjs";
 import type { Progress as GotProgress } from "got";
@@ -94,6 +95,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
   );
   GithubApiCache.createInstance(context);
   ReleaseTagsLoader.createInstance(context.extensionUri);
+  VersionBundlesLoader.createInstance(context.extensionUri);
 
   const picoProjectActivityBarProvider = new PicoProjectActivityBar();
   const ui = new UI(picoProjectActivityBarProvider);
@@ -107,8 +109,8 @@ export async function activate(context: ExtensionContext): Promise<void> {
     | CommandWithArgs
   > = [
     new NewProjectCommand(context.extensionUri),
-    new SwitchSDKCommand(ui, context.extensionUri),
-    new SwitchBoardCommand(ui, context.extensionUri),
+    new SwitchSDKCommand(ui),
+    new SwitchBoardCommand(ui),
     new LaunchTargetPathCommand(),
     new GetPythonPathCommand(),
     new GetEnvPathCommand(),

src/utils/releaseTags.mts

@@ -4,6 +4,7 @@ import { isInternetConnected } from "./downloadHelpers.mjs";
 import { get } from "https";
 import Logger from "../logger.mjs";
 import { CURRENT_DATA_VERSION } from "./sharedConstants.mjs";
+import { unknownErrorToString } from "./errorHelper.mjs";
 
 const releaseTagsUrl =
   "https://raspberrypi.github.io/pico-vscode/" +
@@ -68,9 +69,9 @@ export default class ReleaseTagsLoader {
             } catch (error) {
               reject(
                 new Error(
-                  `Failed to parse release tags JSON: ${
-                    error instanceof Error ? error.message : (error as string)
-                  }`
+                  `Failed to parse release tags JSON: ${unknownErrorToString(
+                    error
+                  )}`
                 )
               );
             }
@@ -87,7 +88,7 @@ export default class ReleaseTagsLoader {
     } catch (error) {
       Logger.log(
         "Failed to download release tags:",
-        error instanceof Error ? error.message : (error as string)
+        unknownErrorToString(error)
       );
 
       try {
@@ -104,7 +105,7 @@ export default class ReleaseTagsLoader {
       } catch (e) {
         Logger.log(
           "Failed to load release tags from local file:",
-          e instanceof Error ? e.message : (e as string)
+          unknownErrorToString(e)
         );
         this.tags = {
           tools: {},

src/utils/versionBundles.mts

@@ -4,6 +4,7 @@ import { isInternetConnected } from "./downloadHelpers.mjs";
 import { get } from "https";
 import Logger from "../logger.mjs";
 import { CURRENT_DATA_VERSION } from "./sharedConstants.mjs";
+import { unknownErrorToString } from "./errorHelper.mjs";
 
 const versionBundlesUrl =
   "https://raspberrypi.github.io/pico-vscode/" +
@@ -27,11 +28,27 @@ export interface VersionBundles {
 }
 
 export default class VersionBundlesLoader {
+  private static instance: VersionBundlesLoader | undefined;
   private bundles?: VersionBundles;
 
-  constructor(private readonly _extensionUri: Uri) {}
+  private constructor(private readonly _extensionUri: Uri) {}
+
+  public static createInstance(extensionUri: Uri): VersionBundlesLoader {
+    if (!VersionBundlesLoader.instance) {
+      VersionBundlesLoader.instance = new VersionBundlesLoader(extensionUri);
+    }
+
+    return VersionBundlesLoader.instance;
+  }
+
+  public static getInstance(): VersionBundlesLoader {
+    if (!VersionBundlesLoader.instance) {
+      throw new Error("VersionBundlesLoader not initialized");
+    }
+
+    return VersionBundlesLoader.instance;
+  }
 
-  // TODO: may add singleton pattern
   private async loadBundles(): Promise<void> {
     try {
       if (!(await isInternetConnected())) {
@@ -57,8 +74,18 @@ export default class VersionBundlesLoader {
 
           // Parse the JSON data when the download is complete
           response.on("end", () => {
-            // Resolve with the array of VersionBundles
-            resolve(JSON.parse(data) as VersionBundles);
+            try {
+              // Resolve with the array of VersionBundles
+              resolve(JSON.parse(data) as VersionBundles);
+            } catch (error) {
+              reject(
+                new Error(
+                  `Failed to parse version bundles JSON: ${unknownErrorToString(
+                    error
+                  )}`
+                )
+              );
+            }
           });
 
           // Handle errors
@@ -72,7 +99,7 @@ export default class VersionBundlesLoader {
     } catch (error) {
       Logger.log(
         "Failed to download version bundles:",
-        error instanceof Error ? error.message : (error as string)
+        unknownErrorToString(error)
       );
 
       try {
@@ -89,7 +116,7 @@ export default class VersionBundlesLoader {
       } catch (e) {
         Logger.log(
           "Failed to load version bundles from local file:",
-          e instanceof Error ? e.message : (e as string)
+          unknownErrorToString(e)
         );
         this.bundles = {};
       }
@@ -105,22 +132,4 @@ export default class VersionBundlesLoader {
 
     return (this.bundles ?? {})[version];
   }
-
-  public async getPythonWindowsAmd64Url(
-    pythonVersion: string
-  ): Promise<VersionBundle | undefined> {
-    if (this.bundles === undefined) {
-      await this.loadBundles();
-    }
-    if (this.bundles === undefined) {
-      return undefined;
-    }
-
-    const bundle = Object.values(this.bundles).find(
-      bundle => bundle.python.version === pythonVersion
-    );
-
-    //return bundle?.python.windowsAmd64;
-    return bundle;
-  }
 }

src/webview/newProjectPanel.mts

@@ -1513,7 +1513,7 @@ export class NewProjectPanel {
         : "light";
     const riscvDefaultSvgUri = defaultTheme === "dark" ? riscvWhiteSvgUri : riscvBlackSvgUri;
 
-    this._versionBundlesLoader = new VersionBundlesLoader(this._extensionUri);
+    this._versionBundlesLoader = VersionBundlesLoader.getInstance();
 
     // construct auxiliary html
     // TODO: add offline handling - only load installed ones