@gitpod/gitpod-protocol 0.1.5-pd-ide-metrics.57 → 0.1.5-pd-ide-service.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/data/gitpod-schema.json +63 -129
  2. package/lib/admin-protocol.d.ts +3 -0
  3. package/lib/admin-protocol.d.ts.map +1 -1
  4. package/lib/admin-protocol.js.map +1 -1
  5. package/lib/billing-mode.d.ts +9 -4
  6. package/lib/billing-mode.d.ts.map +1 -1
  7. package/lib/billing-mode.js +15 -16
  8. package/lib/billing-mode.js.map +1 -1
  9. package/lib/gitpod-service.d.ts +20 -15
  10. package/lib/gitpod-service.d.ts.map +1 -1
  11. package/lib/gitpod-service.js +12 -0
  12. package/lib/gitpod-service.js.map +1 -1
  13. package/lib/ide-protocol.d.ts +8 -0
  14. package/lib/ide-protocol.d.ts.map +1 -1
  15. package/lib/messaging/error.d.ts +4 -1
  16. package/lib/messaging/error.d.ts.map +1 -1
  17. package/lib/messaging/error.js +9 -3
  18. package/lib/messaging/error.js.map +1 -1
  19. package/lib/plans.d.ts +1 -0
  20. package/lib/plans.d.ts.map +1 -1
  21. package/lib/plans.js +4 -0
  22. package/lib/plans.js.map +1 -1
  23. package/lib/protocol.d.ts +18 -3
  24. package/lib/protocol.d.ts.map +1 -1
  25. package/lib/protocol.js +16 -1
  26. package/lib/protocol.js.map +1 -1
  27. package/lib/teams-projects-protocol.d.ts +0 -1
  28. package/lib/teams-projects-protocol.d.ts.map +1 -1
  29. package/lib/teams-projects-protocol.js.map +1 -1
  30. package/lib/usage.d.ts +48 -17
  31. package/lib/usage.d.ts.map +1 -1
  32. package/lib/usage.js +6 -6
  33. package/lib/usage.js.map +1 -1
  34. package/lib/util/garbage-collected-cache.d.ts.map +1 -1
  35. package/lib/util/garbage-collected-cache.js +5 -0
  36. package/lib/util/garbage-collected-cache.js.map +1 -1
  37. package/lib/util/logging.spec.d.ts +7 -0
  38. package/lib/util/logging.spec.d.ts.map +1 -0
  39. package/lib/util/logging.spec.js +52 -0
  40. package/lib/util/logging.spec.js.map +1 -0
  41. package/lib/util/nice-grpc.d.ts +9 -0
  42. package/lib/util/nice-grpc.d.ts.map +1 -0
  43. package/lib/util/nice-grpc.js +119 -0
  44. package/lib/util/nice-grpc.js.map +1 -0
  45. package/lib/util/timeutil.d.ts +1 -0
  46. package/lib/util/timeutil.d.ts.map +1 -1
  47. package/lib/util/timeutil.js +7 -1
  48. package/lib/util/timeutil.js.map +1 -1
  49. package/lib/util/timeutil.spec.d.ts +2 -0
  50. package/lib/util/timeutil.spec.d.ts.map +1 -1
  51. package/lib/util/timeutil.spec.js +34 -0
  52. package/lib/util/timeutil.spec.js.map +1 -1
  53. package/lib/workspace-class.d.ts +1 -1
  54. package/lib/workspace-class.d.ts.map +1 -1
  55. package/lib/workspace-instance.d.ts +1 -0
  56. package/lib/workspace-instance.d.ts.map +1 -1
  57. package/package.json +4 -2
  58. package/pkg-yarn.lock +4 -2
  59. package/provenance-bundle.jsonl +1 -1
  60. package/src/admin-protocol.ts +3 -0
  61. package/src/billing-mode.ts +26 -15
  62. package/src/gitpod-service.ts +33 -15
  63. package/src/ide-protocol.ts +10 -0
  64. package/src/messaging/error.ts +13 -4
  65. package/src/plans.ts +4 -0
  66. package/src/protocol.ts +35 -4
  67. package/src/teams-projects-protocol.ts +0 -1
  68. package/src/usage.ts +52 -30
  69. package/src/util/garbage-collected-cache.ts +5 -0
  70. package/src/util/logging.spec.ts +23 -0
  71. package/src/util/nice-grpc.ts +93 -0
  72. package/src/util/timeutil.spec.ts +28 -1
  73. package/src/util/timeutil.ts +6 -0
  74. package/src/workspace-class.ts +1 -1
  75. package/src/workspace-instance.ts +3 -0
package/lib/usage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AA0CH,IAAY,SAGX;AAHD,WAAY,SAAS;IACjB,qDAAc,CAAA;IACd,mDAAa,CAAA;AACjB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB"}
1
+ {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAaH,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,qEAAuB,CAAA;IACvB,mEAAsB,CAAA;AAC1B,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB"}
@@ -1 +1 @@
1
- {"version":3,"file":"garbage-collected-cache.d.ts","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,UAAU,UAAU,CAAC,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,CAAC;IACT,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAqB,CAAC,CAAC;IAGpB,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,MAAM;IAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IAFzG,SAAS,CAAC,QAAQ,CAAC,KAAK,6BAAoC;gBAE7B,oBAAoB,EAAE,MAAM,EAAqB,iBAAiB,EAAE,MAAM;IAIlG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAazB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAQ/B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIzB,SAAS,CAAC,uBAAuB;IAIjC,SAAS,CAAC,cAAc;IASxB,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;CAG3D"}
1
+ {"version":3,"file":"garbage-collected-cache.d.ts","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,UAAU,UAAU,CAAC,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,CAAC;IACT,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAqB,CAAC,CAAC;IAGpB,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,MAAM;IAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IAFzG,SAAS,CAAC,QAAQ,CAAC,KAAK,6BAAoC;gBAE7B,oBAAoB,EAAE,MAAM,EAAqB,iBAAiB,EAAE,MAAM;IAIlG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAazB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAa/B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIzB,SAAS,CAAC,uBAAuB;IAIjC,SAAS,CAAC,cAAc;IASxB,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;CAG3D"}
@@ -31,6 +31,11 @@ class GarbageCollectedCache {
31
31
  if (!entry) {
32
32
  return undefined;
33
33
  }
34
+ // Still valid?
35
+ if (entry.expiryDate < Date.now()) {
36
+ this.store.delete(entry.key);
37
+ return undefined;
38
+ }
34
39
  return entry.value;
35
40
  }
36
41
  delete(key) {
@@ -1 +1 @@
1
- {"version":3,"file":"garbage-collected-cache.js","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,qCAAkC;AAQlC,MAAa,qBAAqB;IAG9B,YAA+B,oBAA4B,EAAqB,iBAAyB;QAA1E,yBAAoB,GAApB,oBAAoB,CAAQ;QAAqB,sBAAiB,GAAjB,iBAAiB,CAAQ;QAFtF,UAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;QAGxD,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,KAAQ;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACV,kFAAkF;YAClF,OAAO;SACV;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAChB,GAAG;YACH,KAAK;YACL,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;SACpC,CAAC,CAAC;IACP,CAAC;IAEM,GAAG,CAAC,GAAW;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,KAAK,CAAC,KAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,GAAW;QACrB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAES,uBAAuB;QAC7B,IAAA,eAAM,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACvE,CAAC;IAES,cAAc;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE;gBACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aAChC;SACJ;IACL,CAAC;IAES,cAAc,CAAC,aAAsB;QAC3C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;IAC5E,CAAC;CACJ;AAhDD,sDAgDC"}
1
+ {"version":3,"file":"garbage-collected-cache.js","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,qCAAkC;AAQlC,MAAa,qBAAqB;IAG9B,YAA+B,oBAA4B,EAAqB,iBAAyB;QAA1E,yBAAoB,GAApB,oBAAoB,CAAQ;QAAqB,sBAAiB,GAAjB,iBAAiB,CAAQ;QAFtF,UAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;QAGxD,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,KAAQ;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACV,kFAAkF;YAClF,OAAO;SACV;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAChB,GAAG;YACH,KAAK;YACL,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;SACpC,CAAC,CAAC;IACP,CAAC;IAEM,GAAG,CAAC,GAAW;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QACD,eAAe;QACf,IAAI,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7B,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,KAAK,CAAC,KAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,GAAW;QACrB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAES,uBAAuB;QAC7B,IAAA,eAAM,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACvE,CAAC;IAES,cAAc;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE;gBACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aAChC;SACJ;IACL,CAAC;IAES,cAAc,CAAC,aAAsB;QAC3C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;IAC5E,CAAC;CACJ;AArDD,sDAqDC"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
3
+ * Licensed under the GNU Affero General Public License (AGPL).
4
+ * See License-AGPL.txt in the project root for license information.
5
+ */
6
+ export {};
7
+ //# sourceMappingURL=logging.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logging.spec.d.ts","sourceRoot":"","sources":["../../src/util/logging.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ /**
3
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
4
+ * Licensed under the GNU Affero General Public License (AGPL).
5
+ * See License-AGPL.txt in the project root for license information.
6
+ */
7
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
11
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
12
+ };
13
+ var __metadata = (this && this.__metadata) || function (k, v) {
14
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15
+ };
16
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
17
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
18
+ return new (P || (P = Promise))(function (resolve, reject) {
19
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
20
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
21
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
22
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
23
+ });
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ const mocha_typescript_1 = require("mocha-typescript");
27
+ const logging_1 = require("./logging");
28
+ let TestLogging = class TestLogging {
29
+ testLogInfo_output() {
30
+ return __awaiter(this, void 0, void 0, function* () {
31
+ const testObj = {
32
+ null: null,
33
+ undefined: undefined,
34
+ empty: "",
35
+ foo: "bar",
36
+ number: 0,
37
+ };
38
+ logging_1.log.info("info logging test", testObj);
39
+ });
40
+ }
41
+ };
42
+ __decorate([
43
+ mocha_typescript_1.test,
44
+ __metadata("design:type", Function),
45
+ __metadata("design:paramtypes", []),
46
+ __metadata("design:returntype", Promise)
47
+ ], TestLogging.prototype, "testLogInfo_output", null);
48
+ TestLogging = __decorate([
49
+ mocha_typescript_1.suite
50
+ ], TestLogging);
51
+ module.exports = new TestLogging();
52
+ //# sourceMappingURL=logging.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logging.spec.js","sourceRoot":"","sources":["../../src/util/logging.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;AAEH,uDAA+C;AAC/C,uCAAgC;AAGhC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACM,kBAAkB;;YACjC,MAAM,OAAO,GAAG;gBACZ,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,EAAE;gBACT,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE,CAAC;aACZ,CAAC;YACF,aAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;KAAA;CACJ,CAAA;AAVS;IAAL,uBAAI;;;;qDASJ;AAVC,WAAW;IADhB,wBAAK;GACA,WAAW,CAWhB;AACD,MAAM,CAAC,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC"}
@@ -0,0 +1,9 @@
1
+ /**
2
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
3
+ * Licensed under the GNU Affero General Public License (AGPL).
4
+ * See License-AGPL.txt in the project root for license information.
5
+ */
6
+ import { ClientMiddleware } from "nice-grpc-common";
7
+ import { IClientCallMetrics } from "./grpc";
8
+ export declare function prometheusClientMiddleware(metrics: IClientCallMetrics): ClientMiddleware;
9
+ //# sourceMappingURL=nice-grpc.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nice-grpc.d.ts","sourceRoot":"","sources":["../../src/util/nice-grpc.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAGH,gBAAgB,EAInB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAkB,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AA2B5D,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,gBAAgB,CAkDxF"}
@@ -0,0 +1,119 @@
1
+ "use strict";
2
+ /**
3
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
4
+ * Licensed under the GNU Affero General Public License (AGPL).
5
+ * See License-AGPL.txt in the project root for license information.
6
+ */
7
+ var __asyncValues = (this && this.__asyncValues) || function (o) {
8
+ if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
9
+ var m = o[Symbol.asyncIterator], i;
10
+ return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
11
+ function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
12
+ function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
13
+ };
14
+ var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
15
+ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
16
+ if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
17
+ var g = generator.apply(thisArg, _arguments || []), i, q = [];
18
+ return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
19
+ function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
20
+ function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
21
+ function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
22
+ function fulfill(value) { resume("next", value); }
23
+ function reject(value) { resume("throw", value); }
24
+ function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
25
+ };
26
+ var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
27
+ var i, p;
28
+ return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
29
+ function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
30
+ };
31
+ Object.defineProperty(exports, "__esModule", { value: true });
32
+ exports.prometheusClientMiddleware = void 0;
33
+ const abort_controller_x_1 = require("abort-controller-x");
34
+ const nice_grpc_common_1 = require("nice-grpc-common");
35
+ function getLabels(method) {
36
+ const callType = method.requestStream
37
+ ? method.responseStream
38
+ ? "bidi_stream"
39
+ : "client_stream"
40
+ : method.responseStream
41
+ ? "server_stream"
42
+ : "unary";
43
+ const { path } = method;
44
+ const [serviceName, methodName] = path.split("/").slice(1);
45
+ return {
46
+ type: callType,
47
+ service: serviceName,
48
+ method: methodName,
49
+ };
50
+ }
51
+ function incrementStreamMessagesCounter(iterable, callback) {
52
+ return __asyncGenerator(this, arguments, function* incrementStreamMessagesCounter_1() {
53
+ var e_1, _a;
54
+ try {
55
+ for (var iterable_1 = __asyncValues(iterable), iterable_1_1; iterable_1_1 = yield __await(iterable_1.next()), !iterable_1_1.done;) {
56
+ const item = iterable_1_1.value;
57
+ callback();
58
+ yield yield __await(item);
59
+ }
60
+ }
61
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
62
+ finally {
63
+ try {
64
+ if (iterable_1_1 && !iterable_1_1.done && (_a = iterable_1.return)) yield __await(_a.call(iterable_1));
65
+ }
66
+ finally { if (e_1) throw e_1.error; }
67
+ }
68
+ });
69
+ }
70
+ function prometheusClientMiddleware(metrics) {
71
+ return function prometheusClientMiddlewareGenerator(call, options) {
72
+ return __asyncGenerator(this, arguments, function* prometheusClientMiddlewareGenerator_1() {
73
+ const labels = getLabels(call.method);
74
+ metrics.started(labels);
75
+ let settled = false;
76
+ let status = nice_grpc_common_1.Status.OK;
77
+ try {
78
+ let request;
79
+ if (!call.requestStream) {
80
+ request = call.request;
81
+ }
82
+ else {
83
+ request = incrementStreamMessagesCounter(call.request, metrics.sent.bind(metrics, labels));
84
+ }
85
+ if (!call.responseStream) {
86
+ const response = yield __await(yield* __asyncDelegator(__asyncValues(call.next(request, options))));
87
+ settled = true;
88
+ return yield __await(response);
89
+ }
90
+ else {
91
+ yield __await(yield* __asyncDelegator(__asyncValues(incrementStreamMessagesCounter(call.next(request, options), metrics.received.bind(metrics, labels)))));
92
+ settled = true;
93
+ return yield __await(void 0);
94
+ }
95
+ }
96
+ catch (err) {
97
+ settled = true;
98
+ if (err instanceof nice_grpc_common_1.ClientError) {
99
+ status = err.code;
100
+ }
101
+ else if ((0, abort_controller_x_1.isAbortError)(err)) {
102
+ status = nice_grpc_common_1.Status.CANCELLED;
103
+ }
104
+ else {
105
+ status = nice_grpc_common_1.Status.UNKNOWN;
106
+ }
107
+ throw err;
108
+ }
109
+ finally {
110
+ if (!settled) {
111
+ status = nice_grpc_common_1.Status.CANCELLED;
112
+ }
113
+ metrics.handled(Object.assign(Object.assign({}, labels), { code: nice_grpc_common_1.Status[status] }));
114
+ }
115
+ });
116
+ };
117
+ }
118
+ exports.prometheusClientMiddleware = prometheusClientMiddleware;
119
+ //# sourceMappingURL=nice-grpc.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nice-grpc.js","sourceRoot":"","sources":["../../src/util/nice-grpc.ts"],"names":[],"mappings":"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"}
@@ -25,6 +25,7 @@ export declare const earliest: (d1: string, d2: string) => string;
25
25
  export declare const orderAsc: (d1: string, d2: string) => number;
26
26
  export declare const liftDate1: <T>(d1: string, f: (d1: Date) => T) => T;
27
27
  export declare const liftDate: <T>(d1: string, d2: string, f: (d1: Date, d2: Date) => T) => T;
28
+ export declare function daysBefore(date: string, days: number): string;
28
29
  export declare function hoursBefore(date: string, hours: number): string;
29
30
  export declare function hoursLater(date: string, hours: number): string;
30
31
  export declare function secondsBefore(date: string, seconds: number): string;
@@ -1 +1 @@
1
- {"version":3,"file":"timeutil.d.ts","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAUpE;AACD,eAAO,MAAM,UAAU,aAAc,MAAM,SAAS,MAAM,KAAG,MAIvD,CAAC;AAGP,eAAO,MAAM,SAAS,OAAQ,MAAM,UAAU,MAAM,WACoB,CAAC;AACzE,eAAO,MAAM,eAAe,OAAQ,MAAM,MAAM,MAAM,WAC4B,CAAC;AACnF,eAAO,MAAM,gBAAgB,OAAQ,MAAM,MAAM,MAAM,WAA8D,CAAC;AAEtH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,KAAG,OACA,CAAC;AAC/D,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAoB,CAAC;AAC5F,eAAO,MAAM,aAAa,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAmB,CAAC;AACpF,eAAO,MAAM,MAAM,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAC9E,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAChF,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAAmE,CAAC;AACtH,eAAO,MAAM,SAAS,UAAW,MAAM,UAAU,IAAI,YAA6B,CAAC;AACnF,eAAO,MAAM,QAAQ,UAAW,MAAM,MAAM,MAAM,UAAU,IAAI,MAAM,IAAI,YAA2C,CAAC;AAEtH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI/D;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEzD"}
1
+ {"version":3,"file":"timeutil.d.ts","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAUpE;AACD,eAAO,MAAM,UAAU,aAAc,MAAM,SAAS,MAAM,KAAG,MAIvD,CAAC;AAGP,eAAO,MAAM,SAAS,OAAQ,MAAM,UAAU,MAAM,WACoB,CAAC;AACzE,eAAO,MAAM,eAAe,OAAQ,MAAM,MAAM,MAAM,WAC4B,CAAC;AACnF,eAAO,MAAM,gBAAgB,OAAQ,MAAM,MAAM,MAAM,WAA8D,CAAC;AAEtH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,KAAG,OACA,CAAC;AAC/D,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAoB,CAAC;AAC5F,eAAO,MAAM,aAAa,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAmB,CAAC;AACpF,eAAO,MAAM,MAAM,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAC9E,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAChF,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAAmE,CAAC;AACtH,eAAO,MAAM,SAAS,UAAW,MAAM,UAAU,IAAI,YAA6B,CAAC;AACnF,eAAO,MAAM,QAAQ,UAAW,MAAM,MAAM,MAAM,UAAU,IAAI,MAAM,IAAI,YAA2C,CAAC;AAEtH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAI7D;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI/D;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEzD"}
@@ -5,7 +5,7 @@
5
5
  * See License-AGPL.txt in the project root for license information.
6
6
  */
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.hoursToMilliseconds = exports.millisecondsToHours = exports.rightBefore = exports.rightAfter = exports.secondsBefore = exports.hoursLater = exports.hoursBefore = exports.liftDate = exports.liftDate1 = exports.orderAsc = exports.earliest = exports.oldest = exports.isDateSmaller = exports.isDateSmallerOrEqual = exports.isDateGreaterOrEqual = exports.durationInMillis = exports.durationInHours = exports.addMillis = exports.yearsLater = exports.oneMonthLater = void 0;
8
+ exports.hoursToMilliseconds = exports.millisecondsToHours = exports.rightBefore = exports.rightAfter = exports.secondsBefore = exports.hoursLater = exports.hoursBefore = exports.daysBefore = exports.liftDate = exports.liftDate1 = exports.orderAsc = exports.earliest = exports.oldest = exports.isDateSmaller = exports.isDateSmallerOrEqual = exports.isDateGreaterOrEqual = exports.durationInMillis = exports.durationInHours = exports.addMillis = exports.yearsLater = exports.oneMonthLater = void 0;
9
9
  /**
10
10
  * Returns the <code>day</code>th of the next month from <code>formDate</code>.
11
11
  * If the next month does not have a <code>day</code>th, the last day of that
@@ -56,6 +56,12 @@ const liftDate1 = (d1, f) => f(new Date(d1));
56
56
  exports.liftDate1 = liftDate1;
57
57
  const liftDate = (d1, d2, f) => f(new Date(d1), new Date(d2));
58
58
  exports.liftDate = liftDate;
59
+ function daysBefore(date, days) {
60
+ const result = new Date(date);
61
+ result.setDate(result.getDate() - days);
62
+ return result.toISOString();
63
+ }
64
+ exports.daysBefore = daysBefore;
59
65
  function hoursBefore(date, hours) {
60
66
  const result = new Date(date);
61
67
  result.setHours(result.getHours() - hours);
@@ -1 +1 @@
1
- {"version":3,"file":"timeutil.js","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"timeutil.js","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,9 @@
4
4
  * See License-AGPL.txt in the project root for license information.
5
5
  */
6
6
  export declare class TimeutilSpec {
7
+ testDaysBefore(): void;
7
8
  testTimeutil(): void;
8
9
  isOneMonthLater(from: Date, day: number, expectation: Date): void;
10
+ testDaysBefore2(): void;
9
11
  }
10
12
  //# sourceMappingURL=timeutil.spec.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"timeutil.spec.d.ts","sourceRoot":"","sources":["../../src/util/timeutil.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,YAAY;IAErB,YAAY;IAuBZ,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI;CAI7D"}
1
+ {"version":3,"file":"timeutil.spec.d.ts","sourceRoot":"","sources":["../../src/util/timeutil.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,YAAY;IAErB,cAAc;IAMd,YAAY;IAuBZ,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI;IAM1D,eAAe;CAmBlB"}
@@ -20,6 +20,10 @@ const expect = chai.expect;
20
20
  const mocha_typescript_1 = require("mocha-typescript");
21
21
  const timeutil_1 = require("./timeutil");
22
22
  let TimeutilSpec = class TimeutilSpec {
23
+ testDaysBefore() {
24
+ const now = new Date().toISOString();
25
+ expect((0, timeutil_1.daysBefore)(now, 2)).to.be.eq((0, timeutil_1.hoursBefore)(now, 48));
26
+ }
23
27
  testTimeutil() {
24
28
  // targeting a 1st, 1th of Jan => 1st of Feb
25
29
  this.isOneMonthLater(new Date(2000, 0, 1), 1, new Date(2000, 1, 1));
@@ -41,13 +45,43 @@ let TimeutilSpec = class TimeutilSpec {
41
45
  const later = (0, timeutil_1.oneMonthLater)(from.toISOString(), day);
42
46
  expect(later, `expected ${later} to be equal ${expectation}`).to.be.equal(expectation.toISOString());
43
47
  }
48
+ testDaysBefore2() {
49
+ const tests = [
50
+ {
51
+ date: new Date("2021-07-13T00:00:00.000Z"),
52
+ daysEarlier: 365,
53
+ expectation: "2020-07-13T00:00:00.000Z",
54
+ },
55
+ {
56
+ date: new Date("2019-02-01T00:00:00.000Z"),
57
+ daysEarlier: 365,
58
+ expectation: "2018-02-01T00:00:00.000Z",
59
+ },
60
+ ];
61
+ for (const t of tests) {
62
+ const actual = (0, timeutil_1.daysBefore)(t.date.toISOString(), t.daysEarlier);
63
+ expect(actual).to.equal(t.expectation, `expected ${actual} to be equal ${t.expectation}`);
64
+ }
65
+ }
44
66
  };
67
+ __decorate([
68
+ mocha_typescript_1.test,
69
+ __metadata("design:type", Function),
70
+ __metadata("design:paramtypes", []),
71
+ __metadata("design:returntype", void 0)
72
+ ], TimeutilSpec.prototype, "testDaysBefore", null);
45
73
  __decorate([
46
74
  mocha_typescript_1.test,
47
75
  __metadata("design:type", Function),
48
76
  __metadata("design:paramtypes", []),
49
77
  __metadata("design:returntype", void 0)
50
78
  ], TimeutilSpec.prototype, "testTimeutil", null);
79
+ __decorate([
80
+ mocha_typescript_1.test,
81
+ __metadata("design:type", Function),
82
+ __metadata("design:paramtypes", []),
83
+ __metadata("design:returntype", void 0)
84
+ ], TimeutilSpec.prototype, "testDaysBefore2", null);
51
85
  TimeutilSpec = __decorate([
52
86
  (0, mocha_typescript_1.suite)()
53
87
  ], TimeutilSpec);
@@ -1 +1 @@
1
- {"version":3,"file":"timeutil.spec.js","sourceRoot":"","sources":["../../src/util/timeutil.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,6BAA6B;AAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAC3B,uDAA+C;AAC/C,yCAA2C;AAG3C,IAAa,YAAY,GAAzB,MAAa,YAAY;IAErB,YAAY;QACR,4CAA4C;QAC5C,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpE,+CAA+C;QAC/C,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAEvE,+CAA+C;QAC/C,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAEvE,+CAA+C;QAC/C,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAEvE,YAAY;QACZ,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAExE,MAAM;QACN,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACvE,gBAAgB;QAChB,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,eAAe,CAAC,IAAU,EAAE,GAAW,EAAE,WAAiB;QACtD,MAAM,KAAK,GAAG,IAAA,wBAAa,EAAC,IAAI,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,EAAE,YAAY,KAAK,gBAAgB,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IACzG,CAAC;CACJ,CAAA;AA3BG;IADC,uBAAI;;;;gDAsBJ;AAvBQ,YAAY;IADxB,IAAA,wBAAK,GAAE;GACK,YAAY,CA6BxB;AA7BY,oCAAY"}
1
+ {"version":3,"file":"timeutil.spec.js","sourceRoot":"","sources":["../../src/util/timeutil.spec.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,6 @@ export interface SupportedWorkspaceClass {
9
9
  displayName: string;
10
10
  description: string;
11
11
  powerups: number;
12
- isDefault: boolean;
12
+ isSelected: boolean;
13
13
  }
14
14
  //# sourceMappingURL=workspace-class.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-class.d.ts","sourceRoot":"","sources":["../src/workspace-class.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACtB"}
1
+ {"version":3,"file":"workspace-class.d.ts","sourceRoot":"","sources":["../src/workspace-class.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACvB"}
@@ -83,6 +83,7 @@ export interface WorkspaceInstanceConfiguration {
83
83
  featureFlags?: NamedWorkspaceFeatureFlag[];
84
84
  ideImage: string;
85
85
  desktopIdeImage?: string;
86
+ desktopIdePluginImage?: string;
86
87
  supervisorImage?: string;
87
88
  ideConfig?: ConfigurationIdeConfig;
88
89
  }
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-instance.d.ts","sourceRoot":"","sources":["../src/workspace-instance.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace-instance.d.ts","sourceRoot":"","sources":["../src/workspace-instance.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,15 +1,17 @@
1
1
  {
2
2
  "dependencies": {
3
3
  "@types/react": "17.0.32",
4
+ "abort-controller-x": "^0.4.0",
4
5
  "ajv": "^6.5.4",
5
6
  "analytics-node": "^6.0.0",
6
7
  "configcat-node": "^8.0.0",
7
8
  "cookie": "^0.4.2",
8
9
  "express": "^4.17.3",
9
- "google-protobuf": "^3.18.0-rc.2",
10
+ "google-protobuf": "^3.19.1",
10
11
  "inversify": "^5.1.1",
11
12
  "jaeger-client": "^3.18.1",
12
13
  "js-yaml": "^3.10.0",
14
+ "nice-grpc-common": "^2.0.0",
13
15
  "opentracing": "^0.14.5",
14
16
  "prom-client": "^13.2.0",
15
17
  "random-number-csprng": "^1.0.2",
@@ -67,5 +69,5 @@
67
69
  "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput"
68
70
  },
69
71
  "types": "./lib/index.d.ts",
70
- "version": "0.1.5-pd-ide-metrics.57"
72
+ "version": "0.1.5-pd-ide-service.11"
71
73
  }
package/pkg-yarn.lock CHANGED
@@ -4,18 +4,20 @@
4
4
 
5
5
  "@gitpod/gitpod-protocol@0.1.5":
6
6
  version "0.1.5"
7
- resolved "file:///tmp/cache/a58dfdf410ac84efaec542f9b3c444d91ff14e92.tar.gz"
7
+ resolved "file:///tmp/cache/3c700a8b5e98e70c5233173bea4e629f3ed63aeb.tar.gz"
8
8
  dependencies:
9
9
  "@types/react" "17.0.32"
10
+ abort-controller-x "^0.4.0"
10
11
  ajv "^6.5.4"
11
12
  analytics-node "^6.0.0"
12
13
  configcat-node "^8.0.0"
13
14
  cookie "^0.4.2"
14
15
  express "^4.17.3"
15
- google-protobuf "^3.18.0-rc.2"
16
+ google-protobuf "^3.19.1"
16
17
  inversify "^5.1.1"
17
18
  jaeger-client "^3.18.1"
18
19
  js-yaml "^3.10.0"
20
+ nice-grpc-common "^2.0.0"
19
21
  opentracing "^0.14.5"
20
22
  prom-client "^13.2.0"
21
23
  random-number-csprng "^1.0.2"