Initial extension interaction service

extension/src/server/interactionService.ts

@@ -101,7 +101,7 @@ export class InteractionService implements IInteractionService {
             ignoreFocusOut: true
         });
 
-        return selected || null;
+        return selected ?? null;
     }
 
     displayIncompatibleVersionError(requiredCapability: string, appHostHostingSdkVersion: string) {
@@ -196,21 +196,18 @@ export class InteractionService implements IInteractionService {
     }
 }
 
-export function addInteractionServiceEndpoints(connection: MessageConnection, interactionService: IInteractionService, rpcClient: ICliRpcClient) {
-    connection.onRequest("showStatus", interactionService.showStatus.bind(interactionService));
-    connection.onRequest("promptForString", (promptText: string, defaultValue: string | null) =>
-        interactionService.promptForString(promptText, defaultValue, rpcClient));
-    connection.onRequest("confirm", interactionService.confirm.bind(interactionService));
-    connection.onRequest("promptForSelection", (promptText: string, choices: string[]) =>
-        interactionService.promptForSelection(promptText, choices)
-    );
-    connection.onRequest("displayIncompatibleVersionError", interactionService.displayIncompatibleVersionError.bind(interactionService));
-    connection.onRequest("displayError", interactionService.displayError.bind(interactionService));
-    connection.onRequest("displayMessage", interactionService.displayMessage.bind(interactionService));
-    connection.onRequest("displaySuccess", interactionService.displaySuccess.bind(interactionService));
-    connection.onRequest("displaySubtleMessage", interactionService.displaySubtleMessage.bind(interactionService));
-    connection.onRequest("displayEmptyLine", interactionService.displayEmptyLine.bind(interactionService));
-    connection.onRequest("displayDashboardUrls", interactionService.displayDashboardUrls.bind(interactionService));
-    connection.onRequest("displayLines", interactionService.displayLines.bind(interactionService));
-    connection.onRequest("displayCancellationMessage", interactionService.displayCancellationMessage.bind(interactionService));
+export function addInteractionServiceEndpoints(connection: MessageConnection, interactionService: IInteractionService, rpcClient: ICliRpcClient, withAuthentication: (callback: (...params: any[]) => any) => (...params: any[]) => any) {
+    connection.onRequest("showStatus", withAuthentication(interactionService.showStatus.bind(interactionService)));
+    connection.onRequest("promptForString", withAuthentication(async (promptText: string, defaultValue: string | null) => interactionService.promptForString(promptText, defaultValue, rpcClient)));
+    connection.onRequest("confirm", withAuthentication(interactionService.confirm.bind(interactionService)));
+    connection.onRequest("promptForSelection", withAuthentication(interactionService.promptForSelection.bind(interactionService)));
+    connection.onRequest("displayIncompatibleVersionError", withAuthentication(interactionService.displayIncompatibleVersionError.bind(interactionService)));
+    connection.onRequest("displayError", withAuthentication(interactionService.displayError.bind(interactionService)));
+    connection.onRequest("displayMessage", withAuthentication(interactionService.displayMessage.bind(interactionService)));
+    connection.onRequest("displaySuccess", withAuthentication(interactionService.displaySuccess.bind(interactionService)));
+    connection.onRequest("displaySubtleMessage", withAuthentication( interactionService.displaySubtleMessage.bind(interactionService)));
+    connection.onRequest("displayEmptyLine", withAuthentication(interactionService.displayEmptyLine.bind(interactionService)));
+    connection.onRequest("displayDashboardUrls", withAuthentication(interactionService.displayDashboardUrls.bind(interactionService)));
+    connection.onRequest("displayLines", withAuthentication(interactionService.displayLines.bind(interactionService)));
+    connection.onRequest("displayCancellationMessage", withAuthentication(interactionService.displayCancellationMessage.bind(interactionService)));
 }

extension/src/server/rpcServer.ts

@@ -2,7 +2,7 @@ import * as net from 'net';
 import * as vscode from 'vscode';
 import { createMessageConnection, MessageConnection } from 'vscode-jsonrpc';
 import { StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node';
-import { rpcServerListening, rpcServerAddressError } from '../constants/strings';
+import { rpcServerAddressError } from '../constants/strings';
 import * as crypto from 'crypto';
 import { addInteractionServiceEndpoints, IInteractionService } from './interactionService';
 import { ICliRpcClient } from './rpcClient';
@@ -18,12 +18,17 @@ export type RpcServerInformation = {
 export function setupRpcServer(interactionService: (connection: MessageConnection) => IInteractionService, rpcClient: (connection: MessageConnection, token: string) => ICliRpcClient, outputChannelWriter: IOutputChannelWriter): Promise<RpcServerInformation> {
     const token = generateToken();
 
-    function withAuthentication(callback: (params: any) => any) {
-        return (params: any) => {
-            if (!params || params.token !== token) {
+    function withAuthentication(callback: (...params: any[]) => any) {
+        return (...params: any[]) => {
+            if (!params || params[0] !== token) {
                 throw new Error('Invalid token provided');
             }
-            return callback(params);
+
+            if (Array.isArray(params)) {
+                (params as any[]).shift();
+            }
+
+            return callback(...params);
         };
     }
 
@@ -42,15 +47,15 @@ export function setupRpcServer(interactionService: (connection: MessageConnectio
                 return ["baseline.v1"];
             }));
 
-            addInteractionServiceEndpoints(connection, interactionService(connection), rpcClient(connection, token));
+            addInteractionServiceEndpoints(connection, interactionService(connection), rpcClient(connection, token), withAuthentication);
 
             connection.listen();
         });
 
         rpcServer.listen(0, () => {
             const addressInfo = rpcServer?.address();
             if (typeof addressInfo === 'object' && addressInfo?.port) {
-                const fullAddress = (addressInfo.address === "::" ? "" : `${addressInfo.address}:`) + addressInfo.port;
+                const fullAddress = (addressInfo.address === "::" ? "localhost" : `${addressInfo.address}`) + ":" + addressInfo.port;
                 outputChannelWriter.appendLine(`Aspire extension server listening on: ${fullAddress}`);
                 resolve({
                     token: token,

extension/src/test/rpc/e2eServerTests.test.ts

@@ -42,7 +42,7 @@ suite('End-to-end RPC server auth tests', () => {
 		const rpcServerInfo = extension.exports.getRpcServerInfo() as RpcServerInformation;
 
 		// Connect as a client
-		const client = net.createConnection(rpcServerInfo.address);
+		const client = net.createConnection(rpcServerInfo.address.replace('localhost:', ''));
 		await new Promise<void>((resolve) => client.once('connect', resolve));
 
 		const connection = createMessageConnection(

extension/src/utils/terminal.ts

@@ -15,6 +15,7 @@ export function getAspireTerminal(): vscode.Terminal {
         const env = { 
             ...process.env, 
             ASPIRE_EXTENSION_ENDPOINT: rpcServerInfo.address,
+            ASPIRE_EXTENSION_TOKEN: rpcServerInfo.token,
             ASPIRE_EXTENSION_PROMPT_ENABLED: 'true',
             ASPIRE_LOCALE_OVERRIDE: vscode.env.language
          };

src/Aspire.Cli/Backchannel/AppHostIncompatibleException.cs

@@ -3,7 +3,4 @@
 
 namespace Aspire.Cli.Backchannel;
 
-internal sealed class AppHostIncompatibleException(string message, string requiredCapability) : Exception(message)
-{
-    public string RequiredCapability { get; } = requiredCapability;
-}
+internal sealed class AppHostIncompatibleException(string message, string requiredCapability) : IncompatibleException(message, requiredCapability);