@gitpod/gitpod-protocol 0.1.5-v0.6.0-beta4 → 0.1.5-vn-6525.75

package/lib/util/gitpod-host-url.d.ts

@@ -7,7 +7,6 @@ export interface UrlChange {
     (old: URL): Partial<URL>;
 }
 export declare type UrlUpdate = UrlChange | Partial<URL>;
-export declare const workspaceIDRegex: RegExp;
 export declare class GitpodHostUrl {
     readonly url: URL;
     constructor(urlParam?: string | URL);
@@ -25,7 +24,7 @@ export declare class GitpodHostUrl {
     asUpgradeSubscription(): GitpodHostUrl;
     asAccessControl(): GitpodHostUrl;
     asSettings(): GitpodHostUrl;
-    asGraphQLApi(): GitpodHostUrl;
+    asPreferences(): GitpodHostUrl;
     asStart(workspaceId?: string | undefined): GitpodHostUrl;
     asWorkspaceAuth(instanceID: string, redirect?: boolean): GitpodHostUrl;
     toString(): string;
@@ -33,5 +32,6 @@ export declare class GitpodHostUrl {
     get workspaceId(): string | undefined;
     get blobServe(): boolean;
     asSorry(message: string): GitpodHostUrl;
+    asApiLogout(): GitpodHostUrl;
 }
 //# sourceMappingURL=gitpod-host-url.d.ts.map

package/lib/util/gitpod-host-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitpod-host-url.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CAC3B;AACD,oBAAY,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAEjD,eAAO,MAAM,gBAAgB,QAAoC,CAAC;AAElE,qBAAa,aAAa;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEN,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAanC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAInC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI/C,sBAAsB,IAAI,aAAa;IASvC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,GAAG,aAAa;IAI/D,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;IAK7B,WAAW,CAAC,UAAU,EAAE,MAAM;IAI9B,WAAW,IAAI,aAAa;IAI5B,WAAW,IAAI,aAAa;IAI5B,OAAO,IAAI,aAAa;IAIxB,qBAAqB,IAAI,aAAa;IAItC,eAAe,IAAI,aAAa;IAIhC,UAAU,IAAI,aAAa;IAI3B,YAAY,IAAI,aAAa;IAI7B,OAAO,CAAC,WAAW,qBAAmB,GAAG,aAAa;IAOtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa;IAItE,QAAQ;IAIR,mBAAmB;IAQnB,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAapC;IAED,IAAI,SAAS,IAAI,OAAO,CAQvB;IAED,OAAO,CAAC,OAAO,EAAE,MAAM;CAI1B"}
+{"version":3,"file":"gitpod-host-url.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC5B;AACD,oBAAY,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAWjD,qBAAa,aAAa;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEN,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAanC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAInC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI/C,sBAAsB,IAAI,aAAa;IASvC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,GAAG,aAAa;IAI/D,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;IAK7B,WAAW,CAAC,UAAU,EAAE,MAAM;IAI9B,WAAW,IAAI,aAAa;IAI5B,WAAW,IAAI,aAAa;IAI5B,OAAO,IAAI,aAAa;IAIxB,qBAAqB,IAAI,aAAa;IAItC,eAAe,IAAI,aAAa;IAIhC,UAAU,IAAI,aAAa;IAI3B,aAAa,IAAI,aAAa;IAI9B,OAAO,CAAC,WAAW,qBAAmB,GAAG,aAAa;IAOtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa;IAOtE,QAAQ;IAIR,mBAAmB;IAQnB,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAiBpC;IAED,IAAI,SAAS,IAAI,OAAO,CAQvB;IAED,OAAO,CAAC,OAAO,EAAE,MAAM;IAIvB,WAAW,IAAI,aAAa;CAG/B"}

package/lib/util/gitpod-host-url.js

@@ -5,134 +5,137 @@
  * See License-AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GitpodHostUrl = exports.workspaceIDRegex = void 0;
-var URL = require('url').URL || window.URL;
-var logging_1 = require("./logging");
-exports.workspaceIDRegex = /([a-z0-9]{4,8}-)+([a-z0-9]{12})/;
-var GitpodHostUrl = /** @class */ (function () {
-    function GitpodHostUrl(urlParam) {
-        if (urlParam === undefined || typeof urlParam === 'string') {
-            this.url = new URL(urlParam || 'https://gitpod.io');
-            this.url.search = '';
-            this.url.hash = '';
-            this.url.pathname = '';
+exports.GitpodHostUrl = void 0;
+const URL = require("url").URL || window.URL;
+const logging_1 = require("./logging");
+const baseWorkspaceIDRegex = "(([a-f][0-9a-f]{7}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|([0-9a-z]{2,16}-[0-9a-z]{2,16}-[0-9a-z]{8,11}))";
+// this pattern matches v4 UUIDs as well as the new generated workspace ids (e.g. pink-panda-ns35kd21)
+const workspaceIDRegex = RegExp(`^${baseWorkspaceIDRegex}$`);
+// this pattern matches URL prefixes of workspaces
+const workspaceUrlPrefixRegex = RegExp(`^([0-9]{4,6}-)?${baseWorkspaceIDRegex}\\.`);
+class GitpodHostUrl {
+    constructor(urlParam) {
+        if (urlParam === undefined || typeof urlParam === "string") {
+            this.url = new URL(urlParam || "https://gitpod.io");
+            this.url.search = "";
+            this.url.hash = "";
+            this.url.pathname = "";
         }
         else if (urlParam instanceof URL) {
             this.url = urlParam;
         }
         else {
-            logging_1.log.error('Unexpected urlParam', { urlParam: urlParam });
+            logging_1.log.error("Unexpected urlParam", { urlParam });
         }
     }
-    GitpodHostUrl.fromWorkspaceUrl = function (url) {
+    static fromWorkspaceUrl(url) {
         return new GitpodHostUrl(new URL(url));
-    };
-    GitpodHostUrl.prototype.withWorkspacePrefix = function (workspaceId, region) {
-        return this.withDomainPrefix(workspaceId + ".ws-" + region + ".");
-    };
-    GitpodHostUrl.prototype.withDomainPrefix = function (prefix) {
-        return this.with(function (url) { return ({ host: prefix + url.host }); });
-        ;
-    };
-    GitpodHostUrl.prototype.withoutWorkspacePrefix = function () {
-        if (!this.url.host.match(exports.workspaceIDRegex)) {
+    }
+    withWorkspacePrefix(workspaceId, region) {
+        return this.withDomainPrefix(`${workspaceId}.ws-${region}.`);
+    }
+    withDomainPrefix(prefix) {
+        return this.with((url) => ({ host: prefix + url.host }));
+    }
+    withoutWorkspacePrefix() {
+        if (!this.url.host.match(workspaceUrlPrefixRegex)) {
             // URL has no workspace prefix
             return this;
         }
         return this.withoutDomainPrefix(2);
-    };
-    GitpodHostUrl.prototype.withoutDomainPrefix = function (removeSegmentsCount) {
-        return this.with(function (url) { return ({ host: url.host.split('.').splice(removeSegmentsCount).join('.') }); });
-    };
-    GitpodHostUrl.prototype.with = function (urlUpdate) {
-        var update = typeof urlUpdate === 'function' ? urlUpdate(this.url) : urlUpdate;
-        var addSlashToPath = update.pathname && update.pathname.length > 0 && !update.pathname.startsWith('/');
+    }
+    withoutDomainPrefix(removeSegmentsCount) {
+        return this.with((url) => ({ host: url.host.split(".").splice(removeSegmentsCount).join(".") }));
+    }
+    with(urlUpdate) {
+        const update = typeof urlUpdate === "function" ? urlUpdate(this.url) : urlUpdate;
+        const addSlashToPath = update.pathname && update.pathname.length > 0 && !update.pathname.startsWith("/");
         if (addSlashToPath) {
-            update.pathname = '/' + update.pathname;
+            update.pathname = "/" + update.pathname;
         }
-        var result = Object.assign(new URL(this.toString()), update);
+        const result = Object.assign(new URL(this.toString()), update);
         return new GitpodHostUrl(result);
-    };
-    GitpodHostUrl.prototype.withApi = function (urlUpdate) {
-        var updated = urlUpdate ? this.with(urlUpdate) : this;
-        return updated.with(function (url) { return ({ pathname: "/api" + url.pathname }); });
-    };
-    GitpodHostUrl.prototype.withContext = function (contextUrl) {
-        return this.with(function (url) { return ({ hash: contextUrl }); });
-    };
-    GitpodHostUrl.prototype.asWebsocket = function () {
-        return this.with(function (url) { return ({ protocol: url.protocol === 'https:' ? 'wss:' : 'ws:' }); });
-    };
-    GitpodHostUrl.prototype.asDashboard = function () {
-        return this.with(function (url) { return ({ pathname: '/workspaces/' }); });
-    };
-    GitpodHostUrl.prototype.asLogin = function () {
-        return this.with(function (url) { return ({ pathname: '/login/' }); });
-    };
-    GitpodHostUrl.prototype.asUpgradeSubscription = function () {
-        return this.with(function (url) { return ({ pathname: '/upgrade-subscription/' }); });
-    };
-    GitpodHostUrl.prototype.asAccessControl = function () {
-        return this.with(function (url) { return ({ pathname: '/access-control/' }); });
-    };
-    GitpodHostUrl.prototype.asSettings = function () {
-        return this.with(function (url) { return ({ pathname: '/settings/' }); });
-    };
-    GitpodHostUrl.prototype.asGraphQLApi = function () {
-        return this.with(function (url) { return ({ pathname: '/graphql/' }); });
-    };
-    GitpodHostUrl.prototype.asStart = function (workspaceId) {
-        if (workspaceId === void 0) { workspaceId = this.workspaceId; }
+    }
+    withApi(urlUpdate) {
+        const updated = urlUpdate ? this.with(urlUpdate) : this;
+        return updated.with((url) => ({ pathname: `/api${url.pathname}` }));
+    }
+    withContext(contextUrl) {
+        return this.with((url) => ({ hash: contextUrl }));
+    }
+    asWebsocket() {
+        return this.with((url) => ({ protocol: url.protocol === "https:" ? "wss:" : "ws:" }));
+    }
+    asDashboard() {
+        return this.with((url) => ({ pathname: "/" }));
+    }
+    asLogin() {
+        return this.with((url) => ({ pathname: "/login" }));
+    }
+    asUpgradeSubscription() {
+        return this.with((url) => ({ pathname: "/plans" }));
+    }
+    asAccessControl() {
+        return this.with((url) => ({ pathname: "/integrations" }));
+    }
+    asSettings() {
+        return this.with((url) => ({ pathname: "/settings" }));
+    }
+    asPreferences() {
+        return this.with((url) => ({ pathname: "/preferences" }));
+    }
+    asStart(workspaceId = this.workspaceId) {
         return this.withoutWorkspacePrefix().with({
-            pathname: '/start/',
-            hash: '#' + workspaceId
+            pathname: "/start/",
+            hash: "#" + workspaceId,
         });
-    };
-    GitpodHostUrl.prototype.asWorkspaceAuth = function (instanceID, redirect) {
-        return this.with(function (url) { return ({ pathname: "/api/auth/workspace-cookie/" + instanceID, search: redirect ? "redirect" : "" }); });
-    };
-    GitpodHostUrl.prototype.toString = function () {
+    }
+    asWorkspaceAuth(instanceID, redirect) {
+        return this.with((url) => ({
+            pathname: `/api/auth/workspace-cookie/${instanceID}`,
+            search: redirect ? "redirect" : "",
+        }));
+    }
+    toString() {
         return this.url.toString();
-    };
-    GitpodHostUrl.prototype.toStringWoRootSlash = function () {
-        var result = this.toString();
-        if (result.endsWith('/')) {
+    }
+    toStringWoRootSlash() {
+        let result = this.toString();
+        if (result.endsWith("/")) {
             result = result.slice(0, result.length - 1);
         }
         return result;
-    };
-    Object.defineProperty(GitpodHostUrl.prototype, "workspaceId", {
-        get: function () {
-            var hostSegs = this.url.host.split(".");
-            if (hostSegs.length > 1 && hostSegs[0].match(exports.workspaceIDRegex)) {
+    }
+    get workspaceId() {
+        const hostSegs = this.url.host.split(".");
+        if (hostSegs.length > 1) {
+            const matchResults = hostSegs[0].match(workspaceIDRegex);
+            if (matchResults) {
                 // URL has a workspace prefix
-                return hostSegs[0];
-            }
-            var pathSegs = this.url.pathname.split("/");
-            if (pathSegs.length > 3 && pathSegs[1] === "workspace") {
-                return pathSegs[2];
-            }
-            return undefined;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(GitpodHostUrl.prototype, "blobServe", {
-        get: function () {
-            var hostSegments = this.url.host.split(".");
-            if (hostSegments[0] === 'blobserve') {
-                return true;
+                // port prefixes are excluded
+                return matchResults[0];
             }
-            var pathSegments = this.url.pathname.split("/");
-            return pathSegments[0] === "blobserve";
-        },
-        enumerable: false,
-        configurable: true
-    });
-    GitpodHostUrl.prototype.asSorry = function (message) {
-        return this.with({ pathname: '/sorry', hash: message });
-    };
-    return GitpodHostUrl;
-}());
+        }
+        const pathSegs = this.url.pathname.split("/");
+        if (pathSegs.length > 3 && pathSegs[1] === "workspace") {
+            return pathSegs[2];
+        }
+        return undefined;
+    }
+    get blobServe() {
+        const hostSegments = this.url.host.split(".");
+        if (hostSegments[0] === "blobserve") {
+            return true;
+        }
+        const pathSegments = this.url.pathname.split("/");
+        return pathSegments[0] === "blobserve";
+    }
+    asSorry(message) {
+        return this.with({ pathname: "/sorry", hash: message });
+    }
+    asApiLogout() {
+        return this.withApi((url) => ({ pathname: "/logout/" }));
+    }
+}
 exports.GitpodHostUrl = GitpodHostUrl;
 //# sourceMappingURL=gitpod-host-url.js.map

package/lib/util/gitpod-host-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitpod-host-url.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,IAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;AAC7C,qCAAgC;AAOnB,QAAA,gBAAgB,GAAG,iCAAiC,CAAC;AAElE;IAGI,uBAAY,QAAuB;QAC/B,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACxD,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC1B;aAAM,IAAI,QAAQ,YAAY,GAAG,EAAE;YAChC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC;SACvB;aAAM;YACH,aAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;SAClD;IACL,CAAC;IAEM,8BAAgB,GAAvB,UAAwB,GAAW;QAC/B,OAAO,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,2CAAmB,GAAnB,UAAoB,WAAmB,EAAE,MAAc;QACnD,OAAO,IAAI,CAAC,gBAAgB,CAAI,WAAW,YAAO,MAAM,MAAG,CAAC,CAAC;IACjE,CAAC;IAED,wCAAgB,GAAhB,UAAiB,MAAc;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,EAA7B,CAA6B,CAAC,CAAC;QAAA,CAAC;IAC5D,CAAC;IAED,8CAAsB,GAAtB;QACI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAgB,CAAC,EAAE;YACxC,8BAA8B;YAC9B,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,2CAAmB,GAAnB,UAAoB,mBAA2B;QAC3C,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAArE,CAAqE,CAAC,CAAC;IACnG,CAAC;IAED,4BAAI,GAAJ,UAAK,SAAoB;QACrB,IAAM,MAAM,GAAG,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACjF,IAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACzG,IAAI,cAAc,EAAE;YAChB,MAAM,CAAC,QAAQ,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;SAC3C;QACD,IAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC/D,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,+BAAO,GAAP,UAAQ,SAAqB;QACzB,IAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACxD,OAAO,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,SAAO,GAAG,CAAC,QAAU,EAAE,CAAC,EAArC,CAAqC,CAAC,CAAC;IACtE,CAAC;IAED,mCAAW,GAAX,UAAY,UAAkB;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAtB,CAAsB,CAAC,CAAC;IACpD,CAAC;IAED,mCAAW,GAAX;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAA1D,CAA0D,CAAC,CAAC;IACxF,CAAC;IAED,mCAAW,GAAX;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,EAA9B,CAA8B,CAAC,CAAC;IAC5D,CAAC;IAED,+BAAO,GAAP;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAzB,CAAyB,CAAC,CAAC;IACvD,CAAC;IAED,6CAAqB,GAArB;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,wBAAwB,EAAE,CAAC,EAAxC,CAAwC,CAAC,CAAC;IACtE,CAAC;IAED,uCAAe,GAAf;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,EAAlC,CAAkC,CAAC,CAAC;IAChE,CAAC;IAED,kCAAU,GAAV;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,EAA5B,CAA4B,CAAC,CAAC;IAC1D,CAAC;IAED,oCAAY,GAAZ;QACI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,EAA3B,CAA2B,CAAC,CAAC;IACzD,CAAC;IAED,+BAAO,GAAP,UAAQ,WAA8B;QAA9B,4BAAA,EAAA,cAAc,IAAI,CAAC,WAAW;QAClC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC;YACtC,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,GAAG,GAAG,WAAW;SAC1B,CAAC,CAAC;IACP,CAAC;IAED,uCAAe,GAAf,UAAgB,UAAkB,EAAE,QAAkB;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,EAAE,QAAQ,EAAE,gCAA8B,UAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAA9F,CAA8F,CAAC,CAAC;IAC5H,CAAC;IAED,gCAAQ,GAAR;QACI,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,2CAAmB,GAAnB;QACI,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,sBAAI,sCAAW;aAAf;YACI,IAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,wBAAgB,CAAC,EAAE;gBAC5D,6BAA6B;gBAC7B,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;aACtB;YAED,IAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC7C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;gBACpD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;aACtB;YAED,OAAO,SAAS,CAAC;QACrB,CAAC;;;OAAA;IAED,sBAAI,oCAAS;aAAb;YACI,IAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;gBACjC,OAAO,IAAI,CAAC;aACf;YAED,IAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACjD,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;QAC3C,CAAC;;;OAAA;IAED,+BAAO,GAAP,UAAQ,OAAe;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;IAEL,oBAAC;AAAD,CAAC,AA5ID,IA4IC;AA5IY,sCAAa"}
+{"version":3,"file":"gitpod-host-url.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"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"}

package/lib/util/gitpod-host-url.spec.d.ts

@@ -1,9 +1,16 @@
 /**
- * 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.
  */
 export declare class GitpodHostUrlTest {
     parseWorkspaceId_pathBased(): void;
+    parseWorkspaceId_hosts_withEnvVarsInjected(): void;
+    testWithoutWorkspacePrefix(): Promise<void>;
+    testWithoutWorkspacePrefix2(): Promise<void>;
+    testWithoutWorkspacePrefix3(): Promise<void>;
+    testWithoutWorkspacePrefix4(): Promise<void>;
+    testWithoutWorkspacePrefix5(): Promise<void>;
+    testWithoutWorkspacePrefix6(): Promise<void>;
 }
 //# sourceMappingURL=gitpod-host-url.spec.d.ts.map

package/lib/util/gitpod-host-url.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitpod-host-url.spec.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,iBAAiB;IAEb,0BAA0B;CAI1C"}
+{"version":3,"file":"gitpod-host-url.spec.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,iBAAiB;IACb,0BAA0B;IAO1B,0CAA0C;IAOpC,0BAA0B;IAQ1B,2BAA2B;IAM3B,2BAA2B;IAQ3B,2BAA2B;IAQ3B,2BAA2B;IAQ3B,2BAA2B;CASjD"}

package/lib/util/gitpod-host-url.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.
  */
@@ -13,30 +13,122 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitpodHostUrlTest = void 0;
-var chai = require("chai");
-var mocha_typescript_1 = require("mocha-typescript");
-var gitpod_host_url_1 = require("./gitpod-host-url");
-var expect = chai.expect;
-var GitpodHostUrlTest = /** @class */ (function () {
-    function GitpodHostUrlTest() {
-    }
-    GitpodHostUrlTest.prototype.parseWorkspaceId_pathBased = function () {
-        var actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("http://35.223.201.195/workspace/bc77e03d-c781-4235-bca0-e24087f5e472/").workspaceId;
+const chai = require("chai");
+const mocha_typescript_1 = require("mocha-typescript");
+const gitpod_host_url_1 = require("./gitpod-host-url");
+const expect = chai.expect;
+let GitpodHostUrlTest = class GitpodHostUrlTest {
+    parseWorkspaceId_pathBased() {
+        const actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("http://35.223.201.195/workspace/bc77e03d-c781-4235-bca0-e24087f5e472/").workspaceId;
         expect(actual).to.equal("bc77e03d-c781-4235-bca0-e24087f5e472");
-    };
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], GitpodHostUrlTest.prototype, "parseWorkspaceId_pathBased", null);
-    GitpodHostUrlTest = __decorate([
-        mocha_typescript_1.suite
-    ], GitpodHostUrlTest);
-    return GitpodHostUrlTest;
-}());
+    }
+    parseWorkspaceId_hosts_withEnvVarsInjected() {
+        const actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gray-grasshopper-nfbitfia.ws-eu02.gitpod-staging.com/#passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo").workspaceId;
+        expect(actual).to.equal("gray-grasshopper-nfbitfia");
+    }
+    testWithoutWorkspacePrefix() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://3000-moccasin-ferret-155799b3.ws-eu02.gitpod-staging.com/")
+                .withoutWorkspacePrefix()
+                .toString()).to.equal("https://gitpod-staging.com/");
+        });
+    }
+    testWithoutWorkspacePrefix2() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gitpod-staging.com/").withoutWorkspacePrefix().toString()).to.equal("https://gitpod-staging.com/");
+        });
+    }
+    testWithoutWorkspacePrefix3() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gray-rook-5523v5d8.ws-dev.my-branch-1234.staging.gitpod-dev.com/")
+                .withoutWorkspacePrefix()
+                .toString()).to.equal("https://my-branch-1234.staging.gitpod-dev.com/");
+        });
+    }
+    testWithoutWorkspacePrefix4() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://my-branch-1234.staging.gitpod-dev.com/")
+                .withoutWorkspacePrefix()
+                .toString()).to.equal("https://my-branch-1234.staging.gitpod-dev.com/");
+        });
+    }
+    testWithoutWorkspacePrefix5() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://abc-nice-brunch-4224.staging.gitpod-dev.com/")
+                .withoutWorkspacePrefix()
+                .toString()).to.equal("https://abc-nice-brunch-4224.staging.gitpod-dev.com/");
+        });
+    }
+    testWithoutWorkspacePrefix6() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gray-rook-5523v5d8.ws-dev.abc-nice-brunch-4224.staging.gitpod-dev.com/")
+                .withoutWorkspacePrefix()
+                .toString()).to.equal("https://abc-nice-brunch-4224.staging.gitpod-dev.com/");
+        });
+    }
+};
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], GitpodHostUrlTest.prototype, "parseWorkspaceId_pathBased", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], GitpodHostUrlTest.prototype, "parseWorkspaceId_hosts_withEnvVarsInjected", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix2", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix3", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix4", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix5", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix6", null);
+GitpodHostUrlTest = __decorate([
+    mocha_typescript_1.suite
+], GitpodHostUrlTest);
 exports.GitpodHostUrlTest = GitpodHostUrlTest;
 module.exports = new GitpodHostUrlTest();
 //# sourceMappingURL=gitpod-host-url.spec.js.map

package/lib/util/gitpod-host-url.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitpod-host-url.spec.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,2BAA6B;AAC7B,qDAA+C;AAC/C,qDAAkD;AAClD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B;IAAA;IAMA,CAAC;IAJgB,sDAA0B,GAAjC;QACF,IAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CAAC,uEAAuE,CAAC,CAAC,WAAW,CAAC;QACnI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAHK;QAAL,uBAAI;;;;uEAGJ;IALQ,iBAAiB;QAD7B,wBAAK;OACO,iBAAiB,CAM7B;IAAD,wBAAC;CAAA,AAND,IAMC;AANY,8CAAiB;AAO9B,MAAM,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"gitpod-host-url.spec.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAEH,6BAA6B;AAC7B,uDAA+C;AAC/C,uDAAkD;AAClD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IACb,0BAA0B;QACnC,MAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CACzC,uEAAuE,CAC1E,CAAC,WAAW,CAAC;QACd,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,0CAA0C;QACnD,MAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CACzC,mIAAmI,CACtI,CAAC,WAAW,CAAC;QACd,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzD,CAAC;IAEkB,0BAA0B;;YACzC,MAAM,CACF,+BAAa,CAAC,gBAAgB,CAAC,mEAAmE,CAAC;iBAC9F,sBAAsB,EAAE;iBACxB,QAAQ,EAAE,CAClB,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC9C,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CACF,+BAAa,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CACpG,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC9C,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CACF,+BAAa,CAAC,gBAAgB,CAAC,0EAA0E,CAAC;iBACrG,sBAAsB,EAAE;iBACxB,QAAQ,EAAE,CAClB,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACjE,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CACF,+BAAa,CAAC,gBAAgB,CAAC,gDAAgD,CAAC;iBAC3E,sBAAsB,EAAE;iBACxB,QAAQ,EAAE,CAClB,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACjE,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CACF,+BAAa,CAAC,gBAAgB,CAAC,sDAAsD,CAAC;iBACjF,sBAAsB,EAAE;iBACxB,QAAQ,EAAE,CAClB,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACvE,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CACF,+BAAa,CAAC,gBAAgB,CAC1B,gFAAgF,CACnF;iBACI,sBAAsB,EAAE;iBACxB,QAAQ,EAAE,CAClB,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACvE,CAAC;KAAA;CACJ,CAAA;AA7DS;IAAL,uBAAI;;;;mEAKJ;AAEK;IAAL,uBAAI;;;;mFAKJ;AAEK;IAAL,uBAAI;;;;mEAMJ;AAEK;IAAL,uBAAI;;;;oEAIJ;AAEK;IAAL,uBAAI;;;;oEAMJ;AAEK;IAAL,uBAAI;;;;oEAMJ;AAEK;IAAL,uBAAI;;;;oEAMJ;AAEK;IAAL,uBAAI;;;;oEAQJ;AA7DQ,iBAAiB;IAD7B,wBAAK;GACO,iBAAiB,CA8D7B;AA9DY,8CAAiB;AA+D9B,MAAM,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAC"}

package/lib/util/grpc.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2021 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.
+ */
+export declare const defaultGRPCOptions: {
+    "grpc.keepalive_timeout_ms": number;
+    "grpc.keepalive_time_ms": number;
+    "grpc.http2.min_time_between_pings_ms": number;
+    "grpc.keepalive_permit_without_calls": number;
+    "grpc-node.max_session_memory": number;
+    "grpc.max_reconnect_backoff_ms": number;
+    "grpc.max_receive_message_length": number;
+};
+//# sourceMappingURL=grpc.d.ts.map

package/lib/util/grpc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc.d.ts","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;CAQ9B,CAAC"}

package/lib/util/grpc.js

@@ -0,0 +1,18 @@
+"use strict";
+/**
+ * Copyright (c) 2021 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.defaultGRPCOptions = void 0;
+exports.defaultGRPCOptions = {
+    "grpc.keepalive_timeout_ms": 10000,
+    "grpc.keepalive_time_ms": 60000,
+    "grpc.http2.min_time_between_pings_ms": 10000,
+    "grpc.keepalive_permit_without_calls": 1,
+    "grpc-node.max_session_memory": 50,
+    "grpc.max_reconnect_backoff_ms": 5000,
+    "grpc.max_receive_message_length": 1024 * 1024 * 16,
+};
+//# sourceMappingURL=grpc.js.map

package/lib/util/grpc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc.js","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEU,QAAA,kBAAkB,GAAG;IAC9B,2BAA2B,EAAE,KAAK;IAClC,wBAAwB,EAAE,KAAK;IAC/B,sCAAsC,EAAE,KAAK;IAC7C,qCAAqC,EAAE,CAAC;IACxC,8BAA8B,EAAE,EAAE;IAClC,+BAA+B,EAAE,IAAI;IACrC,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,EAAE;CACtD,CAAC"}

package/lib/util/jaeger-client-types.d.ts

@@ -0,0 +1,68 @@
+/**
+ * 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.
+ */
+import { opentracing } from "jaeger-client";
+export interface TracingConfig {
+    serviceName?: string;
+    disable?: boolean;
+    sampler?: SamplerConfig;
+    reporter?: ReporterConfig;
+}
+export interface TracingOptions {
+    reporter?: Reporter;
+    metrics?: MetricsFactory;
+    logger?: Logger;
+    tags?: any;
+}
+export interface ReporterConfig {
+    logSpans?: boolean;
+    agentHost?: string;
+    agentPort?: number;
+    flushIntervalMs?: number;
+}
+export interface SamplerConfig {
+    type: string;
+    param: number;
+    host?: string;
+    port?: number;
+    refreshIntervalMs?: number;
+}
+export interface Logger {
+    info(msg: string): void;
+    error(msg: string): void;
+}
+export interface Reporter {
+    report(span: opentracing.Span): void;
+    close(callback?: () => void): void;
+    setProcess(serviceName: string, tags: any): void;
+}
+export interface MetricsFactory {
+    createCounter(name: string, tags: any): Counter;
+    createTimer(name: string, tags: any): Timer;
+    createGauge(name: string, tags: any): Gauge;
+}
+export interface Counter {
+    increment(delta: number): void;
+}
+export interface Timer {
+    record(value: number): void;
+}
+export interface Gauge {
+    update(value: number): void;
+}
+export interface SamplingDecision {
+    sample: boolean;
+    retryable: boolean;
+    tags: any;
+}
+export interface Sampler {
+    name(): string;
+    isSampled(operation: string, tags: any): boolean;
+    onCreateSpan(span: opentracing.Span): SamplingDecision;
+    onSetOperationName(span: opentracing.Span, operationName: string): SamplingDecision;
+    onSetTag(span: opentracing.Span, key: string, value: any): SamplingDecision;
+    close(callback: () => void): void;
+}
+//# sourceMappingURL=jaeger-client-types.d.ts.map

package/lib/util/jaeger-client-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jaeger-client-types.d.ts","sourceRoot":"","sources":["../../src/util/jaeger-client-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAO5C,MAAM,WAAW,aAAa;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,MAAM;IACnB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,QAAQ;IACrB,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACrC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACnC,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,cAAc;IAC3B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC;IAChD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC;IAC5C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC;CAC/C;AAGD,MAAM,WAAW,OAAO;IAEpB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAGD,MAAM,WAAW,KAAK;IAElB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAGD,MAAM,WAAW,KAAK;IAElB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAYD,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC;CACb;AAGD,MAAM,WAAW,OAAO;IACpB,IAAI,IAAI,MAAM,CAAC;IACf,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC;IACjD,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,GAAG,gBAAgB,CAAC;IACvD,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACpF,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,gBAAgB,CAAC;IAC5E,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;CACrC"}

package/lib/{theia-plugins.js → util/jaeger-client-types.js}

@@ -5,4 +5,4 @@
  * See License-AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=theia-plugins.js.map
+//# sourceMappingURL=jaeger-client-types.js.map

package/lib/util/jaeger-client-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jaeger-client-types.js","sourceRoot":"","sources":["../../src/util/jaeger-client-types.ts"],"names":[],"mappings":";AAAA;;;;GAIG"}