Start heartbeat as soon as possible

Author: jeanp413

src/heartbeat.ts

@@ -110,7 +110,7 @@ export class HeartbeatManager extends Disposable {
             }
         }));
 
-        this.logService.info(`Heartbeat manager for workspace ${this.connectionInfo.workspaceId} (${this.connectionInfo.instanceId}) - ${this.connectionInfo.gitpodHost} started`);
+        this.logService.info(`Heartbeat manager for workspace ${this.connectionInfo.workspaceId} - ${this.connectionInfo.gitpodHost} started`);
 
         // Start heartbeating interval
         this.sendHeartBeat();

src/remoteSession.ts

@@ -66,35 +66,43 @@ export class RemoteSession extends Disposable {
 			this.usePublicApi = await this.experiments.getUsePublicAPI(this.connectionInfo.gitpodHost);
 			this.logService.info(`Going to use ${this.usePublicApi ? 'public' : 'server'} API`);
 
-			let instanceId: string;
 			if (this.usePublicApi) {
 				this.workspaceState = new WorkspaceState(this.connectionInfo.workspaceId, this.sessionService, this.logService);
-				await this.workspaceState.initialize();
-				if (!this.workspaceState.instanceId || !this.workspaceState.isWorkspaceRunning) {
-					throw new NoRunningInstanceError(this.connectionInfo.workspaceId, this.workspaceState.workspaceData.phase);
-				}
+				this.workspaceState.initialize()
+					.then(() => {
+						if (!this.workspaceState!.instanceId || !this.workspaceState!.isWorkspaceRunning) {
+							vscode.commands.executeCommand('workbench.action.remote.close');
+							return;
+						}
+						const instanceId = this.workspaceState!.instanceId;
+						if (instanceId !== this.connectionInfo.instanceId) {
+							this.logService.info(`Updating workspace ${this.connectionInfo.workspaceId} latest instance id ${this.connectionInfo.instanceId} => ${instanceId}`);
+							this.connectionInfo.instanceId = instanceId;
+						}
+
+						const { sshDestStr } = getGitpodRemoteWindowConnectionInfo(this.context)!;
+						this.context.globalState.update(`${SSH_DEST_KEY}${sshDestStr}`, { ...this.connectionInfo } as SSHConnectionParams);
+					});
 
 				this._register(this.workspaceState.onWorkspaceWillStop(async () => {
 					await this.remoteService.saveRestartInfo();
 					vscode.commands.executeCommand('workbench.action.remote.close');
 				}));
-				instanceId = this.workspaceState.instanceId;
 			} else {
 				const workspaceInfo = await withServerApi(this.sessionService.getGitpodToken(), this.connectionInfo.gitpodHost, service => service.server.getWorkspace(this.connectionInfo.workspaceId), this.logService);
 				if (!workspaceInfo.latestInstance || workspaceInfo.latestInstance?.status?.phase === 'stopping' || workspaceInfo.latestInstance?.status?.phase === 'stopped') {
 					throw new NoRunningInstanceError(this.connectionInfo.workspaceId, workspaceInfo.latestInstance?.status?.phase);
 				}
-				instanceId = workspaceInfo.latestInstance.id;
-			}
+				const instanceId = workspaceInfo.latestInstance.id;
+				if (instanceId !== this.connectionInfo.instanceId) {
+					this.logService.info(`Updating workspace ${this.connectionInfo.workspaceId} latest instance id ${this.connectionInfo.instanceId} => ${instanceId}`);
+					this.connectionInfo.instanceId = instanceId;
+				}
 
-			if (instanceId !== this.connectionInfo.instanceId) {
-				this.logService.info(`Updating workspace ${this.connectionInfo.workspaceId} latest instance id ${this.connectionInfo.instanceId} => ${instanceId}`);
-				this.connectionInfo.instanceId = instanceId;
+				const { sshDestStr } = getGitpodRemoteWindowConnectionInfo(this.context)!;
+				this.context.globalState.update(`${SSH_DEST_KEY}${sshDestStr}`, { ...this.connectionInfo } as SSHConnectionParams);
 			}
 
-			const { sshDestStr } = getGitpodRemoteWindowConnectionInfo(this.context)!;
-			await this.context.globalState.update(`${SSH_DEST_KEY}${sshDestStr}`, { ...this.connectionInfo } as SSHConnectionParams);
-
 			this.heartbeatManager = new HeartbeatManager(this.connectionInfo, this.workspaceState, this.sessionService, this.logService, this.telemetryService);
 
 			this.remoteService.initializeRemoteExtensions();

src/workspaceState.ts

@@ -23,16 +23,29 @@ export class WorkspaceState extends Disposable {
     readonly onWorkspaceStopped = onceEvent(filterEvent(this.onWorkspaceStateChanged, () => this.isWorkspaceStopped));
 
     public get isWorkspaceStopping() {
+        if (!this._workspaceData) {
+            return false;
+        }
+
         const phase = this._workspaceStatus?.instance?.status?.phase;
         return phase === WorkspaceInstanceStatus_Phase.STOPPING;
     }
 
     public get isWorkspaceStopped() {
+        if (!this._workspaceData) {
+            return false;
+        }
+
         const phase = this._workspaceStatus?.instance?.status?.phase;
         return phase === WorkspaceInstanceStatus_Phase.STOPPED;
     }
 
     public get isWorkspaceRunning() {
+        if (!this._workspaceData) {
+            // If not initialized yet assume it's running
+            return true;
+        }
+
         const phase = this._workspaceStatus?.instance?.status?.phase;
         return phase === WorkspaceInstanceStatus_Phase.RUNNING;
     }
@@ -64,27 +77,25 @@ export class WorkspaceState extends Disposable {
 
     public async initialize() {
         const ws = await this.sessionService.getAPI().getWorkspace(this.workspaceId);
-        this._workspaceStatus = ws!.status;
         this._workspaceData = rawWorkspaceToWorkspaceData(ws);
-        this.logService.trace(`WorkspaceState: initial state`, this._workspaceData.phase);
+        this.checkWorkspaceState(ws.status!);
     }
 
-    private async checkWorkspaceState(workspaceState: WorkspaceStatus) {
-        if (!this._workspaceStatus) {
-            this.logService.error(`WorkspaceState not initialized`);
+    private checkWorkspaceState(workspaceState: WorkspaceStatus) {
+        if (!this._workspaceData) {
             return;
         }
 
         const phase = workspaceState.instance?.status?.phase;
-        const oldPhase = this._workspaceStatus.instance?.status?.phase;
+        const oldPhase = this._workspaceStatus?.instance?.status?.phase;
         this._workspaceStatus = workspaceState;
 
         this._workspaceData!.workspaceUrl = workspaceState.instance!.status!.url;
         this._workspaceData!.phase = WorkspaceInstanceStatus_Phase[workspaceState.instance!.status!.phase ?? WorkspaceInstanceStatus_Phase.UNSPECIFIED].toLowerCase() as WorkspacePhase;
         this._workspaceData!.lastUsed = workspaceState.instance!.createdAt!.toDate();
         this._workspaceData!.recentFolders = workspaceState.instance!.status!.recentFolders;
 
-        if (phase && oldPhase && phase !== oldPhase) {
+        if (typeof phase !== undefined && phase !== oldPhase) {
             this.logService.trace(`WorkspaceState: update state`, this._workspaceData!.phase);
             this._onWorkspaceStateChanged.fire();
         }