@gitpod/gitpod-protocol 0.1.5-sje-installation-admin-dashboard.22 → 0.1.5-sje-installer-fun.1

package/src/util/parse-workspace-id.spec.ts

@@ -4,14 +4,17 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import * as chai from 'chai';
-import { suite, test } from 'mocha-typescript';
-import { matchesInstanceIdOrLegacyWorkspaceIdExactly, matchesNewWorkspaceIdExactly, parseWorkspaceIdFromHostname } from './parse-workspace-id';
+import * as chai from "chai";
+import { suite, test } from "mocha-typescript";
+import {
+    matchesInstanceIdOrLegacyWorkspaceIdExactly,
+    matchesNewWorkspaceIdExactly,
+    parseWorkspaceIdFromHostname,
+} from "./parse-workspace-id";
 const expect = chai.expect;
 
 @suite
 export class ParseWorkspaceIdTest {
-
     @test public parseWorkspaceIdFromHostname_fromWorkspaceLocation() {
         const actual = parseWorkspaceIdFromHostname("moccasin-ferret-155799b3.ws-eu01.gitpod.io");
         expect(actual).to.equal("moccasin-ferret-155799b3");
@@ -28,7 +31,9 @@ export class ParseWorkspaceIdTest {
     }
 
     @test public parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost() {
-        const actual = parseWorkspaceIdFromHostname("webview-3000-moccasin-ferret-155799b3.ws-eu01.some.subdomain.somehost.com");
+        const actual = parseWorkspaceIdFromHostname(
+            "webview-3000-moccasin-ferret-155799b3.ws-eu01.some.subdomain.somehost.com",
+        );
         expect(actual).to.equal("moccasin-ferret-155799b3");
     }
 
@@ -44,12 +49,16 @@ export class ParseWorkspaceIdTest {
     }
 
     @test public parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix() {
-        const actual = parseWorkspaceIdFromHostname("webview-3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
+        const actual = parseWorkspaceIdFromHostname(
+            "webview-3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io",
+        );
         expect(actual).to.equal("b7e0eaf8-ec73-44ec-81ea-04859263b656");
     }
 
     @test public parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost() {
-        const actual = parseWorkspaceIdFromHostname("webview-3000-ca81a50f-09d7-465c-acd9-264a747d5351.ws-eu01.some.subdomain.somehost.com");
+        const actual = parseWorkspaceIdFromHostname(
+            "webview-3000-ca81a50f-09d7-465c-acd9-264a747d5351.ws-eu01.some.subdomain.somehost.com",
+        );
         expect(actual).to.equal("ca81a50f-09d7-465c-acd9-264a747d5351");
     }
 
@@ -73,4 +82,4 @@ export class ParseWorkspaceIdTest {
         expect(actual).to.be.false;
     }
 }
-module.exports = new ParseWorkspaceIdTest()
+module.exports = new ParseWorkspaceIdTest();

package/src/util/parse-workspace-id.ts

@@ -20,7 +20,7 @@ const REGEX_WORKSPACE_ID_LEGACY_FROM_HOSTNAME = new RegExp(`(${REGEX_WORKSPACE_I
  *  - webview-1234-moccasin-ferret-155799b3.ws-eu01.gitpod.io (or any other string replacing webview)
  * @param hostname The hostname the request is headed to
  */
-export const parseWorkspaceIdFromHostname = function(hostname: string) {
+export const parseWorkspaceIdFromHostname = function (hostname: string) {
     const match = REGEX_WORKSPACE_ID_FROM_HOSTNAME.exec(hostname);
     if (match && match.length >= 2) {
         return match[1];
@@ -41,15 +41,14 @@ const REGEX_INSTANCE_ID_EXACT = new RegExp(`^${REGEX_INSTANCE_ID.source}$`);
  * @param maybeId
  * @returns
  */
-export const matchesInstanceIdOrLegacyWorkspaceIdExactly = function(maybeId: string): boolean {
-    return REGEX_INSTANCE_ID_EXACT.test(maybeId)
-        || REGEX_WORKSPACE_ID_LEGACY_EXACT.test(maybeId);
+export const matchesInstanceIdOrLegacyWorkspaceIdExactly = function (maybeId: string): boolean {
+    return REGEX_INSTANCE_ID_EXACT.test(maybeId) || REGEX_WORKSPACE_ID_LEGACY_EXACT.test(maybeId);
 };
 
 /**
  * @param maybeWorkspaceId
  * @returns
  */
-export const matchesNewWorkspaceIdExactly = function(maybeWorkspaceId: string): boolean {
+export const matchesNewWorkspaceIdExactly = function (maybeWorkspaceId: string): boolean {
     return REGEX_WORKSPACE_ID_EXACT.test(maybeWorkspaceId);
-};
+};

package/src/util/queue.spec.ts

@@ -4,19 +4,19 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { suite, test, slow, timeout } from 'mocha-typescript'
-import * as chai from 'chai'
-const chaiSubset = require('chai-subset');
+import { suite, test, slow, timeout } from "mocha-typescript";
+import * as chai from "chai";
+const chaiSubset = require("chai-subset");
 chai.use(chaiSubset);
 
-import { Queue } from '..';
-import { fail } from 'assert';
-import { Deferred } from './deferred';
+import { Queue } from "..";
+import { fail } from "assert";
+import { Deferred } from "./deferred";
 
-const expect = chai.expect
-
-@suite class QueueSpec {
+const expect = chai.expect;
 
+@suite
+class QueueSpec {
     queue: Queue;
     seq: number[];
 
@@ -35,8 +35,7 @@ const expect = chai.expect
                             resolve(undefined);
                         }, sleep);
                     });
-                else
-                    this.seq.push(seqNr);
+                else this.seq.push(seqNr);
             };
 
             if (nextTick)
@@ -45,20 +44,22 @@ const expect = chai.expect
                         push().then(resolve);
                     });
                 });
-            else
-                await push();
+            else await push();
         });
     }
     execError(seqNr: number): Deferred<boolean> {
         const deferred = new Deferred<boolean>();
-        this.queue.enqueue(async () => {
-            this.seq.push(seqNr);
-            throw new Error('test error');
-        }).then(() => {
-            deferred.reject(false);
-        }).catch(() => {
-            deferred.resolve(true);
-        });
+        this.queue
+            .enqueue(async () => {
+                this.seq.push(seqNr);
+                throw new Error("test error");
+            })
+            .then(() => {
+                deferred.reject(false);
+            })
+            .catch(() => {
+                deferred.resolve(true);
+            });
 
         return deferred;
     }
@@ -67,7 +68,9 @@ const expect = chai.expect
         expect(actual).to.have.lengthOf(expected.length);
         const expIt = expected.entries();
         for (const act of actual) {
-            const { value: [, exp] } = expIt.next();
+            const {
+                value: [, exp],
+            } = expIt.next();
             expect(act).to.deep.equal(exp);
         }
     }
@@ -93,7 +96,6 @@ const expect = chai.expect
         this.expectArray(this.seq, [1, 2]);
     }
 
-
     @test public async continueDespiteError() {
         this.exec(1);
         const receivedError = this.execError(2);
@@ -107,7 +109,7 @@ const expect = chai.expect
     @test public async mustCatchError() {
         const f = async () => {
             throw new Error();
-        }
+        };
         try {
             const p = this.queue.enqueue(async () => {
                 return f();
@@ -124,7 +126,7 @@ const expect = chai.expect
     @test public async expectUncaughtError() {
         const f = async () => {
             throw new Error();
-        }
+        };
         const p = this.queue.enqueue(async () => {
             return f();
         });

package/src/util/repeat.ts

@@ -42,4 +42,4 @@ export function repeat(op: () => Promise<void> | void, everyMilliseconds: number
             clearTimeout(timer);
         }
     });
-}
+}

package/src/util/semaphore.ts

@@ -4,19 +4,18 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-
 export class Semaphore {
     protected queue: (() => void)[] = [];
     protected used: number;
 
     constructor(protected readonly capacity: number) {
-        if(capacity < 1) {
+        if (capacity < 1) {
             throw new Error("Capacity cannot be less than 1");
         }
     }
 
     public release() {
-        if(this.used == 0) return;
+        if (this.used == 0) return;
 
         const queued = this.queue.shift();
         if (queued) {
@@ -28,7 +27,7 @@ export class Semaphore {
 
     public async acquire(): Promise<void> {
         this.used++;
-        if(this.used <= this.capacity) {
+        if (this.used <= this.capacity) {
             return Promise.resolve();
         }
 
@@ -36,5 +35,4 @@ export class Semaphore {
             this.queue.push(rs);
         });
     }
-
-}
+}

package/src/util/skip-if.ts

@@ -4,7 +4,6 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-
 /**
  * The subset of actually available fields and methods which are not exported but we care about
  */
@@ -18,14 +17,18 @@ interface TestSuiteContext extends Mocha.ISuiteCallbackContext {
  * @param doSkip A function which takes a TestSuite and decides if it should be skipped
  */
 export function skipIf(doSkip: (suite: TestSuiteContext) => boolean): MochaTypeScript.SuiteTrait {
-    const trait: MochaTypeScript.SuiteTrait = function(this: Mocha.ISuiteCallbackContext, ctx: Mocha.ISuiteCallbackContext, ctor: Function): void {
-        const suite = ctx as any as TestSuiteContext;  // No idea why those fields are not exported in the types
+    const trait: MochaTypeScript.SuiteTrait = function (
+        this: Mocha.ISuiteCallbackContext,
+        ctx: Mocha.ISuiteCallbackContext,
+        ctor: Function,
+    ): void {
+        const suite = ctx as any as TestSuiteContext; // No idea why those fields are not exported in the types
         const skip = doSkip(suite);
-        suite.beforeEach(function(this: Mocha.IHookCallbackContext) {
+        suite.beforeEach(function (this: Mocha.IHookCallbackContext) {
             if (skip) {
                 this.skip();
             }
-        })
+        });
     };
 
     // Mark as "trait": mimics the behavior of https://github.com/testdeck/testdeck/blob/9d2dd6a458c2c86c945f6f2999b8278b7528a7a7/index.ts#L433
@@ -45,4 +48,4 @@ export function skipIfEnvVarNotSet(name: string): MochaTypeScript.SuiteTrait {
         }
         return skip;
     });
-}
+}

package/src/util/timeutil.spec.ts

@@ -4,40 +4,39 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import * as chai from 'chai';
+import * as chai from "chai";
 const expect = chai.expect;
-import { suite, test } from 'mocha-typescript';
-import { oneMonthLater } from './timeutil';
+import { suite, test } from "mocha-typescript";
+import { oneMonthLater } from "./timeutil";
 
 @suite()
 export class TimeutilSpec {
-
     @test
     testTimeutil() {
         // targeting a 1st, 1th of Jan => 1st of Feb
-        this.isOneMonthLater(new Date(2000, 0, 1), 1, new Date(2000, 1, 1))
+        this.isOneMonthLater(new Date(2000, 0, 1), 1, new Date(2000, 1, 1));
 
         // targeting a 31th, 30th of Apr => 31st of May
-        this.isOneMonthLater(new Date(2000, 3, 30), 31, new Date(2000, 4, 31))
+        this.isOneMonthLater(new Date(2000, 3, 30), 31, new Date(2000, 4, 31));
 
         // targeting a 31th, 31th of Mar => 30th of Apr
-        this.isOneMonthLater(new Date(2000, 2, 31), 31, new Date(2000, 3, 30))
+        this.isOneMonthLater(new Date(2000, 2, 31), 31, new Date(2000, 3, 30));
 
         // targeting a 30th, 30th of Mar => 30th of Apr
-        this.isOneMonthLater(new Date(2000, 2, 30), 30, new Date(2000, 3, 30))
+        this.isOneMonthLater(new Date(2000, 2, 30), 30, new Date(2000, 3, 30));
 
         // next year
-        this.isOneMonthLater(new Date(2000, 11, 1), 1, new Date(2001, 0, 1))
-        this.isOneMonthLater(new Date(2000, 11, 31), 31, new Date(2001, 0, 31))
+        this.isOneMonthLater(new Date(2000, 11, 1), 1, new Date(2001, 0, 1));
+        this.isOneMonthLater(new Date(2000, 11, 31), 31, new Date(2001, 0, 31));
 
         // Feb
-        this.isOneMonthLater(new Date(2001, 0, 31), 31, new Date(2001, 1, 28))
+        this.isOneMonthLater(new Date(2001, 0, 31), 31, new Date(2001, 1, 28));
         // Feb leap year
-        this.isOneMonthLater(new Date(2000, 0, 31), 31, new Date(2000, 1, 29))
+        this.isOneMonthLater(new Date(2000, 0, 31), 31, new Date(2000, 1, 29));
     }
 
     isOneMonthLater(from: Date, day: number, expectation: Date) {
-        const later = oneMonthLater(from.toISOString(), day)
-        expect(later, `expected ${later} to be equal ${expectation}`).to.be.equal(expectation.toISOString())
+        const later = oneMonthLater(from.toISOString(), day);
+        expect(later, `expected ${later} to be equal ${expectation}`).to.be.equal(expectation.toISOString());
     }
-}
+}

package/src/util/timeutil.ts

@@ -24,28 +24,38 @@ export function oneMonthLater(fromDate: string, day?: number): string {
     }
     return later.toISOString();
 }
-export const yearsLater = (fromDate: string, years: number): string => liftDate1(fromDate, (d) => {
-    d.setUTCFullYear(d.getUTCFullYear() + years);
-    return d.toISOString();
-});
+export const yearsLater = (fromDate: string, years: number): string =>
+    liftDate1(fromDate, (d) => {
+        d.setUTCFullYear(d.getUTCFullYear() + years);
+        return d.toISOString();
+    });
 
 // tslint:disable-next-line:no-shadowed-variable
-export const addMillis = (d1: string, millis: number) => liftDate1(d1, (d1) => new Date(d1.getTime() + millis).toISOString());
-export const durationInHours = (d1: string, d2: string) => liftDate(d1, d2, (d1, d2) => millisecondsToHours(d1.getTime() - d2.getTime()));
+export const addMillis = (d1: string, millis: number) =>
+    liftDate1(d1, (d1) => new Date(d1.getTime() + millis).toISOString());
+export const durationInHours = (d1: string, d2: string) =>
+    liftDate(d1, d2, (d1, d2) => millisecondsToHours(d1.getTime() - d2.getTime()));
 export const durationInMillis = (d1: string, d2: string) => liftDate(d1, d2, (d1, d2) => d1.getTime() - d2.getTime());
 // tslint:disable-next-line:no-shadowed-variable
-export const isDateGreaterOrEqual = (d1: string, d2: string): boolean => liftDate(d1, d2, (d1, d2) => d1.getTime() >= d2.getTime());
+export const isDateGreaterOrEqual = (d1: string, d2: string): boolean =>
+    liftDate(d1, d2, (d1, d2) => d1.getTime() >= d2.getTime());
 export const isDateSmallerOrEqual = (d1: string, d2: string | undefined) => !d2 || d1 <= d2;
 export const isDateSmaller = (d1: string, d2: string | undefined) => !d2 || d1 < d2;
-export const oldest = (d1: string, d2: string): string => d1 > d2 ? d1 : d2;
-export const earliest = (d1: string, d2: string): string => d1 < d2 ? d1 : d2;
+export const oldest = (d1: string, d2: string): string => (d1 > d2 ? d1 : d2);
+export const earliest = (d1: string, d2: string): string => (d1 < d2 ? d1 : d2);
 export const orderAsc = (d1: string, d2: string): number => liftDate(d1, d2, (d1, d2) => d1.getTime() - d2.getTime());
 export const liftDate1 = <T>(d1: string, f: (d1: Date) => T): T => f(new Date(d1));
 export const liftDate = <T>(d1: string, d2: string, f: (d1: Date, d2: Date) => T): T => f(new Date(d1), new Date(d2));
 
+export function hoursBefore(date: string, hours: number): string {
+    const result = new Date(date);
+    result.setHours(result.getHours() - hours);
+    return result.toISOString();
+}
+
 export function hoursLater(date: string, hours: number): string {
-    const result = new Date(date)
-    result.setHours(result.getHours() + hours)
+    const result = new Date(date);
+    result.setHours(result.getHours() + hours);
     return result.toISOString();
 }
 

package/src/util/tracing.spec.ts

@@ -4,28 +4,31 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { suite, test } from "mocha-typescript"
-import * as chai from "chai"
+import { suite, test } from "mocha-typescript";
+import * as chai from "chai";
 import { TraceContext } from "./tracing";
 import { MockTracer } from "opentracing";
 
-const expect = chai.expect
-
-@suite class TestTracing {
+const expect = chai.expect;
 
+@suite
+class TestTracing {
     @test public async testTracingContext_addNestedTags() {
         const tracer = new MockTracer();
-        const span = tracer.startSpan('testTracingContext_addNestedTags');
-        TraceContext.addNestedTags({ span }, {
-            rpc: {
-                system: "jsonrpc",
-                jsonrpc: {
-                    version: "1.0",
-                    method: "test",
-                    parameters: ["abc", "def"],
+        const span = tracer.startSpan("testTracingContext_addNestedTags");
+        TraceContext.addNestedTags(
+            { span },
+            {
+                rpc: {
+                    system: "jsonrpc",
+                    jsonrpc: {
+                        version: "1.0",
+                        method: "test",
+                        parameters: ["abc", "def"],
+                    },
                 },
             },
-        });
+        );
 
         const mockSpan = tracer.report().spans[0];
         expect(mockSpan.tags()).to.deep.equal({
@@ -39,13 +42,16 @@ const expect = chai.expect
 
     @test public async testTracingContext_addNestedTags_null() {
         const tracer = new MockTracer();
-        const span = tracer.startSpan('testTracingContext_addNestedTags_null');
-        TraceContext.addNestedTags({ span }, {
-            someShape: {
-                thisIsNull: null,
-                thisIsUndefined: undefined,
+        const span = tracer.startSpan("testTracingContext_addNestedTags_null");
+        TraceContext.addNestedTags(
+            { span },
+            {
+                someShape: {
+                    thisIsNull: null,
+                    thisIsUndefined: undefined,
+                },
             },
-        });
+        );
 
         const mockSpan = tracer.report().spans[0];
         expect(mockSpan.tags()).to.deep.equal({
@@ -56,7 +62,7 @@ const expect = chai.expect
 
     @test public async testTracingContext_addJsonRPCParameters() {
         const tracer = new MockTracer();
-        const span = tracer.startSpan('testTracingContext_addJsonRPCParameters');
+        const span = tracer.startSpan("testTracingContext_addJsonRPCParameters");
         const ctx = { span };
         TraceContext.addJsonRPCParameters(ctx, {
             one: "one",
@@ -78,6 +84,5 @@ const expect = chai.expect
             "rpc.system": "jsonrpc",
         });
     }
-
 }
-module.exports = new TestTracing()
+module.exports = new TestTracing();