Remove storage.ts file entirely

Author: EhabY

src/commands.ts

@@ -9,13 +9,14 @@ import * as vscode from "vscode";
 import { createWorkspaceIdentifier, extractAgents } from "./api/api-helper";
 import { CoderApi } from "./api/coderApi";
 import { needToken } from "./api/utils";
+import { BinaryManager } from "./core/binaryManager";
 import { CliConfigManager } from "./core/cliConfig";
 import { MementoManager } from "./core/mementoManager";
 import { PathResolver } from "./core/pathResolver";
 import { SecretsManager } from "./core/secretsManager";
 import { CertificateError } from "./error";
 import { getGlobalFlags } from "./globalFlags";
-import { Storage } from "./storage";
+import { Logger } from "./logging/logger";
 import { escapeCommandArg, toRemoteAuthority, toSafeHost } from "./util";
 import {
 	AgentTreeItem,
@@ -39,10 +40,11 @@ export class Commands {
 	public constructor(
 		private readonly vscodeProposed: typeof vscode,
 		private readonly restClient: Api,
-		private readonly storage: Storage,
+		private readonly logger: Logger,
 		private readonly pathResolver: PathResolver,
 		private readonly mementoManager: MementoManager,
 		private readonly secretsManager: SecretsManager,
+		private readonly binaryManager: BinaryManager,
 	) {
 		this.cliConfigManager = new CliConfigManager(pathResolver);
 	}
@@ -249,7 +251,7 @@ export class Commands {
 		token: string,
 		isAutologin: boolean,
 	): Promise<{ user: User; token: string } | null> {
-		const client = CoderApi.create(url, token, this.storage.output, () =>
+		const client = CoderApi.create(url, token, this.logger, () =>
 			vscode.workspace.getConfiguration(),
 		);
 		if (!needToken(vscode.workspace.getConfiguration())) {
@@ -261,10 +263,7 @@ export class Commands {
 			} catch (err) {
 				const message = getErrorMessage(err, "no response from the server");
 				if (isAutologin) {
-					this.storage.output.warn(
-						"Failed to log in to Coder server:",
-						message,
-					);
+					this.logger.warn("Failed to log in to Coder server:", message);
 				} else {
 					this.vscodeProposed.window.showErrorMessage(
 						"Failed to log in to Coder server",
@@ -516,7 +515,7 @@ export class Commands {
 					if (!url) {
 						throw new Error("No coder url found for sidebar");
 					}
-					const binary = await this.storage.fetchBinary(
+					const binary = await this.binaryManager.fetchBinary(
 						this.restClient,
 						toSafeHost(url),
 					);
@@ -764,7 +763,7 @@ export class Commands {
 			// If we have no agents, the workspace may not be running, in which case
 			// we need to fetch the agents through the resources API, as the
 			// workspaces query does not include agents when off.
-			this.storage.output.info("Fetching agents from template version");
+			this.logger.info("Fetching agents from template version");
 			const resources = await this.restClient.getTemplateVersionResources(
 				workspace.latest_build.template_version_id,
 			);

src/core/pathResolver.ts

@@ -103,7 +103,7 @@ export class PathResolver {
 	}
 
 	/**
-	 * The uri of a directory in which the extension can create log files.
+	 * The URI of a directory in which the extension can create log files.
 	 *
 	 * The directory might not exist on disk and creation is up to the extension.
 	 * However, the parent directory is guaranteed to be existent.

src/extension.ts

@@ -7,13 +7,13 @@ import { errToStr } from "./api/api-helper";
 import { CoderApi } from "./api/coderApi";
 import { needToken } from "./api/utils";
 import { Commands } from "./commands";
+import { BinaryManager } from "./core/binaryManager";
 import { CliConfigManager } from "./core/cliConfig";
 import { MementoManager } from "./core/mementoManager";
 import { PathResolver } from "./core/pathResolver";
 import { SecretsManager } from "./core/secretsManager";
 import { CertificateError, getErrorDetail } from "./error";
 import { Remote } from "./remote";
-import { Storage } from "./storage";
 import { toSafeHost } from "./util";
 import { WorkspaceQuery, WorkspaceProvider } from "./workspacesProvider";
 
@@ -62,7 +62,6 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	const secretsManager = new SecretsManager(ctx.secrets);
 
 	const output = vscode.window.createOutputChannel("Coder", { log: true });
-	const storage = new Storage(output, pathResolver);
 
 	// Try to clear this flag ASAP
 	const isFirstConnect = await mementoManager.getAndClearFirstConnect();
@@ -74,20 +73,20 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	const client = CoderApi.create(
 		url || "",
 		await secretsManager.getSessionToken(),
-		storage.output,
+		output,
 		() => vscode.workspace.getConfiguration(),
 	);
 
 	const myWorkspacesProvider = new WorkspaceProvider(
 		WorkspaceQuery.Mine,
 		client,
-		storage,
+		output,
 		5,
 	);
 	const allWorkspacesProvider = new WorkspaceProvider(
 		WorkspaceQuery.All,
 		client,
-		storage,
+		output,
 	);
 
 	// createTreeView, unlike registerTreeDataProvider, gives us the tree view API
@@ -257,15 +256,18 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 		},
 	});
 
+	const binaryManager = new BinaryManager(output, pathResolver);
+
 	// Register globally available commands.  Many of these have visibility
 	// controlled by contexts, see `when` in the package.json.
 	const commands = new Commands(
 		vscodeProposed,
 		client,
-		storage,
+		output,
 		pathResolver,
 		mementoManager,
 		secretsManager,
+		binaryManager,
 	);
 	vscode.commands.registerCommand("coder.login", commands.login.bind(commands));
 	vscode.commands.registerCommand(
@@ -322,10 +324,11 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	if (remoteSSHExtension && vscodeProposed.env.remoteAuthority) {
 		const remote = new Remote(
 			vscodeProposed,
-			storage,
+			output,
 			commands,
 			ctx.extensionMode,
 			pathResolver,
+			binaryManager,
 		);
 		try {
 			const details = await remote.setup(
@@ -340,7 +343,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 			}
 		} catch (ex) {
 			if (ex instanceof CertificateError) {
-				storage.output.warn(ex.x509Err || ex.message);
+				output.warn(ex.x509Err || ex.message);
 				await ex.showModal("Failed to open workspace");
 			} else if (isAxiosError(ex)) {
 				const msg = getErrorMessage(ex, "None");
@@ -349,7 +352,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 				const method = ex.config?.method?.toUpperCase() || "request";
 				const status = ex.response?.status || "None";
 				const message = `API ${method} to '${urlString}' failed.\nStatus code: ${status}\nMessage: ${msg}\nDetail: ${detail}`;
-				storage.output.warn(message);
+				output.warn(message);
 				await vscodeProposed.window.showErrorMessage(
 					"Failed to open workspace",
 					{
@@ -360,7 +363,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 				);
 			} else {
 				const message = errToStr(ex, "No error message was provided");
-				storage.output.warn(message);
+				output.warn(message);
 				await vscodeProposed.window.showErrorMessage(
 					"Failed to open workspace",
 					{
@@ -379,12 +382,12 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	// See if the plugin client is authenticated.
 	const baseUrl = client.getAxiosInstance().defaults.baseURL;
 	if (baseUrl) {
-		storage.output.info(`Logged in to ${baseUrl}; checking credentials`);
+		output.info(`Logged in to ${baseUrl}; checking credentials`);
 		client
 			.getAuthenticatedUser()
 			.then(async (user) => {
 				if (user && user.roles) {
-					storage.output.info("Credentials are valid");
+					output.info("Credentials are valid");
 					vscode.commands.executeCommand(
 						"setContext",
 						"coder.authenticated",
@@ -402,13 +405,13 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 					myWorkspacesProvider.fetchAndRefresh();
 					allWorkspacesProvider.fetchAndRefresh();
 				} else {
-					storage.output.warn("No error, but got unexpected response", user);
+					output.warn("No error, but got unexpected response", user);
 				}
 			})
 			.catch((error) => {
 				// This should be a failure to make the request, like the header command
 				// errored.
-				storage.output.warn("Failed to check user authentication", error);
+				output.warn("Failed to check user authentication", error);
 				vscode.window.showErrorMessage(
 					`Failed to check user authentication: ${error.message}`,
 				);
@@ -417,7 +420,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 				vscode.commands.executeCommand("setContext", "coder.loaded", true);
 			});
 	} else {
-		storage.output.info("Not currently logged in");
+		output.info("Not currently logged in");
 		vscode.commands.executeCommand("setContext", "coder.loaded", true);
 
 		// Handle autologin, if not already logged in.

src/inbox.ts

@@ -4,7 +4,7 @@ import {
 } from "coder/site/src/api/typesGenerated";
 import * as vscode from "vscode";
 import { CoderApi } from "./api/coderApi";
-import { type Storage } from "./storage";
+import { Logger } from "./logging/logger";
 import { OneWayWebSocket } from "./websocket/oneWayWebSocket";
 
 // These are the template IDs of our notifications.
@@ -14,12 +14,12 @@ const TEMPLATE_WORKSPACE_OUT_OF_MEMORY = "a9d027b4-ac49-4fb1-9f6d-45af15f64e7a";
 const TEMPLATE_WORKSPACE_OUT_OF_DISK = "f047f6a3-5713-40f7-85aa-0394cce9fa3a";
 
 export class Inbox implements vscode.Disposable {
-	readonly #storage: Storage;
+	readonly #logger: Logger;
 	#disposed = false;
 	#socket: OneWayWebSocket<GetInboxNotificationResponse>;
 
-	constructor(workspace: Workspace, client: CoderApi, storage: Storage) {
-		this.#storage = storage;
+	constructor(workspace: Workspace, client: CoderApi, logger: Logger) {
+		this.#logger = logger;
 
 		const watchTemplates = [
 			TEMPLATE_WORKSPACE_OUT_OF_DISK,
@@ -31,7 +31,7 @@ export class Inbox implements vscode.Disposable {
 		this.#socket = client.watchInboxNotifications(watchTemplates, watchTargets);
 
 		this.#socket.addEventListener("open", () => {
-			this.#storage.output.info("Listening to Coder Inbox");
+			this.#logger.info("Listening to Coder Inbox");
 		});
 
 		this.#socket.addEventListener("error", () => {
@@ -41,10 +41,7 @@ export class Inbox implements vscode.Disposable {
 
 		this.#socket.addEventListener("message", (data) => {
 			if (data.parseError) {
-				this.#storage.output.error(
-					"Failed to parse inbox message",
-					data.parseError,
-				);
+				this.#logger.error("Failed to parse inbox message", data.parseError);
 			} else {
 				vscode.window.showInformationMessage(
 					data.parsedMessage.notification.title,
@@ -55,7 +52,7 @@ export class Inbox implements vscode.Disposable {
 
 	dispose() {
 		if (!this.#disposed) {
-			this.#storage.output.info("No longer listening to Coder Inbox");
+			this.#logger.info("No longer listening to Coder Inbox");
 			this.#socket.close();
 			this.#disposed = true;
 		}