@gitpod/gitpod-protocol 0.1.5-test.9 → 0.1.5-tweak-workspaceconfig-origin-docs-fork.0

package/lib/util/tracing.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.
  */
@@ -11,21 +11,27 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var opentracing = require("opentracing");
-var jaeger_client_1 = require("jaeger-client");
-var opentracing_1 = require("opentracing");
-var inversify_1 = require("inversify");
+exports.PerOperationSampler = exports.TracingManager = exports.TraceContext = void 0;
+const opentracing = require("opentracing");
+const jaeger_client_1 = require("jaeger-client");
+const opentracing_1 = require("opentracing");
+const inversify_1 = require("inversify");
 var TraceContext;
 (function (TraceContext) {
-    function startSpan(operation, ctx) {
-        var options = {
-            childOf: ctx.span
+    function startSpan(operation, parentCtx) {
+        const options = {
+            childOf: parentCtx.span
         };
         return opentracing.globalTracer().startSpan(operation, options);
     }
     TraceContext.startSpan = startSpan;
+    function childContextWithSpan(operation, parentCtx) {
+        const span = startSpan(operation, parentCtx);
+        return { span };
+    }
+    TraceContext.childContextWithSpan = childContextWithSpan;
     function startAsyncSpan(operation, ctx) {
-        var options = {};
+        const options = {};
         if (!!ctx.span) {
             options.references = [opentracing.followsFrom(ctx.span.context())];
         }
@@ -43,22 +49,53 @@ var TraceContext;
         ctx.span.setTag("error", true);
     }
     TraceContext.logError = logError;
+    function logJsonRPCError(ctx, method, err) {
+        if (!ctx.span) {
+            return;
+        }
+        logError(ctx, err);
+        // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md#json-rpc
+        ctx.span.addTags({
+            rpc: {
+                system: "jsonrpc",
+                method,
+                jsonrpc: {
+                    error_code: err.code,
+                    error_message: err.message,
+                },
+            },
+        });
+    }
+    TraceContext.logJsonRPCError = logJsonRPCError;
+    function addJsonRPCParameters(ctx, method, args) {
+        if (!ctx.span) {
+            return;
+        }
+        ctx.span.addTags({
+            rpc: {
+                system: "jsonrpc",
+                method,
+                jsonrpc: {
+                    parameters: args.slice(),
+                },
+            },
+        });
+    }
+    TraceContext.addJsonRPCParameters = addJsonRPCParameters;
 })(TraceContext = exports.TraceContext || (exports.TraceContext = {}));
-var TracingManager = /** @class */ (function () {
-    function TracingManager() {
-    }
-    TracingManager.prototype.setup = function (serviceName, opts) {
-        opentracing_1.initGlobalTracer(this.getTracerForService(serviceName, opts));
-    };
-    TracingManager.prototype.getTracerForService = function (serviceName, opts) {
-        var config = {
+let TracingManager = class TracingManager {
+    setup(serviceName, opts) {
+        (0, opentracing_1.initGlobalTracer)(this.getTracerForService(serviceName, opts));
+    }
+    getTracerForService(serviceName, opts) {
+        const config = {
             disable: false,
             reporter: {
                 logSpans: false
             },
-            serviceName: serviceName
+            serviceName
         };
-        var t = jaeger_client_1.initTracerFromEnv(config, {
+        const t = (0, jaeger_client_1.initTracerFromEnv)(config, {
             logger: console
         });
         if (opts) {
@@ -67,26 +104,25 @@ var TracingManager = /** @class */ (function () {
             }
         }
         return t;
-    };
-    TracingManager = __decorate([
-        inversify_1.injectable()
-    ], TracingManager);
-    return TracingManager;
-}());
+    }
+};
+TracingManager = __decorate([
+    (0, inversify_1.injectable)()
+], TracingManager);
 exports.TracingManager = TracingManager;
-var PerOperationSampler = /** @class */ (function () {
-    function PerOperationSampler(fallback, strategies) {
+class PerOperationSampler {
+    constructor(fallback, strategies) {
         this.fallback = fallback;
         this.strategies = strategies;
     }
-    PerOperationSampler.prototype.name = function () {
+    name() {
         return 'PerOperationSampler';
-    };
-    PerOperationSampler.prototype.toString = function () {
-        return "" + this.name();
-    };
-    PerOperationSampler.prototype.isSampled = function (operation, tags) {
-        var shouldSample = this.strategies[operation];
+    }
+    toString() {
+        return `${this.name()}`;
+    }
+    isSampled(operation, tags) {
+        let shouldSample = this.strategies[operation];
         if (shouldSample === undefined) {
             if (!this.fallback.isSampled) {
                 return false;
@@ -94,31 +130,30 @@ var PerOperationSampler = /** @class */ (function () {
             return this.fallback.isSampled(operation, tags);
         }
         return shouldSample;
-    };
-    PerOperationSampler.prototype.onCreateSpan = function (span) {
-        var outTags = {};
-        var isSampled = this.isSampled(span.operationName, outTags);
+    }
+    onCreateSpan(span) {
+        const outTags = {};
+        const isSampled = this.isSampled(span.operationName, outTags);
         // NB: return retryable=true here since we can change decision after setOperationName().
         return { sample: isSampled, retryable: true, tags: outTags };
-    };
-    PerOperationSampler.prototype.onSetOperationName = function (span, operationName) {
-        var outTags = {};
-        var isSampled = this.isSampled(span.operationName, outTags);
+    }
+    onSetOperationName(span, operationName) {
+        const outTags = {};
+        const isSampled = this.isSampled(span.operationName, outTags);
         return { sample: isSampled, retryable: false, tags: outTags };
-    };
-    PerOperationSampler.prototype.onSetTag = function (span, key, value) {
+    }
+    onSetTag(span, key, value) {
         return { sample: false, retryable: true, tags: null };
-    };
-    PerOperationSampler.prototype.equal = function (other) {
+    }
+    equal(other) {
         return false; // TODO equal should be removed
-    };
-    PerOperationSampler.prototype.close = function (callback) {
+    }
+    close(callback) {
         // all nested samplers are of simple types, so we do not need to Close them
         if (callback) {
             callback();
         }
-    };
-    return PerOperationSampler;
-}());
+    }
+}
 exports.PerOperationSampler = PerOperationSampler;
 //# sourceMappingURL=tracing.js.map

package/lib/util/tracing.js.map

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

package/lib/util/workspace-port-authentication.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/workspace-port-authentication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-port-authentication.d.ts","sourceRoot":"","sources":["../../src/util/workspace-port-authentication.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;EAOE;AACF,eAAO,MAAM,0BAA0B,+CAKtC,CAAC"}
+{"version":3,"file":"workspace-port-authentication.d.ts","sourceRoot":"","sources":["../../src/util/workspace-port-authentication.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;EAOE;AACF,eAAO,MAAM,0BAA0B,SAAkB,MAAM,eAAe,MAAM,KAAG,MAKtF,CAAC"}

package/lib/util/workspace-port-authentication.js

@@ -1,10 +1,11 @@
 "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.worspacePortAuthCookieName = void 0;
 /**
 * These cookies are set in the Theia frontend. This pattern is relied upon in:
 *  - proxy:
@@ -13,10 +14,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 *  - server:
 *    - to authenticate access to port locations
 */
-exports.worspacePortAuthCookieName = function (host, workspaceId) {
+const worspacePortAuthCookieName = function (host, workspaceId) {
     return host
         .replace(/https?/, '')
         .replace(/[\W_]+/g, "_")
-        + ("_ws_" + workspaceId + "_port_auth_");
+        + `_ws_${workspaceId}_port_auth_`;
 };
+exports.worspacePortAuthCookieName = worspacePortAuthCookieName;
 //# sourceMappingURL=workspace-port-authentication.js.map

package/lib/util/workspace-port-authentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-port-authentication.js","sourceRoot":"","sources":["../../src/util/workspace-port-authentication.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAEH;;;;;;;EAOE;AACW,QAAA,0BAA0B,GAAG,UAAS,IAAY,EAAE,WAAmB;IAChF,OAAO,IAAI;SACN,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;WACtB,SAAO,WAAW,gBAAa,CAAA,CAAC;AAC1C,CAAC,CAAC"}
+{"version":3,"file":"workspace-port-authentication.js","sourceRoot":"","sources":["../../src/util/workspace-port-authentication.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH;;;;;;;EAOE;AACK,MAAM,0BAA0B,GAAG,UAAS,IAAY,EAAE,WAAmB;IAChF,OAAO,IAAI;SACN,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;UACtB,OAAO,WAAW,aAAa,CAAC;AAC1C,CAAC,CAAC;AALW,QAAA,0BAA0B,8BAKrC"}

package/lib/workspace-cluster.d.ts

@@ -0,0 +1,74 @@
+/**
+ * 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 { DeepPartial } from "./util/deep-partial";
+import { PermissionName } from './permission';
+export interface WorkspaceCluster {
+    name: string;
+    url: string;
+    tls?: TLSConfig;
+    state: WorkspaceClusterState;
+    maxScore: number;
+    score: number;
+    govern: boolean;
+    admissionConstraints?: AdmissionConstraint[];
+    admissionPreferences?: AdmissionPreference[];
+}
+export declare type WorkspaceClusterState = "available" | "cordoned" | "draining";
+export interface TLSConfig {
+    ca: string;
+    key: string;
+    crt: string;
+}
+export declare namespace TLSConfig {
+    const loadFromBase64File: (path: string) => string;
+}
+export declare type WorkspaceClusterWoTLS = Omit<WorkspaceCluster, "tls">;
+export declare type WorkspaceManagerConnectionInfo = Pick<WorkspaceCluster, "name" | "url" | "tls">;
+export declare type AdmissionConstraint = AdmissionConstraintFeaturePreview | AdmissionConstraintHasRole | AdmissionConstraintHasUserLevel;
+export declare type AdmissionConstraintFeaturePreview = {
+    type: "has-feature-preview";
+};
+export declare type AdmissionConstraintHasRole = {
+    type: "has-permission";
+    permission: PermissionName;
+};
+export declare type AdmissionConstraintHasUserLevel = {
+    type: "has-user-level";
+    level: string;
+};
+export declare type AdmissionPreference = AdmissionPreferenceUserLevel;
+export declare type AdmissionPreferenceUserLevel = {
+    type: 'user-level';
+    level: string;
+};
+export declare const WorkspaceClusterDB: unique symbol;
+export interface WorkspaceClusterDB {
+    /**
+     * Stores the given WorkspaceCluster to the cluster-local DB in a consistent manner.
+     * If there already is an entry with the same name it's merged and updated with the given state.
+     * @param cluster
+     */
+    save(cluster: WorkspaceCluster): Promise<void>;
+    /**
+     * Deletes the cluster identified by this name, if any.
+     * @param name
+     */
+    deleteByName(name: string): Promise<void>;
+    /**
+     * Finds a WorkspaceCluster with the given name. If there is none, `undefined` is returned.
+     * @param name
+     */
+    findByName(name: string): Promise<WorkspaceCluster | undefined>;
+    /**
+     * Lists all WorkspaceClusterWoTls for which the given predicate is true (does not return TLS for size/speed concerns)
+     * @param predicate
+     */
+    findFiltered(predicate: DeepPartial<WorkspaceClusterFilter>): Promise<WorkspaceClusterWoTLS[]>;
+}
+export interface WorkspaceClusterFilter extends Pick<WorkspaceCluster, "state" | "govern" | "url"> {
+    minScore: number;
+}
+//# sourceMappingURL=workspace-cluster.d.ts.map

package/lib/workspace-cluster.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-cluster.d.ts","sourceRoot":"","sources":["../src/workspace-cluster.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAI7B,IAAI,EAAE,MAAM,CAAC;IAGb,GAAG,EAAE,MAAM,CAAC;IAGZ,GAAG,CAAC,EAAE,SAAS,CAAC;IAGhB,KAAK,EAAE,qBAAqB,CAAC;IAG7B,QAAQ,EAAE,MAAM,CAAC;IAGjB,KAAK,EAAE,MAAM,CAAC;IAGd,MAAM,EAAE,OAAO,CAAC;IAGhB,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAG7C,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChD;AAED,oBAAY,qBAAqB,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,CAAC;AAC1E,MAAM,WAAW,SAAS;IAEtB,EAAE,EAAE,MAAM,CAAC;IAEX,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,EAAE,MAAM,CAAC;CACf;AACD,yBAAiB,SAAS,CAAC;IAChB,MAAM,kBAAkB,SAAU,MAAM,KAAG,MAA6E,CAAC;CACnI;AACD,oBAAY,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;AAClE,oBAAY,8BAA8B,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC;AAE5F,oBAAY,mBAAmB,GAAG,iCAAiC,GAAG,0BAA0B,GAAG,+BAA+B,CAAC;AACnI,oBAAY,iCAAiC,GAAG;IAAE,IAAI,EAAE,qBAAqB,CAAA;CAAE,CAAC;AAChF,oBAAY,0BAA0B,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,UAAU,EAAE,cAAc,CAAA;CAAE,CAAC;AAChG,oBAAY,+BAA+B,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExF,oBAAY,mBAAmB,GAAG,4BAA4B,CAAC;AAC/D,oBAAY,4BAA4B,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAGjF,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C;;;OAGG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAEhE;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC,sBAAsB,CAAC,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;CAClG;AACD,MAAM,WAAW,sBAAuB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC9F,QAAQ,EAAE,MAAM,CAAC;CACpB"}

package/lib/workspace-cluster.js

@@ -0,0 +1,16 @@
+"use strict";
+/**
+ * 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.WorkspaceClusterDB = exports.TLSConfig = void 0;
+const fs = require("fs");
+const env_1 = require("./env");
+var TLSConfig;
+(function (TLSConfig) {
+    TLSConfig.loadFromBase64File = (path) => fs.readFileSync((0, env_1.filePathTelepresenceAware)(path)).toString("base64");
+})(TLSConfig = exports.TLSConfig || (exports.TLSConfig = {}));
+exports.WorkspaceClusterDB = Symbol("WorkspaceClusterDB");
+//# sourceMappingURL=workspace-cluster.js.map

package/lib/workspace-cluster.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-cluster.js","sourceRoot":"","sources":["../src/workspace-cluster.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,yBAAyB;AACzB,+BAAkD;AA4ClD,IAAiB,SAAS,CAEzB;AAFD,WAAiB,SAAS;IACT,4BAAkB,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAA,+BAAyB,EAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACpI,CAAC,EAFgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAEzB;AAaY,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC"}

package/lib/workspace-instance.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.
  */
@@ -10,6 +10,7 @@ export interface WorkspaceInstance {
     creationTime: string;
     deployedTime?: string;
     startedTime?: string;
+    stoppingTime?: string;
     stoppedTime?: string;
     ideUrl: string;
     region: string;
@@ -26,6 +27,8 @@ export interface WorkspaceInstanceStatus {
     repo?: WorkspaceInstanceRepoStatus;
     timeout?: string;
     nodeName?: string;
+    podName?: string;
+    nodeIp?: string;
     ownerToken?: string;
 }
 export declare type WorkspaceInstancePhase = "unknown" | "preparing" | "pending" | "creating" | "initializing" | "running" | "interrupted" | "stopping" | "stopped";
@@ -33,16 +36,16 @@ export interface WorkspaceInstanceConditions {
     failed?: string;
     timeout?: string;
     pullingImages?: boolean;
-    serviceExists?: boolean;
     deployed?: boolean;
     neededImageBuild?: boolean;
     firstUserActivity?: string;
+    headlessTaskFailed?: string;
+    stoppedByRequest?: boolean;
 }
 export declare type AdmissionLevel = 'owner_only' | 'everyone';
 export declare type PortVisibility = 'public' | 'private';
 export interface WorkspaceInstancePort {
     port: number;
-    targetPort?: number;
     visibility?: PortVisibility;
     url?: string;
 }
@@ -57,7 +60,10 @@ export interface WorkspaceInstanceRepoStatus {
     totalUnpushedCommits?: number;
 }
 export interface WorkspaceInstanceConfiguration {
-    theiaVersion: string;
+    theiaVersion?: string;
     featureFlags?: NamedWorkspaceFeatureFlag[];
+    ideImage: string;
+    desktopIdeImage?: string;
+    supervisorImage?: string;
 }
 //# sourceMappingURL=workspace-instance.d.ts.map

package/lib/workspace-instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-instance.d.ts","sourceRoot":"","sources":["../src/workspace-instance.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAGvD,MAAM,WAAW,iBAAiB;IAE9B,EAAE,EAAE,MAAM,CAAC;IAGX,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,MAAM,EAAE,MAAM,CAAC;IAGf,MAAM,EAAE,MAAM,CAAC;IAGf,cAAc,EAAE,MAAM,CAAC;IAGvB,MAAM,EAAE,uBAAuB,CAAC;IAKhC,aAAa,CAAC,EAAE,8BAA8B,CAAC;IAG/C,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC9B;AAGD,MAAM,WAAW,uBAAuB;IAEpC,KAAK,EAAE,sBAAsB,CAAC;IAG9B,UAAU,EAAE,2BAA2B,CAAC;IAGxC,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,YAAY,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAGvC,IAAI,CAAC,EAAE,2BAA2B,CAAC;IAGnC,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,oBAAY,sBAAsB,GAG9B,SAAS,GAIT,WAAW,GAKX,SAAS,GAKT,UAAU,GAIV,cAAc,GAId,SAAS,GAIT,aAAa,GAGb,UAAU,GAGV,SAAS,CAAC;AAEd,MAAM,WAAW,2BAA2B;IAExC,MAAM,CAAC,EAAE,MAAM,CAAA;IAGf,OAAO,CAAC,EAAE,MAAM,CAAA;IAGhB,aAAa,CAAC,EAAE,OAAO,CAAA;IAGvB,aAAa,CAAC,EAAE,OAAO,CAAA;IAGvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAG3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGD,oBAAY,cAAc,GAAG,YAAY,GAAG,UAAU,CAAC;AAGvD,oBAAY,cAAc,GAAG,QAAQ,GAAG,SAAS,CAAC;AAGlD,MAAM,WAAW,qBAAqB;IAElC,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,UAAU,CAAC,EAAE,cAAc,CAAC;IAG5B,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,WAAW,2BAA2B;IAExC,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAG3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAG7B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAG1B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAG5B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAG3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAChC;AAGD,MAAM,WAAW,8BAA8B;IAE3C,YAAY,EAAE,MAAM,CAAC;IAGrB,YAAY,CAAC,EAAE,yBAAyB,EAAE,CAAC;CAC9C"}
+{"version":3,"file":"workspace-instance.d.ts","sourceRoot":"","sources":["../src/workspace-instance.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAGvD,MAAM,WAAW,iBAAiB;IAE9B,EAAE,EAAE,MAAM,CAAC;IAGX,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,CAAC;IAIf,cAAc,EAAE,MAAM,CAAC;IAGvB,MAAM,EAAE,uBAAuB,CAAC;IAKhC,aAAa,CAAC,EAAE,8BAA8B,CAAC;IAG/C,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC9B;AAGD,MAAM,WAAW,uBAAuB;IAEpC,KAAK,EAAE,sBAAsB,CAAC;IAG9B,UAAU,EAAE,2BAA2B,CAAC;IAGxC,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,YAAY,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAGvC,IAAI,CAAC,EAAE,2BAA2B,CAAC;IAGnC,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,oBAAY,sBAAsB,GAG9B,SAAS,GAIT,WAAW,GAKX,SAAS,GAKT,UAAU,GAIV,cAAc,GAId,SAAS,GAIT,aAAa,GAGb,UAAU,GAGV,SAAS,CAAC;AAEd,MAAM,WAAW,2BAA2B;IAExC,MAAM,CAAC,EAAE,MAAM,CAAA;IAGf,OAAO,CAAC,EAAE,MAAM,CAAA;IAGhB,aAAa,CAAC,EAAE,OAAO,CAAA;IAGvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAG3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAG3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAG5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAGD,oBAAY,cAAc,GAAG,YAAY,GAAG,UAAU,CAAC;AAGvD,oBAAY,cAAc,GAAG,QAAQ,GAAG,SAAS,CAAC;AAGlD,MAAM,WAAW,qBAAqB;IAElC,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,CAAC,EAAE,cAAc,CAAC;IAG5B,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,WAAW,2BAA2B;IAExC,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAG3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAG7B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAG1B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAG5B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAG3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAChC;AAGD,MAAM,WAAW,8BAA8B;IAG3C,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,YAAY,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAG3C,QAAQ,EAAE,MAAM,CAAC;IAGjB,eAAe,CAAC,EAAE,MAAM,CAAA;IAGxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B"}

package/lib/workspace-instance.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.
  */

package/lib/wsready.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * 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.
  */

package/lib/wsready.js

@@ -1,11 +1,12 @@
 "use strict";
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * 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 });
-// generated using github.com/32leaves/bel on 2020-06-11 14:47:30.351829728 +0000 UTC m=+0.002956090
+exports.WorkspaceInitSource = void 0;
+// generated using github.com/32leaves/bel on 2021-11-04 12:16:53.917570766 +0000 UTC m=+0.006002884
 // DO NOT MODIFY
 var WorkspaceInitSource;
 (function (WorkspaceInitSource) {

package/lib/wsready.js.map

@@ -1 +1 @@
-{"version":3,"file":"wsready.js","sourceRoot":"","sources":["../src/wsready.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAEH,oGAAoG;AACpG,gBAAgB;AAEhB,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC3B,8DAAuC,CAAA;IACvC,kEAA2C,CAAA;IAC3C,4DAAqC,CAAA;AACzC,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B"}
+{"version":3,"file":"wsready.js","sourceRoot":"","sources":["../src/wsready.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,oGAAoG;AACpG,gBAAgB;AAEhB,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC3B,8DAAuC,CAAA;IACvC,kEAA2C,CAAA;IAC3C,4DAAqC,CAAA;AACzC,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B"}

package/package.json

@@ -1,30 +1,46 @@
 {
   "dependencies": {
+    "@types/react": "17.0.32",
     "ajv": "^6.5.4",
-    "inversify": "^5.0.1",
-    "jaeger-client": "3.17.2",
+    "analytics-node": "^4.0.1",
+    "cookie": "^0.4.1",
+    "inversify": "^5.1.1",
+    "jaeger-client": "^3.18.1",
     "js-yaml": "^3.10.0",
-    "opentracing": "^0.14.4",
-    "prom-client": "^10.2.0",
-    "reconnecting-websocket": "^4.2.0",
-    "reflect-metadata": "^0.1.10",
-    "uuid": "^3.3.3",
+    "opentracing": "^0.14.5",
+    "prom-client": "^13.2.0",
+    "random-number-csprng": "^1.0.2",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "reconnecting-websocket": "^4.4.0",
+    "reflect-metadata": "^0.1.13",
+    "uuid": "^8.3.2",
+    "vscode-jsonrpc": "^5.0.1",
+    "vscode-languageserver-protocol": "3.16.0",
+    "vscode-languageserver-types": "3.16.0",
     "vscode-uri": "^1.0.1",
     "vscode-ws-jsonrpc": "^0.2.0",
-    "ws": "^5.2.2"
+    "ws": "^7.4.6"
   },
   "devDependencies": {
-    "@types/chai-subset": "^1.3.1",
+    "@types/analytics-node": "^3.1.5",
+    "@types/chai-subset": "^1.3.3",
+    "@types/cookie": "^0.4.1",
     "@types/js-yaml": "^3.10.1",
-    "@types/uuid": "^3.4.5",
+    "@types/mocha": "^5.2.7",
+    "@types/node": "^16.11.6",
+    "@types/random-number-csprng": "^1.0.0",
+    "@types/uuid": "^8.3.1",
     "@types/ws": "^5.1.2",
-    "chai": "^4.1.2",
+    "chai": "^4.3.4",
     "chai-subset": "^1.6.0",
     "mocha": "^5.0.0",
     "mocha-typescript": "^1.1.11",
     "rimraf": "^2.6.2",
-    "ts-node": "<7.0.0",
-    "typescript": "^3.1.3"
+    "ts-node": "^9.0.0",
+    "typescript": "~4.4.2",
+    "typescript-json-schema": "^0.50.1",
+    "typescript-parser": "^2.6.1"
   },
   "files": [
     "lib",
@@ -39,9 +55,9 @@
     "build": "tsc",
     "clean": "rimraf lib",
     "prepare": "yarn run clean && yarn run build",
-    "test": "mocha --opts mocha.opts '**/*.spec.ts'",
+    "test": "mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'",
     "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput"
   },
   "types": "./lib/index.d.ts",
-  "version": "0.1.5-test.9"
-}
+  "version": "0.1.5-tweak-workspaceconfig-origin-docs-fork.0"
+}

package/pkg-yarn.lock

@@ -4,18 +4,27 @@
 
 "@gitpod/gitpod-protocol@0.1.5":
   version "0.1.5"
-  resolved "file:///tmp/cache/8d3ce0ae0a96520ebefe2bde421ac4dcbcd38ea2.tar.gz"
+  resolved "file:///tmp/cache/e57dd37d77000b669093c186ef4f032ebe3c194a.tar.gz"
   dependencies:
+    "@types/react" "17.0.32"
     ajv "^6.5.4"
-    inversify "^5.0.1"
-    jaeger-client "3.17.2"
+    analytics-node "^4.0.1"
+    cookie "^0.4.1"
+    inversify "^5.1.1"
+    jaeger-client "^3.18.1"
     js-yaml "^3.10.0"
-    opentracing "^0.14.4"
-    prom-client "^10.2.0"
-    reconnecting-websocket "^4.2.0"
-    reflect-metadata "^0.1.10"
-    uuid "^3.3.3"
+    opentracing "^0.14.5"
+    prom-client "^13.2.0"
+    random-number-csprng "^1.0.2"
+    react "17.0.2"
+    react-dom "17.0.2"
+    reconnecting-websocket "^4.4.0"
+    reflect-metadata "^0.1.13"
+    uuid "^8.3.2"
+    vscode-jsonrpc "^5.0.1"
+    vscode-languageserver-protocol "3.16.0"
+    vscode-languageserver-types "3.16.0"
     vscode-uri "^1.0.1"
     vscode-ws-jsonrpc "^0.2.0"
-    ws "^5.2.2"
+    ws "^7.4.6"