diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b048df8..851f7c7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Fixed + +- Recreate REST client in spots where confirmStart may have waited indefinitely. + ## [v1.4.0](https://github.com/coder/vscode-coder/releases/tag/v1.3.9) (2025-02-04) - Recreate REST client after starting a workspace to ensure fresh TLS certificates. diff --git a/src/remote.ts b/src/remote.ts index 9b7f6f8a..ace2a378 100644 --- a/src/remote.ts +++ b/src/remote.ts @@ -51,10 +51,11 @@ export class Remote { * Try to get the workspace running. Return undefined if the user canceled. */ private async maybeWaitForRunning( - restClient: Api, workspace: Workspace, label: string, binPath: string, + baseUrlRaw: string, + token: string, ): Promise { const workspaceName = `${workspace.owner_name}/${workspace.name}` @@ -94,6 +95,7 @@ export class Remote { title: "Waiting for workspace build...", }, async () => { + let restClient = await makeCoderSdk(baseUrlRaw, token, this.storage) const globalConfigDir = path.dirname(this.storage.getSessionTokenPath(label)) while (workspace.latest_build.status !== "running") { ++attempts @@ -109,6 +111,9 @@ export class Remote { if (!(await this.confirmStart(workspaceName))) { return undefined } + // Recreate REST client since confirmStart may have waited an + // indeterminate amount of time for confirmation. + restClient = await makeCoderSdk(baseUrlRaw, token, this.storage) writeEmitter = initWriteEmitterAndTerminal() this.storage.writeToCoderOutputChannel(`Starting ${workspaceName}...`) workspace = await startWorkspaceIfStoppedOrFailed( @@ -126,6 +131,9 @@ export class Remote { if (!(await this.confirmStart(workspaceName))) { return undefined } + // Recreate REST client since confirmStart may have waited an + // indeterminate amount of time for confirmation. + restClient = await makeCoderSdk(baseUrlRaw, token, this.storage) writeEmitter = initWriteEmitterAndTerminal() this.storage.writeToCoderOutputChannel(`Starting ${workspaceName}...`) workspace = await startWorkspaceIfStoppedOrFailed( @@ -316,7 +324,7 @@ export class Remote { // If the workspace is not in a running state, try to get it running. if (workspace.latest_build.status !== "running") { - if (!(await this.maybeWaitForRunning(workspaceRestClient, workspace, parts.label, binaryPath))) { + if (!(await this.maybeWaitForRunning(workspace, parts.label, binaryPath, baseUrlRaw, token))) { // User declined to start the workspace. await this.closeRemote() } else { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy