@gitpod/gitpod-protocol 0.1.5-svenefftinge-dashboard-invalid-2274.5 → 0.1.5-tar-telemetry-settings-data.0

package/lib/util/logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}

package/lib/util/make-link.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */

package/lib/util/make-link.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
@@ -10,8 +10,8 @@ function isOpenNewTab(event) {
     return event.metaKey || (event.ctrlKey);
 }
 function makeLink(node, url, hover) {
-    node.onclick = function (event) {
-        var target = '_self';
+    node.onclick = event => {
+        let target = '_self';
         if (isOpenNewTab(event)) {
             target = '_blank';
         }

package/lib/util/make-link.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-link.js","sourceRoot":"","sources":["../../src/util/make-link.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,SAAS,YAAY,CAAC,KAAiB;IACnC,OAAO,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAiB,EAAE,GAAW,EAAE,KAAa;IAClE,IAAI,CAAC,OAAO,GAAG,UAAA,KAAK;QAChB,IAAI,MAAM,GAAG,OAAO,CAAC;QACrB,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,GAAG,QAAQ,CAAC;SACrB;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;AACvB,CAAC;AAVD,4BAUC"}
+{"version":3,"file":"make-link.js","sourceRoot":"","sources":["../../src/util/make-link.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,SAAS,YAAY,CAAC,KAAiB;IACnC,OAAO,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAiB,EAAE,GAAW,EAAE,KAAa;IAClE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE;QACnB,IAAI,MAAM,GAAG,OAAO,CAAC;QACrB,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,GAAG,QAAQ,CAAC;SACrB;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;AACvB,CAAC;AAVD,4BAUC"}

package/lib/util/parse-workspace-id.d.ts

@@ -1,14 +1,24 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
 /**
  * Hostname may be of the form:
- *  - b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io
- *  - 1234-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io
- *  - webview-1234-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io (or any other string replacing webview)
+ *  - moccasin-ferret-155799b3.ws-eu01.gitpod.io
+ *  - 1234-moccasin-ferret-155799b3.ws-eu01.gitpod.io
+ *  - 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 declare const parseWorkspaceIdFromHostname: (hostname: string) => string | undefined;
+/**
+ * @param maybeId
+ * @returns
+ */
+export declare const matchesInstanceIdOrLegacyWorkspaceIdExactly: (maybeId: string) => boolean;
+/**
+ * @param maybeWorkspaceId
+ * @returns
+ */
+export declare const matchesNewWorkspaceIdExactly: (maybeWorkspaceId: string) => boolean;
 //# sourceMappingURL=parse-workspace-id.d.ts.map

package/lib/util/parse-workspace-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-workspace-id.d.ts","sourceRoot":"","sources":["../../src/util/parse-workspace-id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,aAAsB,MAAM,uBASpE,CAAA"}
+{"version":3,"file":"parse-workspace-id.d.ts","sourceRoot":"","sources":["../../src/util/parse-workspace-id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,aAAsB,MAAM,uBAWpE,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,2CAA2C,YAAqB,MAAM,KAAG,OAGrF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,4BAA4B,qBAA8B,MAAM,KAAG,OAE/E,CAAC"}

package/lib/util/parse-workspace-id.js

@@ -1,27 +1,57 @@
 "use strict";
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseWorkspaceIdFromHostname = void 0;
+exports.matchesNewWorkspaceIdExactly = exports.matchesInstanceIdOrLegacyWorkspaceIdExactly = exports.parseWorkspaceIdFromHostname = void 0;
+const REGEX_WORKSPACE_ID = /[0-9a-z]{2,16}-[0-9a-z]{2,16}-[0-9a-z]{8,11}/;
+const REGEX_WORKSPACE_ID_EXACT = new RegExp(`^${REGEX_WORKSPACE_ID.source}$`);
+// We need to parse the workspace id precisely here to get the case '<some-str>-<port>-<wsid>.ws.' right
+const REGEX_WORKSPACE_ID_FROM_HOSTNAME = new RegExp(`(${REGEX_WORKSPACE_ID.source})\.ws`);
+const REGEX_WORKSPACE_ID_LEGACY = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/;
+const REGEX_WORKSPACE_ID_LEGACY_EXACT = new RegExp(`^${REGEX_WORKSPACE_ID_LEGACY.source}$`);
+const REGEX_WORKSPACE_ID_LEGACY_FROM_HOSTNAME = new RegExp(`(${REGEX_WORKSPACE_ID_LEGACY.source})\.ws`);
 /**
  * Hostname may be of the form:
- *  - b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io
- *  - 1234-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io
- *  - webview-1234-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io (or any other string replacing webview)
+ *  - moccasin-ferret-155799b3.ws-eu01.gitpod.io
+ *  - 1234-moccasin-ferret-155799b3.ws-eu01.gitpod.io
+ *  - webview-1234-moccasin-ferret-155799b3.ws-eu01.gitpod.io (or any other string replacing webview)
  * @param hostname The hostname the request is headed to
  */
-exports.parseWorkspaceIdFromHostname = function (hostname) {
-    // We need to parse the workspace id precisely here to get the case '<some-str>-<port>-<wsid>.ws.' right
-    var wsIdExpression = /([a-z][0-9a-z]+\-([0-9a-z]+\-){3}[0-9a-z]+)\.ws/g;
-    var match = wsIdExpression.exec(hostname);
+const parseWorkspaceIdFromHostname = function (hostname) {
+    const match = REGEX_WORKSPACE_ID_FROM_HOSTNAME.exec(hostname);
     if (match && match.length >= 2) {
         return match[1];
     }
     else {
+        const legacyMatch = REGEX_WORKSPACE_ID_LEGACY_FROM_HOSTNAME.exec(hostname);
+        if (legacyMatch && legacyMatch.length >= 2) {
+            return legacyMatch[1];
+        }
         return undefined;
     }
 };
+exports.parseWorkspaceIdFromHostname = parseWorkspaceIdFromHostname;
+/** Equalls UUIDv4 (and REGEX_WORKSPACE_ID_LEGACY!) */
+const REGEX_INSTANCE_ID = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/;
+const REGEX_INSTANCE_ID_EXACT = new RegExp(`^${REGEX_INSTANCE_ID.source}$`);
+/**
+ * @param maybeId
+ * @returns
+ */
+const matchesInstanceIdOrLegacyWorkspaceIdExactly = function (maybeId) {
+    return REGEX_INSTANCE_ID_EXACT.test(maybeId)
+        || REGEX_WORKSPACE_ID_LEGACY_EXACT.test(maybeId);
+};
+exports.matchesInstanceIdOrLegacyWorkspaceIdExactly = matchesInstanceIdOrLegacyWorkspaceIdExactly;
+/**
+ * @param maybeWorkspaceId
+ * @returns
+ */
+const matchesNewWorkspaceIdExactly = function (maybeWorkspaceId) {
+    return REGEX_WORKSPACE_ID_EXACT.test(maybeWorkspaceId);
+};
+exports.matchesNewWorkspaceIdExactly = matchesNewWorkspaceIdExactly;
 //# sourceMappingURL=parse-workspace-id.js.map

package/lib/util/parse-workspace-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-workspace-id.js","sourceRoot":"","sources":["../../src/util/parse-workspace-id.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH;;;;;;GAMG;AACU,QAAA,4BAA4B,GAAG,UAAS,QAAgB;IACjE,wGAAwG;IACxG,IAAM,cAAc,GAAG,kDAAkD,CAAC;IAC1E,IAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QAC5B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;KACnB;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC,CAAA"}
+{"version":3,"file":"parse-workspace-id.js","sourceRoot":"","sources":["../../src/util/parse-workspace-id.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,MAAM,kBAAkB,GAAG,8CAA8C,CAAC;AAC1E,MAAM,wBAAwB,GAAG,IAAI,MAAM,CAAC,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;AAC9E,wGAAwG;AACxG,MAAM,gCAAgC,GAAG,IAAI,MAAM,CAAC,IAAI,kBAAkB,CAAC,MAAM,OAAO,CAAC,CAAC;AAE1F,MAAM,yBAAyB,GAAG,8DAA8D,CAAC;AACjG,MAAM,+BAA+B,GAAG,IAAI,MAAM,CAAC,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5F,MAAM,uCAAuC,GAAG,IAAI,MAAM,CAAC,IAAI,yBAAyB,CAAC,MAAM,OAAO,CAAC,CAAC;AAExG;;;;;;GAMG;AACI,MAAM,4BAA4B,GAAG,UAAS,QAAgB;IACjE,MAAM,KAAK,GAAG,gCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QAC5B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;KACnB;SAAM;QACH,MAAM,WAAW,GAAG,uCAAuC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC;SACzB;QACD,OAAO,SAAS,CAAC;KACpB;AACL,CAAC,CAAC;AAXW,QAAA,4BAA4B,gCAWvC;AAEF,sDAAsD;AACtD,MAAM,iBAAiB,GAAG,8DAA8D,CAAC;AACzF,MAAM,uBAAuB,GAAG,IAAI,MAAM,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;AAE5E;;;GAGG;AACI,MAAM,2CAA2C,GAAG,UAAS,OAAe;IAC/E,OAAO,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC;WACrC,+BAA+B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACzD,CAAC,CAAC;AAHW,QAAA,2CAA2C,+CAGtD;AAEF;;;GAGG;AACI,MAAM,4BAA4B,GAAG,UAAS,gBAAwB;IACzE,OAAO,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AAC3D,CAAC,CAAC;AAFW,QAAA,4BAA4B,gCAEvC"}

package/lib/util/parse-workspace-id.spec.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
@@ -8,5 +8,13 @@ export declare class ParseWorkspaceIdTest {
     parseWorkspaceIdFromHostname_fromWorkspacePortLocation(): void;
     parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix(): void;
     parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost(): void;
+    parseLegacyWorkspaceIdFromHostname_fromWorkspaceLocation(): void;
+    parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocation(): void;
+    parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix(): void;
+    parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost(): void;
+    matchesInstanceIdOrLegacyWorkspaceIdExactly_positive(): void;
+    matchesInstanceIdOrLegacyWorkspaceIdExactly_negative(): void;
+    matchesWorkspaceIdExactly_new_positive(): void;
+    matchesWorkspaceIdExactly_new_negative(): void;
 }
 //# sourceMappingURL=parse-workspace-id.spec.d.ts.map

package/lib/util/parse-workspace-id.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-workspace-id.spec.d.ts","sourceRoot":"","sources":["../../src/util/parse-workspace-id.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,oBAAoB;IAEhB,kDAAkD;IAKlD,sDAAsD;IAKtD,uEAAuE;IAKvE,iFAAiF;CAIjG"}
+{"version":3,"file":"parse-workspace-id.spec.d.ts","sourceRoot":"","sources":["../../src/util/parse-workspace-id.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,oBAAoB;IAEhB,kDAAkD;IAKlD,sDAAsD;IAKtD,uEAAuE;IAKvE,iFAAiF;IAMjF,wDAAwD;IAKxD,4DAA4D;IAK5D,6EAA6E;IAK7E,uFAAuF;IAMvF,oDAAoD;IAIpD,oDAAoD;IAMpD,sCAAsC;IAItC,sCAAsC;CAItD"}

package/lib/util/parse-workspace-id.spec.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
@@ -15,58 +15,138 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParseWorkspaceIdTest = void 0;
-var chai = require("chai");
-var mocha_typescript_1 = require("mocha-typescript");
-var parse_workspace_id_1 = require("./parse-workspace-id");
-var expect = chai.expect;
-var ParseWorkspaceIdTest = /** @class */ (function () {
-    function ParseWorkspaceIdTest() {
+const chai = require("chai");
+const mocha_typescript_1 = require("mocha-typescript");
+const parse_workspace_id_1 = require("./parse-workspace-id");
+const expect = chai.expect;
+let ParseWorkspaceIdTest = class ParseWorkspaceIdTest {
+    parseWorkspaceIdFromHostname_fromWorkspaceLocation() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("moccasin-ferret-155799b3.ws-eu01.gitpod.io");
+        expect(actual).to.equal("moccasin-ferret-155799b3");
     }
-    ParseWorkspaceIdTest.prototype.parseWorkspaceIdFromHostname_fromWorkspaceLocation = function () {
-        var actual = parse_workspace_id_1.parseWorkspaceIdFromHostname("b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
+    parseWorkspaceIdFromHostname_fromWorkspacePortLocation() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("3000-moccasin-ferret-155799b3.ws-eu01.gitpod.io");
+        expect(actual).to.equal("moccasin-ferret-155799b3");
+    }
+    parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("webview-3000-moccasin-ferret-155799b3.ws-eu01.gitpod.io");
+        expect(actual).to.equal("moccasin-ferret-155799b3");
+    }
+    parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("webview-3000-moccasin-ferret-155799b3.ws-eu01.some.subdomain.somehost.com");
+        expect(actual).to.equal("moccasin-ferret-155799b3");
+    }
+    // legacy mode
+    parseLegacyWorkspaceIdFromHostname_fromWorkspaceLocation() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
         expect(actual).to.equal("b7e0eaf8-ec73-44ec-81ea-04859263b656");
-    };
-    ParseWorkspaceIdTest.prototype.parseWorkspaceIdFromHostname_fromWorkspacePortLocation = function () {
-        var actual = parse_workspace_id_1.parseWorkspaceIdFromHostname("3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
+    }
+    parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocation() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
         expect(actual).to.equal("b7e0eaf8-ec73-44ec-81ea-04859263b656");
-    };
-    ParseWorkspaceIdTest.prototype.parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix = function () {
-        var actual = parse_workspace_id_1.parseWorkspaceIdFromHostname("webview-3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
+    }
+    parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("webview-3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
         expect(actual).to.equal("b7e0eaf8-ec73-44ec-81ea-04859263b656");
-    };
-    ParseWorkspaceIdTest.prototype.parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost = function () {
-        var actual = parse_workspace_id_1.parseWorkspaceIdFromHostname("webview-3000-ca81a50f-09d7-465c-acd9-264a747d5351.ws-eu01.some.subdomain.somehost.com");
+    }
+    parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost() {
+        const actual = (0, parse_workspace_id_1.parseWorkspaceIdFromHostname)("webview-3000-ca81a50f-09d7-465c-acd9-264a747d5351.ws-eu01.some.subdomain.somehost.com");
         expect(actual).to.equal("ca81a50f-09d7-465c-acd9-264a747d5351");
-    };
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspaceLocation", null);
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspacePortLocation", null);
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix", null);
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost", null);
-    ParseWorkspaceIdTest = __decorate([
-        mocha_typescript_1.suite
-    ], ParseWorkspaceIdTest);
-    return ParseWorkspaceIdTest;
-}());
+    }
+    // match - instance ID
+    matchesInstanceIdOrLegacyWorkspaceIdExactly_positive() {
+        const actual = (0, parse_workspace_id_1.matchesInstanceIdOrLegacyWorkspaceIdExactly)("b7e0eaf8-ec73-44ec-81ea-04859263b656");
+        expect(actual).to.be.true;
+    }
+    matchesInstanceIdOrLegacyWorkspaceIdExactly_negative() {
+        const actual = (0, parse_workspace_id_1.matchesInstanceIdOrLegacyWorkspaceIdExactly)("b7e0eaf8-ec73-44ec-81a-04859263b656");
+        expect(actual).to.be.false;
+    }
+    // match - new workspace ID
+    matchesWorkspaceIdExactly_new_positive() {
+        const actual = (0, parse_workspace_id_1.matchesNewWorkspaceIdExactly)("moccasin-ferret-155799b3");
+        expect(actual).to.be.true;
+    }
+    matchesWorkspaceIdExactly_new_negative() {
+        const actual = (0, parse_workspace_id_1.matchesNewWorkspaceIdExactly)("moccasin-ferret-15599b3");
+        expect(actual).to.be.false;
+    }
+};
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspaceLocation", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspacePortLocation", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseLegacyWorkspaceIdFromHostname_fromWorkspaceLocation", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocation", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "matchesInstanceIdOrLegacyWorkspaceIdExactly_positive", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "matchesInstanceIdOrLegacyWorkspaceIdExactly_negative", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "matchesWorkspaceIdExactly_new_positive", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ParseWorkspaceIdTest.prototype, "matchesWorkspaceIdExactly_new_negative", null);
+ParseWorkspaceIdTest = __decorate([
+    mocha_typescript_1.suite
+], ParseWorkspaceIdTest);
 exports.ParseWorkspaceIdTest = ParseWorkspaceIdTest;
 module.exports = new ParseWorkspaceIdTest();
 //# sourceMappingURL=parse-workspace-id.spec.js.map

package/lib/util/parse-workspace-id.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-workspace-id.spec.js","sourceRoot":"","sources":["../../src/util/parse-workspace-id.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,2BAA6B;AAC7B,qDAA+C;AAC/C,2DAAoE;AACpE,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B;IAAA;IAqBA,CAAC;IAnBgB,iFAAkD,GAAzD;QACF,IAAM,MAAM,GAAG,iDAA4B,CAAC,wDAAwD,CAAC,CAAC;QACtG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,qFAAsD,GAA7D;QACF,IAAM,MAAM,GAAG,iDAA4B,CAAC,6DAA6D,CAAC,CAAC;QAC3G,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,sGAAuE,GAA9E;QACF,IAAM,MAAM,GAAG,iDAA4B,CAAC,qEAAqE,CAAC,CAAC;QACnH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,gHAAiF,GAAxF;QACF,IAAM,MAAM,GAAG,iDAA4B,CAAC,uFAAuF,CAAC,CAAC;QACrI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAlBK;QAAL,uBAAI;;;;kGAGJ;IAEK;QAAL,uBAAI;;;;sGAGJ;IAEK;QAAL,uBAAI;;;;uHAGJ;IAEK;QAAL,uBAAI;;;;iIAGJ;IApBQ,oBAAoB;QADhC,wBAAK;OACO,oBAAoB,CAqBhC;IAAD,2BAAC;CAAA,AArBD,IAqBC;AArBY,oDAAoB;AAsBjC,MAAM,CAAC,OAAO,GAAG,IAAI,oBAAoB,EAAE,CAAA"}
+{"version":3,"file":"parse-workspace-id.spec.js","sourceRoot":"","sources":["../../src/util/parse-workspace-id.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,6BAA6B;AAC7B,uDAA+C;AAC/C,6DAA+I;AAC/I,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAEhB,kDAAkD;QAC3D,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,4CAA4C,CAAC,CAAC;QAC1F,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACxD,CAAC;IAEY,sDAAsD;QAC/D,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,iDAAiD,CAAC,CAAC;QAC/F,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACxD,CAAC;IAEY,uEAAuE;QAChF,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,yDAAyD,CAAC,CAAC;QACvG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACxD,CAAC;IAEY,iFAAiF;QAC1F,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,2EAA2E,CAAC,CAAC;QACzH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACxD,CAAC;IAED,cAAc;IACD,wDAAwD;QACjE,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,wDAAwD,CAAC,CAAC;QACtG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,4DAA4D;QACrE,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,6DAA6D,CAAC,CAAC;QAC3G,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,6EAA6E;QACtF,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,qEAAqE,CAAC,CAAC;QACnH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,uFAAuF;QAChG,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,uFAAuF,CAAC,CAAC;QACrI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAED,sBAAsB;IACT,oDAAoD;QAC7D,MAAM,MAAM,GAAG,IAAA,gEAA2C,EAAC,sCAAsC,CAAC,CAAC;QACnG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC;IACY,oDAAoD;QAC7D,MAAM,MAAM,GAAG,IAAA,gEAA2C,EAAC,qCAAqC,CAAC,CAAC;QAClG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,2BAA2B;IACd,sCAAsC;QAC/C,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,0BAA0B,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC;IACY,sCAAsC;QAC/C,MAAM,MAAM,GAAG,IAAA,iDAA4B,EAAC,yBAAyB,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC/B,CAAC;CACJ,CAAA;AA5DS;IAAL,uBAAI;;;;8FAGJ;AAEK;IAAL,uBAAI;;;;kGAGJ;AAEK;IAAL,uBAAI;;;;mHAGJ;AAEK;IAAL,uBAAI;;;;6HAGJ;AAGK;IAAL,uBAAI;;;;oGAGJ;AAEK;IAAL,uBAAI;;;;wGAGJ;AAEK;IAAL,uBAAI;;;;yHAGJ;AAEK;IAAL,uBAAI;;;;mIAGJ;AAGK;IAAL,uBAAI;;;;gGAGJ;AACK;IAAL,uBAAI;;;;gGAGJ;AAGK;IAAL,uBAAI;;;;kFAGJ;AACK;IAAL,uBAAI;;;;kFAGJ;AA7DQ,oBAAoB;IADhC,wBAAK;GACO,oBAAoB,CA8DhC;AA9DY,oDAAoB;AA+DjC,MAAM,CAAC,OAAO,GAAG,IAAI,oBAAoB,EAAE,CAAA"}

package/lib/util/queue.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */

package/lib/util/queue.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
@@ -13,68 +13,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Queue = void 0;
-var deferred_1 = require("./deferred");
+const deferred_1 = require("./deferred");
 /**
  * Queues asynchronous operations in a synchronous context
  */
-var Queue = /** @class */ (function () {
-    function Queue() {
+class Queue {
+    constructor() {
         this.queue = Promise.resolve();
     }
-    Queue.prototype.enqueue = function (operation) {
-        var _this = this;
-        var enqueue = new deferred_1.Deferred();
-        this.queue = this.queue.then(function () { return __awaiter(_this, void 0, void 0, function () {
-            var result, err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, operation()];
-                    case 1:
-                        result = _a.sent();
-                        enqueue.resolve(result);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        err_1 = _a.sent();
-                        enqueue.reject(err_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        }); });
+    enqueue(operation) {
+        const enqueue = new deferred_1.Deferred();
+        this.queue = this.queue.then(() => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const result = yield operation();
+                enqueue.resolve(result);
+            }
+            catch (err) {
+                enqueue.reject(err);
+            }
+        }));
         return enqueue.promise;
-    };
-    return Queue;
-}());
+    }
+}
 exports.Queue = Queue;
 //# sourceMappingURL=queue.js.map

package/lib/util/queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/util/queue.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAsC;AAEtC;;GAEG;AACH;IAAA;QACc,UAAK,GAAiB,OAAO,CAAC,OAAO,EAAE,CAAC;IActD,CAAC;IAZG,uBAAO,GAAP,UAAW,SAA2B;QAAtC,iBAWC;QAVG,IAAM,OAAO,GAAG,IAAI,mBAAQ,EAAK,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;;;;;;wBAEN,qBAAM,SAAS,EAAE,EAAA;;wBAA1B,MAAM,GAAG,SAAiB;wBAChC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;;;;wBAExB,OAAO,CAAC,MAAM,CAAC,KAAG,CAAC,CAAC;;;;;aAE3B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC;IAC3B,CAAC;IACL,YAAC;AAAD,CAAC,AAfD,IAeC;AAfY,sBAAK"}
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/util/queue.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,yCAAsC;AAEtC;;GAEG;AACH,MAAa,KAAK;IAAlB;QACc,UAAK,GAAiB,OAAO,CAAC,OAAO,EAAE,CAAC;IActD,CAAC;IAZG,OAAO,CAAI,SAA2B;QAClC,MAAM,OAAO,GAAG,IAAI,mBAAQ,EAAK,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAS,EAAE;YACpC,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;gBACjC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAC3B;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACvB;QACL,CAAC,CAAA,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC;IAC3B,CAAC;CACJ;AAfD,sBAeC"}

package/lib/util/queue.spec.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */