misc merging stuff

Author: Megha Narayanan

packages/cli/src/commands/sandbox/sandbox-devtools/react-app/src/services/sandbox_client_service.test.ts

@@ -92,6 +92,18 @@ void describe('SandboxClientService', () => {
     });
   });
 
+  void describe('getSavedCloudFormationEvents', () => {
+    void it('emits GET_SAVED_CLOUD_FORMATION_EVENTS event', () => {
+      service.getSavedCloudFormationEvents();
+
+      assert.strictEqual(mockSocket.mockEmit.mock.callCount(), 1);
+      assert.strictEqual(
+        mockSocket.mockEmit.mock.calls[0].arguments[0],
+        SOCKET_EVENTS.GET_SAVED_CLOUD_FORMATION_EVENTS,
+      );
+    });
+  });
+
   void describe('saveLogSettings', () => {
     void it('emits SAVE_LOG_SETTINGS event with correct parameters', () => {
       const settings = { maxLogSizeMB: 50 };
@@ -216,5 +228,17 @@ void describe('SandboxClientService', () => {
         SOCKET_EVENTS.SAVED_CONSOLE_LOGS,
       );
     });
+
+    void it('registers onSavedCloudFormationEvents handler correctly', () => {
+      const mockHandler = mock.fn();
+
+      service.onSavedCloudFormationEvents(mockHandler);
+
+      assert.strictEqual(mockSocket.mockOn.mock.callCount(), 1);
+      assert.strictEqual(
+        mockSocket.mockOn.mock.calls[0].arguments[0],
+        SOCKET_EVENTS.SAVED_CLOUD_FORMATION_EVENTS,
+      );
+    });
   });
 });

packages/cli/src/commands/sandbox/sandbox-devtools/react-app/src/services/sandbox_client_service.ts

@@ -7,6 +7,13 @@ import {
 } from '../../../shared/socket_types';
 import { DeploymentEvent } from './deployment_client_service';
 
+/**
+ * Interface for log settings data
+ */
+export interface LogSettings {
+  maxLogSizeMB: number;
+  currentSizeMB?: number;
+}
 /**
  * Service for handling sandbox-related socket communication
  */
@@ -58,6 +65,13 @@ export class SandboxClientService extends SocketClientService {
     return this.on(SOCKET_EVENTS.SANDBOX_STATUS, handler);
   }
 
+  /**
+   * Gets saved CloudFormation events
+   */
+  public getSavedCloudFormationEvents(): void {
+    this.emit(SOCKET_EVENTS.GET_SAVED_CLOUD_FORMATION_EVENTS);
+  }
+
   /**
    * Saves log settings
    * @param settings The log settings to save
@@ -77,13 +91,6 @@ export class SandboxClientService extends SocketClientService {
     return this.on(SOCKET_EVENTS.LOG_SETTINGS, handler);
   }
 
-  /**
-   * Gets saved CloudFormation events
-   */
-  public getSavedCloudFormationEvents(): void {
-    this.emit(SOCKET_EVENTS.GET_SAVED_CLOUD_FORMATION_EVENTS);
-  }
-
   /**
    * Gets log settings
    */
@@ -102,17 +109,6 @@ export class SandboxClientService extends SocketClientService {
     return this.on('log', handler);
   }
 
-  /**
-   * Registers a handler for saved CloudFormation events
-   * @param handler The event handler
-   * @returns An object with an unsubscribe method
-   */
-  public onSavedCloudFormationEvents(
-    handler: (events: DeploymentEvent[]) => void,
-  ): { unsubscribe: () => void } {
-    return this.on(SOCKET_EVENTS.SAVED_CLOUD_FORMATION_EVENTS, handler);
-  }
-
   /**
    * Saves console logs
    * @param logs The console logs to save
@@ -138,4 +134,15 @@ export class SandboxClientService extends SocketClientService {
   } {
     return this.on(SOCKET_EVENTS.SAVED_CONSOLE_LOGS, handler);
   }
+
+  /**
+   * Registers a handler for saved CloudFormation events
+   * @param handler The event handler
+   * @returns An object with an unsubscribe method
+   */
+  public onSavedCloudFormationEvents(
+    handler: (events: DeploymentEvent[]) => void,
+  ): { unsubscribe: () => void } {
+    return this.on(SOCKET_EVENTS.SAVED_CLOUD_FORMATION_EVENTS, handler);
+  }
 }

packages/cli/src/commands/sandbox/sandbox-devtools/sandbox_devtools_command.ts

@@ -181,7 +181,8 @@ export class SandboxDevToolsCommand implements CommandModule<object> {
     storageManager: LocalStorageManager,
   ): void {
     // Listen for deployment started
-    sandbox.on('deploymentStarted', (data: { timestamp?: string }) => {      void (async () => {
+    sandbox.on('deploymentStarted', (data: { timestamp?: string }) => {
+      void (async () => {
         this.printer.log('Deployment started', LogLevel.DEBUG);
 
         const currentState = await getSandboxState();
@@ -194,20 +195,20 @@ export class SandboxDevToolsCommand implements CommandModule<object> {
           );
         }
 
-      // Clear CloudFormation events when a new deployment starts
-      storageManager.clearCloudFormationEvents();
-      // Reset CloudFormation timestamp to avoid showing old events
-      storageManager.clearCloudFormationTimestamp();
-      // Save current timestamp to start tracking from now
-      storageManager.saveLastCloudFormationTimestamp(new Date());
-      this.printer.log(
-        'Cleared previous CloudFormation events and reset timestamp',
-        LogLevel.DEBUG,
-      );
-      this.printer.log(
-        'Cleared previous CloudFormation events',
-        LogLevel.DEBUG,
-      );
+        // Clear CloudFormation events when a new deployment starts
+        storageManager.clearCloudFormationEvents();
+        // Reset CloudFormation timestamp to avoid showing old events
+        storageManager.clearCloudFormationTimestamp();
+        // Save current timestamp to start tracking from now
+        storageManager.saveLastCloudFormationTimestamp(new Date());
+        this.printer.log(
+          'Cleared previous CloudFormation events and reset timestamp',
+          LogLevel.DEBUG,
+        );
+        this.printer.log(
+          'Cleared previous CloudFormation events',
+          LogLevel.DEBUG,
+        );
         const statusData: SandboxStatusData = {
           status: currentState, // This should be 'deploying' after deployment starts,
           identifier: backendId.name,
@@ -246,20 +247,20 @@ export class SandboxDevToolsCommand implements CommandModule<object> {
 
         const currentState = await getSandboxState();
         // Clear CloudFormation events when a new deployment starts
-      storageManager.clearCloudFormationEvents();
-      // Reset CloudFormation timestamp to avoid showing old events
-      storageManager.clearCloudFormationTimestamp();
-      // Save current timestamp to start tracking from now
-      storageManager.saveLastCloudFormationTimestamp(new Date());
-      this.printer.log(
-        'Cleared previous CloudFormation events and reset timestamp',
-        LogLevel.DEBUG,
-      );
-      this.printer.log(
-        'Cleared previous CloudFormation events',
-        LogLevel.DEBUG,
-      );
-      const statusData: SandboxStatusData = {
+        storageManager.clearCloudFormationEvents();
+        // Reset CloudFormation timestamp to avoid showing old events
+        storageManager.clearCloudFormationTimestamp();
+        // Save current timestamp to start tracking from now
+        storageManager.saveLastCloudFormationTimestamp(new Date());
+        this.printer.log(
+          'Cleared previous CloudFormation events and reset timestamp',
+          LogLevel.DEBUG,
+        );
+        this.printer.log(
+          'Cleared previous CloudFormation events',
+          LogLevel.DEBUG,
+        );
+        const statusData: SandboxStatusData = {
           status: currentState, // This should be 'deleting' after deletion starts
           identifier: backendId.name,
           message: 'Deletion started',

packages/cli/src/commands/sandbox/sandbox-devtools/services/socket_handlers_resources.ts

@@ -52,6 +52,68 @@ export class SocketHandlerResources {
     );
   }
 
+  /**
+   * Handles the testLambdaFunction event
+   */
+  public async handleTestLambdaFunction(
+    socket: Socket,
+    data: SocketEvents['testLambdaFunction'],
+  ): Promise<void> {
+    if (!data?.resourceId || !data?.functionName) {
+      socket.emit(SOCKET_EVENTS.LAMBDA_TEST_RESULT, {
+        resourceId: data?.resourceId || 'unknown',
+        error: 'Invalid function information provided',
+      });
+      return;
+    }
+
+    try {
+      const { resourceId, functionName, input } = data;
+
+      // Parse the input as JSON
+      let payload: Record<string, unknown>;
+      try {
+        payload = input ? JSON.parse(input) : {};
+      } catch (error) {
+        socket.emit(SOCKET_EVENTS.LAMBDA_TEST_RESULT, {
+          resourceId,
+          error: `Invalid JSON input: ${String(error)}`,
+        });
+        return;
+      }
+
+      // Invoke the Lambda function
+      const command = new InvokeCommand({
+        FunctionName: functionName,
+        Payload: JSON.stringify(payload),
+      });
+
+      const response = await this.lambdaClient.send(command);
+
+      // Parse the response payload
+      let result = '';
+      if (response.Payload) {
+        const responseText = Buffer.from(response.Payload).toString('utf-8');
+        result = responseText;
+      }
+
+      // Send the result to the client
+      socket.emit(SOCKET_EVENTS.LAMBDA_TEST_RESULT, {
+        resourceId,
+        result,
+      });
+    } catch (error) {
+      this.printer.log(
+        `Error testing Lambda function ${data.functionName}: ${String(error)}`,
+        LogLevel.ERROR,
+      );
+      socket.emit(SOCKET_EVENTS.LAMBDA_TEST_RESULT, {
+        resourceId: data.resourceId,
+        error: String(error),
+      });
+    }
+  }
+
   /**
    * Handles the getSavedCloudFormationEvents event
    */

packages/cli/src/commands/sandbox/sandbox-devtools/shared/socket_events.ts

@@ -93,6 +93,7 @@ export const SOCKET_EVENTS = {
    * Event received when log settings are sent from the server
    */
   LOG_SETTINGS: 'logSettings',
+
   /**
    * Event to test a Lambda function
    */
@@ -152,6 +153,7 @@ export const SOCKET_EVENTS = {
    * Event received when saved console logs are sent from the server
    */
   SAVED_CONSOLE_LOGS: 'savedConsoleLogs',
+
   /**
    * Event which triggers UI to show a deployment error
    * Contains error details like name, message, resolution, and timestamp.