@gitpod/gitpod-protocol 0.1.5-server-vscode-ouath2.17 → 0.1.5-server-vscode-oauth2.14

package/src/gitpod-service.ts

@@ -5,30 +5,52 @@
  */
 
 import {
-    User, WorkspaceInfo, WorkspaceCreationResult, WorkspaceInstanceUser,
-    WhitelistedRepository, WorkspaceImageBuild, AuthProviderInfo, Branding, CreateWorkspaceMode,
-    Token, UserEnvVarValue, ResolvePluginsParams, PreparePluginUploadParams, Terms,
-    ResolvedPlugins, Configuration, InstallPluginsParams, UninstallPluginParams, UserInfo, GitpodTokenType,
-    GitpodToken, AuthProviderEntry, GuessGitTokenScopesParams, GuessedGitTokenScopes
-} from './protocol';
+    User,
+    WorkspaceInfo,
+    WorkspaceCreationResult,
+    WorkspaceInstanceUser,
+    WhitelistedRepository,
+    WorkspaceImageBuild,
+    AuthProviderInfo,
+    CreateWorkspaceMode,
+    Token,
+    UserEnvVarValue,
+    Terms,
+    Configuration,
+    UserInfo,
+    GitpodTokenType,
+    GitpodToken,
+    AuthProviderEntry,
+    GuessGitTokenScopesParams,
+    GuessedGitTokenScopes,
+    ProjectEnvVar,
+} from "./protocol";
 import {
-    Team, TeamMemberInfo,
-    TeamMembershipInvite, Project, TeamMemberRole, PrebuildWithStatus, StartPrebuildResult
-} from './teams-projects-protocol';
-import { JsonRpcProxy, JsonRpcServer } from './messaging/proxy-factory';
-import { Disposable, CancellationTokenSource } from 'vscode-jsonrpc';
-import { HeadlessLogUrls } from './headless-workspace-log';
-import { WorkspaceInstance, WorkspaceInstancePort, WorkspaceInstancePhase } from './workspace-instance';
-import { AdminServer } from './admin-protocol';
-import { GitpodHostUrl } from './util/gitpod-host-url';
-import { WebSocketConnectionProvider } from './messaging/browser/connection';
-import { PermissionName } from './permission';
-import { LicenseService } from './license-protocol';
-import { Emitter } from './util/event';
-import { AccountStatement, CreditAlert } from './accounting-protocol';
-import { GithubUpgradeURL, PlanCoupon } from './payment-protocol';
-import { TeamSubscription, TeamSubscriptionSlot, TeamSubscriptionSlotResolved } from './team-subscription-protocol';
-import { RemoteTrackMessage } from './analytics';
+    Team,
+    TeamMemberInfo,
+    TeamMembershipInvite,
+    Project,
+    TeamMemberRole,
+    PrebuildWithStatus,
+    StartPrebuildResult,
+    PartialProject,
+} from "./teams-projects-protocol";
+import { JsonRpcProxy, JsonRpcServer } from "./messaging/proxy-factory";
+import { Disposable, CancellationTokenSource } from "vscode-jsonrpc";
+import { HeadlessLogUrls } from "./headless-workspace-log";
+import { WorkspaceInstance, WorkspaceInstancePort, WorkspaceInstancePhase } from "./workspace-instance";
+import { AdminServer } from "./admin-protocol";
+import { GitpodHostUrl } from "./util/gitpod-host-url";
+import { WebSocketConnectionProvider } from "./messaging/browser/connection";
+import { PermissionName } from "./permission";
+import { LicenseService } from "./license-protocol";
+import { Emitter } from "./util/event";
+import { AccountStatement, CreditAlert } from "./accounting-protocol";
+import { GithubUpgradeURL, PlanCoupon } from "./payment-protocol";
+import { TeamSubscription, TeamSubscriptionSlot, TeamSubscriptionSlotResolved } from "./team-subscription-protocol";
+import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from "./analytics";
+import { IDEServer } from "./ide-protocol";
+import { InstallationAdminSettings, TelemetryData } from "./installation-admin-protocol";
 
 export interface GitpodClient {
     onInstanceUpdate(instance: WorkspaceInstance): void;
@@ -44,8 +66,8 @@ export interface GitpodClient {
     //#endregion
 }
 
-export const GitpodServer = Symbol('GitpodServer');
-export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer, LicenseService {
+export const GitpodServer = Symbol("GitpodServer");
+export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer, LicenseService, IDEServer {
     // User related API
     getLoggedInUser(): Promise<User>;
     getTerms(): Promise<Terms>;
@@ -54,7 +76,6 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getOwnAuthProviders(): Promise<AuthProviderEntry[]>;
     updateOwnAuthProvider(params: GitpodServer.UpdateOwnAuthProviderParams): Promise<AuthProviderEntry>;
     deleteOwnAuthProvider(params: GitpodServer.DeleteOwnAuthProviderParams): Promise<void>;
-    getBranding(): Promise<Branding>;
     getConfiguration(): Promise<Configuration>;
     getToken(query: GitpodServer.GetTokenSearchOptions): Promise<Token | undefined>;
     getGitpodTokenScopes(tokenHash: string): Promise<string[]>;
@@ -71,8 +92,15 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getWorkspaceOwner(workspaceId: string): Promise<UserInfo | undefined>;
     getWorkspaceUsers(workspaceId: string): Promise<WorkspaceInstanceUser[]>;
     getFeaturedRepositories(): Promise<WhitelistedRepository[]>;
+    getSuggestedContextURLs(): Promise<string[]>;
+    /**
+     * **Security:**
+     * Sensitive information like an owner token is erased, since it allows access for all team members.
+     * If you need to access an owner token use `getOwnerToken` instead.
+     */
     getWorkspace(id: string): Promise<WorkspaceInfo>;
     isWorkspaceOwner(workspaceId: string): Promise<boolean>;
+    getOwnerToken(workspaceId: string): Promise<string>;
 
     /**
      * Creates and starts a workspace for the given context URL.
@@ -123,6 +151,12 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     removeTeamMember(teamId: string, userId: string): Promise<void>;
     getGenericInvite(teamId: string): Promise<TeamMembershipInvite>;
     resetGenericInvite(inviteId: string): Promise<TeamMembershipInvite>;
+    deleteTeam(teamId: string, userId: string): Promise<void>;
+
+    // Admin Settings
+    adminGetSettings(): Promise<InstallationAdminSettings>;
+    adminUpdateSettings(settings: InstallationAdminSettings): Promise<void>;
+    adminGetTelemetryData(): Promise<TelemetryData>;
 
     // Projects
     getProviderRepositoriesForUser(params: GetProviderRepositoriesParams): Promise<ProviderRepository[]>;
@@ -133,13 +167,20 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getProjectOverview(projectId: string): Promise<Project.Overview | undefined>;
     findPrebuilds(params: FindPrebuildsParams): Promise<PrebuildWithStatus[]>;
     triggerPrebuild(projectId: string, branchName: string | null): Promise<StartPrebuildResult>;
-    setProjectConfiguration(projectId: string, configString: string): Promise<void>;
+    cancelPrebuild(projectId: string, prebuildId: string): Promise<void>;
     fetchProjectRepositoryConfiguration(projectId: string): Promise<string | undefined>;
     guessProjectConfiguration(projectId: string): Promise<string | undefined>;
+    fetchRepositoryConfiguration(cloneUrl: string): Promise<string | undefined>;
+    guessRepositoryConfiguration(cloneUrl: string): Promise<string | undefined>;
+    setProjectConfiguration(projectId: string, configString: string): Promise<void>;
+    updateProjectPartial(partialProject: PartialProject): Promise<void>;
+    setProjectEnvironmentVariable(projectId: string, name: string, value: string, censored: boolean): Promise<void>;
+    getProjectEnvironmentVariables(projectId: string): Promise<ProjectEnvVar[]>;
+    deleteProjectEnvironmentVariable(variableId: string): Promise<void>;
 
     // content service
-    getContentBlobUploadUrl(name: string): Promise<string>
-    getContentBlobDownloadUrl(name: string): Promise<string>
+    getContentBlobUploadUrl(name: string): Promise<string>;
+    getContentBlobDownloadUrl(name: string): Promise<string>;
 
     // Gitpod token
     getGitpodTokens(): Promise<GitpodToken[]>;
@@ -151,10 +192,15 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     registerGithubApp(installationId: string): Promise<void>;
 
     /**
-     * Stores a new snapshot for the given workspace and bucketId
+     * Stores a new snapshot for the given workspace and bucketId. Returns _before_ the actual snapshot is done. To wait for that, use `waitForSnapshot`.
      * @return the snapshot id
      */
     takeSnapshot(options: GitpodServer.TakeSnapshotOptions): Promise<string>;
+    /**
+     *
+     * @param snapshotId
+     */
+    waitForSnapshot(snapshotId: string): Promise<void>;
 
     /**
      * Returns the list of snapshots that exist for a workspace.
@@ -171,23 +217,12 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
      */
     getLayout(workspaceId: string): Promise<string | undefined>;
 
-    /**
-     * @param params
-     * @returns promise resolves to an URL to be used for the upload
-     */
-    preparePluginUpload(params: PreparePluginUploadParams): Promise<string>
-    resolvePlugins(workspaceId: string, params: ResolvePluginsParams): Promise<ResolvedPlugins>;
-    installUserPlugins(params: InstallPluginsParams): Promise<boolean>;
-    uninstallUserPlugin(params: UninstallPluginParams): Promise<boolean>;
-
     guessGitTokenScopes(params: GuessGitTokenScopesParams): Promise<GuessedGitTokenScopes>;
 
     /**
      * gitpod.io concerns
      */
     isStudent(): Promise<boolean>;
-    getPrivateRepoTrialEndDate(): Promise<string | undefined>;
-
     /**
      *
      */
@@ -205,7 +240,6 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
 
     getShowPaymentUI(): Promise<boolean>;
     isChargebeeCustomer(): Promise<boolean>;
-    mayAccessPrivateRepo(): Promise<boolean>;
 
     subscriptionUpgradeTo(subscriptionId: string, chargebeePlanId: string): Promise<void>;
     subscriptionDowngradeTo(subscriptionId: string, chargebeePlanId: string): Promise<void>;
@@ -214,9 +248,13 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
 
     tsGet(): Promise<TeamSubscription[]>;
     tsGetSlots(): Promise<TeamSubscriptionSlotResolved[]>;
-    tsGetUnassignedSlot(teamSubscriptionId: string): Promise<TeamSubscriptionSlot | undefined>
+    tsGetUnassignedSlot(teamSubscriptionId: string): Promise<TeamSubscriptionSlot | undefined>;
     tsAddSlots(teamSubscriptionId: string, quantity: number): Promise<void>;
-    tsAssignSlot(teamSubscriptionId: string, teamSubscriptionSlotId: string, identityStr: string | undefined): Promise<void>
+    tsAssignSlot(
+        teamSubscriptionId: string,
+        teamSubscriptionSlotId: string,
+        identityStr: string | undefined,
+    ): Promise<void>;
     tsReassignSlot(teamSubscriptionId: string, teamSubscriptionSlotId: string, newIdentityStr: string): Promise<void>;
     tsDeactivateSlot(teamSubscriptionId: string, teamSubscriptionSlotId: string): Promise<void>;
     tsReactivateSlot(teamSubscriptionId: string, teamSubscriptionSlotId: string): Promise<void>;
@@ -227,10 +265,23 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
      * Analytics
      */
     trackEvent(event: RemoteTrackMessage): Promise<void>;
+    trackLocation(event: RemotePageMessage): Promise<void>;
+    identifyUser(event: RemoteIdentifyMessage): Promise<void>;
+}
+
+export interface RateLimiterError {
+    method?: string;
+
+    /**
+     * Retry after this many seconds, earliest.
+     * cmp.: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After
+     */
+    retryAfter: number;
 }
 
 export interface CreateProjectParams {
     name: string;
+    slug?: string;
     account: string;
     provider: string;
     cloneUrl: string;
@@ -252,25 +303,37 @@ export interface GetProviderRepositoriesParams {
 }
 export interface ProviderRepository {
     name: string;
+    path?: string;
     account: string;
     accountAvatarUrl: string;
     cloneUrl: string;
-    updatedAt: string;
+    updatedAt?: string;
     installationId?: number;
     installationUpdatedAt?: string;
 
-    inUse?: boolean;
+    inUse?: { userName: string };
+}
+
+export interface ClientHeaderFields {
+    ip?: string;
+    userAgent?: string;
+    dnt?: string;
+    clientRegion?: string;
 }
 
 export const WorkspaceTimeoutValues = ["30m", "60m", "180m"] as const;
 
-export const createServiceMock = function <C extends GitpodClient, S extends GitpodServer>(methods: Partial<JsonRpcProxy<S>>): GitpodServiceImpl<C, S> {
+export const createServiceMock = function <C extends GitpodClient, S extends GitpodServer>(
+    methods: Partial<JsonRpcProxy<S>>,
+): GitpodServiceImpl<C, S> {
     return new GitpodServiceImpl<C, S>(createServerMock(methods));
-}
+};
 
-export const createServerMock = function <C extends GitpodClient, S extends GitpodServer>(methods: Partial<JsonRpcProxy<S>>): JsonRpcProxy<S> {
-    methods.setClient = methods.setClient || (() => { });
-    methods.dispose = methods.dispose || (() => { });
+export const createServerMock = function <C extends GitpodClient, S extends GitpodServer>(
+    methods: Partial<JsonRpcProxy<S>>,
+): JsonRpcProxy<S> {
+    methods.setClient = methods.setClient || (() => {});
+    methods.dispose = methods.dispose || (() => {});
     return new Proxy<JsonRpcProxy<S>>(methods as any as JsonRpcProxy<S>, {
         // @ts-ignore
         get: (target: S, property: keyof S) => {
@@ -279,25 +342,25 @@ export const createServerMock = function <C extends GitpodClient, S extends Gitp
                 throw new Error(`Method ${property} not implemented`);
             }
             return result;
-        }
+        },
     });
-}
+};
 
 type WorkspaceTimeoutDurationTuple = typeof WorkspaceTimeoutValues;
 export type WorkspaceTimeoutDuration = WorkspaceTimeoutDurationTuple[number];
 
 export interface SetWorkspaceTimeoutResult {
-    resetTimeoutOnWorkspaces: string[]
+    resetTimeoutOnWorkspaces: string[];
 }
 
 export interface GetWorkspaceTimeoutResult {
-    duration: WorkspaceTimeoutDuration
-    canChange: boolean
+    duration: WorkspaceTimeoutDuration;
+    canChange: boolean;
 }
 
 export interface StartWorkspaceResult {
-    instanceID: string
-    workspaceURL?: string
+    instanceID: string;
+    workspaceURL?: string;
 }
 
 export namespace GitpodServer {
@@ -305,7 +368,8 @@ export namespace GitpodServer {
         limit?: number;
         searchString?: string;
         pinnedOnly?: boolean;
-        projectId?: string;
+        projectId?: string | string[];
+        includeWithoutProject?: boolean;
     }
     export interface GetAccountStatementOptions {
         date?: string;
@@ -321,6 +385,8 @@ export namespace GitpodServer {
     export interface TakeSnapshotOptions {
         workspaceId: string;
         layoutData?: string;
+        /* this is here to enable backwards-compatibility and untangling rollout between workspace, IDE and meta */
+        dontWait?: boolean;
     }
     export interface GetUserStorageResourceOptions {
         readonly uri: string;
@@ -338,23 +404,23 @@ export namespace GitpodServer {
         readonly roundTripTime?: number;
     }
     export interface UpdateOwnAuthProviderParams {
-        readonly entry: AuthProviderEntry.UpdateEntry | AuthProviderEntry.NewEntry
+        readonly entry: AuthProviderEntry.UpdateEntry | AuthProviderEntry.NewEntry;
     }
     export interface DeleteOwnAuthProviderParams {
-        readonly id: string
+        readonly id: string;
     }
     export type AdmissionLevel = "owner" | "everyone";
     export type PinAction = "pin" | "unpin" | "toggle";
     export interface GenerateNewGitpodTokenOptions {
-        name?: string
-        type: GitpodTokenType
-        scopes?: string[]
+        name?: string;
+        type: GitpodTokenType;
+        scopes?: string[];
     }
 }
 
-export const GitpodServerPath = '/gitpod';
+export const GitpodServerPath = "/gitpod";
 
-export const GitpodServerProxy = Symbol('GitpodServerProxy');
+export const GitpodServerProxy = Symbol("GitpodServerProxy");
 export type GitpodServerProxy<S extends GitpodServer> = JsonRpcProxy<S>;
 
 export class GitpodCompositeClient<Client extends GitpodClient> implements GitpodClient {
@@ -362,12 +428,14 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
 
     public registerClient(client: Partial<Client>): Disposable {
         this.clients.push(client);
-        const index = this.clients.length;
         return {
             dispose: () => {
-                this.clients.slice(index, 1);
-            }
-        }
+                const index = this.clients.indexOf(client);
+                if (index > -1) {
+                    this.clients.splice(index, 1);
+                }
+            },
+        };
     }
 
     onInstanceUpdate(instance: WorkspaceInstance): void {
@@ -376,7 +444,7 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.onInstanceUpdate(instance);
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -388,19 +456,22 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.onPrebuildUpdate(update);
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
     }
 
-    onWorkspaceImageBuildLogs(info: WorkspaceImageBuild.StateInfo, content: WorkspaceImageBuild.LogContent | undefined): void {
+    onWorkspaceImageBuildLogs(
+        info: WorkspaceImageBuild.StateInfo,
+        content: WorkspaceImageBuild.LogContent | undefined,
+    ): void {
         for (const client of this.clients) {
             if (client.onWorkspaceImageBuildLogs) {
                 try {
                     client.onWorkspaceImageBuildLogs(info, content);
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -412,7 +483,7 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.notifyDidOpenConnection();
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -424,7 +495,7 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.notifyDidCloseConnection();
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -436,17 +507,16 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.onCreditAlert(creditAlert);
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
     }
-
 }
 
 export type GitpodService = GitpodServiceImpl<GitpodClient, GitpodServer>;
 
-const hasWindow = (typeof window !== 'undefined');
+const hasWindow = typeof window !== "undefined";
 const phasesOrder: Record<WorkspaceInstancePhase, number> = {
     unknown: 0,
     preparing: 1,
@@ -456,44 +526,41 @@ const phasesOrder: Record<WorkspaceInstancePhase, number> = {
     running: 5,
     interrupted: 6,
     stopping: 7,
-    stopped: 8
+    stopped: 8,
 };
 export class WorkspaceInstanceUpdateListener {
     private readonly onDidChangeEmitter = new Emitter<void>();
     readonly onDidChange = this.onDidChangeEmitter.event;
 
-    private source: 'sync' | 'update' = 'sync';
+    private source: "sync" | "update" = "sync";
 
     get info(): WorkspaceInfo {
         return this._info;
     }
 
-    constructor(
-        private readonly service: GitpodService,
-        private _info: WorkspaceInfo
-    ) {
+    constructor(private readonly service: GitpodService, private _info: WorkspaceInfo) {
         service.registerClient({
-            onInstanceUpdate: instance => {
+            onInstanceUpdate: (instance) => {
                 if (this.isOutOfOrder(instance)) {
                     return;
                 }
                 this.cancelSync();
                 this._info.latestInstance = instance;
-                this.source = 'update';
+                this.source = "update";
                 this.onDidChangeEmitter.fire(undefined);
             },
             notifyDidOpenConnection: () => {
                 this.sync();
-            }
+            },
         });
         if (hasWindow) {
             // learn about page lifecycle here: https://developers.google.com/web/updates/2018/07/page-lifecycle-api
-            window.document.addEventListener('visibilitychange', async () => {
-                if (window.document.visibilityState === 'visible') {
+            window.document.addEventListener("visibilitychange", async () => {
+                if (window.document.visibilityState === "visible") {
                     this.sync();
                 }
             });
-            window.addEventListener('pageshow', e => {
+            window.addEventListener("pageshow", (e) => {
                 if (e.persisted) {
                     this.sync();
                 }
@@ -521,12 +588,12 @@ export class WorkspaceInstanceUpdateListener {
                     return;
                 }
                 this._info = info;
-                this.source = 'sync';
+                this.source = "sync";
                 this.onDidChangeEmitter.fire(undefined);
             } catch (e) {
-                console.error('failed to sync workspace instance:', e)
+                console.error("failed to sync workspace instance:", e);
             }
-        })
+        });
     }
     private cancelSync(): void {
         if (this.syncTokenSource) {
@@ -543,7 +610,7 @@ export class WorkspaceInstanceUpdateListener {
         if (instance.workspaceId !== this._info.workspace.id) {
             return true;
         }
-        if (this.source === 'update') {
+        if (this.source === "update") {
             return false;
         }
         if (instance.id !== this.info.latestInstance?.id) {
@@ -551,15 +618,13 @@ export class WorkspaceInstanceUpdateListener {
         }
         return phasesOrder[instance.status.phase] < phasesOrder[this.info.latestInstance.status.phase];
     }
-
 }
 
 export interface GitpodServiceOptions {
-    onReconnect?: () => (void | Promise<void>)
+    onReconnect?: () => void | Promise<void>;
 }
 
 export class GitpodServiceImpl<Client extends GitpodClient, Server extends GitpodServer> {
-
     private readonly compositeClient = new GitpodCompositeClient<Client>();
 
     constructor(public readonly server: JsonRpcProxy<Server>, private options?: GitpodServiceOptions) {
@@ -574,7 +639,8 @@ export class GitpodServiceImpl<Client extends GitpodClient, Server extends Gitpo
 
     private readonly instanceListeners = new Map<string, Promise<WorkspaceInstanceUpdateListener>>();
     listenToInstance(workspaceId: string): Promise<WorkspaceInstanceUpdateListener> {
-        const listener = this.instanceListeners.get(workspaceId) ||
+        const listener =
+            this.instanceListeners.get(workspaceId) ||
             (async () => {
                 const info = await this.server.getWorkspace(workspaceId);
                 return new WorkspaceInstanceUpdateListener(this, info);
@@ -590,26 +656,25 @@ export class GitpodServiceImpl<Client extends GitpodClient, Server extends Gitpo
     }
 }
 
-export function createGitpodService<C extends GitpodClient, S extends GitpodServer>(serverUrl: string | Promise<string>) {
+export function createGitpodService<C extends GitpodClient, S extends GitpodServer>(
+    serverUrl: string | Promise<string>,
+) {
     const toWsUrl = (serverUrl: string) => {
-        return new GitpodHostUrl(serverUrl)
-            .asWebsocket()
-            .withApi({ pathname: GitpodServerPath })
-            .toString();
+        return new GitpodHostUrl(serverUrl).asWebsocket().withApi({ pathname: GitpodServerPath }).toString();
     };
     let url: string | Promise<string>;
     if (typeof serverUrl === "string") {
         url = toWsUrl(serverUrl);
     } else {
-        url = serverUrl.then(url => toWsUrl(url));
+        url = serverUrl.then((url) => toWsUrl(url));
     }
 
     const connectionProvider = new WebSocketConnectionProvider();
-    let onReconnect = () => { };
+    let onReconnect = () => {};
     const gitpodServer = connectionProvider.createProxy<S>(url, undefined, {
-        onListening: socket => {
+        onListening: (socket) => {
             onReconnect = () => socket.reconnect();
-        }
+        },
     });
     return new GitpodServiceImpl<C, S>(gitpodServer, { onReconnect });
-}
+}

package/src/headless-workspace-log.ts

@@ -4,21 +4,23 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-
 export enum HeadlessWorkspaceEventType {
     LogOutput = "log-output",
     FinishedSuccessfully = "finish-success",
     FinishedButFailed = "finish-fail",
     AbortedTimedOut = "aborted-timeout",
     Aborted = "aborted",
-    Started = "started"
+    Failed = "failed",
+    Started = "started",
 }
 export namespace HeadlessWorkspaceEventType {
     export function isRunning(t: HeadlessWorkspaceEventType) {
         return t === HeadlessWorkspaceEventType.LogOutput;
     }
     export function didFinish(t: HeadlessWorkspaceEventType) {
-        return t === HeadlessWorkspaceEventType.FinishedButFailed || t === HeadlessWorkspaceEventType.FinishedSuccessfully;
+        return (
+            t === HeadlessWorkspaceEventType.FinishedButFailed || t === HeadlessWorkspaceEventType.FinishedSuccessfully
+        );
     }
 }
 
@@ -35,4 +37,4 @@ export interface HeadlessLogUrls {
 
 /** cmp. @const HEADLESS_LOG_STREAM_STATUS_CODE_REGEX */
 export const HEADLESS_LOG_STREAM_STATUS_CODE = "X-LogStream-StatusCode";
-export const HEADLESS_LOG_STREAM_STATUS_CODE_REGEX = /X-LogStream-StatusCode: ([0-9]{3})/;
+export const HEADLESS_LOG_STREAM_STATUS_CODE_REGEX = /X-LogStream-StatusCode: ([0-9]{3})/;

package/src/ide-frontend-service.ts

@@ -7,7 +7,7 @@
 import { Event } from "./util/event";
 import { Disposable } from "./util/disposable";
 
-export type IDEFrontendState = 'init' | 'ready' | 'terminated';
+export type IDEFrontendState = "init" | "ready" | "terminated";
 
 export interface IDEFrontendService {
     readonly state: IDEFrontendState;
@@ -25,4 +25,4 @@ export interface IDEFrontendService {
      * confirmation dialogs for stopped workspaces.
      */
     start(): Disposable;
-}
+}