@gitpod/gitpod-protocol 0.1.5-tar-telemetry-settings-data.3 → 0.1.5-tar-sh-active-users.1

package/src/util/event.ts

@@ -6,13 +6,12 @@
  */
 
 import { Disposable } from "./disposable";
-import { log } from './logging';
+import { log } from "./logging";
 
 /**
  * Represents a typed event.
  */
 export interface Event<T> {
-
     /**
      *
      * @param listener The listener function will be call when the event happens.
@@ -24,12 +23,13 @@ export interface Event<T> {
 }
 
 export namespace Event {
-    const _disposable = { dispose() { } };
-    export const None: Event<any> = function () { return _disposable; };
+    const _disposable = { dispose() {} };
+    export const None: Event<any> = function () {
+        return _disposable;
+    };
 }
 
 class CallbackList {
-
     private _callbacks: Function[] | undefined;
     private _contexts: any[] | undefined;
 
@@ -66,7 +66,7 @@ class CallbackList {
         }
 
         if (foundCallbackWithDifferentContext) {
-            throw new Error('When adding a listener with a context, you should remove it with the same context');
+            throw new Error("When adding a listener with a context, you should remove it with the same context");
         }
     }
 
@@ -105,14 +105,12 @@ export interface EmitterOptions {
 }
 
 export class Emitter<T> {
-
-    private static _noop = function () { };
+    private static _noop = function () {};
 
     private _event: Event<T>;
     private _callbacks: CallbackList | undefined;
 
-    constructor(private _options?: EmitterOptions) {
-    }
+    constructor(private _options?: EmitterOptions) {}
 
     /**
      * For the public to allow to subscribe
@@ -137,7 +135,7 @@ export class Emitter<T> {
                         if (this._options && this._options.onLastListenerRemove && this._callbacks!.isEmpty()) {
                             this._options.onLastListenerRemove(this);
                         }
-                    }
+                    },
                 };
                 if (Array.isArray(disposables)) {
                     disposables.push(result);

package/src/util/garbage-collected-cache.ts

@@ -6,7 +6,6 @@
 
 import { repeat } from "./repeat";
 
-
 interface CacheEntry<T> {
     key: string;
     value: T;
@@ -16,9 +15,7 @@ interface CacheEntry<T> {
 export class GarbageCollectedCache<T> {
     protected readonly store = new Map<string, CacheEntry<T>>();
 
-    constructor(
-        protected readonly defaultMaxAgeSeconds: number,
-        protected readonly gcIntervalSeconds: number) {
+    constructor(protected readonly defaultMaxAgeSeconds: number, protected readonly gcIntervalSeconds: number) {
         this.regularlyCollectGarbage();
     }
 
@@ -40,6 +37,11 @@ export class GarbageCollectedCache<T> {
         if (!entry) {
             return undefined;
         }
+        // Still valid?
+        if (entry.expiryDate < Date.now()) {
+            this.store.delete(entry.key);
+            return undefined;
+        }
         return entry.value;
     }
 
@@ -61,6 +63,6 @@ export class GarbageCollectedCache<T> {
     }
 
     protected calcExpiryDate(maxAgeSeconds?: number): number {
-        return Date.now() + ((maxAgeSeconds || this.defaultMaxAgeSeconds) * 1000);
+        return Date.now() + (maxAgeSeconds || this.defaultMaxAgeSeconds) * 1000;
     }
-}
+}

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

@@ -4,17 +4,17 @@
  * 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 { generateWorkspaceID, colors, animals } from "./generate-workspace-id";
 import { GitpodHostUrl } from "./gitpod-host-url";
 
-const expect = chai.expect
-
-@suite class TestGenerateWorkspaceId {
+const expect = chai.expect;
 
+@suite
+class TestGenerateWorkspaceId {
     @test public async testGenerateWorkspaceId() {
-        for (let i = 0; i < 100; i++) {
+        for (let i = 0; i < 10; i++) {
             const id = await generateWorkspaceID();
             expect(new GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
         }
@@ -29,20 +29,30 @@ const expect = chai.expect
 
     @test public async testCustomName() {
         const data = [
-            ['foo','bar','foo-bar-'],
-            ['f','bar','.{2,16}-bar-'],
-            ['gitpod-io','gitpod','gitpodio-gitpod-'],
-            ['this is rather long and has some "§$"% special chars','also here pretty long and needs abbreviation','thisisratherlon-alsohere-'],
-            ['breatheco-de', 'python-flask-api-tutorial', 'breathecode-pythonflaska-'],
-            ['UPPER', "CaSe", "upper-case-"]
-        ]
+            ["foo", "bar", "foo-bar-"],
+            ["f", "bar", ".{2,16}-bar-"],
+            ["gitpod-io", "gitpod", "gitpodio-gitpod-"],
+            ["breatheco-de", "python-flask-api-tutorial", "breathecode-pythonflask-"],
+            ["short", "muchlongerthaneleven", "short-muchlongerthanel-"],
+            ["muchlongerthaneleven", "short", "muchlongerthanel-short-"],
+            [
+                'this is rather long and has some "§$"% special chars',
+                "also here pretty long and needs abbreviation",
+                "thisisrathe-alsoherepre-",
+            ],
+            ["UPPER", "CaSe", "upper-case-"],
+            [
+                "superlongfirstsegment",
+                "---------",
+                "superlong" /* we don't mantch for the whole first segment, because it has different length depending on the animal that is used to replace the -------*/,
+            ],
+        ];
         for (const d of data) {
             const id = await generateWorkspaceID(d[0], d[1]);
-            expect(id).match(new RegExp("^"+d[2]));
+            expect(id).match(new RegExp("^" + d[2]));
             expect(new GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
             expect(id.length <= 36, `"${id}" is longer than 36 chars (${id.length})`).to.be.true;
         }
     }
-
 }
-module.exports = new TestGenerateWorkspaceId()
+module.exports = new TestGenerateWorkspaceId();