remove LoadPacks and getVersion calls from components-packs-webview-main.ts

Author: edriouk

src/json-rpc/csolution-rpc-client.ts

@@ -43,6 +43,7 @@ class CsolutionServiceImpl extends RpcMethods implements CsolutionService {
     private readonly debouncedLoadPacks = debounce(super.loadPacks.bind(this), 1000);
     private csolutionBin = 'csolution';
     private exitPromise: Promise<void> | undefined;
+    private hasReportedVersionForSession = false;
     private readonly mutex: Mutex;
 
     constructor(
@@ -75,6 +76,19 @@ class CsolutionServiceImpl extends RpcMethods implements CsolutionService {
         if (this.idxWatcher === undefined) {
             this.watchPackIdxFile();
         }
+
+        // Query daemon version once per launched session right before first LoadPacks.
+        if (!this.hasReportedVersionForSession) {
+            try {
+                const version = await super.getVersion();
+                console.log('csolution version:', version);
+            } catch (error) {
+                console.warn('Unable to query csolution version before loadPacks:', error);
+            } finally {
+                this.hasReportedVersionForSession = true;
+            }
+        }
+
         return super.loadPacks();
     }
 
@@ -131,6 +145,7 @@ class CsolutionServiceImpl extends RpcMethods implements CsolutionService {
         this.idxWatcher = undefined;
         this.connection?.dispose();
         this.connection = undefined;
+        this.hasReportedVersionForSession = false;
     }
 
     private async launch(): Promise<boolean> {

src/views/manage-components-packs/components-packs-webview-main.test.ts

@@ -602,16 +602,14 @@ describe('ComponentsPacksWebviewMain', () => {
             expect(stateMessages).toEqual(
                 expect.arrayContaining([
                     'Connecting to rpc daemon',
-                    'Loading Packs...',
                     'Loading Solution...',
                     'Retrieving assigned items...'
                 ])
             );
-            expect(stateMessages.indexOf('Connecting to rpc daemon')).toBeLessThan(stateMessages.indexOf('Loading Packs...'));
-            expect(stateMessages.indexOf('Loading Packs...')).toBeLessThan(stateMessages.indexOf('Loading Solution...'));
+            expect(stateMessages.indexOf('Connecting to rpc daemon')).toBeLessThan(stateMessages.indexOf('Loading Solution...'));
+            expect(stateMessages.indexOf('Loading Solution...')).toBeLessThan(stateMessages.indexOf('Retrieving assigned items...'));
 
-            expect(svc.getVersion).toHaveBeenCalled();
-            expect(svc.loadPacks).toHaveBeenCalled();
+            expect(svc.loadPacks).not.toHaveBeenCalled();
             expect(svc.loadSolution).toHaveBeenCalledWith({ solution: 'solPath', activeTarget: 'activeTs' });
             expect(svc.getUsedItems).toHaveBeenCalledWith({ context: 'activeCtx' });
             expect(svc.getPacksInfo).toHaveBeenCalledWith({ context: 'activeCtx', all: false });
@@ -634,7 +632,6 @@ describe('ComponentsPacksWebviewMain', () => {
             await (componentsPacksWebviewMain as any).loadSolution('solPath', 'activeTs', 'activeCtx', false);
 
             // Heavy operations not called
-            expect(svc.getVersion).not.toHaveBeenCalled();
             expect(svc.loadPacks).not.toHaveBeenCalled();
             expect(svc.loadSolution).not.toHaveBeenCalled();
 
@@ -652,7 +649,7 @@ describe('ComponentsPacksWebviewMain', () => {
 
         it('handles errors and sends error messages', async () => {
             const error = new Error('Boom failure');
-            const svc = setupCsolutionServiceMocks({
+            setupCsolutionServiceMocks({
                 getComponentsTree: jest.fn().mockRejectedValue(error),
                 getLogMessages: jest.fn().mockResolvedValue({
                     errors: ['E1'],
@@ -677,9 +674,6 @@ describe('ComponentsPacksWebviewMain', () => {
 
             // Ensure dirty flag cleared
             expect(calls.some(m => m.type === 'IS_DIRTY' && m.isDirty === false)).toBe(true);
-
-            // Heavy reload start still attempted before failure
-            expect(svc.getVersion).toHaveBeenCalled();
         });
     });
 

src/views/manage-components-packs/components-packs-webview-main.ts

@@ -393,11 +393,6 @@ export class ComponentsPacksWebviewMain {
                 this.availablePacksCache = {};
                 this.unlinkRequests.clear();
                 await this.webviewManager.sendMessage({ type: 'SET_SOLUTION_STATE', stateMessage: 'Connecting to rpc daemon' });
-                const version = await this.csolutionService.getVersion();
-                console.log('csolution version:', version);
-
-                await this.webviewManager.sendMessage({ type: 'SET_SOLUTION_STATE', stateMessage: 'Loading Packs...' });
-                await this.csolutionService.loadPacks();
 
                 await this.webviewManager.sendMessage({ type: 'SET_SOLUTION_STATE', stateMessage: 'Loading Solution...' });
                 const solutionSuccess = await this.csolutionService.loadSolution({ solution: solutionPath, activeTarget: activeTargetSet });