@cmusei/console-forge 0.19.0 → 0.20.0

package/lib/components/console/console.component.d.ts

@@ -5,6 +5,8 @@ import { ConsoleToolbarComponentBase } from '../../models/console-toolbar-compon
 import { ConsolePowerRequest } from '../../models/console-power-request';
 import { ConsoleComponentNetworkConfig } from '../../models/console-component-network-config';
 import { ConsoleConnectionStatus } from '../../models/console-connection-status';
+import { ConsoleNetworkConnectionRequest } from '../../models/console-network-connection-request';
+import { ConsoleNetworkDisconnectionRequest } from '../../models/console-network-disconnection-request';
 import * as i0 from "@angular/core";
 export declare class ConsoleComponent implements OnDestroy {
     autoConnect: import("@angular/core").InputSignal<boolean>;
@@ -18,8 +20,8 @@ export declare class ConsoleComponent implements OnDestroy {
     consoleRecorded: import("@angular/core").OutputEmitterRef<Blob>;
     ctrlAltDelSent: import("@angular/core").OutputEmitterRef<void>;
     localClipboardUpdated: import("@angular/core").OutputEmitterRef<ClipboardItem>;
-    networkConnectionRequested: import("@angular/core").OutputEmitterRef<string>;
-    networkDisconnectRequested: import("@angular/core").OutputEmitterRef<void>;
+    networkConnectionRequested: import("@angular/core").OutputEmitterRef<ConsoleNetworkConnectionRequest>;
+    networkDisconnectRequested: import("@angular/core").OutputEmitterRef<ConsoleNetworkDisconnectionRequest | undefined>;
     powerRequestSent: import("@angular/core").OutputEmitterRef<ConsolePowerRequest>;
     reconnectRequest: import("@angular/core").OutputEmitterRef<ConsoleComponentConfig>;
     screenshotCopied: import("@angular/core").OutputEmitterRef<Blob>;

package/lib/components/console-toolbar/console-toolbar.component.d.ts

@@ -1,9 +1,11 @@
 import { Type } from '@angular/core';
 import { ConsoleClientService } from '../../services/console-clients/console-client.service';
+import { ConsoleComponentNetworkConfig } from '../../models/console-component-network-config';
 import { ConsoleToolbarContext } from '../../models/console-toolbar-context';
 import { ConsoleToolbarComponentBase } from '../../models/console-toolbar-component-base';
+import { ConsoleNetworkConnectionRequest } from '../../models/console-network-connection-request';
+import { ConsoleNetworkDisconnectionRequest } from '../../models/console-network-disconnection-request';
 import { ConsolePowerRequest } from '../../models/console-power-request';
-import { ConsoleComponentNetworkConfig } from '../../models/console-component-network-config';
 import * as i0 from "@angular/core";
 export declare class ConsoleToolbarComponent {
     consoleClient: import("@angular/core").InputSignal<ConsoleClientService>;
@@ -14,8 +16,8 @@ export declare class ConsoleToolbarComponent {
     canvasRecordingFinished: import("@angular/core").OutputEmitterRef<Blob>;
     ctrlAltDelSent: import("@angular/core").OutputEmitterRef<void>;
     keyboardInputSent: import("@angular/core").OutputEmitterRef<string>;
-    networkConnectionRequested: import("@angular/core").OutputEmitterRef<string>;
-    networkDisconnectRequested: import("@angular/core").OutputEmitterRef<void>;
+    networkConnectionRequested: import("@angular/core").OutputEmitterRef<ConsoleNetworkConnectionRequest>;
+    networkDisconnectRequested: import("@angular/core").OutputEmitterRef<ConsoleNetworkDisconnectionRequest | undefined>;
     powerRequestSent: import("@angular/core").OutputEmitterRef<ConsolePowerRequest>;
     reconnectRequestSent: import("@angular/core").OutputEmitterRef<void>;
     screenshotCopied: import("@angular/core").OutputEmitterRef<Blob>;
@@ -25,10 +27,12 @@ export declare class ConsoleToolbarComponent {
     private readonly canvasRecorder;
     private readonly clipboardService;
     private readonly config;
+    private readonly fullscreen;
     private readonly logger;
     private readonly userSettings;
     private readonly window;
     private readonly activeConsoleRecording;
+    private readonly isConnected;
     private readonly isManualConsoleReconnectAvailable;
     protected readonly toolbarComponentContext: ConsoleToolbarContext;
     protected readonly toolbarComponent: import("@angular/core").Signal<Type<ConsoleToolbarComponentBase>>;
@@ -36,7 +40,8 @@ export declare class ConsoleToolbarComponent {
     protected handleCopyScreenshot(): Promise<void>;
     protected handleFullscreen(): Promise<void>;
     protected handleKeyboardInputSend(text: string): Promise<void>;
-    protected handleNetworkConnectionRequest(networkName: string): void;
+    protected handleNetworkConnectionRequest(request: ConsoleNetworkConnectionRequest): void;
+    protected handleNetworkDisconnectionRequest(request?: ConsoleNetworkDisconnectionRequest): void;
     protected handleReconnectRequestSent(): Promise<void>;
     protected handleRecordScreenStart(): void;
     protected handleRecordScreenStop(): Promise<Blob>;

package/lib/components/console-toolbar-default/console-toolbar-default.component.d.ts

@@ -5,6 +5,7 @@ import { ConsoleForgeConfig } from '../../config/console-forge-config';
 import { ConsolePowerRequest } from '../../models/console-power-request';
 import { ConsoleToolbarPosition } from '../../models/console-toolbar-position';
 import { ConsoleToolbarTheme } from '../../models/console-toolbar-theme';
+import { ConsoleNetworkConnectionRequest } from '../../models/console-network-connection-request';
 import * as i0 from "@angular/core";
 export declare class ConsoleToolbarDefaultComponent implements AfterViewInit, ConsoleToolbarComponentBase {
     consoleContext: import("@angular/core").InputSignal<ConsoleToolbarContext>;
@@ -14,19 +15,18 @@ export declare class ConsoleToolbarDefaultComponent implements AfterViewInit, Co
     protected isPowerDialogOpen: boolean;
     protected isSettingsDialogOpen: boolean;
     protected readonly keyboardInputText: import("@angular/core").ModelSignal<string>;
-    protected readonly selectedNetworkForChange: import("@angular/core").ModelSignal<string | undefined>;
     protected readonly cfConfig: ConsoleForgeConfig;
     private readonly clipboardService;
     protected readonly clipboardTextInput: import("@angular/core").Signal<ElementRef<any> | undefined>;
     private readonly picoCssService;
     private readonly hostElement;
-    private readonly currentNetwork;
     constructor();
     ngAfterViewInit(): Promise<void>;
     protected handleChangeToolbarPosition(position: ConsoleToolbarPosition): void;
     protected handleClipboardDialogOpenClose(isOpen: boolean): void;
     protected handleClipboardCopyLastText(text: string): void;
-    protected handleNetworkChangeRequested(networkName?: string): void;
+    protected handleNetworkChangeRequested(request: ConsoleNetworkConnectionRequest): void;
+    protected handleNetworkDisconnectAllRequested(): void;
     protected handleNetworkDialogOpenClose(isOpen: boolean): void;
     protected handleRecordToggle(): void;
     protected handleSendClipboardText(event: Event, text: string): Promise<void>;
@@ -35,8 +35,9 @@ export declare class ConsoleToolbarDefaultComponent implements AfterViewInit, Co
     protected handleSendPowerRequest(request: ConsolePowerRequest): Promise<void>;
     protected handleSettingsDialogOpenClose(isOpen: boolean): void;
     protected handleSettingsAllowLocalClipboardWrite(allow: boolean): void;
-    protected handleSettingsPreserveAspectRatioChange(preserveAspectRatioOnScale: boolean): void;
+    protected handleSettingsAttemptRemoteSessionResize(attempt: boolean): void;
+    protected handleSettingsScaleToContainerHostSize(scaleToCanvasHostSize: boolean): void;
     protected handleToolbarThemeChange(theme?: ConsoleToolbarTheme): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ConsoleToolbarDefaultComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ConsoleToolbarDefaultComponent, "cf-console-toolbar-default", never, { "consoleContext": { "alias": "consoleContext"; "required": true; "isSignal": true; }; "keyboardInputText": { "alias": "keyboardInputText"; "required": false; "isSignal": true; }; "selectedNetworkForChange": { "alias": "selectedNetworkForChange"; "required": false; "isSignal": true; }; }, { "keyboardInputText": "keyboardInputTextChange"; "selectedNetworkForChange": "selectedNetworkForChangeChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ConsoleToolbarDefaultComponent, "cf-console-toolbar-default", never, { "consoleContext": { "alias": "consoleContext"; "required": true; "isSignal": true; }; "keyboardInputText": { "alias": "keyboardInputText"; "required": false; "isSignal": true; }; }, { "keyboardInputText": "keyboardInputTextChange"; }, never, never, true, never>;
 }

package/lib/models/console-component-network-config.d.ts

@@ -1,4 +1,5 @@
 export interface ConsoleComponentNetworkConfig {
-    available: string[];
-    current?: string;
+    networks: string[];
+    nics: string[];
+    currentConnections: Record<string, string>;
 }

package/lib/models/console-network-connection-request.d.ts

@@ -0,0 +1,4 @@
+export interface ConsoleNetworkConnectionRequest {
+    network: string;
+    nic: string;
+}

package/lib/models/console-network-disconnection-request.d.ts

@@ -0,0 +1,7 @@
+export interface ConsoleNetworkDisconnectionRequest {
+    /**
+     * The which should be disconnected. If this value is falsey, interpret as
+     * a request to disconnect all NICs.
+     */
+    nic?: string;
+}

package/lib/models/console-supported-features.d.ts

@@ -27,6 +27,11 @@ export interface ConsoleSupportedFeatures {
      * of the machine, so we usually have to rely on the protocol-specific service to tell us whether the feature is enabled (see our VNC client, wrapping noVnc, for an example)
      */
     powerManagement: boolean;
+    /**
+     * NoVNC seems to have a quirk that causes it to lose proper mouse tracking after leaving fullscreen. We're working around this by requesting a reconnection of the console
+     * upon exiting. VMWare doesn't seem to need this.
+     */
+    requireReconnectOnExitingFullscreen?: boolean;
     /**
      * Whether the remote console protocol/library supports a "view/read"-only canvas. If it doesn't, we have to do some CSS/JS hacking in the console component, so
      * we prefer the client lib/protocol's implementation if we can get it.

package/lib/models/console-toolbar-context.d.ts

@@ -3,6 +3,8 @@ import { CanvasRecording } from "../services/canvas-recorder/canvas-recording";
 import { ConsolePowerRequest } from "./console-power-request";
 import { ConsoleSupportedFeatures } from "./console-supported-features";
 import { ConsoleComponentNetworkConfig } from "./console-component-network-config";
+import { ConsoleNetworkConnectionRequest } from "./console-network-connection-request";
+import { ConsoleNetworkDisconnectionRequest } from "./console-network-disconnection-request";
 import { UserSettingsService } from "../services/user-settings.service";
 export interface ConsoleToolbarContext {
     clipboard: {
@@ -22,8 +24,8 @@ export interface ConsoleToolbarContext {
     };
     networks: {
         config: Signal<ConsoleComponentNetworkConfig | undefined>;
-        connectionRequested(networkName: string): void;
-        disconnectRequested(): void;
+        connectionRequested(request: ConsoleNetworkConnectionRequest): void;
+        disconnectRequested(request: ConsoleNetworkDisconnectionRequest): void;
     };
     state: {
         activeConsoleRecording: Signal<CanvasRecording | undefined>;

package/lib/models/console-user-settings.d.ts

@@ -3,7 +3,8 @@ import { ConsoleToolbarTheme } from "./console-toolbar-theme";
 export interface ConsoleUserSettings {
     console: {
         allowCopyToLocalClipboard: boolean;
-        preserveAspectRatioOnScale: boolean;
+        attemptRemoteSessionResize: boolean;
+        scaleToCanvasHostSize: boolean;
     };
     toolbar: {
         dockTo: ConsoleToolbarPosition;

package/lib/services/console-clients/console-client.service.d.ts

@@ -11,12 +11,10 @@ export interface ConsoleClientService {
     readonly supportedFeatures: Signal<ConsoleSupportedFeatures>;
     connect(url: string, options: ConsoleConnectionOptions): Promise<void>;
     disconnect(): Promise<void>;
-    handlePostFullscreenChange(): void;
     sendClipboardText(text: string): Promise<void>;
     sendCtrlAltDelete(): Promise<void>;
     sendKeyboardInput(text: string): Promise<void>;
     sendPowerRequest(request: ConsolePowerRequest): Promise<void>;
-    setPreserveAspectRatioOnScale(preserve: boolean): Promise<void>;
     setIsViewOnly(isViewOnly: boolean): Promise<void>;
     /**
      * Automatically called by the console component on destroy. Disconnect any clients/websocket usage here

package/lib/services/console-clients/vmware/vmware-console-client.service.d.ts

@@ -22,19 +22,19 @@ export declare class VmWareConsoleClientService implements ConsoleClientService
     readonly supportedFeatures: import("@angular/core").Signal<ConsoleSupportedFeatures>;
     private readonly _needsCanvasSizeUpdate;
     private readonly _needsCanvasSizeUpdateSub;
+    constructor();
     connect(url: string, options: ConsoleConnectionOptions): Promise<void>;
     disconnect(): Promise<void>;
-    handlePostFullscreenChange(): void;
     sendClipboardText(text: string): Promise<void>;
     sendCtrlAltDelete(): Promise<void>;
     sendKeyboardInput(text: string): Promise<void>;
     sendPowerRequest(request: ConsolePowerRequest): Promise<void>;
     setIsViewOnly(isViewOnly: boolean): Promise<void>;
-    setPreserveAspectRatioOnScale(scaleToContainerSize: boolean): Promise<void>;
     dispose(): Promise<void>;
     private doPostConnectionConfig;
     private doPostDisconnectionConfig;
     private handleWindowSizeChange;
+    private updateFromUserSettings;
     static ɵfac: i0.ɵɵFactoryDeclaration<VmWareConsoleClientService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<VmWareConsoleClientService>;
 }

package/lib/services/console-clients/vnc-console-client/vnc-console-client.service.d.ts

@@ -18,19 +18,19 @@ export declare class VncConsoleClientService implements ConsoleClientService {
     private readonly logger;
     private readonly userSettings;
     private noVncClient?;
+    constructor();
     connect(url: string, options: ConsoleConnectionOptions): Promise<void>;
     disconnect(): Promise<void>;
     dispose(): Promise<void>;
-    handlePostFullscreenChange(): void;
     sendClipboardText(text: string): Promise<void>;
     sendCtrlAltDelete(): Promise<void>;
     sendKeyboardInput(text: string): Promise<void>;
     sendPowerRequest(request: ConsolePowerRequest): Promise<void>;
     setIsViewOnly(isViewOnly: boolean): Promise<void>;
-    setPreserveAspectRatioOnScale(preserve: boolean): Promise<void>;
     private doPreConnectionConfig;
     private doPostConnectionConfig;
     private handleDisconnect;
+    private updateFromUserSettings;
     static ɵfac: i0.ɵɵFactoryDeclaration<VncConsoleClientService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<VncConsoleClientService>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmusei/console-forge",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmu-sei/console-forge.git"

package/public-api.d.ts

@@ -8,6 +8,8 @@ export * from "./lib/models/console-connection-options";
 export * from "./lib/models/console-connection-status";
 export * from "./lib/models/console-credentials";
 export * from "./lib/models/console-component-network-config";
+export * from "./lib/models/console-network-connection-request";
+export * from "./lib/models/console-network-disconnection-request";
 export * from "./lib/models/console-power-request";
 export * from "./lib/models/console-supported-features";
 export * from "./lib/models/console-toolbar-position";