chore: improve resource disposal

packages/backend/src/managers/applicationManager.spec.ts

@@ -1001,7 +1001,7 @@ describe('pod detection', async () => {
     );
   });
 
-  test('adoptRunningApplications updates the app state with the found pod', async () => {
+  test('init updates the app state with the found pod', async () => {
     vi.mocked(podManager.getPodsWithLabels).mockResolvedValue([
       {
         Labels: {
@@ -1016,7 +1016,7 @@ describe('pod detection', async () => {
       f();
     });
     const updateApplicationStateSpy = vi.spyOn(manager, 'updateApplicationState');
-    manager.adoptRunningApplications();
+    manager.init();
     await new Promise(resolve => setTimeout(resolve, 0));
     expect(updateApplicationStateSpy).toHaveBeenNthCalledWith(1, 'recipe-id-1', 'model-id-1', {
       pod: {
@@ -1037,13 +1037,13 @@ describe('pod detection', async () => {
     expect(ports).toStrictEqual([5000, 5001]);
   });
 
-  test('adoptRunningApplications does not update the application state with the found pod without label', async () => {
+  test('init does not update the application state with the found pod without label', async () => {
     vi.mocked(podManager.getPodsWithLabels).mockResolvedValue([{} as unknown as PodInfo]);
     mocks.startupSubscribeMock.mockImplementation((f: startupHandle) => {
       f();
     });
     const updateApplicationStateSpy = vi.spyOn(manager, 'updateApplicationState');
-    manager.adoptRunningApplications();
+    manager.init();
     await new Promise(resolve => setTimeout(resolve, 0));
     expect(updateApplicationStateSpy).not.toHaveBeenCalled();
   });
@@ -1054,7 +1054,7 @@ describe('pod detection', async () => {
       f();
     });
     const sendApplicationStateSpy = vi.spyOn(manager, 'notify').mockResolvedValue();
-    manager.adoptRunningApplications();
+    manager.init();
     expect(sendApplicationStateSpy).toHaveBeenCalledOnce();
   });
 
@@ -1074,7 +1074,7 @@ describe('pod detection', async () => {
       return { dispose: vi.fn() };
     });
     const sendApplicationStateSpy = vi.spyOn(manager, 'notify').mockResolvedValue();
-    manager.adoptRunningApplications();
+    manager.init();
     expect(sendApplicationStateSpy).toHaveBeenCalledOnce();
   });
 
@@ -1090,7 +1090,7 @@ describe('pod detection', async () => {
       return { dispose: vi.fn() };
     });
     const sendApplicationStateSpy = vi.spyOn(manager, 'notify').mockResolvedValue();
-    manager.adoptRunningApplications();
+    manager.init();
     expect(sendApplicationStateSpy).not.toHaveBeenCalledOnce();
   });
 
@@ -1109,7 +1109,7 @@ describe('pod detection', async () => {
       return { dispose: vi.fn() };
     });
     const sendApplicationStateSpy = vi.spyOn(manager, 'notify').mockResolvedValue();
-    manager.adoptRunningApplications();
+    manager.init();
     expect(sendApplicationStateSpy).not.toHaveBeenCalledOnce();
   });
 
@@ -1142,7 +1142,7 @@ describe('pod detection', async () => {
       return { dispose: vi.fn() };
     });
     const sendApplicationStateSpy = vi.spyOn(manager, 'notify').mockResolvedValue();
-    manager.adoptRunningApplications();
+    manager.init();
     await new Promise(resolve => setTimeout(resolve, 10));
     expect(sendApplicationStateSpy).toHaveBeenCalledTimes(1);
   });
@@ -1170,7 +1170,7 @@ describe('pod detection', async () => {
       return { dispose: vi.fn() };
     });
     const sendApplicationStateSpy = vi.spyOn(manager, 'notify').mockResolvedValue();
-    manager.adoptRunningApplications();
+    manager.init();
     await new Promise(resolve => setTimeout(resolve, 10));
     expect(sendApplicationStateSpy).toHaveBeenCalledTimes(2);
   });
@@ -1226,7 +1226,7 @@ describe('pod detection', async () => {
     expect(podManager.removePod).toHaveBeenCalledWith('engine-1', 'pod-1');
   });
 
-  test('adoptRunningApplications should check pods health', async () => {
+  test('init should check pods health', async () => {
     vi.mocked(podManager.getHealth).mockResolvedValue('healthy');
     vi.mocked(podManager.getPodsWithLabels).mockResolvedValue([
       {
@@ -1255,7 +1255,7 @@ describe('pod detection', async () => {
       f();
     });
     vi.useFakeTimers();
-    manager.adoptRunningApplications();
+    manager.init();
     await vi.advanceTimersByTimeAsync(1100);
     const state = manager.getApplicationsState();
     expect(state).toHaveLength(1);

packages/backend/src/managers/applicationManager.ts

@@ -553,7 +553,7 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
     }
   }
 
-  adoptRunningApplications() {
+  init() {
     this.podmanConnection.startupSubscribe(() => {
       this.podManager
         .getPodsWithLabels([LABEL_RECIPE_ID])

packages/backend/src/managers/modelsManager.spec.ts

@@ -456,9 +456,9 @@ test('deleteModel deletes the model folder', async () => {
       maxRetries: 3,
     });
   }
-  expect(postMessageMock).toHaveBeenCalledTimes(3);
+  expect(postMessageMock).toHaveBeenCalledTimes(4);
   // check that a new state is sent with the model removed
-  expect(postMessageMock).toHaveBeenNthCalledWith(3, {
+  expect(postMessageMock).toHaveBeenNthCalledWith(4, {
     id: 'new-models-state',
     body: [
       {
@@ -522,9 +522,9 @@ describe('deleting models', () => {
         maxRetries: 3,
       });
     }
-    expect(postMessageMock).toHaveBeenCalledTimes(3);
+    expect(postMessageMock).toHaveBeenCalledTimes(4);
     // check that a new state is sent with the model non removed
-    expect(postMessageMock).toHaveBeenNthCalledWith(3, {
+    expect(postMessageMock).toHaveBeenNthCalledWith(4, {
       id: 'new-models-state',
       body: [
         {

packages/backend/src/managers/modelsManager.ts

@@ -63,6 +63,10 @@ export class ModelsManager implements Disposable {
       });
     });
     this.#disposables.push(disposable);
+
+    this.loadLocalModels().catch((err: unknown) => {
+      console.error('Something went wrong while trying to load local models', err);
+    });
   }
 
   dispose(): void {

packages/backend/src/registries/ContainerRegistry.ts

@@ -26,15 +26,17 @@ export interface ContainerStart {
   id: string;
 }
 
-export class ContainerRegistry {
+export class ContainerRegistry implements podmanDesktopApi.Disposable {
   private count: number = 0;
   private subscribers: Map<string, Subscriber[]> = new Map();
 
   private readonly _onStartContainerEvent = new podmanDesktopApi.EventEmitter<ContainerStart>();
   readonly onStartContainerEvent: podmanDesktopApi.Event<ContainerStart> = this._onStartContainerEvent.event;
 
-  init(): podmanDesktopApi.Disposable {
-    return podmanDesktopApi.containerEngine.onEvent(event => {
+  #eventDisposable: podmanDesktopApi.Disposable | undefined;
+
+  init(): void {
+    this.#eventDisposable = podmanDesktopApi.containerEngine.onEvent(event => {
       if (event.status === 'start') {
         this._onStartContainerEvent.fire({
           id: event.id,
@@ -52,6 +54,10 @@ export class ContainerRegistry {
     });
   }
 
+  dispose(): void {
+    this.#eventDisposable?.dispose();
+  }
+
   subscribe(containerId: string, callback: (status: string) => void): podmanDesktopApi.Disposable {
     const subscriberId = ++this.count;
     const nSubs: Subscriber[] = [

packages/backend/src/registries/LocalRepositoryRegistry.spec.ts

@@ -22,6 +22,7 @@ import type { Webview } from '@podman-desktop/api';
 import type { Recipe } from '@shared/src/models/IRecipe';
 import fs from 'node:fs';
 import path from 'node:path';
+import type { CatalogManager } from '../managers/catalogManager';
 
 const mocks = vi.hoisted(() => ({
   DisposableCreateMock: vi.fn(),
@@ -45,6 +46,11 @@ vi.mock('node:fs', () => {
   };
 });
 
+const catalogManagerMock = {
+  onCatalogUpdate: vi.fn(),
+  getRecipes: vi.fn(),
+} as unknown as CatalogManager;
+
 beforeEach(() => {
   vi.resetAllMocks();
   vi.mock('node:fs');
@@ -57,6 +63,7 @@ test('should not have any repositories by default', () => {
       postMessage: mocks.postMessageMock,
     } as unknown as Webview,
     '/appUserDirectory',
+    catalogManagerMock,
   );
   expect(localRepositories.getLocalRepositories().length).toBe(0);
 });
@@ -67,6 +74,7 @@ test('should notify webview when register', () => {
       postMessage: mocks.postMessageMock,
     } as unknown as Webview,
     '/appUserDirectory',
+    catalogManagerMock,
   );
   localRepositories.register({ path: 'random', sourcePath: 'random', labels: { 'recipe-id': 'random' } });
   expect(mocks.postMessageMock).toHaveBeenNthCalledWith(1, {
@@ -81,6 +89,7 @@ test('should notify webview when unregister', async () => {
       postMessage: mocks.postMessageMock,
     } as unknown as Webview,
     '/appUserDirectory',
+    catalogManagerMock,
   );
   vi.spyOn(fs.promises, 'rm').mockResolvedValue();
   localRepositories.register({ path: 'random', sourcePath: 'random', labels: { 'recipe-id': 'random' } });
@@ -94,18 +103,26 @@ test('should notify webview when unregister', async () => {
 
 test('should register localRepo if it find the folder of the recipe', () => {
   vi.spyOn(fs, 'existsSync').mockReturnValue(true);
+  vi.mocked(catalogManagerMock.onCatalogUpdate).mockImplementation((fn: () => void) => {
+    fn();
+    return { dispose: vi.fn() };
+  });
+  vi.mocked(catalogManagerMock.getRecipes).mockReturnValue([
+    {
+      id: 'recipe',
+    } as unknown as Recipe,
+  ]);
+
   const localRepositories = new LocalRepositoryRegistry(
     {
       postMessage: mocks.postMessageMock,
     } as unknown as Webview,
     '/appUserDirectory',
+    catalogManagerMock,
   );
+
   const registerMock = vi.spyOn(localRepositories, 'register');
-  localRepositories.init([
-    {
-      id: 'recipe',
-    } as unknown as Recipe,
-  ]);
+  localRepositories.init();
 
   const folder = path.join('/appUserDirectory', 'recipe');
   expect(registerMock).toHaveBeenCalledWith({
@@ -117,18 +134,24 @@ test('should register localRepo if it find the folder of the recipe', () => {
 
 test('should NOT register localRepo if it does not find the folder of the recipe', () => {
   vi.spyOn(fs, 'existsSync').mockReturnValue(false);
+  vi.mocked(catalogManagerMock.onCatalogUpdate).mockImplementation((fn: () => void) => {
+    fn();
+    return { dispose: vi.fn() };
+  });
+  vi.mocked(catalogManagerMock.getRecipes).mockReturnValue([
+    {
+      id: 'recipe',
+    } as unknown as Recipe,
+  ]);
+
   const localRepositories = new LocalRepositoryRegistry(
     {
       postMessage: mocks.postMessageMock,
     } as unknown as Webview,
     '/appUserDirectory',
+    catalogManagerMock,
   );
   const registerMock = vi.spyOn(localRepositories, 'register');
-  localRepositories.init([
-    {
-      id: 'recipe',
-    } as unknown as Recipe,
-  ]);
-
+  localRepositories.init();
   expect(registerMock).not.toHaveBeenCalled();
 });

packages/backend/src/registries/LocalRepositoryRegistry.ts

@@ -22,23 +22,32 @@ import { Publisher } from '../utils/Publisher';
 import type { Recipe } from '@shared/src/models/IRecipe';
 import fs from 'node:fs';
 import path from 'node:path';
+import type { CatalogManager } from '../managers/catalogManager';
 
 /**
  * The LocalRepositoryRegistry is responsible for keeping track of the directories where recipe are cloned
  */
-export class LocalRepositoryRegistry extends Publisher<LocalRepository[]> {
+export class LocalRepositoryRegistry extends Publisher<LocalRepository[]> implements Disposable {
   // Map path => LocalRepository
   private repositories: Map<string, LocalRepository> = new Map();
+  #catalogEventDisposable: Disposable | undefined;
 
   constructor(
     webview: Webview,
     private appUserDirectory: string,
+    private catalogManager: CatalogManager,
   ) {
     super(webview, Messages.MSG_LOCAL_REPOSITORY_UPDATE, () => this.getLocalRepositories());
   }
 
-  init(recipes: Recipe[]): void {
-    this.loadLocalRecipeRepositories(recipes);
+  dispose(): void {
+    this.#catalogEventDisposable?.dispose();
+  }
+
+  init(): void {
+    this.#catalogEventDisposable = this.catalogManager.onCatalogUpdate(() => {
+      this.loadLocalRecipeRepositories(this.catalogManager.getRecipes());
+    });
   }
 
   register(localRepository: LocalRepository): Disposable {

packages/backend/src/studio-api-impl.spec.ts

@@ -117,6 +117,7 @@ beforeEach(async () => {
       postMessage: vi.fn().mockResolvedValue(undefined),
     } as unknown as Webview,
     appUserDirectory,
+    {} as unknown as CatalogManager,
   );
 
   const telemetryMock = {