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.6.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/change-path-mode.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 changePathModeInjectable from "./change-path-mode.injectable";
+
+export default getGlobalOverride(changePathModeInjectable, () => () => {
+  throw new Error("tried to change path mode without override");
+});

src/common/fs/change-path-mode.injectable.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import fsInjectable from "./fs.injectable";
+
+export type ChangePathMode = (path: string, newMode: number) => Promise<void>;
+
+const changePathModeInjectable = getInjectable({
+  id: "change-path-mode",
+  instantiate: (di): ChangePathMode => di.inject(fsInjectable).chmod,
+});
+
+export default changePathModeInjectable;

src/common/fs/copy-file.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 copyFileInjectable from "./copy-file.injectable";
+
+export default getGlobalOverride(copyFileInjectable, () => () => {
+  throw new Error("tried to copy a file without override");
+});

src/common/fs/copy-file.injectable.ts

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import fsInjectable from "./fs.injectable";
+
+export type CopyFile = (fromPath: string, toPath: string) => Promise<void>;
+
+const copyFileInjectable = getInjectable({
+  id: "copy-file",
+  instantiate: (di): CopyFile => di.inject(fsInjectable).copyFile,
+});
+
+export default copyFileInjectable;

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/fs/create-write-file-stream.injectable.ts

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import type { createWriteStream } from "fs";
+import fsInjectable from "./fs.injectable";
+
+export type CreateWriteFileStream = typeof createWriteStream;
+
+const createWriteFileStreamInjectable = getInjectable({
+  id: "create-write-file-stream",
+  instantiate: (di) => di.inject(fsInjectable).createWriteStream,
+});
+
+export default createWriteFileStreamInjectable;

src/common/fs/create-write-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 createWriteFileStreamInjectable from "./create-write-file-stream.injectable";
+
+export default getGlobalOverride(createWriteFileStreamInjectable, () => () => {
+  throw new Error("tried to create a file write stream without override");
+});

src/common/fs/ensure-directory.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 ensureDirectoryInjectable from "./ensure-directory.injectable";
+
+export default getGlobalOverride(ensureDirectoryInjectable, () => async () => {
+  throw new Error("tried to ensure directory without override");
+});

src/common/fs/ensure-dir.injectable.ts → src/common/fs/ensure-directory.injectable.ts

@@ -3,16 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import type { EnsureOptions } from "fs-extra";
 import fsInjectable from "./fs.injectable";
 
-export type EnsureDirectory = (dirPath: string) => Promise<void>;
+export type EnsureDirectory = (dirPath: string, options?: number | EnsureOptions) => Promise<void>;
 
-const ensureDirInjectable = getInjectable({
+const ensureDirectoryInjectable = getInjectable({
   id: "ensure-dir",
 
   // TODO: Remove usages of ensureDir from business logic.
   // TODO: Read, Write, Watch etc. operations should do this internally.
   instantiate: (di): EnsureDirectory => di.inject(fsInjectable).ensureDir,
 });
 
-export default ensureDirInjectable;
+export default ensureDirectoryInjectable;

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/path/delimiter.global-override-for-injectable.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import pathDelimiterInjectable from "./delimiter.injectable";
+
+export default getGlobalOverride(pathDelimiterInjectable, () => path.posix.delimiter);

src/common/path/delimiter.injectable.ts

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import path from "path";
+
+const pathDelimiterInjectable = getInjectable({
+  id: "path-delimiter",
+  instantiate: () => path.delimiter,
+  causesSideEffects: true,
+});
+
+export default pathDelimiterInjectable;

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/async-result.ts

@@ -9,3 +9,7 @@ export type AsyncResult<Response, Error = string> =
     : { callWasSuccessful: true; response: Response }
   )
   | { callWasSuccessful: false; error: Error };
+
+export type Result<Response, Error = string> =
+  | { callWasSuccessful: true; response: Response }
+  | { callWasSuccessful: false; error: Error };