Stop using global shared state for ExtensionDiscovery and it's relatives

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx

@@ -22,11 +22,17 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { lifecycleEnum } from "@ogre-tools/injectable";
 import { unpackExtension } from "./unpack-extension";
 import extensionLoaderInjectable from "../../../../../extensions/extension-loader/extension-loader.injectable";
+import getExtensionDestFolderInjectable
+  from "../get-extension-dest-folder/get-extension-dest-folder.injectable";
+import extensionInstallationStateStoreInjectable
+  from "../../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 
 const unpackExtensionInjectable = getInjectable({
   instantiate: (di) =>
     unpackExtension({
       extensionLoader: di.inject(extensionLoaderInjectable),
+      getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
+      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
     }),
 
   lifecycle: lifecycleEnum.singleton,

src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx

@@ -20,93 +20,98 @@
  */
 import type { InstallRequestValidated } from "../create-temp-files-and-validate/create-temp-files-and-validate";
 import { Disposer, extractTar, noop } from "../../../../../common/utils";
-import { ExtensionInstallationStateStore } from "../../extension-install.store";
 import { extensionDisplayName } from "../../../../../extensions/lens-extension";
 import logger from "../../../../../main/logger";
 import type { ExtensionLoader } from "../../../../../extensions/extension-loader";
 import { Notifications } from "../../../notifications";
 import { getMessageFromError } from "../../get-message-from-error/get-message-from-error";
-import { getExtensionDestFolder } from "../get-extension-dest-folder/get-extension-dest-folder";
 import path from "path";
 import fse from "fs-extra";
 import { when } from "mobx";
 import React from "react";
+import type { ExtensionInstallationStateStore } from "../../../../../extensions/extension-installation-state-store/extension-installation-state-store";
 
 interface Dependencies {
   extensionLoader: ExtensionLoader
+  getExtensionDestFolder: (name: string) => string
+  extensionInstallationStateStore: ExtensionInstallationStateStore
 }
 
-export const unpackExtension = ({ extensionLoader }: Dependencies) => async (
-  request: InstallRequestValidated,
-  disposeDownloading?: Disposer,
-) => {
-  const {
-    id,
-    fileName,
-    tempFile,
-    manifest: { name, version },
-  } = request;
+export const unpackExtension =
+  ({
+    extensionLoader,
+    getExtensionDestFolder,
+    extensionInstallationStateStore,
+  }: Dependencies) =>
+    async (request: InstallRequestValidated, disposeDownloading?: Disposer) => {
+      const {
+        id,
+        fileName,
+        tempFile,
+        manifest: { name, version },
+      } = request;
 
-  ExtensionInstallationStateStore.setInstalling(id);
-  disposeDownloading?.();
+      extensionInstallationStateStore.setInstalling(id);
+      disposeDownloading?.();
 
-  const displayName = extensionDisplayName(name, version);
-  const extensionFolder = getExtensionDestFolder(name);
-  const unpackingTempFolder = path.join(
-    path.dirname(tempFile),
-    `${path.basename(tempFile)}-unpacked`,
-  );
+      const displayName = extensionDisplayName(name, version);
+      const extensionFolder = getExtensionDestFolder(name);
+      const unpackingTempFolder = path.join(
+        path.dirname(tempFile),
+        `${path.basename(tempFile)}-unpacked`,
+      );
 
-  logger.info(`Unpacking extension ${displayName}`, { fileName, tempFile });
+      logger.info(`Unpacking extension ${displayName}`, { fileName, tempFile });
 
-  try {
-    // extract to temp folder first
-    await fse.remove(unpackingTempFolder).catch(noop);
-    await fse.ensureDir(unpackingTempFolder);
-    await extractTar(tempFile, { cwd: unpackingTempFolder });
+      try {
+      // extract to temp folder first
+        await fse.remove(unpackingTempFolder).catch(noop);
+        await fse.ensureDir(unpackingTempFolder);
+        await extractTar(tempFile, { cwd: unpackingTempFolder });
 
-    // move contents to extensions folder
-    const unpackedFiles = await fse.readdir(unpackingTempFolder);
-    let unpackedRootFolder = unpackingTempFolder;
+        // move contents to extensions folder
+        const unpackedFiles = await fse.readdir(unpackingTempFolder);
+        let unpackedRootFolder = unpackingTempFolder;
 
-    if (unpackedFiles.length === 1) {
-      // check if %extension.tgz was packed with single top folder,
-      // e.g. "npm pack %ext_name" downloads file with "package" root folder within tarball
-      unpackedRootFolder = path.join(unpackingTempFolder, unpackedFiles[0]);
-    }
+        if (unpackedFiles.length === 1) {
+        // check if %extension.tgz was packed with single top folder,
+        // e.g. "npm pack %ext_name" downloads file with "package" root folder within tarball
+          unpackedRootFolder = path.join(unpackingTempFolder, unpackedFiles[0]);
+        }
 
-    await fse.ensureDir(extensionFolder);
-    await fse.move(unpackedRootFolder, extensionFolder, { overwrite: true });
+        await fse.ensureDir(extensionFolder);
+        await fse.move(unpackedRootFolder, extensionFolder, { overwrite: true });
 
-    // wait for the loader has actually install it
-    await when(() => extensionLoader.userExtensions.has(id));
+        // wait for the loader has actually install it
+        await when(() => extensionLoader.userExtensions.has(id));
 
-    // Enable installed extensions by default.
-    extensionLoader.setIsEnabled(id, true);
+        // Enable installed extensions by default.
+        extensionLoader.setIsEnabled(id, true);
 
-    Notifications.ok(
-      <p>
-        Extension <b>{displayName}</b> successfully installed!
-      </p>,
-    );
-  } catch (error) {
-    const message = getMessageFromError(error);
+        Notifications.ok(
+          <p>
+          Extension <b>{displayName}</b> successfully installed!
+          </p>,
+        );
+      } catch (error) {
+        const message = getMessageFromError(error);
 
-    logger.info(
-      `[EXTENSION-INSTALLATION]: installing ${request.fileName} has failed: ${message}`,
-      { error },
-    );
-    Notifications.error(
-      <p>
-        Installing extension <b>{displayName}</b> has failed: <em>{message}</em>
-      </p>,
-    );
-  } finally {
-    // Remove install state once finished
-    ExtensionInstallationStateStore.clearInstalling(id);
+        logger.info(
+          `[EXTENSION-INSTALLATION]: installing ${request.fileName} has failed: ${message}`,
+          { error },
+        );
+        Notifications.error(
+          <p>
+          Installing extension <b>{displayName}</b> has failed:{" "}
+            <em>{message}</em>
+          </p>,
+        );
+      } finally {
+      // Remove install state once finished
+        extensionInstallationStateStore.clearInstalling(id);
 
-    // clean up
-    fse.remove(unpackingTempFolder).catch(noop);
-    fse.unlink(tempFile).catch(noop);
-  }
-};
+        // clean up
+        fse.remove(unpackingTempFolder).catch(noop);
+        fse.unlink(tempFile).catch(noop);
+      }
+    };