Fix failing to start shell being hidden from user

package.json

@@ -118,8 +118,7 @@
       "<rootDir>/packages"
     ],
     "setupFiles": [
-      "<rootDir>/src/jest.setup.ts",
-      "jest-canvas-mock"
+      "<rootDir>/src/jest.setup.ts"
     ],
     "globalSetup": "<rootDir>/src/jest.timezone.ts",
     "setupFilesAfterEnv": [
@@ -265,7 +264,7 @@
     "immer": "^9.0.17",
     "joi": "^17.7.0",
     "js-yaml": "^4.1.0",
-    "jsdom": "^16.7.0",
+    "jsdom": "^20.0.1",
     "lodash": "^4.17.15",
     "marked": "^4.2.5",
     "md5-file": "^5.0.0",
@@ -301,8 +300,7 @@
     "win-ca": "^3.5.0",
     "winston": "^3.8.2",
     "winston-transport-browserconsole": "^1.0.5",
-    "ws": "^8.12.0",
-    "xterm-link-provider": "^1.3.1"
+    "ws": "^8.12.0"
   },
   "devDependencies": {
     "@async-fn/jest": "1.6.4",
@@ -335,6 +333,7 @@
     "@types/html-webpack-plugin": "^3.2.6",
     "@types/http-proxy": "^1.17.9",
     "@types/jest": "^28.1.6",
+    "@types/jest-image-snapshot": "^5.1.0",
     "@types/js-yaml": "^4.0.5",
     "@types/jsdom": "^16.2.14",
     "@types/lodash": "^4.14.191",
@@ -372,8 +371,10 @@
     "@types/webpack-node-externals": "^2.5.3",
     "@typescript-eslint/eslint-plugin": "^5.48.1",
     "@typescript-eslint/parser": "^5.48.1",
+    "@types/ws": "^8.5.4",
     "adr": "^1.4.3",
     "ansi_up": "^5.1.0",
+    "canvas": "^2.10.1",
     "chalk": "^4.1.2",
     "chart.js": "^2.9.4",
     "circular-dependency-plugin": "^5.2.2",
@@ -403,8 +404,8 @@
     "ignore-loader": "^0.1.2",
     "include-media": "^1.4.9",
     "jest": "^28.1.3",
-    "jest-canvas-mock": "^2.3.1",
     "jest-environment-jsdom": "^28.1.3",
+    "jest-image-snapshot": "^5.2.0",
     "jest-mock-extended": "^2.0.9",
     "make-plural": "^6.2.2",
     "memfs": "^3.4.12",
@@ -447,28 +448,16 @@
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.11.1",
     "webpack-node-externals": "^3.0.0",
-    "xterm": "^4.19.0",
-    "xterm-addon-fit": "^0.5.0"
+    "xterm": "^5.0.0",
+    "xterm-addon-fit": "^0.5.0",
+    "xterm-addon-search": "^0.10.0",
+    "xterm-addon-web-links": "^0.7.0",
+    "xterm-addon-webgl": "^0.13.0",
+    "xterm-link-provider": "^1.3.1"
   },
   "peerDependencies": {
-    "@types/byline": "^4.2.33",
-    "@types/chart.js": "^2.9.36",
-    "@types/color": "^3.0.3",
-    "@types/crypto-js": "^3.1.47",
-    "@types/lodash": "^4.14.191",
-    "@types/proper-lockfile": "^4.1.2",
-    "@types/react-dom": "^17.0.16",
-    "@types/react-router-dom": "^5.3.3",
-    "@types/react-virtualized-auto-sizer": "^1.0.1",
-    "@types/react-window": "^1.8.5",
-    "@types/request-promise-native": "^1.0.18",
-    "@types/tar": "^6.1.3",
-    "@types/tcp-port-used": "^1.0.1",
-    "@types/url-parse": "^1.4.8",
-    "@types/uuid": "^8.3.4",
     "monaco-editor": "^0.29.1",
     "react-select": "^5.7.0",
-    "typed-emitter": "^1.4.0",
-    "xterm-addon-fit": "^0.5.0"
+    "typed-emitter": "^1.4.0"
   }
 }

src/common/app-paths/app-paths-channel.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { AppPaths } from "./app-path-injection-token";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel";
 
 export type AppPathsChannel = RequestChannel<void, AppPaths>;
 

src/common/app-paths/app-paths.test.ts

@@ -56,6 +56,10 @@ describe("app-paths", () => {
     });
   });
 
+  afterEach(() => {
+    builder.quit();
+  });
+
   describe("normally", () => {
     let windowDi: DiContainer;
     let mainDi: DiContainer;

src/common/fs/create-read-file-stream.global-override-for-injectable.ts

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import createReadFileStreamInjectable from "./create-read-file-stream.injectable";
+
+export default getGlobalOverride(createReadFileStreamInjectable, () => () => {
+  throw new Error("tried to create read stream for a file without override");
+});

src/common/helm/add-helm-repository-channel.ts

@@ -4,7 +4,7 @@
  */
 import type { HelmRepo } from "./helm-repo";
 import type { AsyncResult } from "../utils/async-result";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel";
 
 export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<void, string>>;
 

src/common/helm/get-active-helm-repositories-channel.ts

@@ -4,7 +4,7 @@
  */
 import type { HelmRepo } from "./helm-repo";
 import type { AsyncResult } from "../utils/async-result";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel";
 
 export type GetActiveHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
 

src/common/helm/remove-helm-repository-channel.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { AsyncResult } from "../utils/async-result";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel";
 import type { HelmRepo } from "./helm-repo";
 
 export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<void, string>>;

src/common/logger.ts

@@ -5,9 +5,9 @@
 
 
 export interface Logger {
-  info: (message: string, ...args: any) => void;
-  error: (message: string, ...args: any) => void;
-  debug: (message: string, ...args: any) => void;
-  warn: (message: string, ...args: any) => void;
-  silly: (message: string, ...args: any) => void;
+  info: (message: string, ...args: any[]) => void;
+  error: (message: string, ...args: any[]) => void;
+  debug: (message: string, ...args: any[]) => void;
+  warn: (message: string, ...args: any[]) => void;
+  silly: (message: string, ...args: any[]) => void;
 }

src/common/terminal/channels.ts

@@ -10,6 +10,7 @@ export enum TerminalChannels {
   CONNECTED = "connected",
   RESIZE = "resize",
   PING = "ping",
+  ERROR = "error",
 }
 
 export type TerminalMessage = {
@@ -28,4 +29,7 @@ export type TerminalMessage = {
   };
 } | {
   type: TerminalChannels.PING;
+} | {
+  type: TerminalChannels.ERROR;
+  data: string;
 };

src/common/utils/channel/channel.test.ts

@@ -11,15 +11,15 @@ import { getApplicationBuilder } from "../../../renderer/components/test-utils/g
 import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import type { MessageChannel } from "./message-channel-listener-injection-token";
 import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
-import type { RequestFromChannel } from "./request-from-channel-injection-token";
-import { requestFromChannelInjectionToken } from "./request-from-channel-injection-token";
-import type { RequestChannel } from "./request-channel-listener-injection-token";
+import type { RequestChannel } from "./request-channel";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getPromiseStatus } from "../../test-utils/get-promise-status";
 import { runInAction } from "mobx";
 import type { RequestChannelHandler } from "../../../main/utils/channel/channel-listeners/listener-tokens";
 import { getRequestChannelListenerInjectable } from "../../../main/utils/channel/channel-listeners/listener-tokens";
+import type { RequestFromChannel } from "../../../renderer/utils/channel/request-from-channel.injectable";
+import requestFromChannelInjectable from "../../../renderer/utils/channel/request-from-channel.injectable";
 
 type TestMessageChannel = MessageChannel<string>;
 type TestRequestChannel = RequestChannel<string, string>;
@@ -60,6 +60,10 @@ describe("channel", () => {
       messageToChannel = mainDi.inject(sendMessageToChannelInjectionToken);
     });
 
+    afterEach(() => {
+      builder.quit();
+    });
+
     describe("given window is started", () => {
       let someWindowFake: LensWindow;
 
@@ -103,10 +107,10 @@ describe("channel", () => {
   describe("messaging from renderer to main, given listener for channel in a main and application has started", () => {
     let messageListenerInMainMock: jest.Mock;
     let messageToChannel: SendMessageToChannel;
+    let builder: ApplicationBuilder;
 
     beforeEach(async () => {
-      const applicationBuilder = getApplicationBuilder();
-
+      builder = getApplicationBuilder();
       messageListenerInMainMock = jest.fn();
 
       const testChannelListenerInMainInjectable = getInjectable({
@@ -120,19 +124,23 @@ describe("channel", () => {
         injectionToken: messageChannelListenerInjectionToken,
       });
 
-      applicationBuilder.beforeApplicationStart((mainDi) => {
+      builder.beforeApplicationStart((mainDi) => {
         runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
         });
       });
 
-      await applicationBuilder.render();
+      await builder.render();
 
-      const windowDi = applicationBuilder.applicationWindow.only.di;
+      const windowDi = builder.applicationWindow.only.di;
 
       messageToChannel = windowDi.inject(sendMessageToChannelInjectionToken);
     });
 
+    afterEach(() => {
+      builder.quit();
+    });
+
     it("when sending message, triggers listener in main", () => {
       messageToChannel(testMessageChannel, "some-message");
 
@@ -143,30 +151,32 @@ describe("channel", () => {
   describe("requesting from main in renderer, given listener for channel in a main and application has started", () => {
     let requestListenerInMainMock: AsyncFnMock<RequestChannelHandler<TestRequestChannel>>;
     let requestFromChannel: RequestFromChannel;
+    let builder: ApplicationBuilder;
 
     beforeEach(async () => {
-      const applicationBuilder = getApplicationBuilder();
-
+      builder = getApplicationBuilder();
       requestListenerInMainMock = asyncFn();
 
       const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
         channel: testRequestChannel,
         handler: () => requestListenerInMainMock,
       });
 
-      applicationBuilder.beforeApplicationStart((mainDi) => {
+      builder.beforeApplicationStart((mainDi) => {
         runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
         });
       });
 
-      await applicationBuilder.render();
+      await builder.render();
 
-      const windowDi = applicationBuilder.applicationWindow.only.di;
+      const windowDi = builder.applicationWindow.only.di;
 
-      requestFromChannel = windowDi.inject(
-        requestFromChannelInjectionToken,
-      );
+      requestFromChannel = windowDi.inject(requestFromChannelInjectable);
+    });
+
+    afterEach(() => {
+      builder.quit();
     });
 
     describe("when requesting from channel", () => {
@@ -196,28 +206,38 @@ describe("channel", () => {
     });
   });
 
-  it("when registering multiple handlers for the same channel, throws", async () => {
-    const applicationBuilder = getApplicationBuilder();
+  describe("when registering multiple handlers for the same channel", () => {
+    let builder: ApplicationBuilder;
 
-    const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
-      channel: testRequestChannel,
-      handler: () => () => "some-value",
-    });
-    const testChannelListenerInMain2Injectable = getRequestChannelListenerInjectable({
-      channel: testRequestChannel,
-      handler: () => () => "some-other-value",
-    });
+    beforeEach(() => {
+      builder = getApplicationBuilder();
+
+      const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
+        channel: testRequestChannel,
+        handler: () => () => "some-value",
+      });
+      const testChannelListenerInMain2Injectable = getRequestChannelListenerInjectable({
+        channel: testRequestChannel,
+        handler: () => () => "some-other-value",
+      });
 
-    testChannelListenerInMain2Injectable.id += "2";
+      testChannelListenerInMain2Injectable.id += "2";
 
-    applicationBuilder.beforeApplicationStart((mainDi) => {
-      runInAction(() => {
-        mainDi.register(testChannelListenerInMainInjectable);
-        mainDi.register(testChannelListenerInMain2Injectable);
+      builder.beforeApplicationStart((mainDi) => {
+        runInAction(() => {
+          mainDi.register(testChannelListenerInMainInjectable);
+          mainDi.register(testChannelListenerInMain2Injectable);
+        });
       });
     });
 
-    await expect(applicationBuilder.render()).rejects.toThrow('Tried to register a multiple channel handlers for "some-request-channel-id", only one handler is supported for a request channel.');
+    afterEach(() => {
+      builder.quit();
+    });
+
+    it("throws on startup", async () => {
+      await expect(builder.render()).rejects.toThrow('Tried to register a multiple channel handlers for "some-request-channel-id", only one handler is supported for a request channel.');
+    });
   });
 });
 

src/common/utils/channel/request-channel-listener-injection-token.ts → src/common/utils/channel/request-channel.ts

@@ -8,3 +8,11 @@ export interface RequestChannel<Request, Response> {
   _requestSignature?: Request; // used only to mark `Request` as "used"
   _responseSignature?: Response; // used only to mark `Response` as "used"
 }
+
+export type ChannelRequest<Channel> = Channel extends RequestChannel<infer Request, any>
+  ? Request
+  : never;
+
+export type ChannelResponse<Channel> = Channel extends RequestChannel<any, infer Response>
+  ? Response
+  : never;

src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../channel/request-channel";
 
 export type ResolveSystemProxyChannel = RequestChannel<string, string>;
 

src/common/utils/sync-box/channels.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { MessageChannel } from "../channel/message-channel-listener-injection-token";
-import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../channel/request-channel";
 
 export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>;