Disconnect if newly connected server doesn't support console type (#7)

src/common/constants.ts

@@ -44,8 +44,9 @@ export const ICON_ID = {
   runAll: 'run-all',
   runSelection: 'run',
   server: 'server',
-  runningServer: 'circle-large-filled',
-  stoppedServer: 'circle-slash',
+  serverConnected: 'circle-large-filled',
+  serverRunning: 'circle-large-outline',
+  serverStopped: 'circle-slash',
 } as const;
 
 export const CONNECTION_TREE_ITEM_CONTEXT = {

src/common/errors.ts

@@ -0,0 +1,6 @@
+export class UnsupportedConsoleTypeError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'UnsupportedConsoleTypeError';
+  }
+}

src/common/index.ts

@@ -1,2 +1,3 @@
 export * from './commands';
 export * from './constants';
+export * from './errors';

src/controllers/ConnectionController.ts

@@ -21,6 +21,7 @@ import {
   updateConnectionStatusBarItem,
   type ConnectionOption,
 } from '../util';
+import { UnsupportedConsoleTypeError } from '../common';
 
 const logger = new Logger('ConnectionController');
 
@@ -138,6 +139,8 @@ export class ConnectionController implements Disposable {
   ): Promise<void> => {
     updateConnectionStatusBarItem(this.connectStatusBarItem, 'connecting');
 
+    let newConnectionUrl: URL | null = null;
+
     if ('url' in connectionOrServer) {
       const cn = await this._serverManager.connectToServer(
         connectionOrServer.url
@@ -148,9 +151,21 @@ export class ConnectionController implements Disposable {
       }
 
       connectionOrServer = cn;
+      newConnectionUrl = cn.serverUrl;
     }
 
-    await this._serverManager.setEditorConnection(editor, connectionOrServer);
+    try {
+      await this._serverManager.setEditorConnection(editor, connectionOrServer);
+    } catch (err) {
+      updateConnectionStatusBarItem(this.connectStatusBarItem, 'disconnected');
+
+      // If our error was on a newly created connection, disconnect from it.
+      if (err instanceof UnsupportedConsoleTypeError && newConnectionUrl) {
+        this._serverManager.disconnectFromServer(newConnectionUrl);
+      }
+
+      throw err;
+    }
 
     updateConnectionStatusBarItem(
       this.connectStatusBarItem,
@@ -206,7 +221,7 @@ export class ConnectionController implements Disposable {
       // If there are multiple options to select, prompt the user to select one.
       const isSelected = await this.onPromptUserToSelectConnection();
 
-      // User cancelled the selection
+      // User cancelled the selection or an error occurred
       if (!isSelected) {
         return null;
       }
@@ -259,16 +274,17 @@ export class ConnectionController implements Disposable {
         editor.document.languageId,
         editorActiveConnectionUrl
       );
-    } catch (err) {
-      this._toaster.error(String(err));
-    }
 
-    if (result == null) {
-      return false;
-    }
+      if (result == null) {
+        return false;
+      }
 
-    await this.connectEditor(result.data, editor);
+      await this.connectEditor(result.data, editor);
 
-    return true;
+      return true;
+    } catch (err) {
+      this._toaster.error(err instanceof Error ? err.message : String(err));
+      return false;
+    }
   };
 }

src/providers/ServerTreeProvider.ts

@@ -52,11 +52,15 @@ export class ServerTreeProvider extends TreeDataProviderBase<ServerNode> {
 
     return {
       label: new URL(urlStr).host,
-      description: element.type === 'DHC' ? undefined : 'Enterprise',
+      description: isConnected ? '(1)' : undefined, // element.type === 'DHC' ? undefined : 'Enterprise',
       tooltip: canConnect ? `Click to connect to ${urlStr}` : urlStr,
       contextValue: element.type === 'DHC' ? contextValue : undefined,
       iconPath: new vscode.ThemeIcon(
-        isRunning ? ICON_ID.runningServer : ICON_ID.stoppedServer
+        isRunning
+          ? isConnected
+            ? ICON_ID.serverConnected
+            : ICON_ID.serverRunning
+          : ICON_ID.serverStopped
       ),
       command: canConnect
         ? {

src/services/ServerManager.ts

@@ -1,5 +1,8 @@
 import * as vscode from 'vscode';
-import { SERVER_STATUS_CHECK_INTERVAL } from '../common';
+import {
+  SERVER_STATUS_CHECK_INTERVAL,
+  UnsupportedConsoleTypeError,
+} from '../common';
 import { isDhcServerRunning } from '../dh/dhc';
 import { isDheServerRunning } from '../dh/dhe';
 import type {
@@ -221,8 +224,8 @@ export class ServerManager implements IServerManager {
         editor.document.languageId as ConsoleType
       ))
     ) {
-      throw new Error(
-        `Connection '${dhService.serverUrl}' does not support the console type of the editor.`
+      throw new UnsupportedConsoleTypeError(
+        `Connection '${dhService.serverUrl}' does not support '${editor.document.languageId}'.`
       );
     }