@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
@@ -13,65 +13,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  step((generator = generator.apply(thisArg, _arguments || [])).next());
14
14
  });
15
15
  };
16
- var __generator = (this && this.__generator) || function (thisArg, body) {
17
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
18
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
19
- function verb(n) { return function (v) { return step([n, v]); }; }
20
- function step(op) {
21
- if (f) throw new TypeError("Generator is already executing.");
22
- while (_) try {
23
- 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;
24
- if (y = 0, t) op = [op[0] & 2, t.value];
25
- switch (op[0]) {
26
- case 0: case 1: t = op; break;
27
- case 4: _.label++; return { value: op[1], done: false };
28
- case 5: _.label++; y = op[1]; op = [0]; continue;
29
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
30
- default:
31
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
32
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
33
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
34
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
35
- if (t[2]) _.ops.pop();
36
- _.trys.pop(); continue;
37
- }
38
- op = body.call(thisArg, _);
39
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
40
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
41
- }
42
- };
43
- var __values = (this && this.__values) || function(o) {
44
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
45
- if (m) return m.call(o);
46
- if (o && typeof o.length === "number") return {
47
- next: function () {
48
- if (o && i >= o.length) o = void 0;
49
- return { value: o && o[i++], done: !o };
50
- }
51
- };
52
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
53
- };
54
16
  Object.defineProperty(exports, "__esModule", { value: true });
55
17
  exports.createGitpodService = exports.GitpodServiceImpl = exports.WorkspaceInstanceUpdateListener = exports.GitpodCompositeClient = exports.GitpodServerProxy = exports.GitpodServerPath = exports.createServerMock = exports.createServiceMock = exports.WorkspaceTimeoutValues = exports.GitpodServer = void 0;
56
- var vscode_jsonrpc_1 = require("vscode-jsonrpc");
57
- var gitpod_host_url_1 = require("./util/gitpod-host-url");
58
- var connection_1 = require("./messaging/browser/connection");
59
- var event_1 = require("./util/event");
18
+ const vscode_jsonrpc_1 = require("vscode-jsonrpc");
19
+ const gitpod_host_url_1 = require("./util/gitpod-host-url");
20
+ const connection_1 = require("./messaging/browser/connection");
21
+ const event_1 = require("./util/event");
60
22
  exports.GitpodServer = Symbol('GitpodServer');
61
23
  exports.WorkspaceTimeoutValues = ["30m", "60m", "180m"];
62
- var createServiceMock = function (methods) {
24
+ const createServiceMock = function (methods) {
63
25
  return new GitpodServiceImpl(exports.createServerMock(methods));
64
26
  };
65
27
  exports.createServiceMock = createServiceMock;
66
- var createServerMock = function (methods) {
67
- methods.setClient = methods.setClient || (function () { });
68
- methods.dispose = methods.dispose || (function () { });
28
+ const createServerMock = function (methods) {
29
+ methods.setClient = methods.setClient || (() => { });
30
+ methods.dispose = methods.dispose || (() => { });
69
31
  return new Proxy(methods, {
70
32
  // @ts-ignore
71
- get: function (target, property) {
72
- var result = target[property];
33
+ get: (target, property) => {
34
+ const result = target[property];
73
35
  if (!result) {
74
- throw new Error("Method " + property + " not implemented");
36
+ throw new Error(`Method ${property} not implemented`);
75
37
  }
76
38
  return result;
77
39
  }
@@ -80,163 +42,95 @@ var createServerMock = function (methods) {
80
42
  exports.createServerMock = createServerMock;
81
43
  exports.GitpodServerPath = '/gitpod';
82
44
  exports.GitpodServerProxy = Symbol('GitpodServerProxy');
83
- var GitpodCompositeClient = /** @class */ (function () {
84
- function GitpodCompositeClient() {
45
+ class GitpodCompositeClient {
46
+ constructor() {
85
47
  this.clients = [];
86
48
  }
87
- GitpodCompositeClient.prototype.registerClient = function (client) {
88
- var _this = this;
49
+ registerClient(client) {
89
50
  this.clients.push(client);
90
- var index = this.clients.length;
51
+ const index = this.clients.length;
91
52
  return {
92
- dispose: function () {
93
- _this.clients.slice(index, 1);
53
+ dispose: () => {
54
+ this.clients.slice(index, 1);
94
55
  }
95
56
  };
96
- };
97
- GitpodCompositeClient.prototype.onInstanceUpdate = function (instance) {
98
- var e_1, _a;
99
- try {
100
- for (var _b = __values(this.clients), _c = _b.next(); !_c.done; _c = _b.next()) {
101
- var client = _c.value;
102
- if (client.onInstanceUpdate) {
103
- try {
104
- client.onInstanceUpdate(instance);
105
- }
106
- catch (error) {
107
- console.error(error);
108
- }
57
+ }
58
+ onInstanceUpdate(instance) {
59
+ for (const client of this.clients) {
60
+ if (client.onInstanceUpdate) {
61
+ try {
62
+ client.onInstanceUpdate(instance);
109
63
  }
110
- }
111
- }
112
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
113
- finally {
114
- try {
115
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
116
- }
117
- finally { if (e_1) throw e_1.error; }
118
- }
119
- };
120
- GitpodCompositeClient.prototype.onPrebuildUpdate = function (update) {
121
- var e_2, _a;
122
- try {
123
- for (var _b = __values(this.clients), _c = _b.next(); !_c.done; _c = _b.next()) {
124
- var client = _c.value;
125
- if (client.onPrebuildUpdate) {
126
- try {
127
- client.onPrebuildUpdate(update);
128
- }
129
- catch (error) {
130
- console.error(error);
131
- }
64
+ catch (error) {
65
+ console.error(error);
132
66
  }
133
67
  }
134
68
  }
135
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
136
- finally {
137
- try {
138
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
139
- }
140
- finally { if (e_2) throw e_2.error; }
141
- }
142
- };
143
- GitpodCompositeClient.prototype.onWorkspaceImageBuildLogs = function (info, content) {
144
- var e_3, _a;
145
- try {
146
- for (var _b = __values(this.clients), _c = _b.next(); !_c.done; _c = _b.next()) {
147
- var client = _c.value;
148
- if (client.onWorkspaceImageBuildLogs) {
149
- try {
150
- client.onWorkspaceImageBuildLogs(info, content);
151
- }
152
- catch (error) {
153
- console.error(error);
154
- }
69
+ }
70
+ onPrebuildUpdate(update) {
71
+ for (const client of this.clients) {
72
+ if (client.onPrebuildUpdate) {
73
+ try {
74
+ client.onPrebuildUpdate(update);
155
75
  }
156
- }
157
- }
158
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
159
- finally {
160
- try {
161
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
162
- }
163
- finally { if (e_3) throw e_3.error; }
164
- }
165
- };
166
- GitpodCompositeClient.prototype.notifyDidOpenConnection = function () {
167
- var e_4, _a;
168
- try {
169
- for (var _b = __values(this.clients), _c = _b.next(); !_c.done; _c = _b.next()) {
170
- var client = _c.value;
171
- if (client.notifyDidOpenConnection) {
172
- try {
173
- client.notifyDidOpenConnection();
174
- }
175
- catch (error) {
176
- console.error(error);
177
- }
76
+ catch (error) {
77
+ console.error(error);
178
78
  }
179
79
  }
180
80
  }
181
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
182
- finally {
183
- try {
184
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
185
- }
186
- finally { if (e_4) throw e_4.error; }
187
- }
188
- };
189
- GitpodCompositeClient.prototype.notifyDidCloseConnection = function () {
190
- var e_5, _a;
191
- try {
192
- for (var _b = __values(this.clients), _c = _b.next(); !_c.done; _c = _b.next()) {
193
- var client = _c.value;
194
- if (client.notifyDidCloseConnection) {
195
- try {
196
- client.notifyDidCloseConnection();
197
- }
198
- catch (error) {
199
- console.error(error);
200
- }
81
+ }
82
+ onWorkspaceImageBuildLogs(info, content) {
83
+ for (const client of this.clients) {
84
+ if (client.onWorkspaceImageBuildLogs) {
85
+ try {
86
+ client.onWorkspaceImageBuildLogs(info, content);
87
+ }
88
+ catch (error) {
89
+ console.error(error);
201
90
  }
202
91
  }
203
92
  }
204
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
205
- finally {
206
- try {
207
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
93
+ }
94
+ notifyDidOpenConnection() {
95
+ for (const client of this.clients) {
96
+ if (client.notifyDidOpenConnection) {
97
+ try {
98
+ client.notifyDidOpenConnection();
99
+ }
100
+ catch (error) {
101
+ console.error(error);
102
+ }
208
103
  }
209
- finally { if (e_5) throw e_5.error; }
210
104
  }
211
- };
212
- GitpodCompositeClient.prototype.onCreditAlert = function (creditAlert) {
213
- var e_6, _a;
214
- try {
215
- for (var _b = __values(this.clients), _c = _b.next(); !_c.done; _c = _b.next()) {
216
- var client = _c.value;
217
- if (client.onCreditAlert) {
218
- try {
219
- client.onCreditAlert(creditAlert);
220
- }
221
- catch (error) {
222
- console.error(error);
223
- }
105
+ }
106
+ notifyDidCloseConnection() {
107
+ for (const client of this.clients) {
108
+ if (client.notifyDidCloseConnection) {
109
+ try {
110
+ client.notifyDidCloseConnection();
111
+ }
112
+ catch (error) {
113
+ console.error(error);
224
114
  }
225
115
  }
226
116
  }
227
- catch (e_6_1) { e_6 = { error: e_6_1 }; }
228
- finally {
229
- try {
230
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
117
+ }
118
+ onCreditAlert(creditAlert) {
119
+ for (const client of this.clients) {
120
+ if (client.onCreditAlert) {
121
+ try {
122
+ client.onCreditAlert(creditAlert);
123
+ }
124
+ catch (error) {
125
+ console.error(error);
126
+ }
231
127
  }
232
- finally { if (e_6) throw e_6.error; }
233
128
  }
234
- };
235
- return GitpodCompositeClient;
236
- }());
129
+ }
130
+ }
237
131
  exports.GitpodCompositeClient = GitpodCompositeClient;
238
- var hasWindow = (typeof window !== 'undefined');
239
- var phasesOrder = {
132
+ const hasWindow = (typeof window !== 'undefined');
133
+ const phasesOrder = {
240
134
  unknown: 0,
241
135
  preparing: 1,
242
136
  pending: 2,
@@ -247,9 +141,8 @@ var phasesOrder = {
247
141
  stopping: 7,
248
142
  stopped: 8
249
143
  };
250
- var WorkspaceInstanceUpdateListener = /** @class */ (function () {
251
- function WorkspaceInstanceUpdateListener(service, _info) {
252
- var _this = this;
144
+ class WorkspaceInstanceUpdateListener {
145
+ constructor(service, _info) {
253
146
  this.service = service;
254
147
  this._info = _info;
255
148
  this.onDidChangeEmitter = new event_1.Emitter();
@@ -257,93 +150,73 @@ var WorkspaceInstanceUpdateListener = /** @class */ (function () {
257
150
  this.source = 'sync';
258
151
  this.syncQueue = Promise.resolve();
259
152
  service.registerClient({
260
- onInstanceUpdate: function (instance) {
261
- if (_this.isOutOfOrder(instance)) {
153
+ onInstanceUpdate: instance => {
154
+ if (this.isOutOfOrder(instance)) {
262
155
  return;
263
156
  }
264
- _this.cancelSync();
265
- _this._info.latestInstance = instance;
266
- _this.source = 'update';
267
- _this.onDidChangeEmitter.fire(undefined);
157
+ this.cancelSync();
158
+ this._info.latestInstance = instance;
159
+ this.source = 'update';
160
+ this.onDidChangeEmitter.fire(undefined);
268
161
  },
269
- notifyDidOpenConnection: function () {
270
- _this.sync();
162
+ notifyDidOpenConnection: () => {
163
+ this.sync();
271
164
  }
272
165
  });
273
166
  if (hasWindow) {
274
167
  // learn about page lifecycle here: https://developers.google.com/web/updates/2018/07/page-lifecycle-api
275
- window.document.addEventListener('visibilitychange', function () { return __awaiter(_this, void 0, void 0, function () {
276
- return __generator(this, function (_a) {
277
- if (window.document.visibilityState === 'visible') {
278
- this.sync();
279
- }
280
- return [2 /*return*/];
281
- });
282
- }); });
283
- window.addEventListener('pageshow', function (e) {
168
+ window.document.addEventListener('visibilitychange', () => __awaiter(this, void 0, void 0, function* () {
169
+ if (window.document.visibilityState === 'visible') {
170
+ this.sync();
171
+ }
172
+ }));
173
+ window.addEventListener('pageshow', e => {
284
174
  if (e.persisted) {
285
- _this.sync();
175
+ this.sync();
286
176
  }
287
177
  });
288
178
  }
289
179
  }
290
- Object.defineProperty(WorkspaceInstanceUpdateListener.prototype, "info", {
291
- get: function () {
292
- return this._info;
293
- },
294
- enumerable: false,
295
- configurable: true
296
- });
180
+ get info() {
181
+ return this._info;
182
+ }
297
183
  /**
298
184
  * Only one sync can be performed at the same time.
299
185
  * Any new sync request or instance update cancels all previously scheduled sync requests.
300
186
  */
301
- WorkspaceInstanceUpdateListener.prototype.sync = function () {
302
- var _this = this;
187
+ sync() {
303
188
  this.cancelSync();
304
189
  this.syncTokenSource = new vscode_jsonrpc_1.CancellationTokenSource();
305
- var token = this.syncTokenSource.token;
306
- this.syncQueue = this.syncQueue.then(function () { return __awaiter(_this, void 0, void 0, function () {
307
- var info, e_7;
308
- return __generator(this, function (_a) {
309
- switch (_a.label) {
310
- case 0:
311
- if (token.isCancellationRequested) {
312
- return [2 /*return*/];
313
- }
314
- _a.label = 1;
315
- case 1:
316
- _a.trys.push([1, 3, , 4]);
317
- return [4 /*yield*/, this.service.server.getWorkspace(this._info.workspace.id)];
318
- case 2:
319
- info = _a.sent();
320
- if (token.isCancellationRequested) {
321
- return [2 /*return*/];
322
- }
323
- this._info = info;
324
- this.source = 'sync';
325
- this.onDidChangeEmitter.fire(undefined);
326
- return [3 /*break*/, 4];
327
- case 3:
328
- e_7 = _a.sent();
329
- console.error('failed to sync workspace instance:', e_7);
330
- return [3 /*break*/, 4];
331
- case 4: return [2 /*return*/];
190
+ const token = this.syncTokenSource.token;
191
+ this.syncQueue = this.syncQueue.then(() => __awaiter(this, void 0, void 0, function* () {
192
+ if (token.isCancellationRequested) {
193
+ return;
194
+ }
195
+ try {
196
+ const info = yield this.service.server.getWorkspace(this._info.workspace.id);
197
+ if (token.isCancellationRequested) {
198
+ return;
332
199
  }
333
- });
334
- }); });
335
- };
336
- WorkspaceInstanceUpdateListener.prototype.cancelSync = function () {
200
+ this._info = info;
201
+ this.source = 'sync';
202
+ this.onDidChangeEmitter.fire(undefined);
203
+ }
204
+ catch (e) {
205
+ console.error('failed to sync workspace instance:', e);
206
+ }
207
+ }));
208
+ }
209
+ cancelSync() {
337
210
  if (this.syncTokenSource) {
338
211
  this.syncTokenSource.cancel();
339
212
  this.syncTokenSource = undefined;
340
213
  }
341
- };
214
+ }
342
215
  /**
343
216
  * If sync seen more recent update then ignore all updates with previous phases.
344
217
  * Within the same phase still the race can occur but which should be eventually consistent.
345
218
  */
346
- WorkspaceInstanceUpdateListener.prototype.isOutOfOrder = function (instance) {
219
+ isOutOfOrder(instance) {
347
220
  var _a;
348
221
  if (instance.workspaceId !== this._info.workspace.id) {
349
222
  return true;
@@ -355,82 +228,63 @@ var WorkspaceInstanceUpdateListener = /** @class */ (function () {
355
228
  return false;
356
229
  }
357
230
  return phasesOrder[instance.status.phase] < phasesOrder[this.info.latestInstance.status.phase];
358
- };
359
- return WorkspaceInstanceUpdateListener;
360
- }());
231
+ }
232
+ }
361
233
  exports.WorkspaceInstanceUpdateListener = WorkspaceInstanceUpdateListener;
362
- var GitpodServiceImpl = /** @class */ (function () {
363
- function GitpodServiceImpl(server, options) {
364
- var _this = this;
234
+ class GitpodServiceImpl {
235
+ constructor(server, options) {
365
236
  this.server = server;
366
237
  this.options = options;
367
238
  this.compositeClient = new GitpodCompositeClient();
368
239
  this.instanceListeners = new Map();
369
240
  server.setClient(this.compositeClient);
370
- server.onDidOpenConnection(function () { return _this.compositeClient.notifyDidOpenConnection(); });
371
- server.onDidCloseConnection(function () { return _this.compositeClient.notifyDidCloseConnection(); });
241
+ server.onDidOpenConnection(() => this.compositeClient.notifyDidOpenConnection());
242
+ server.onDidCloseConnection(() => this.compositeClient.notifyDidCloseConnection());
372
243
  }
373
- GitpodServiceImpl.prototype.registerClient = function (client) {
244
+ registerClient(client) {
374
245
  return this.compositeClient.registerClient(client);
375
- };
376
- GitpodServiceImpl.prototype.listenToInstance = function (workspaceId) {
377
- var _this = this;
378
- var listener = this.instanceListeners.get(workspaceId) ||
379
- (function () { return __awaiter(_this, void 0, void 0, function () {
380
- var info;
381
- return __generator(this, function (_a) {
382
- switch (_a.label) {
383
- case 0: return [4 /*yield*/, this.server.getWorkspace(workspaceId)];
384
- case 1:
385
- info = _a.sent();
386
- return [2 /*return*/, new WorkspaceInstanceUpdateListener(this, info)];
387
- }
388
- });
389
- }); })();
246
+ }
247
+ listenToInstance(workspaceId) {
248
+ const listener = this.instanceListeners.get(workspaceId) ||
249
+ (() => __awaiter(this, void 0, void 0, function* () {
250
+ const info = yield this.server.getWorkspace(workspaceId);
251
+ return new WorkspaceInstanceUpdateListener(this, info);
252
+ }))();
390
253
  this.instanceListeners.set(workspaceId, listener);
391
254
  return listener;
392
- };
393
- GitpodServiceImpl.prototype.reconnect = function () {
255
+ }
256
+ reconnect() {
394
257
  var _a;
395
- return __awaiter(this, void 0, void 0, function () {
396
- return __generator(this, function (_b) {
397
- switch (_b.label) {
398
- case 0:
399
- if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.onReconnect)) return [3 /*break*/, 2];
400
- return [4 /*yield*/, this.options.onReconnect()];
401
- case 1:
402
- _b.sent();
403
- _b.label = 2;
404
- case 2: return [2 /*return*/];
405
- }
406
- });
258
+ return __awaiter(this, void 0, void 0, function* () {
259
+ if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.onReconnect) {
260
+ yield this.options.onReconnect();
261
+ }
407
262
  });
408
- };
409
- return GitpodServiceImpl;
410
- }());
263
+ }
264
+ }
411
265
  exports.GitpodServiceImpl = GitpodServiceImpl;
412
266
  function createGitpodService(serverUrl) {
413
- var toWsUrl = function (serverUrl) {
267
+ const toWsUrl = (serverUrl) => {
414
268
  return new gitpod_host_url_1.GitpodHostUrl(serverUrl)
415
269
  .asWebsocket()
416
270
  .withApi({ pathname: exports.GitpodServerPath })
417
271
  .toString();
418
272
  };
419
- var url;
273
+ let url;
420
274
  if (typeof serverUrl === "string") {
421
275
  url = toWsUrl(serverUrl);
422
276
  }
423
277
  else {
424
- url = serverUrl.then(function (url) { return toWsUrl(url); });
278
+ url = serverUrl.then(url => toWsUrl(url));
425
279
  }
426
- var connectionProvider = new connection_1.WebSocketConnectionProvider();
427
- var onReconnect = function () { };
428
- var gitpodServer = connectionProvider.createProxy(url, undefined, {
429
- onListening: function (socket) {
430
- onReconnect = function () { return socket.reconnect(); };
280
+ const connectionProvider = new connection_1.WebSocketConnectionProvider();
281
+ let onReconnect = () => { };
282
+ const gitpodServer = connectionProvider.createProxy(url, undefined, {
283
+ onListening: socket => {
284
+ onReconnect = () => socket.reconnect();
431
285
  }
432
286
  });
433
- return new GitpodServiceImpl(gitpodServer, { onReconnect: onReconnect });
287
+ return new GitpodServiceImpl(gitpodServer, { onReconnect });
434
288
  }
435
289
  exports.createGitpodService = createGitpodService;
436
290
  //# sourceMappingURL=gitpod-service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"gitpod-service.js","sourceRoot":"","sources":["../src/gitpod-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gitpod-service.js","sourceRoot":"","sources":["../src/gitpod-service.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { Logger } from "vscode-ws-jsonrpc";
2
2
  import { JsonRpcProxy } from "../proxy-factory";
3
- import { ConnectionHandler } from "../handler";
4
- import ReconnectingWebSocket from 'reconnecting-websocket';
3
+ import { ConnectionEventHandler, ConnectionHandler } from "../handler";
4
+ import ReconnectingWebSocket, { Event } from 'reconnecting-websocket';
5
5
  export interface WebSocketOptions {
6
6
  onerror?: (event: Event) => void;
7
7
  onListening?: (socket: ReconnectingWebSocket) => void;
@@ -18,7 +18,7 @@ export declare class WebSocketConnectionProvider {
18
18
  /**
19
19
  * Install a connection handler for the given path.
20
20
  */
21
- listen(handler: ConnectionHandler, options?: WebSocketOptions): WebSocket;
21
+ listen(handler: ConnectionHandler, eventHandler: ConnectionEventHandler, options?: WebSocketOptions): WebSocket;
22
22
  protected createLogger(): Logger;
23
23
  /**
24
24
  * Creates a web socket for the given url
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/browser/connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAuB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,qBAAqB,MAAM,wBAAwB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC7B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAC;CACzD;AAED,qBAAa,2BAA2B;IAEpC;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC;IAsB3H;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS;IAuBzE,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;CAW1C"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/browser/connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAuC,MAAM,mBAAmB,CAAC;AAIhF,OAAO,EAAuB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,WAAW,gBAAgB;IAC7B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAC;CACzD;AAED,qBAAa,2BAA2B;IAEpC;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC;IAyB3H;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS;IAwB/G,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;CAW1C"}