@gitpod/gitpod-protocol 0.1.5-se-multi-repo.37 → 0.1.5-se-cancel-reason.0

package/src/gitpod-file-parser.ts

@@ -7,40 +7,39 @@
 import { injectable } from "inversify";
 import * as yaml from "js-yaml";
 import * as Ajv from "ajv";
-import { log } from './util/logging';
+import { log } from "./util/logging";
 import { WorkspaceConfig, PortRangeConfig } from "./protocol";
 
-export type MaybeConfig = WorkspaceConfig | undefined
+export type MaybeConfig = WorkspaceConfig | undefined;
 
-const schema = require('../data/gitpod-schema.json');
+const schema = require("../data/gitpod-schema.json");
 const validate = new Ajv().compile(schema);
 const defaultParseOptions = {
     acceptPortRanges: false,
 };
 
 export interface ParseResult {
-    config: WorkspaceConfig
-    parsedConfig?: WorkspaceConfig
-    validationErrors?: string[]
+    config: WorkspaceConfig;
+    parsedConfig?: WorkspaceConfig;
+    validationErrors?: string[];
 }
 
 @injectable()
 export class GitpodFileParser {
-
     public parse(content: string, parseOptions = {}, defaultConfig: WorkspaceConfig = {}): ParseResult {
         const options = {
-           ...defaultParseOptions,
-           ...parseOptions,
+            ...defaultParseOptions,
+            ...parseOptions,
         };
         try {
             const parsedConfig = yaml.safeLoad(content) as any;
             validate(parsedConfig);
-            const validationErrors = validate.errors ? validate.errors.map( e => e.message || e.keyword ) : undefined;
+            const validationErrors = validate.errors ? validate.errors.map((e) => e.message || e.keyword) : undefined;
             if (validationErrors && validationErrors.length > 0) {
                 return {
                     config: defaultConfig,
                     parsedConfig,
-                    validationErrors
+                    validationErrors,
                 };
             }
             const overrides = {} as any;
@@ -49,17 +48,17 @@ export class GitpodFileParser {
             }
             return {
                 config: {
-                    ... defaultConfig,
-                    ... parsedConfig,
-                    ... overrides,
+                    ...defaultConfig,
+                    ...parsedConfig,
+                    ...overrides,
                 },
-                parsedConfig
+                parsedConfig,
             };
         } catch (err) {
-            log.error('Unparsable Gitpod configuration', err, { content });
+            log.error("Unparsable Gitpod configuration", err, { content });
             return {
                 config: defaultConfig,
-                validationErrors: ['Unparsable Gitpod configuration: ' + err.toString()]
+                validationErrors: ["Unparsable Gitpod configuration: " + err.toString()],
             };
         }
     }

package/src/gitpod-service.ts

@@ -5,32 +5,59 @@
  */
 
 import {
-    User, WorkspaceInfo, WorkspaceCreationResult, WorkspaceInstanceUser,
-    WhitelistedRepository, WorkspaceImageBuild, AuthProviderInfo, CreateWorkspaceMode,
-    Token, UserEnvVarValue, ResolvePluginsParams, PreparePluginUploadParams, Terms,
-    ResolvedPlugins, Configuration, InstallPluginsParams, UninstallPluginParams, UserInfo, GitpodTokenType,
-    GitpodToken, AuthProviderEntry, GuessGitTokenScopesParams, GuessedGitTokenScopes, ProjectEnvVar
-} from './protocol';
+    User,
+    WorkspaceInfo,
+    WorkspaceCreationResult,
+    WorkspaceInstanceUser,
+    WhitelistedRepository,
+    WorkspaceImageBuild,
+    AuthProviderInfo,
+    CreateWorkspaceMode,
+    Token,
+    UserEnvVarValue,
+    Terms,
+    Configuration,
+    UserInfo,
+    GitpodTokenType,
+    GitpodToken,
+    AuthProviderEntry,
+    GuessGitTokenScopesParams,
+    GuessedGitTokenScopes,
+    ProjectEnvVar,
+    PrebuiltWorkspace,
+} from "./protocol";
 import {
-    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';
+    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,
+    TeamSubscription2,
+    TeamSubscriptionSlot,
+    TeamSubscriptionSlotResolved,
+} from "./team-subscription-protocol";
+import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from "./analytics";
+import { IDEServer } from "./ide-protocol";
+import { InstallationAdminSettings, TelemetryData } from "./installation-admin-protocol";
+import { Currency } from "./plans";
 
 export interface GitpodClient {
     onInstanceUpdate(instance: WorkspaceInstance): void;
@@ -46,7 +73,7 @@ export interface GitpodClient {
     //#endregion
 }
 
-export const GitpodServer = Symbol('GitpodServer');
+export const GitpodServer = Symbol("GitpodServer");
 export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer, LicenseService, IDEServer {
     // User related API
     getLoggedInUser(): Promise<User>;
@@ -146,6 +173,8 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getUserProjects(): Promise<Project[]>;
     getProjectOverview(projectId: string): Promise<Project.Overview | undefined>;
     findPrebuilds(params: FindPrebuildsParams): Promise<PrebuildWithStatus[]>;
+    findPrebuildByWorkspaceID(workspaceId: string): Promise<PrebuiltWorkspace | undefined>;
+    getPrebuild(prebuildId: string): Promise<PrebuildWithStatus | undefined>;
     triggerPrebuild(projectId: string, branchName: string | null): Promise<StartPrebuildResult>;
     cancelPrebuild(projectId: string, prebuildId: string): Promise<void>;
     fetchProjectRepositoryConfiguration(projectId: string): Promise<string | undefined>;
@@ -159,8 +188,8 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     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[]>;
@@ -169,6 +198,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
 
     // misc
     sendFeedback(feedback: string): Promise<string | undefined>;
+    isGitHubAppEnabled(): Promise<boolean>;
     registerGithubApp(installationId: string): Promise<void>;
 
     /**
@@ -197,15 +227,6 @@ 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>;
 
     /**
@@ -223,7 +244,9 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
      */
     getChargebeeSiteId(): Promise<string>;
     createPortalSession(): Promise<{}>;
+    createTeamPortalSession(teamId: string): Promise<{}>;
     checkout(planId: string, planQuantity?: number): Promise<{}>;
+    teamCheckout(teamId: string, planId: string): Promise<{}>;
     getAvailableCoupons(): Promise<PlanCoupon[]>;
     getAppliedCoupons(): Promise<PlanCoupon[]>;
 
@@ -235,17 +258,28 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     subscriptionCancel(subscriptionId: string): Promise<void>;
     subscriptionCancelDowngrade(subscriptionId: string): Promise<void>;
 
+    getTeamSubscription(teamId: string): Promise<TeamSubscription2 | undefined>;
     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>;
 
     getGithubUpgradeUrls(): Promise<GithubUpgradeURL[]>;
 
+    getStripePublishableKey(): Promise<string>;
+    getStripeSetupIntentClientSecret(): Promise<string>;
+    findStripeSubscriptionIdForTeam(teamId: string): Promise<string | undefined>;
+    subscribeTeamToStripe(teamId: string, setupIntentId: string, currency: Currency): Promise<void>;
+    getStripePortalUrlForTeam(teamId: string): Promise<string>;
+
     /**
      * Analytics
      */
@@ -255,13 +289,13 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
 }
 
 export interface RateLimiterError {
-    method?: string,
+    method?: string;
 
     /**
      * Retry after this many seconds, earliest.
      * cmp.: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After
      */
-    retryAfter: number,
+    retryAfter: number;
 }
 
 export interface CreateProjectParams {
@@ -292,7 +326,7 @@ export interface ProviderRepository {
     account: string;
     accountAvatarUrl: string;
     cloneUrl: string;
-    updatedAt: string;
+    updatedAt?: string;
     installationId?: number;
     installationUpdatedAt?: string;
 
@@ -306,15 +340,28 @@ export interface ClientHeaderFields {
     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 WORKSPACE_TIMEOUT_DEFAULT_SHORT = "short";
+export const WORKSPACE_TIMEOUT_DEFAULT_LONG = "long";
+export const WORKSPACE_TIMEOUT_EXTENDED = "extended";
+export const WORKSPACE_TIMEOUT_EXTENDED_ALT = "180m"; // for backwards compatibility since the IDE uses this
+export const WorkspaceTimeoutValues = [
+    WORKSPACE_TIMEOUT_DEFAULT_SHORT,
+    WORKSPACE_TIMEOUT_DEFAULT_LONG,
+    WORKSPACE_TIMEOUT_EXTENDED,
+    WORKSPACE_TIMEOUT_EXTENDED_ALT,
+] as const;
+
+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) => {
@@ -323,25 +370,26 @@ 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;
+    durationRaw: string;
+    canChange: boolean;
 }
 
 export interface StartWorkspaceResult {
-    instanceID: string
-    workspaceURL?: string
+    instanceID: string;
+    workspaceURL?: string;
 }
 
 export namespace GitpodServer {
@@ -385,23 +433,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 {
@@ -415,8 +463,8 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 if (index > -1) {
                     this.clients.splice(index, 1);
                 }
-            }
-        }
+            },
+        };
     }
 
     onInstanceUpdate(instance: WorkspaceInstance): void {
@@ -425,7 +473,7 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.onInstanceUpdate(instance);
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -437,19 +485,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);
                 }
             }
         }
@@ -461,7 +512,7 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.notifyDidOpenConnection();
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -473,7 +524,7 @@ export class GitpodCompositeClient<Client extends GitpodClient> implements Gitpo
                 try {
                     client.notifyDidCloseConnection();
                 } catch (error) {
-                    console.error(error)
+                    console.error(error);
                 }
             }
         }
@@ -485,64 +536,61 @@ 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,
-    pending: 2,
-    creating: 3,
-    initializing: 4,
-    running: 5,
-    interrupted: 6,
-    stopping: 7,
-    stopped: 8
+    building: 2,
+    pending: 3,
+    creating: 4,
+    initializing: 5,
+    running: 6,
+    interrupted: 7,
+    stopping: 8,
+    stopped: 9,
 };
 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();
                 }
@@ -570,12 +618,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) {
@@ -592,7 +640,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) {
@@ -600,15 +648,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) {
@@ -623,7 +669,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);
@@ -639,26 +686,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;
-}
+}