@gitpod/gitpod-protocol 0.1.5-server-vscode-ouath2.18 → 0.1.5-server-vscode-oauth2.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 (157) hide show
  1. package/lib/accounting-protocol.js +6 -6
  2. package/lib/accounting-protocol.js.map +1 -1
  3. package/lib/admin-protocol.d.ts +8 -2
  4. package/lib/admin-protocol.d.ts.map +1 -1
  5. package/lib/admin-protocol.js +2 -13
  6. package/lib/admin-protocol.js.map +1 -1
  7. package/lib/analytics.d.ts +12 -1
  8. package/lib/analytics.d.ts.map +1 -1
  9. package/lib/context-url.js +4 -4
  10. package/lib/context-url.js.map +1 -1
  11. package/lib/context-url.spec.js +45 -48
  12. package/lib/context-url.spec.js.map +1 -1
  13. package/lib/email-protocol.js +3 -3
  14. package/lib/email-protocol.js.map +1 -1
  15. package/lib/encryption/container-module.js +4 -4
  16. package/lib/encryption/container-module.js.map +1 -1
  17. package/lib/encryption/encryption-engine.js +19 -20
  18. package/lib/encryption/encryption-engine.js.map +1 -1
  19. package/lib/encryption/encryption-engine.spec.js +29 -36
  20. package/lib/encryption/encryption-engine.spec.js.map +1 -1
  21. package/lib/encryption/encryption-service.js +29 -43
  22. package/lib/encryption/encryption-service.js.map +1 -1
  23. package/lib/encryption/key-provider.js +25 -30
  24. package/lib/encryption/key-provider.js.map +1 -1
  25. package/lib/env.d.ts +0 -1
  26. package/lib/env.d.ts.map +1 -1
  27. package/lib/env.js +12 -14
  28. package/lib/env.js.map +1 -1
  29. package/lib/gitpod-file-parser.js +25 -41
  30. package/lib/gitpod-file-parser.js.map +1 -1
  31. package/lib/gitpod-file-parser.spec.js +116 -116
  32. package/lib/gitpod-file-parser.spec.js.map +1 -1
  33. package/lib/gitpod-service.d.ts +12 -2
  34. package/lib/gitpod-service.d.ts.map +1 -1
  35. package/lib/gitpod-service.js +148 -294
  36. package/lib/gitpod-service.js.map +1 -1
  37. package/lib/messaging/browser/connection.d.ts +3 -3
  38. package/lib/messaging/browser/connection.d.ts.map +1 -1
  39. package/lib/messaging/browser/connection.js +172 -35
  40. package/lib/messaging/browser/connection.js.map +1 -1
  41. package/lib/messaging/browser/window-connection.js +34 -54
  42. package/lib/messaging/browser/window-connection.js.map +1 -1
  43. package/lib/messaging/client-call-metrics.js +17 -18
  44. package/lib/messaging/client-call-metrics.js.map +1 -1
  45. package/lib/messaging/connection-error-handler.js +11 -23
  46. package/lib/messaging/connection-error-handler.js.map +1 -1
  47. package/lib/messaging/handler.d.ts +10 -0
  48. package/lib/messaging/handler.d.ts.map +1 -1
  49. package/lib/messaging/node/connection.js +20 -20
  50. package/lib/messaging/node/connection.js.map +1 -1
  51. package/lib/messaging/proxy-factory.d.ts +2 -0
  52. package/lib/messaging/proxy-factory.d.ts.map +1 -1
  53. package/lib/messaging/proxy-factory.js +73 -160
  54. package/lib/messaging/proxy-factory.js.map +1 -1
  55. package/lib/permission.d.ts +1 -2
  56. package/lib/permission.d.ts.map +1 -1
  57. package/lib/permission.js +12 -13
  58. package/lib/permission.js.map +1 -1
  59. package/lib/plans.js +38 -57
  60. package/lib/plans.js.map +1 -1
  61. package/lib/protocol.js +44 -114
  62. package/lib/protocol.js.map +1 -1
  63. package/lib/team-subscription-protocol.js +11 -11
  64. package/lib/team-subscription-protocol.js.map +1 -1
  65. package/lib/teams-projects-protocol.d.ts +3 -1
  66. package/lib/teams-projects-protocol.d.ts.map +1 -1
  67. package/lib/teams-projects-protocol.js +4 -15
  68. package/lib/teams-projects-protocol.js.map +1 -1
  69. package/lib/util/analytics.d.ts.map +1 -1
  70. package/lib/util/analytics.js +35 -26
  71. package/lib/util/analytics.js.map +1 -1
  72. package/lib/util/async-iterator.js +55 -133
  73. package/lib/util/async-iterator.js.map +1 -1
  74. package/lib/util/cancelable.js +17 -59
  75. package/lib/util/cancelable.js.map +1 -1
  76. package/lib/util/date-time.js +8 -8
  77. package/lib/util/date-time.js.map +1 -1
  78. package/lib/util/deferred.js +10 -12
  79. package/lib/util/deferred.js.map +1 -1
  80. package/lib/util/disposable.js +26 -39
  81. package/lib/util/disposable.js.map +1 -1
  82. package/lib/util/event.js +58 -74
  83. package/lib/util/event.js.map +1 -1
  84. package/lib/util/garbage-collected-cache.js +22 -46
  85. package/lib/util/garbage-collected-cache.js.map +1 -1
  86. package/lib/util/generate-workspace-id.js +11 -67
  87. package/lib/util/generate-workspace-id.js.map +1 -1
  88. package/lib/util/generate-workspace-id.spec.js +34 -79
  89. package/lib/util/generate-workspace-id.spec.js.map +1 -1
  90. package/lib/util/gitpod-cookie.d.ts +20 -0
  91. package/lib/util/gitpod-cookie.d.ts.map +1 -0
  92. package/lib/util/gitpod-cookie.js +44 -0
  93. package/lib/util/gitpod-cookie.js.map +1 -0
  94. package/lib/util/gitpod-host-url.js +93 -103
  95. package/lib/util/gitpod-host-url.js.map +1 -1
  96. package/lib/util/gitpod-host-url.spec.js +87 -135
  97. package/lib/util/gitpod-host-url.spec.js.map +1 -1
  98. package/lib/util/grpc.js +3 -3
  99. package/lib/util/grpc.js.map +1 -1
  100. package/lib/util/logging.d.ts.map +1 -1
  101. package/lib/util/logging.js +68 -109
  102. package/lib/util/logging.js.map +1 -1
  103. package/lib/util/make-link.js +2 -2
  104. package/lib/util/make-link.js.map +1 -1
  105. package/lib/util/parse-workspace-id.d.ts +10 -0
  106. package/lib/util/parse-workspace-id.d.ts.map +1 -1
  107. package/lib/util/parse-workspace-id.js +31 -7
  108. package/lib/util/parse-workspace-id.js.map +1 -1
  109. package/lib/util/parse-workspace-id.spec.d.ts +4 -0
  110. package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
  111. package/lib/util/parse-workspace-id.spec.js +123 -84
  112. package/lib/util/parse-workspace-id.spec.js.map +1 -1
  113. package/lib/util/queue.js +16 -55
  114. package/lib/util/queue.js.map +1 -1
  115. package/lib/util/queue.spec.js +144 -288
  116. package/lib/util/queue.spec.js.map +1 -1
  117. package/lib/util/repeater.js +35 -88
  118. package/lib/util/repeater.js.map +1 -1
  119. package/lib/util/safe-promise.js +9 -12
  120. package/lib/util/safe-promise.js.map +1 -1
  121. package/lib/util/semaphore.js +15 -46
  122. package/lib/util/semaphore.js.map +1 -1
  123. package/lib/util/skip-if.js +6 -6
  124. package/lib/util/skip-if.js.map +1 -1
  125. package/lib/util/timeutil.js +16 -16
  126. package/lib/util/timeutil.js.map +1 -1
  127. package/lib/util/timeutil.spec.js +21 -24
  128. package/lib/util/timeutil.spec.js.map +1 -1
  129. package/lib/util/tracing.js +43 -47
  130. package/lib/util/tracing.js.map +1 -1
  131. package/lib/util/workspace-port-authentication.js +2 -2
  132. package/lib/util/workspace-port-authentication.js.map +1 -1
  133. package/lib/workspace-cluster.d.ts +11 -1
  134. package/lib/workspace-cluster.d.ts.map +1 -1
  135. package/lib/workspace-cluster.js +3 -3
  136. package/lib/workspace-cluster.js.map +1 -1
  137. package/lib/workspace-instance.d.ts +2 -0
  138. package/lib/workspace-instance.d.ts.map +1 -1
  139. package/package.json +3 -1
  140. package/pkg-yarn.lock +2 -1
  141. package/src/admin-protocol.ts +9 -3
  142. package/src/analytics.ts +14 -1
  143. package/src/env.ts +0 -1
  144. package/src/gitpod-service.ts +13 -2
  145. package/src/messaging/browser/connection.ts +176 -10
  146. package/src/messaging/handler.ts +12 -0
  147. package/src/messaging/proxy-factory.ts +10 -4
  148. package/src/permission.ts +0 -1
  149. package/src/teams-projects-protocol.ts +3 -1
  150. package/src/util/analytics.ts +17 -1
  151. package/src/util/gitpod-cookie.ts +39 -0
  152. package/src/util/grpc.ts +3 -3
  153. package/src/util/logging.ts +33 -20
  154. package/src/util/parse-workspace-id.spec.ts +21 -1
  155. package/src/util/parse-workspace-id.ts +32 -6
  156. package/src/workspace-cluster.ts +8 -1
  157. package/src/workspace-instance.ts +6 -0
@@ -22,151 +22,103 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
22
22
  step((generator = generator.apply(thisArg, _arguments || [])).next());
23
23
  });
24
24
  };
25
- var __generator = (this && this.__generator) || function (thisArg, body) {
26
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
27
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
28
- function verb(n) { return function (v) { return step([n, v]); }; }
29
- function step(op) {
30
- if (f) throw new TypeError("Generator is already executing.");
31
- while (_) try {
32
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
33
- if (y = 0, t) op = [op[0] & 2, t.value];
34
- switch (op[0]) {
35
- case 0: case 1: t = op; break;
36
- case 4: _.label++; return { value: op[1], done: false };
37
- case 5: _.label++; y = op[1]; op = [0]; continue;
38
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
39
- default:
40
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
41
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
42
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
43
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
44
- if (t[2]) _.ops.pop();
45
- _.trys.pop(); continue;
46
- }
47
- op = body.call(thisArg, _);
48
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
49
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
50
- }
51
- };
52
25
  Object.defineProperty(exports, "__esModule", { value: true });
53
26
  exports.GitpodHostUrlTest = void 0;
54
- var chai = require("chai");
55
- var mocha_typescript_1 = require("mocha-typescript");
56
- var gitpod_host_url_1 = require("./gitpod-host-url");
57
- var expect = chai.expect;
58
- var GitpodHostUrlTest = /** @class */ (function () {
59
- function GitpodHostUrlTest() {
60
- }
61
- GitpodHostUrlTest.prototype.parseWorkspaceId_pathBased = function () {
62
- var actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("http://35.223.201.195/workspace/bc77e03d-c781-4235-bca0-e24087f5e472/").workspaceId;
27
+ const chai = require("chai");
28
+ const mocha_typescript_1 = require("mocha-typescript");
29
+ const gitpod_host_url_1 = require("./gitpod-host-url");
30
+ const expect = chai.expect;
31
+ let GitpodHostUrlTest = class GitpodHostUrlTest {
32
+ parseWorkspaceId_pathBased() {
33
+ const actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("http://35.223.201.195/workspace/bc77e03d-c781-4235-bca0-e24087f5e472/").workspaceId;
63
34
  expect(actual).to.equal("bc77e03d-c781-4235-bca0-e24087f5e472");
64
- };
65
- GitpodHostUrlTest.prototype.parseWorkspaceId_hosts_withEnvVarsInjected = function () {
66
- var 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;
35
+ }
36
+ parseWorkspaceId_hosts_withEnvVarsInjected() {
37
+ 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;
67
38
  expect(actual).to.equal("gray-grasshopper-nfbitfia");
68
- };
69
- GitpodHostUrlTest.prototype.testWithoutWorkspacePrefix = function () {
70
- return __awaiter(this, void 0, void 0, function () {
71
- return __generator(this, function (_a) {
72
- 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/");
73
- return [2 /*return*/];
74
- });
39
+ }
40
+ testWithoutWorkspacePrefix() {
41
+ return __awaiter(this, void 0, void 0, function* () {
42
+ 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/");
75
43
  });
76
- };
77
- GitpodHostUrlTest.prototype.testWithoutWorkspacePrefix2 = function () {
78
- return __awaiter(this, void 0, void 0, function () {
79
- return __generator(this, function (_a) {
80
- expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gitpod-staging.com/").withoutWorkspacePrefix().toString()).to.equal("https://gitpod-staging.com/");
81
- return [2 /*return*/];
82
- });
44
+ }
45
+ testWithoutWorkspacePrefix2() {
46
+ return __awaiter(this, void 0, void 0, function* () {
47
+ expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gitpod-staging.com/").withoutWorkspacePrefix().toString()).to.equal("https://gitpod-staging.com/");
83
48
  });
84
- };
85
- GitpodHostUrlTest.prototype.testWithoutWorkspacePrefix3 = function () {
86
- return __awaiter(this, void 0, void 0, function () {
87
- return __generator(this, function (_a) {
88
- 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/");
89
- return [2 /*return*/];
90
- });
49
+ }
50
+ testWithoutWorkspacePrefix3() {
51
+ return __awaiter(this, void 0, void 0, function* () {
52
+ 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/");
91
53
  });
92
- };
93
- GitpodHostUrlTest.prototype.testWithoutWorkspacePrefix4 = function () {
94
- return __awaiter(this, void 0, void 0, function () {
95
- return __generator(this, function (_a) {
96
- 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/");
97
- return [2 /*return*/];
98
- });
54
+ }
55
+ testWithoutWorkspacePrefix4() {
56
+ return __awaiter(this, void 0, void 0, function* () {
57
+ 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/");
99
58
  });
100
- };
101
- GitpodHostUrlTest.prototype.testWithoutWorkspacePrefix5 = function () {
102
- return __awaiter(this, void 0, void 0, function () {
103
- return __generator(this, function (_a) {
104
- 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/");
105
- return [2 /*return*/];
106
- });
59
+ }
60
+ testWithoutWorkspacePrefix5() {
61
+ return __awaiter(this, void 0, void 0, function* () {
62
+ 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/");
107
63
  });
108
- };
109
- GitpodHostUrlTest.prototype.testWithoutWorkspacePrefix6 = function () {
110
- return __awaiter(this, void 0, void 0, function () {
111
- return __generator(this, function (_a) {
112
- 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/");
113
- return [2 /*return*/];
114
- });
64
+ }
65
+ testWithoutWorkspacePrefix6() {
66
+ return __awaiter(this, void 0, void 0, function* () {
67
+ 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/");
115
68
  });
116
- };
117
- __decorate([
118
- mocha_typescript_1.test,
119
- __metadata("design:type", Function),
120
- __metadata("design:paramtypes", []),
121
- __metadata("design:returntype", void 0)
122
- ], GitpodHostUrlTest.prototype, "parseWorkspaceId_pathBased", null);
123
- __decorate([
124
- mocha_typescript_1.test,
125
- __metadata("design:type", Function),
126
- __metadata("design:paramtypes", []),
127
- __metadata("design:returntype", void 0)
128
- ], GitpodHostUrlTest.prototype, "parseWorkspaceId_hosts_withEnvVarsInjected", null);
129
- __decorate([
130
- mocha_typescript_1.test,
131
- __metadata("design:type", Function),
132
- __metadata("design:paramtypes", []),
133
- __metadata("design:returntype", Promise)
134
- ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix", null);
135
- __decorate([
136
- mocha_typescript_1.test,
137
- __metadata("design:type", Function),
138
- __metadata("design:paramtypes", []),
139
- __metadata("design:returntype", Promise)
140
- ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix2", null);
141
- __decorate([
142
- mocha_typescript_1.test,
143
- __metadata("design:type", Function),
144
- __metadata("design:paramtypes", []),
145
- __metadata("design:returntype", Promise)
146
- ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix3", null);
147
- __decorate([
148
- mocha_typescript_1.test,
149
- __metadata("design:type", Function),
150
- __metadata("design:paramtypes", []),
151
- __metadata("design:returntype", Promise)
152
- ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix4", null);
153
- __decorate([
154
- mocha_typescript_1.test,
155
- __metadata("design:type", Function),
156
- __metadata("design:paramtypes", []),
157
- __metadata("design:returntype", Promise)
158
- ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix5", null);
159
- __decorate([
160
- mocha_typescript_1.test,
161
- __metadata("design:type", Function),
162
- __metadata("design:paramtypes", []),
163
- __metadata("design:returntype", Promise)
164
- ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix6", null);
165
- GitpodHostUrlTest = __decorate([
166
- mocha_typescript_1.suite
167
- ], GitpodHostUrlTest);
168
- return GitpodHostUrlTest;
169
- }());
69
+ }
70
+ };
71
+ __decorate([
72
+ mocha_typescript_1.test,
73
+ __metadata("design:type", Function),
74
+ __metadata("design:paramtypes", []),
75
+ __metadata("design:returntype", void 0)
76
+ ], GitpodHostUrlTest.prototype, "parseWorkspaceId_pathBased", null);
77
+ __decorate([
78
+ mocha_typescript_1.test,
79
+ __metadata("design:type", Function),
80
+ __metadata("design:paramtypes", []),
81
+ __metadata("design:returntype", void 0)
82
+ ], GitpodHostUrlTest.prototype, "parseWorkspaceId_hosts_withEnvVarsInjected", null);
83
+ __decorate([
84
+ mocha_typescript_1.test,
85
+ __metadata("design:type", Function),
86
+ __metadata("design:paramtypes", []),
87
+ __metadata("design:returntype", Promise)
88
+ ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix", null);
89
+ __decorate([
90
+ mocha_typescript_1.test,
91
+ __metadata("design:type", Function),
92
+ __metadata("design:paramtypes", []),
93
+ __metadata("design:returntype", Promise)
94
+ ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix2", null);
95
+ __decorate([
96
+ mocha_typescript_1.test,
97
+ __metadata("design:type", Function),
98
+ __metadata("design:paramtypes", []),
99
+ __metadata("design:returntype", Promise)
100
+ ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix3", null);
101
+ __decorate([
102
+ mocha_typescript_1.test,
103
+ __metadata("design:type", Function),
104
+ __metadata("design:paramtypes", []),
105
+ __metadata("design:returntype", Promise)
106
+ ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix4", null);
107
+ __decorate([
108
+ mocha_typescript_1.test,
109
+ __metadata("design:type", Function),
110
+ __metadata("design:paramtypes", []),
111
+ __metadata("design:returntype", Promise)
112
+ ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix5", null);
113
+ __decorate([
114
+ mocha_typescript_1.test,
115
+ __metadata("design:type", Function),
116
+ __metadata("design:paramtypes", []),
117
+ __metadata("design:returntype", Promise)
118
+ ], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix6", null);
119
+ GitpodHostUrlTest = __decorate([
120
+ mocha_typescript_1.suite
121
+ ], GitpodHostUrlTest);
170
122
  exports.GitpodHostUrlTest = GitpodHostUrlTest;
171
123
  module.exports = new GitpodHostUrlTest();
172
124
  //# sourceMappingURL=gitpod-host-url.spec.js.map
@@ -1 +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;IAmCA,CAAC;IAjCgB,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;IAEY,sEAA0C,GAAjD;QACF,IAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CAAC,mIAAmI,CAAC,CAAC,WAAW,CAAC;QAC/L,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzD,CAAC;IAEkB,sDAA0B,GAAvC;;;gBACF,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,mEAAmE,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;KAC3L;IAEkB,uDAA2B,GAAxC;;;gBACF,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;KACrJ;IAEkB,uDAA2B,GAAxC;;;gBACF,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,0EAA0E,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;;;;KACrN;IAEkB,uDAA2B,GAAxC;;;gBACF,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,gDAAgD,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;;;;KAC3L;IAEkB,uDAA2B,GAAxC;;;gBACF,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,sDAAsD,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;;;;KACvM;IAEkB,uDAA2B,GAAxC;;;gBACF,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,gFAAgF,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;;;;KACjO;IAhCK;QAAL,uBAAI;;;;uEAGJ;IAEK;QAAL,uBAAI;;;;uFAGJ;IAEK;QAAL,uBAAI;;;;uEAEJ;IAEK;QAAL,uBAAI;;;;wEAEJ;IAEK;QAAL,uBAAI;;;;wEAEJ;IAEK;QAAL,uBAAI;;;;wEAEJ;IAEK;QAAL,uBAAI;;;;wEAEJ;IAEK;QAAL,uBAAI;;;;wEAEJ;IAlCQ,iBAAiB;QAD7B,wBAAK;OACO,iBAAiB,CAmC7B;IAAD,wBAAC;CAAA,AAnCD,IAmCC;AAnCY,8CAAiB;AAoC9B,MAAM,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAA"}
1
+ {"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;IAEb,0BAA0B;QACnC,MAAM,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;IAEY,0CAA0C;QACnD,MAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CAAC,mIAAmI,CAAC,CAAC,WAAW,CAAC;QAC/L,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzD,CAAC;IAEkB,0BAA0B;;YACzC,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,mEAAmE,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5L,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACtJ,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,0EAA0E,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACtN,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,gDAAgD,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC5L,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,sDAAsD,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACxM,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,gFAAgF,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAClO,CAAC;KAAA;CACJ,CAAA;AAjCS;IAAL,uBAAI;;;;mEAGJ;AAEK;IAAL,uBAAI;;;;mFAGJ;AAEK;IAAL,uBAAI;;;;mEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAlCQ,iBAAiB;IAD7B,wBAAK;GACO,iBAAiB,CAmC7B;AAnCY,8CAAiB;AAoC9B,MAAM,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAA"}
package/lib/util/grpc.js CHANGED
@@ -7,9 +7,9 @@
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
8
  exports.defaultGRPCOptions = void 0;
9
9
  exports.defaultGRPCOptions = {
10
- "grpc.keepalive_timeout_ms": 1000,
11
- "grpc.keepalive_time_ms": 5000,
12
- "grpc.http2.min_time_between_pings_ms": 1000,
10
+ "grpc.keepalive_timeout_ms": 10000,
11
+ "grpc.keepalive_time_ms": 60000,
12
+ "grpc.http2.min_time_between_pings_ms": 10000,
13
13
  "grpc.keepalive_permit_without_calls": 1,
14
14
  "grpc-node.max_session_memory": 50,
15
15
  "grpc.max_reconnect_backoff_ms": 5000,
@@ -1 +1 @@
1
- {"version":3,"file":"grpc.js","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEW,QAAA,kBAAkB,GAAG;IAC/B,2BAA2B,EAAE,IAAI;IACjC,wBAAwB,EAAE,IAAI;IAC9B,sCAAsC,EAAE,IAAI;IAC5C,qCAAqC,EAAE,CAAC;IACxC,8BAA8B,EAAE,EAAE;IAClC,+BAA+B,EAAE,IAAI;IACrC,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,EAAE;CACtD,CAAC"}
1
+ {"version":3,"file":"grpc.js","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEW,QAAA,kBAAkB,GAAG;IAC/B,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"}
@@ -1 +1 @@
1
- {"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
@@ -4,43 +4,12 @@
4
4
  * Licensed under the GNU Affero General Public License (AGPL).
5
5
  * See License-AGPL.txt in the project root for license information.
6
6
  */
7
- var __assign = (this && this.__assign) || function () {
8
- __assign = Object.assign || function(t) {
9
- for (var s, i = 1, n = arguments.length; i < n; i++) {
10
- s = arguments[i];
11
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
12
- t[p] = s[p];
13
- }
14
- return t;
15
- };
16
- return __assign.apply(this, arguments);
17
- };
18
- var __read = (this && this.__read) || function (o, n) {
19
- var m = typeof Symbol === "function" && o[Symbol.iterator];
20
- if (!m) return o;
21
- var i = m.call(o), r, ar = [], e;
22
- try {
23
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
24
- }
25
- catch (error) { e = { error: error }; }
26
- finally {
27
- try {
28
- if (r && !r.done && (m = i["return"])) m.call(i);
29
- }
30
- finally { if (e) throw e.error; }
31
- }
32
- return ar;
33
- };
34
- var __spread = (this && this.__spread) || function () {
35
- for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
36
- return ar;
37
- };
38
7
  Object.defineProperty(exports, "__esModule", { value: true });
39
8
  exports.LogrusLogLevel = exports.LogrusLogLevels = exports.log = exports.LogContext = void 0;
40
- var inspect = require('util').inspect; // undefined in frontend
41
- var jsonLogging = false;
42
- var component;
43
- var version;
9
+ const inspect = require('util').inspect; // undefined in frontend
10
+ let jsonLogging = false;
11
+ let component;
12
+ let version;
44
13
  ;
45
14
  var LogContext;
46
15
  (function (LogContext) {
@@ -56,35 +25,19 @@ var LogContext;
56
25
  ;
57
26
  var log;
58
27
  (function (log) {
59
- function error() {
60
- var args = [];
61
- for (var _i = 0; _i < arguments.length; _i++) {
62
- args[_i] = arguments[_i];
63
- }
28
+ function error(...args) {
64
29
  errorLog(false, args);
65
30
  }
66
31
  log.error = error;
67
- function warn() {
68
- var args = [];
69
- for (var _i = 0; _i < arguments.length; _i++) {
70
- args[_i] = arguments[_i];
71
- }
32
+ function warn(...args) {
72
33
  warnLog(false, args);
73
34
  }
74
35
  log.warn = warn;
75
- function info() {
76
- var args = [];
77
- for (var _i = 0; _i < arguments.length; _i++) {
78
- args[_i] = arguments[_i];
79
- }
36
+ function info(...args) {
80
37
  infoLog(false, args);
81
38
  }
82
39
  log.info = info;
83
- function debug() {
84
- var args = [];
85
- for (var _i = 0; _i < arguments.length; _i++) {
86
- args[_i] = arguments[_i];
87
- }
40
+ function debug(...args) {
88
41
  debugLog(false, args);
89
42
  }
90
43
  log.debug = debug;
@@ -99,27 +52,29 @@ var log;
99
52
  log.enableJSONLogging = enableJSONLogging;
100
53
  function setLogLevel(logLevel) {
101
54
  jsonLogging = true;
102
- var noop = function () { };
103
- var setLog = function (logFunc, funcLvl) {
104
- if (LogrusLogLevel.isGreatherOrEqual(funcLvl, logLevel)) {
105
- return function () {
106
- var args = [];
107
- for (var _i = 0; _i < arguments.length; _i++) {
108
- args[_i] = arguments[_i];
109
- }
110
- logFunc(true, args);
111
- };
112
- }
113
- else {
114
- return noop;
115
- }
55
+ console.error = function (...args) {
56
+ errorLog(true, args);
57
+ };
58
+ console.warn = function (...args) {
59
+ warnLog(true, args);
60
+ };
61
+ console.info = function (...args) {
62
+ infoLog(true, args);
63
+ };
64
+ console.debug = function (...args) {
65
+ debugLog(true, args);
116
66
  };
117
- console.error = setLog(errorLog, "error");
118
- console.warn = setLog(warnLog, "warning");
119
- console.info = setLog(infoLog, "info");
120
- console.debug = setLog(debugLog, "debug");
121
67
  console.log = console.info;
122
68
  // FIXME wrap also other console methods (e.g. trace())
69
+ // set/unset log functions based on loglevel so we only have to evaluate once, not every call
70
+ const noop = () => { };
71
+ const setLog = (logFunc, funcLevel) => {
72
+ return LogrusLogLevel.isGreatherOrEqual(funcLevel, logLevel) ? logFunc : noop;
73
+ };
74
+ errorLog = setLog(doErrorLog, "error");
75
+ warnLog = setLog(doWarnLog, "warning");
76
+ infoLog = setLog(doInfoLog, "info");
77
+ debugLog = setLog(doDebugLog, "debug");
123
78
  }
124
79
  log.setLogLevel = setLogLevel;
125
80
  function resetToDefaultLogging() {
@@ -136,16 +91,20 @@ var log;
136
91
  }
137
92
  log.setVersion = setVersion;
138
93
  })(log = exports.log || (exports.log = {}));
139
- function errorLog(calledViaConsole, args) {
94
+ let errorLog = doErrorLog;
95
+ function doErrorLog(calledViaConsole, args) {
140
96
  doLog(calledViaConsole, errorConsoleLog, 'ERROR', args);
141
97
  }
142
- function warnLog(calledViaConsole, args) {
98
+ let warnLog = doWarnLog;
99
+ function doWarnLog(calledViaConsole, args) {
143
100
  doLog(calledViaConsole, warnConsoleLog, 'WARNING', args);
144
101
  }
145
- function infoLog(calledViaConsole, args) {
102
+ let infoLog = doInfoLog;
103
+ function doInfoLog(calledViaConsole, args) {
146
104
  doLog(calledViaConsole, infoConsoleLog, 'INFO', args);
147
105
  }
148
- function debugLog(calledViaConsole, args) {
106
+ let debugLog = doDebugLog;
107
+ function doDebugLog(calledViaConsole, args) {
149
108
  doLog(calledViaConsole, debugConsoleLog, 'DEBUG', args);
150
109
  }
151
110
  exports.LogrusLogLevels = {
@@ -171,15 +130,15 @@ var LogrusLogLevel;
171
130
  LogrusLogLevel.isGreatherOrEqual = isGreatherOrEqual;
172
131
  function getLevelArity(lvl) {
173
132
  return Object.keys(exports.LogrusLogLevels)
174
- .findIndex(function (l) { return l === lvl; });
133
+ .findIndex((l) => l === lvl);
175
134
  }
176
135
  function getFromEnv() {
177
- var lvlStr = process.env.LOG_LEVEL;
136
+ const lvlStr = process.env.LOG_LEVEL;
178
137
  if (!lvlStr) {
179
138
  return undefined;
180
139
  }
181
- var lvl = lvlStr;
182
- var exists = exports.LogrusLogLevels[lvl];
140
+ const lvl = lvlStr;
141
+ const exists = exports.LogrusLogLevels[lvl];
183
142
  if (!exists) {
184
143
  return undefined;
185
144
  }
@@ -189,7 +148,7 @@ var LogrusLogLevel;
189
148
  })(LogrusLogLevel = exports.LogrusLogLevel || (exports.LogrusLogLevel = {}));
190
149
  var GoogleLogSeverity;
191
150
  (function (GoogleLogSeverity) {
192
- GoogleLogSeverity.isGreaterOrEqualThanWarning = function (severity) {
151
+ GoogleLogSeverity.isGreaterOrEqualThanWarning = (severity) => {
193
152
  switch (severity) {
194
153
  case 'INFO':
195
154
  case 'DEBUG':
@@ -201,17 +160,17 @@ var GoogleLogSeverity;
201
160
  })(GoogleLogSeverity || (GoogleLogSeverity = {}));
202
161
  function doLog(calledViaConsole, consoleLog, severity, args) {
203
162
  if (!jsonLogging) {
204
- consoleLog.apply(void 0, __spread(args));
163
+ consoleLog(...args);
205
164
  return;
206
165
  }
207
166
  if (args.length == 0) {
208
167
  // console.xyz()
209
168
  return;
210
169
  }
211
- var context;
212
- var message;
213
- var error;
214
- var payloadArgs;
170
+ let context;
171
+ let message;
172
+ let error;
173
+ let payloadArgs;
215
174
  if (args[0] instanceof Error) {
216
175
  // console.xyz(Error, ...any) / log.xyz(Error) / log.xyz(Error, LogPayload)
217
176
  error = args[0];
@@ -259,7 +218,7 @@ function doLog(calledViaConsole, consoleLog, severity, args) {
259
218
  payloadArgs = args;
260
219
  }
261
220
  }
262
- var logItem = makeLogItem(severity, context, message, error, payloadArgs, calledViaConsole);
221
+ const logItem = makeLogItem(severity, context, message, error, payloadArgs, calledViaConsole);
263
222
  if (logItem !== undefined) {
264
223
  consoleLog(logItem);
265
224
  }
@@ -268,20 +227,20 @@ function makeLogItem(severity, context, message, error, payloadArgs, calledViaCo
268
227
  if (context !== undefined && Object.keys(context).length == 0) {
269
228
  context = undefined;
270
229
  }
271
- var reportedErrorEvent = {};
230
+ let reportedErrorEvent = {};
272
231
  if (GoogleLogSeverity.isGreaterOrEqualThanWarning(severity)) {
273
232
  reportedErrorEvent = makeReportedErrorEvent(error);
274
233
  }
275
- var payload = payloadArgs.length == 0 ? undefined : payloadArgs.length == 1 ? payloadArgs[0] : payloadArgs;
276
- var logItem = __assign(__assign({}, reportedErrorEvent), { component: component,
277
- severity: severity, time: new Date().toISOString(), environment: process.env.KUBE_STAGE, region: process.env.GITPOD_REGION, context: context,
278
- message: message,
279
- error: error,
280
- payload: payload, loggedViaConsole: calledViaConsole ? true : undefined });
281
- var result = stringifyLogItem(logItem);
234
+ const payload = payloadArgs.length == 0 ? undefined : payloadArgs.length == 1 ? payloadArgs[0] : payloadArgs;
235
+ const logItem = Object.assign(Object.assign({}, reportedErrorEvent), { component,
236
+ severity, time: new Date().toISOString(), environment: process.env.KUBE_STAGE, context,
237
+ message,
238
+ error,
239
+ payload, loggedViaConsole: calledViaConsole ? true : undefined });
240
+ let result = stringifyLogItem(logItem);
282
241
  if (result.length > maxAllowedLogItemLength && payload !== undefined) {
283
242
  delete logItem.payload;
284
- logItem.payloadStub = "Payload stripped as log item was longer than " + maxAllowedLogItemLength + " characters";
243
+ logItem.payloadStub = `Payload stripped as log item was longer than ${maxAllowedLogItemLength} characters`;
285
244
  result = stringifyLogItem(logItem);
286
245
  if (result.length <= maxAllowedLogItemLength) {
287
246
  log.warn('Log item too large, stripping payload', { logItemStub: makeLogItemStub(logItem) });
@@ -296,7 +255,7 @@ function makeLogItem(severity, context, message, error, payloadArgs, calledViaCo
296
255
  // See https://cloud.google.com/error-reporting/docs/formatting-error-messages
297
256
  // and https://cloud.google.com/error-reporting/reference/rest/v1beta1/projects.events/report#ReportedErrorEvent
298
257
  function makeReportedErrorEvent(error) {
299
- var result = {
258
+ const result = {
300
259
  // Serves as marker only
301
260
  "@type": "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent",
302
261
  // This is useful for filtering in the UI
@@ -307,7 +266,7 @@ function makeReportedErrorEvent(error) {
307
266
  };
308
267
  if (error) {
309
268
  // According to: https://cloud.google.com/error-reporting/docs/formatting-error-messages#json_representation
310
- var stackTrace = error.stack;
269
+ const stackTrace = error.stack;
311
270
  if (stackTrace) {
312
271
  result.stack_trace = stackTrace;
313
272
  }
@@ -315,7 +274,7 @@ function makeReportedErrorEvent(error) {
315
274
  return result;
316
275
  }
317
276
  function makeLogItemStub(logItem) {
318
- var result = {
277
+ const result = {
319
278
  component: logItem.component,
320
279
  severity: logItem.severity,
321
280
  time: logItem.time,
@@ -357,16 +316,16 @@ function stringifyLogItem(logItem) {
357
316
  * Jsonifies Errors properly, not as {} only.
358
317
  */
359
318
  function jsonStringifyWithErrors(value) {
360
- return JSON.stringify(value, function (key, value) { return value instanceof Error ? value.stack : value; });
319
+ return JSON.stringify(value, (key, value) => { return value instanceof Error ? value.stack : value; });
361
320
  }
362
- var logConsoleLog = console.log;
363
- var errorConsoleLog = console.error;
364
- var warnConsoleLog = console.warn;
365
- var infoConsoleLog = console.info;
366
- var debugConsoleLog = console.debug;
321
+ const logConsoleLog = console.log;
322
+ const errorConsoleLog = console.error;
323
+ const warnConsoleLog = console.warn;
324
+ const infoConsoleLog = console.info;
325
+ const debugConsoleLog = console.debug;
367
326
  // according to https://cloud.google.com/logging/quotas#logging_usage_limits, the log item must fit in 100 KB (internal data
368
327
  // size; its relation to the stringified JSON's size is unknown), so let's have a sufficient safe margin
369
- var maxAllowedLogItemLength = 32 * 1024;
370
- var maxMessageStubLength = 1024;
371
- var maxErrorStubLength = 4096;
328
+ const maxAllowedLogItemLength = 32 * 1024;
329
+ const maxMessageStubLength = 1024;
330
+ const maxErrorStubLength = 4096;
372
331
  //# sourceMappingURL=logging.js.map