@gitpod/gitpod-protocol 0.1.5-wth-argo.0 → 0.1.5-yh-vmoptions-fork.1

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

@@ -4,6 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
+import { repeat } from "./repeat";
 
 interface CacheEntry<T> {
     key: string;
@@ -13,13 +14,11 @@ 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();
     }
-    
+
     public set(key: string, value: T) {
         const oldValue = this.store.get(key);
         if (oldValue) {
@@ -41,8 +40,12 @@ export class GarbageCollectedCache<T> {
         return entry.value;
     }
 
+    public delete(key: string) {
+        this.store.delete(key);
+    }
+
     protected regularlyCollectGarbage() {
-        setInterval(() => this.collectGarbage(), this.gcIntervalSeconds * 1000);
+        repeat(() => this.collectGarbage(), this.gcIntervalSeconds * 1000);
     }
 
     protected collectGarbage() {
@@ -55,6 +58,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,19 +4,19 @@
  * 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 { workspaceIDRegex } from "./gitpod-host-url";
+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++) {
-            const name = await generateWorkspaceID();
-            expect(workspaceIDRegex.test(name), name).to.be.true;
+        for (let i = 0; i < 10; i++) {
+            const id = await generateWorkspaceID();
+            expect(new GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
         }
     }
 
@@ -27,5 +27,32 @@ const expect = chai.expect
         expect(longestName.length <= 36, `"${longestName}" is longer than 36 chars (${longestName.length})`).to.be.true;
     }
 
+    @test public async testCustomName() {
+        const data = [
+            ["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(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();