@gitpod/gitpod-protocol 0.1.5-vn-integrate-gitpod-yml-tasks-into-jetbrainsa.5 → 0.1.5-vn-6525.77
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.
- package/data/gitpod-schema.json +28 -2
- package/lib/accounting-protocol.d.ts +10 -10
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +22 -31
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts +4 -2
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts +4 -5
- package/lib/analytics.d.ts.map +1 -1
- package/lib/analytics.js.map +1 -1
- package/lib/auth.d.ts.map +1 -1
- package/lib/context-url.d.ts.map +1 -1
- package/lib/context-url.js +3 -3
- package/lib/context-url.js.map +1 -1
- package/lib/context-url.spec.d.ts.map +1 -1
- package/lib/context-url.spec.js +20 -5
- package/lib/context-url.spec.js.map +1 -1
- package/lib/email-protocol.d.ts +1 -1
- package/lib/email-protocol.d.ts.map +1 -1
- package/lib/email-protocol.js.map +1 -1
- package/lib/encryption/container-module.d.ts.map +1 -1
- package/lib/encryption/container-module.js +1 -1
- package/lib/encryption/container-module.js.map +1 -1
- package/lib/encryption/encryption-engine.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.js +7 -7
- package/lib/encryption/encryption-engine.js.map +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.spec.js +2 -3
- package/lib/encryption/encryption-engine.spec.js.map +1 -1
- package/lib/encryption/encryption-service.d.ts.map +1 -1
- package/lib/encryption/encryption-service.js +1 -1
- package/lib/encryption/encryption-service.js.map +1 -1
- package/lib/encryption/key-provider.d.ts.map +1 -1
- package/lib/encryption/key-provider.js +7 -9
- package/lib/encryption/key-provider.js.map +1 -1
- package/lib/env.d.ts +1 -1
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +5 -5
- package/lib/env.js.map +1 -1
- package/lib/gitpod-file-parser.d.ts.map +1 -1
- package/lib/gitpod-file-parser.js +6 -6
- package/lib/gitpod-file-parser.js.map +1 -1
- package/lib/gitpod-file-parser.spec.js +42 -39
- package/lib/gitpod-file-parser.spec.js.map +1 -1
- package/lib/gitpod-service.d.ts +23 -26
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +32 -26
- package/lib/gitpod-service.js.map +1 -1
- package/lib/headless-workspace-log.d.ts +1 -0
- package/lib/headless-workspace-log.d.ts.map +1 -1
- package/lib/headless-workspace-log.js +2 -1
- package/lib/headless-workspace-log.js.map +1 -1
- package/lib/ide-frontend-service.d.ts +1 -1
- package/lib/ide-protocol.d.ts +6 -6
- package/lib/ide-protocol.d.ts.map +1 -1
- package/lib/index.d.ts +16 -16
- package/lib/installation-admin-protocol.d.ts +1 -1
- package/lib/installation-admin-protocol.d.ts.map +1 -1
- package/lib/installation-admin-protocol.js +2 -2
- package/lib/installation-admin-protocol.js.map +1 -1
- package/lib/license-protocol.d.ts.map +1 -1
- package/lib/license-protocol.js.map +1 -1
- package/lib/messaging/browser/connection.d.ts +1 -1
- package/lib/messaging/browser/connection.d.ts.map +1 -1
- package/lib/messaging/browser/connection.js +19 -19
- package/lib/messaging/browser/connection.js.map +1 -1
- package/lib/messaging/browser/window-connection.d.ts +4 -4
- package/lib/messaging/browser/window-connection.d.ts.map +1 -1
- package/lib/messaging/browser/window-connection.js +9 -6
- package/lib/messaging/browser/window-connection.js.map +1 -1
- package/lib/messaging/client-call-metrics.d.ts +2 -2
- package/lib/messaging/client-call-metrics.d.ts.map +1 -1
- package/lib/messaging/client-call-metrics.js +20 -20
- package/lib/messaging/client-call-metrics.js.map +1 -1
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/handler.d.ts.map +1 -1
- package/lib/messaging/handler.js +1 -1
- package/lib/messaging/node/connection.js +8 -8
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts +1 -1
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +7 -9
- package/lib/messaging/proxy-factory.js.map +1 -1
- package/lib/payment-protocol.d.ts.map +1 -1
- package/lib/payment-protocol.js +1 -1
- package/lib/payment-protocol.js.map +1 -1
- package/lib/permission.d.ts +2 -2
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +12 -23
- package/lib/permission.js.map +1 -1
- package/lib/plans.d.ts +3 -3
- package/lib/plans.d.ts.map +1 -1
- package/lib/plans.js +206 -171
- package/lib/plans.js.map +1 -1
- package/lib/protocol.d.ts +53 -37
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +85 -86
- package/lib/protocol.js.map +1 -1
- package/lib/snapshot-url.spec.js.map +1 -1
- package/lib/team-subscription-protocol.d.ts +5 -3
- package/lib/team-subscription-protocol.d.ts.map +1 -1
- package/lib/team-subscription-protocol.js +4 -4
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +3 -3
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js +1 -1
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/typings/globals.d.ts +2 -2
- package/lib/typings/globals.d.ts.map +1 -1
- package/lib/util/analytics.d.ts.map +1 -1
- package/lib/util/analytics.js +12 -3
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/async-iterator.d.ts.map +1 -1
- package/lib/util/async-iterator.js +3 -3
- package/lib/util/async-iterator.js.map +1 -1
- package/lib/util/cancelable.js.map +1 -1
- package/lib/util/date-time.js +6 -6
- package/lib/util/date-time.js.map +1 -1
- package/lib/util/deferred.js.map +1 -1
- package/lib/util/disposable.d.ts.map +1 -1
- package/lib/util/disposable.js +2 -2
- package/lib/util/disposable.js.map +1 -1
- package/lib/util/event.d.ts.map +1 -1
- package/lib/util/event.js +5 -3
- package/lib/util/event.js.map +1 -1
- package/lib/util/garbage-collected-cache.d.ts.map +1 -1
- package/lib/util/garbage-collected-cache.js +1 -1
- package/lib/util/garbage-collected-cache.js.map +1 -1
- package/lib/util/generate-workspace-id.d.ts.map +1 -1
- package/lib/util/generate-workspace-id.js +435 -435
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/generate-workspace-id.spec.js +10 -6
- package/lib/util/generate-workspace-id.spec.js.map +1 -1
- package/lib/util/gitpod-cookie.d.ts +1 -1
- package/lib/util/gitpod-cookie.d.ts.map +1 -1
- package/lib/util/gitpod-cookie.js +0 -3
- package/lib/util/gitpod-cookie.js.map +1 -1
- package/lib/util/gitpod-host-url.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.js +31 -29
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +15 -5
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.d.ts.map +1 -1
- package/lib/util/grpc.js.map +1 -1
- package/lib/util/jaeger-client-types.d.ts.map +1 -1
- package/lib/util/logging.d.ts +1 -1
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +22 -23
- package/lib/util/logging.js.map +1 -1
- package/lib/util/make-link.js +5 -5
- package/lib/util/make-link.js.map +1 -1
- package/lib/util/parse-workspace-id.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.js +1 -2
- package/lib/util/parse-workspace-id.js.map +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.spec.js.map +1 -1
- package/lib/util/queue.spec.js +9 -6
- package/lib/util/queue.spec.js.map +1 -1
- package/lib/util/semaphore.d.ts.map +1 -1
- package/lib/util/semaphore.js.map +1 -1
- package/lib/util/skip-if.d.ts.map +1 -1
- package/lib/util/skip-if.js.map +1 -1
- package/lib/util/timeutil.d.ts.map +1 -1
- package/lib/util/timeutil.js +2 -2
- package/lib/util/timeutil.js.map +1 -1
- package/lib/util/timeutil.spec.d.ts.map +1 -1
- package/lib/util/timeutil.spec.js.map +1 -1
- package/lib/util/tracing.d.ts +6 -6
- package/lib/util/tracing.d.ts.map +1 -1
- package/lib/util/tracing.js +6 -6
- package/lib/util/tracing.js.map +1 -1
- package/lib/util/tracing.spec.js +3 -3
- package/lib/util/tracing.spec.js.map +1 -1
- package/lib/util/workspace-port-authentication.d.ts +7 -7
- package/lib/util/workspace-port-authentication.d.ts.map +1 -1
- package/lib/util/workspace-port-authentication.js +8 -11
- package/lib/util/workspace-port-authentication.js.map +1 -1
- package/lib/workspace-cluster.d.ts +1 -1
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js +2 -4
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +2 -2
- package/lib/workspace-instance.d.ts.map +1 -1
- package/lib/wsready.d.ts +1 -1
- package/lib/wsready.d.ts.map +1 -1
- package/lib/wsready.js +2 -2
- package/package.json +2 -2
- package/pkg-yarn.lock +2 -2
- package/provenance-bundle.jsonl +1 -1
- package/src/accounting-protocol.ts +53 -51
- package/src/admin-protocol.ts +25 -21
- package/src/analytics.ts +26 -28
- package/src/auth.ts +2 -2
- package/src/context-url.spec.ts +25 -11
- package/src/context-url.ts +80 -78
- package/src/email-protocol.ts +5 -6
- package/src/encryption/container-module.ts +2 -3
- package/src/encryption/encryption-engine.spec.ts +9 -8
- package/src/encryption/encryption-engine.ts +14 -14
- package/src/encryption/encryption-service.ts +4 -5
- package/src/encryption/key-provider.ts +16 -19
- package/src/env.ts +9 -9
- package/src/gitpod-file-parser.spec.ts +55 -61
- package/src/gitpod-file-parser.ts +16 -17
- package/src/gitpod-service.ts +130 -104
- package/src/headless-workspace-log.ts +6 -4
- package/src/ide-frontend-service.ts +2 -2
- package/src/ide-protocol.ts +8 -8
- package/src/index.ts +16 -16
- package/src/installation-admin-protocol.ts +9 -9
- package/src/license-protocol.ts +5 -6
- package/src/messaging/browser/connection.ts +45 -47
- package/src/messaging/browser/window-connection.ts +39 -29
- package/src/messaging/client-call-metrics.ts +70 -71
- package/src/messaging/error.ts +1 -3
- package/src/messaging/handler.ts +6 -6
- package/src/messaging/node/connection.ts +8 -8
- package/src/messaging/proxy-factory.ts +23 -30
- package/src/oss-allowlist.ts +3 -3
- package/src/payment-protocol.ts +2 -2
- package/src/permission.ts +20 -31
- package/src/plans.ts +236 -189
- package/src/protocol.ts +239 -239
- package/src/snapshot-url.spec.ts +9 -7
- package/src/team-subscription-protocol.ts +33 -23
- package/src/teams-projects-protocol.ts +8 -8
- package/src/typings/globals.ts +4 -4
- package/src/util/analytics.ts +46 -24
- package/src/util/async-iterator.ts +4 -5
- package/src/util/cancelable.ts +3 -3
- package/src/util/date-time.ts +8 -8
- package/src/util/deferred.ts +6 -6
- package/src/util/disposable.ts +3 -6
- package/src/util/event.ts +9 -11
- package/src/util/garbage-collected-cache.ts +3 -6
- package/src/util/generate-workspace-id.spec.ts +18 -15
- package/src/util/generate-workspace-id.ts +453 -453
- package/src/util/gitpod-cookie.ts +8 -9
- package/src/util/gitpod-host-url.spec.ts +40 -13
- package/src/util/gitpod-host-url.ts +37 -34
- package/src/util/grpc.ts +1 -1
- package/src/util/jaeger-client-types.ts +2 -2
- package/src/util/logging.ts +49 -39
- package/src/util/make-link.ts +6 -7
- package/src/util/parse-workspace-id.spec.ts +17 -8
- package/src/util/parse-workspace-id.ts +5 -6
- package/src/util/queue.spec.ts +27 -25
- package/src/util/repeat.ts +1 -1
- package/src/util/semaphore.ts +4 -6
- package/src/util/skip-if.ts +9 -6
- package/src/util/timeutil.spec.ts +14 -15
- package/src/util/timeutil.ts +15 -11
- package/src/util/tracing.spec.ts +28 -23
- package/src/util/tracing.ts +46 -41
- package/src/util/workspace-port-authentication.ts +10 -13
- package/src/workspace-cluster.ts +15 -12
- package/src/workspace-instance.ts +27 -23
- package/src/wsready.ts +3 -3
- package/data/builtin-theia-plugins.json +0 -372
- package/lib/theia-plugins.d.ts +0 -11
- package/lib/theia-plugins.d.ts.map +0 -1
- package/lib/theia-plugins.js +0 -8
- package/lib/theia-plugins.js.map +0 -1
- package/src/theia-plugins.ts +0 -11
package/lib/gitpod-service.js
CHANGED
|
@@ -14,13 +14,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
14
14
|
});
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.createGitpodService = exports.GitpodServiceImpl = exports.WorkspaceInstanceUpdateListener = exports.GitpodCompositeClient = exports.GitpodServerProxy = exports.GitpodServerPath = exports.createServerMock = exports.createServiceMock = exports.WorkspaceTimeoutValues = exports.GitpodServer = void 0;
|
|
17
|
+
exports.createGitpodService = exports.GitpodServiceImpl = exports.WorkspaceInstanceUpdateListener = exports.GitpodCompositeClient = exports.GitpodServerProxy = exports.GitpodServerPath = exports.createServerMock = exports.createServiceMock = exports.WorkspaceTimeoutValues = exports.WORKSPACE_TIMEOUT_EXTENDED_ALT = exports.WORKSPACE_TIMEOUT_EXTENDED = exports.WORKSPACE_TIMEOUT_DEFAULT_LONG = exports.WORKSPACE_TIMEOUT_DEFAULT_SHORT = exports.GitpodServer = void 0;
|
|
18
18
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
|
19
19
|
const gitpod_host_url_1 = require("./util/gitpod-host-url");
|
|
20
20
|
const connection_1 = require("./messaging/browser/connection");
|
|
21
21
|
const event_1 = require("./util/event");
|
|
22
|
-
exports.GitpodServer = Symbol(
|
|
23
|
-
exports.
|
|
22
|
+
exports.GitpodServer = Symbol("GitpodServer");
|
|
23
|
+
exports.WORKSPACE_TIMEOUT_DEFAULT_SHORT = "short";
|
|
24
|
+
exports.WORKSPACE_TIMEOUT_DEFAULT_LONG = "long";
|
|
25
|
+
exports.WORKSPACE_TIMEOUT_EXTENDED = "extended";
|
|
26
|
+
exports.WORKSPACE_TIMEOUT_EXTENDED_ALT = "180m"; // for backwards compatibility since the IDE uses this
|
|
27
|
+
exports.WorkspaceTimeoutValues = [
|
|
28
|
+
exports.WORKSPACE_TIMEOUT_DEFAULT_SHORT,
|
|
29
|
+
exports.WORKSPACE_TIMEOUT_DEFAULT_LONG,
|
|
30
|
+
exports.WORKSPACE_TIMEOUT_EXTENDED,
|
|
31
|
+
exports.WORKSPACE_TIMEOUT_EXTENDED_ALT,
|
|
32
|
+
];
|
|
24
33
|
const createServiceMock = function (methods) {
|
|
25
34
|
return new GitpodServiceImpl((0, exports.createServerMock)(methods));
|
|
26
35
|
};
|
|
@@ -36,12 +45,12 @@ const createServerMock = function (methods) {
|
|
|
36
45
|
throw new Error(`Method ${property} not implemented`);
|
|
37
46
|
}
|
|
38
47
|
return result;
|
|
39
|
-
}
|
|
48
|
+
},
|
|
40
49
|
});
|
|
41
50
|
};
|
|
42
51
|
exports.createServerMock = createServerMock;
|
|
43
|
-
exports.GitpodServerPath =
|
|
44
|
-
exports.GitpodServerProxy = Symbol(
|
|
52
|
+
exports.GitpodServerPath = "/gitpod";
|
|
53
|
+
exports.GitpodServerProxy = Symbol("GitpodServerProxy");
|
|
45
54
|
class GitpodCompositeClient {
|
|
46
55
|
constructor() {
|
|
47
56
|
this.clients = [];
|
|
@@ -54,7 +63,7 @@ class GitpodCompositeClient {
|
|
|
54
63
|
if (index > -1) {
|
|
55
64
|
this.clients.splice(index, 1);
|
|
56
65
|
}
|
|
57
|
-
}
|
|
66
|
+
},
|
|
58
67
|
};
|
|
59
68
|
}
|
|
60
69
|
onInstanceUpdate(instance) {
|
|
@@ -131,7 +140,7 @@ class GitpodCompositeClient {
|
|
|
131
140
|
}
|
|
132
141
|
}
|
|
133
142
|
exports.GitpodCompositeClient = GitpodCompositeClient;
|
|
134
|
-
const hasWindow =
|
|
143
|
+
const hasWindow = typeof window !== "undefined";
|
|
135
144
|
const phasesOrder = {
|
|
136
145
|
unknown: 0,
|
|
137
146
|
preparing: 1,
|
|
@@ -141,7 +150,7 @@ const phasesOrder = {
|
|
|
141
150
|
running: 5,
|
|
142
151
|
interrupted: 6,
|
|
143
152
|
stopping: 7,
|
|
144
|
-
stopped: 8
|
|
153
|
+
stopped: 8,
|
|
145
154
|
};
|
|
146
155
|
class WorkspaceInstanceUpdateListener {
|
|
147
156
|
constructor(service, _info) {
|
|
@@ -149,30 +158,30 @@ class WorkspaceInstanceUpdateListener {
|
|
|
149
158
|
this._info = _info;
|
|
150
159
|
this.onDidChangeEmitter = new event_1.Emitter();
|
|
151
160
|
this.onDidChange = this.onDidChangeEmitter.event;
|
|
152
|
-
this.source =
|
|
161
|
+
this.source = "sync";
|
|
153
162
|
this.syncQueue = Promise.resolve();
|
|
154
163
|
service.registerClient({
|
|
155
|
-
onInstanceUpdate: instance => {
|
|
164
|
+
onInstanceUpdate: (instance) => {
|
|
156
165
|
if (this.isOutOfOrder(instance)) {
|
|
157
166
|
return;
|
|
158
167
|
}
|
|
159
168
|
this.cancelSync();
|
|
160
169
|
this._info.latestInstance = instance;
|
|
161
|
-
this.source =
|
|
170
|
+
this.source = "update";
|
|
162
171
|
this.onDidChangeEmitter.fire(undefined);
|
|
163
172
|
},
|
|
164
173
|
notifyDidOpenConnection: () => {
|
|
165
174
|
this.sync();
|
|
166
|
-
}
|
|
175
|
+
},
|
|
167
176
|
});
|
|
168
177
|
if (hasWindow) {
|
|
169
178
|
// learn about page lifecycle here: https://developers.google.com/web/updates/2018/07/page-lifecycle-api
|
|
170
|
-
window.document.addEventListener(
|
|
171
|
-
if (window.document.visibilityState ===
|
|
179
|
+
window.document.addEventListener("visibilitychange", () => __awaiter(this, void 0, void 0, function* () {
|
|
180
|
+
if (window.document.visibilityState === "visible") {
|
|
172
181
|
this.sync();
|
|
173
182
|
}
|
|
174
183
|
}));
|
|
175
|
-
window.addEventListener(
|
|
184
|
+
window.addEventListener("pageshow", (e) => {
|
|
176
185
|
if (e.persisted) {
|
|
177
186
|
this.sync();
|
|
178
187
|
}
|
|
@@ -200,11 +209,11 @@ class WorkspaceInstanceUpdateListener {
|
|
|
200
209
|
return;
|
|
201
210
|
}
|
|
202
211
|
this._info = info;
|
|
203
|
-
this.source =
|
|
212
|
+
this.source = "sync";
|
|
204
213
|
this.onDidChangeEmitter.fire(undefined);
|
|
205
214
|
}
|
|
206
215
|
catch (e) {
|
|
207
|
-
console.error(
|
|
216
|
+
console.error("failed to sync workspace instance:", e);
|
|
208
217
|
}
|
|
209
218
|
}));
|
|
210
219
|
}
|
|
@@ -223,7 +232,7 @@ class WorkspaceInstanceUpdateListener {
|
|
|
223
232
|
if (instance.workspaceId !== this._info.workspace.id) {
|
|
224
233
|
return true;
|
|
225
234
|
}
|
|
226
|
-
if (this.source ===
|
|
235
|
+
if (this.source === "update") {
|
|
227
236
|
return false;
|
|
228
237
|
}
|
|
229
238
|
if (instance.id !== ((_a = this.info.latestInstance) === null || _a === void 0 ? void 0 : _a.id)) {
|
|
@@ -267,24 +276,21 @@ class GitpodServiceImpl {
|
|
|
267
276
|
exports.GitpodServiceImpl = GitpodServiceImpl;
|
|
268
277
|
function createGitpodService(serverUrl) {
|
|
269
278
|
const toWsUrl = (serverUrl) => {
|
|
270
|
-
return new gitpod_host_url_1.GitpodHostUrl(serverUrl)
|
|
271
|
-
.asWebsocket()
|
|
272
|
-
.withApi({ pathname: exports.GitpodServerPath })
|
|
273
|
-
.toString();
|
|
279
|
+
return new gitpod_host_url_1.GitpodHostUrl(serverUrl).asWebsocket().withApi({ pathname: exports.GitpodServerPath }).toString();
|
|
274
280
|
};
|
|
275
281
|
let url;
|
|
276
282
|
if (typeof serverUrl === "string") {
|
|
277
283
|
url = toWsUrl(serverUrl);
|
|
278
284
|
}
|
|
279
285
|
else {
|
|
280
|
-
url = serverUrl.then(url => toWsUrl(url));
|
|
286
|
+
url = serverUrl.then((url) => toWsUrl(url));
|
|
281
287
|
}
|
|
282
288
|
const connectionProvider = new connection_1.WebSocketConnectionProvider();
|
|
283
289
|
let onReconnect = () => { };
|
|
284
290
|
const gitpodServer = connectionProvider.createProxy(url, undefined, {
|
|
285
|
-
onListening: socket => {
|
|
291
|
+
onListening: (socket) => {
|
|
286
292
|
onReconnect = () => socket.reconnect();
|
|
287
|
-
}
|
|
293
|
+
},
|
|
288
294
|
});
|
|
289
295
|
return new GitpodServiceImpl(gitpodServer, { onReconnect });
|
|
290
296
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitpod-service.js","sourceRoot":"","sources":["../src/gitpod-service.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"gitpod-service.js","sourceRoot":"","sources":["../src/gitpod-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-workspace-log.d.ts","sourceRoot":"","sources":["../src/headless-workspace-log.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"headless-workspace-log.d.ts","sourceRoot":"","sources":["../src/headless-workspace-log.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,oBAAY,0BAA0B;IAClC,SAAS,eAAe;IACxB,oBAAoB,mBAAmB;IACvC,iBAAiB,gBAAgB;IACjC,eAAe,oBAAoB;IACnC,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;CACtB;AACD,yBAAiB,0BAA0B,CAAC;IACxC,SAAgB,SAAS,CAAC,CAAC,EAAE,0BAA0B,WAEtD;IACD,SAAgB,SAAS,CAAC,CAAC,EAAE,0BAA0B,WAItD;CACJ;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,0BAA0B,CAAC;CACpC;AAED,MAAM,WAAW,eAAe;IAE5B,OAAO,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC3C;AAED,wDAAwD;AACxD,eAAO,MAAM,+BAA+B,2BAA2B,CAAC;AACxE,eAAO,MAAM,qCAAqC,QAAuC,CAAC"}
|
|
@@ -13,6 +13,7 @@ var HeadlessWorkspaceEventType;
|
|
|
13
13
|
HeadlessWorkspaceEventType["FinishedButFailed"] = "finish-fail";
|
|
14
14
|
HeadlessWorkspaceEventType["AbortedTimedOut"] = "aborted-timeout";
|
|
15
15
|
HeadlessWorkspaceEventType["Aborted"] = "aborted";
|
|
16
|
+
HeadlessWorkspaceEventType["Failed"] = "failed";
|
|
16
17
|
HeadlessWorkspaceEventType["Started"] = "started";
|
|
17
18
|
})(HeadlessWorkspaceEventType = exports.HeadlessWorkspaceEventType || (exports.HeadlessWorkspaceEventType = {}));
|
|
18
19
|
(function (HeadlessWorkspaceEventType) {
|
|
@@ -21,7 +22,7 @@ var HeadlessWorkspaceEventType;
|
|
|
21
22
|
}
|
|
22
23
|
HeadlessWorkspaceEventType.isRunning = isRunning;
|
|
23
24
|
function didFinish(t) {
|
|
24
|
-
return t === HeadlessWorkspaceEventType.FinishedButFailed || t === HeadlessWorkspaceEventType.FinishedSuccessfully;
|
|
25
|
+
return (t === HeadlessWorkspaceEventType.FinishedButFailed || t === HeadlessWorkspaceEventType.FinishedSuccessfully);
|
|
25
26
|
}
|
|
26
27
|
HeadlessWorkspaceEventType.didFinish = didFinish;
|
|
27
28
|
})(HeadlessWorkspaceEventType = exports.HeadlessWorkspaceEventType || (exports.HeadlessWorkspaceEventType = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-workspace-log.js","sourceRoot":"","sources":["../src/headless-workspace-log.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;
|
|
1
|
+
{"version":3,"file":"headless-workspace-log.js","sourceRoot":"","sources":["../src/headless-workspace-log.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,IAAY,0BAQX;AARD,WAAY,0BAA0B;IAClC,sDAAwB,CAAA;IACxB,qEAAuC,CAAA;IACvC,+DAAiC,CAAA;IACjC,iEAAmC,CAAA;IACnC,iDAAmB,CAAA;IACnB,+CAAiB,CAAA;IACjB,iDAAmB,CAAA;AACvB,CAAC,EARW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAQrC;AACD,WAAiB,0BAA0B;IACvC,SAAgB,SAAS,CAAC,CAA6B;QACnD,OAAO,CAAC,KAAK,0BAA0B,CAAC,SAAS,CAAC;IACtD,CAAC;IAFe,oCAAS,YAExB,CAAA;IACD,SAAgB,SAAS,CAAC,CAA6B;QACnD,OAAO,CACH,CAAC,KAAK,0BAA0B,CAAC,iBAAiB,IAAI,CAAC,KAAK,0BAA0B,CAAC,oBAAoB,CAC9G,CAAC;IACN,CAAC;IAJe,oCAAS,YAIxB,CAAA;AACL,CAAC,EATgB,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAS1C;AAaD,wDAAwD;AAC3C,QAAA,+BAA+B,GAAG,wBAAwB,CAAC;AAC3D,QAAA,qCAAqC,GAAG,oCAAoC,CAAC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Event } from "./util/event";
|
|
7
7
|
import { Disposable } from "./util/disposable";
|
|
8
|
-
export declare type IDEFrontendState =
|
|
8
|
+
export declare type IDEFrontendState = "init" | "ready" | "terminated";
|
|
9
9
|
export interface IDEFrontendService {
|
|
10
10
|
readonly state: IDEFrontendState;
|
|
11
11
|
/**
|
package/lib/ide-protocol.d.ts
CHANGED
|
@@ -60,11 +60,11 @@ export interface IDEOption {
|
|
|
60
60
|
/**
|
|
61
61
|
* The type of the IDE, currently 'browser' or 'desktop'.
|
|
62
62
|
*/
|
|
63
|
-
type:
|
|
63
|
+
type: "browser" | "desktop";
|
|
64
64
|
/**
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
65
|
+
* The logo for the IDE. That could be a key in (see
|
|
66
|
+
* components/dashboard/src/images/ideLogos.ts) or a URL.
|
|
67
|
+
*/
|
|
68
68
|
logo: string;
|
|
69
69
|
/**
|
|
70
70
|
* Text of an optional tooltip (plain text only).
|
|
@@ -81,8 +81,8 @@ export interface IDEOption {
|
|
|
81
81
|
*/
|
|
82
82
|
notes?: string[];
|
|
83
83
|
/**
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
* If `true` this IDE option is not visible in the IDE preferences.
|
|
85
|
+
*/
|
|
86
86
|
hidden?: boolean;
|
|
87
87
|
/**
|
|
88
88
|
* The image ref to the IDE image.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ide-protocol.d.ts","sourceRoot":"","sources":["../src/ide-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,SAAS;IACtB;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACvB;;OAEG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAEtC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,OAAO,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CACzC;AAED,MAAM,WAAW,SAAS;IACtB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"ide-protocol.d.ts","sourceRoot":"","sources":["../src/ide-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,SAAS;IACtB;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACvB;;OAEG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAEtC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,OAAO,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CACzC;AAED,MAAM,WAAW,SAAS;IACtB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAEvB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,EAAE,SAAS,GAAG,SAAS,CAAC;IAE5B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -3,20 +3,20 @@
|
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
export * from
|
|
7
|
-
export * from
|
|
8
|
-
export * from
|
|
9
|
-
export * from
|
|
10
|
-
export * from
|
|
11
|
-
export * from
|
|
12
|
-
export * from
|
|
13
|
-
export * from
|
|
14
|
-
export * from
|
|
15
|
-
export * from
|
|
16
|
-
export * from
|
|
17
|
-
export * from
|
|
18
|
-
export * from
|
|
19
|
-
export * from
|
|
20
|
-
export * from
|
|
21
|
-
export * from
|
|
6
|
+
export * from "./protocol";
|
|
7
|
+
export * from "./gitpod-service";
|
|
8
|
+
export * from "./util/disposable";
|
|
9
|
+
export * from "./util/event";
|
|
10
|
+
export * from "./util/queue";
|
|
11
|
+
export * from "./license-protocol";
|
|
12
|
+
export * from "./workspace-instance";
|
|
13
|
+
export * from "./permission";
|
|
14
|
+
export * from "./admin-protocol";
|
|
15
|
+
export * from "./email-protocol";
|
|
16
|
+
export * from "./headless-workspace-log";
|
|
17
|
+
export * from "./context-url";
|
|
18
|
+
export * from "./teams-projects-protocol";
|
|
19
|
+
export * from "./snapshot-url";
|
|
20
|
+
export * from "./oss-allowlist";
|
|
21
|
+
export * from "./installation-admin-protocol";
|
|
22
22
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-admin-protocol.d.ts","sourceRoot":"","sources":["../src/installation-admin-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,QAAA,MAAM,kCAAkC;;CAEvC,
|
|
1
|
+
{"version":3,"file":"installation-admin-protocol.d.ts","sourceRoot":"","sources":["../src/installation-admin-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,QAAA,MAAM,kCAAkC;;CAEvC,CAAC;AAEF,oBAAY,yBAAyB,GAAG,OAAO,kCAAkC,CAAC;AAElF,yBAAiB,yBAAyB,CAAC;IACvC,SAAgB,MAAM,IAAI,CAAC,MAAM,yBAAyB,CAAC,EAAE,CAE5D;CACJ;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,yBAAyB,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC1B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,yBAAiB,iBAAiB,CAAC;IAC/B,SAAgB,aAAa,IAAI,iBAAiB,CAOjD;CACJ"}
|
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
8
8
|
exports.InstallationAdmin = exports.InstallationAdminSettings = void 0;
|
|
9
9
|
const uuid_1 = require("uuid");
|
|
10
10
|
const InstallationAdminSettingsPrototype = {
|
|
11
|
-
sendTelemetry: true
|
|
11
|
+
sendTelemetry: true,
|
|
12
12
|
};
|
|
13
13
|
var InstallationAdminSettings;
|
|
14
14
|
(function (InstallationAdminSettings) {
|
|
@@ -22,7 +22,7 @@ var InstallationAdmin;
|
|
|
22
22
|
function createDefault() {
|
|
23
23
|
return {
|
|
24
24
|
id: (0, uuid_1.v4)(),
|
|
25
|
-
settings: Object.assign({}, InstallationAdminSettingsPrototype)
|
|
25
|
+
settings: Object.assign({}, InstallationAdminSettingsPrototype),
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
28
|
InstallationAdmin.createDefault = createDefault;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-admin-protocol.js","sourceRoot":"","sources":["../src/installation-admin-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,+BAAoC;AAEpC,MAAM,kCAAkC,GAAG;IACvC,aAAa,EAAE,IAAI;CACtB,
|
|
1
|
+
{"version":3,"file":"installation-admin-protocol.js","sourceRoot":"","sources":["../src/installation-admin-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,+BAAoC;AAEpC,MAAM,kCAAkC,GAAG;IACvC,aAAa,EAAE,IAAI;CACtB,CAAC;AAIF,IAAiB,yBAAyB,CAIzC;AAJD,WAAiB,yBAAyB;IACtC,SAAgB,MAAM;QAClB,OAAO,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAwC,CAAC;IAClG,CAAC;IAFe,gCAAM,SAErB,CAAA;AACL,CAAC,EAJgB,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAIzC;AAcD,IAAiB,iBAAiB,CASjC;AATD,WAAiB,iBAAiB;IAC9B,SAAgB,aAAa;QACzB,OAAO;YACH,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,QAAQ,oBACD,kCAAkC,CACxC;SACJ,CAAC;IACN,CAAC;IAPe,+BAAa,gBAO5B,CAAA;AACL,CAAC,EATgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QASjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license-protocol.d.ts","sourceRoot":"","sources":["../src/license-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"license-protocol.d.ts","sourceRoot":"","sources":["../src/license-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,oBAAY,YAAY,GAAG,iBAAiB,CAAC;AAE7C,MAAM,WAAW,WAAW;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;CAC5B;AAED,oBAAY,cAAc;IACtB,cAAc,oBAAoB;CAErC;AAED,MAAM,WAAW,cAAc;IAC3B,eAAe,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACpD,cAAc,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAChD,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license-protocol.js","sourceRoot":"","sources":["../src/license-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;
|
|
1
|
+
{"version":3,"file":"license-protocol.js","sourceRoot":"","sources":["../src/license-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAuBH,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,oDAAkC,CAAA;IAClC,gBAAgB;AACpB,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Logger } from "vscode-ws-jsonrpc";
|
|
2
2
|
import { JsonRpcProxy } from "../proxy-factory";
|
|
3
3
|
import { ConnectionEventHandler, ConnectionHandler } from "../handler";
|
|
4
|
-
import ReconnectingWebSocket, { Event } from
|
|
4
|
+
import ReconnectingWebSocket, { Event } from "reconnecting-websocket";
|
|
5
5
|
export interface WebSocketOptions {
|
|
6
6
|
onerror?: (event: Event) => void;
|
|
7
7
|
onListening?: (socket: ReconnectingWebSocket) => void;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IACpC;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EACxB,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAC9B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,gBAAgB,GAC3B,YAAY,CAAC,CAAC,CAAC;IA2BlB;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS;IAmB/G,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;CAU1C"}
|
|
@@ -26,7 +26,7 @@ class WebSocketConnectionProvider {
|
|
|
26
26
|
const startListening = (path) => {
|
|
27
27
|
const socket = this.listen({
|
|
28
28
|
path,
|
|
29
|
-
onConnection: c => factory.listen(c),
|
|
29
|
+
onConnection: (c) => factory.listen(c),
|
|
30
30
|
}, {
|
|
31
31
|
onTransportDidClose: () => factory.fireConnectionClosed(),
|
|
32
32
|
onTransportDidOpen: () => factory.fireConnectionOpened(),
|
|
@@ -39,7 +39,7 @@ class WebSocketConnectionProvider {
|
|
|
39
39
|
startListening(path);
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
path.then(path => startListening(path));
|
|
42
|
+
path.then((path) => startListening(path));
|
|
43
43
|
}
|
|
44
44
|
return factory.createProxy();
|
|
45
45
|
}
|
|
@@ -52,12 +52,12 @@ class WebSocketConnectionProvider {
|
|
|
52
52
|
const logger = this.createLogger();
|
|
53
53
|
if (options && options.onerror) {
|
|
54
54
|
const onerror = options.onerror;
|
|
55
|
-
webSocket.addEventListener(
|
|
55
|
+
webSocket.addEventListener("error", (event) => {
|
|
56
56
|
onerror(event);
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
|
-
webSocket.addEventListener(
|
|
60
|
+
webSocket.addEventListener("error", (error) => {
|
|
61
61
|
logger.error(JSON.stringify(error));
|
|
62
62
|
});
|
|
63
63
|
}
|
|
@@ -77,7 +77,7 @@ class WebSocketConnectionProvider {
|
|
|
77
77
|
reconnectionDelayGrowFactor: 1.3,
|
|
78
78
|
maxRetries: Infinity,
|
|
79
79
|
debug: false,
|
|
80
|
-
WebSocket: WebSocket
|
|
80
|
+
WebSocket: WebSocket,
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
}
|
|
@@ -160,16 +160,16 @@ class NonClosingWebSocketMessageReader extends messageReader_1.AbstractMessageRe
|
|
|
160
160
|
constructor(socket) {
|
|
161
161
|
super();
|
|
162
162
|
this.events = [];
|
|
163
|
-
this.state =
|
|
163
|
+
this.state = "initial";
|
|
164
164
|
this.callback = () => { };
|
|
165
165
|
this.socket = socket;
|
|
166
|
-
this.socket.onMessage(message => this.readMessage(message));
|
|
167
|
-
this.socket.onError(error => this.fireError(error));
|
|
166
|
+
this.socket.onMessage((message) => this.readMessage(message));
|
|
167
|
+
this.socket.onError((error) => this.fireError(error));
|
|
168
168
|
this.socket.onClose((code, reason) => {
|
|
169
169
|
if (code !== 1000) {
|
|
170
170
|
const error = {
|
|
171
|
-
name:
|
|
172
|
-
message: `Error during socket reconnect: code = ${code}, reason = ${reason}
|
|
171
|
+
name: "" + code,
|
|
172
|
+
message: `Error during socket reconnect: code = ${code}, reason = ${reason}`,
|
|
173
173
|
};
|
|
174
174
|
this.fireError(error);
|
|
175
175
|
}
|
|
@@ -177,8 +177,8 @@ class NonClosingWebSocketMessageReader extends messageReader_1.AbstractMessageRe
|
|
|
177
177
|
});
|
|
178
178
|
}
|
|
179
179
|
listen(callback) {
|
|
180
|
-
if (this.state ===
|
|
181
|
-
this.state =
|
|
180
|
+
if (this.state === "initial") {
|
|
181
|
+
this.state = "listening";
|
|
182
182
|
this.callback = callback;
|
|
183
183
|
while (this.events.length !== 0) {
|
|
184
184
|
const event = this.events.pop();
|
|
@@ -195,30 +195,30 @@ class NonClosingWebSocketMessageReader extends messageReader_1.AbstractMessageRe
|
|
|
195
195
|
}
|
|
196
196
|
}
|
|
197
197
|
readMessage(message) {
|
|
198
|
-
if (this.state ===
|
|
198
|
+
if (this.state === "initial") {
|
|
199
199
|
this.events.splice(0, 0, { message });
|
|
200
200
|
}
|
|
201
|
-
else if (this.state ===
|
|
201
|
+
else if (this.state === "listening") {
|
|
202
202
|
const data = JSON.parse(message);
|
|
203
203
|
this.callback(data);
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
206
|
fireError(error) {
|
|
207
|
-
if (this.state ===
|
|
207
|
+
if (this.state === "initial") {
|
|
208
208
|
this.events.splice(0, 0, { error });
|
|
209
209
|
}
|
|
210
|
-
else if (this.state ===
|
|
210
|
+
else if (this.state === "listening") {
|
|
211
211
|
super.fireError(error);
|
|
212
212
|
}
|
|
213
213
|
}
|
|
214
214
|
fireClose() {
|
|
215
|
-
if (this.state ===
|
|
215
|
+
if (this.state === "initial") {
|
|
216
216
|
this.events.splice(0, 0, {});
|
|
217
217
|
}
|
|
218
|
-
else if (this.state ===
|
|
218
|
+
else if (this.state === "listening") {
|
|
219
219
|
super.fireClose();
|
|
220
220
|
}
|
|
221
|
-
this.state =
|
|
221
|
+
this.state = "closed";
|
|
222
222
|
}
|
|
223
223
|
}
|
|
224
224
|
//# sourceMappingURL=connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/messaging/browser/connection.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAAgF;AAChF,mDAAyD;AACzD,oEAAyE;AACzE,oEAAyE;AACzE,oDAAqE;AAErE,mEAAsE;AAOtE,MAAa,2BAA2B;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/messaging/browser/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
import { Message } from
|
|
7
|
-
import { AbstractMessageWriter, MessageWriter } from
|
|
8
|
-
import { AbstractMessageReader, MessageReader, DataCallback } from
|
|
9
|
-
import { MessageConnection } from
|
|
6
|
+
import { Message } from "vscode-jsonrpc/lib/messages";
|
|
7
|
+
import { AbstractMessageWriter, MessageWriter } from "vscode-jsonrpc/lib/messageWriter";
|
|
8
|
+
import { AbstractMessageReader, MessageReader, DataCallback } from "vscode-jsonrpc/lib/messageReader";
|
|
9
|
+
import { MessageConnection } from "vscode-jsonrpc/lib/main";
|
|
10
10
|
export declare class WindowMessageWriter extends AbstractMessageWriter implements MessageWriter {
|
|
11
11
|
readonly serviceId: string;
|
|
12
12
|
readonly window: Window;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"window-connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAA2B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"window-connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAA2B,MAAM,yBAAyB,CAAC;AAiBrF,qBAAa,mBAAoB,SAAQ,qBAAsB,YAAW,aAAa;IACvE,QAAQ,CAAC,SAAS,EAAE,MAAM;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM;gBAAzE,SAAS,EAAE,MAAM,EAAW,MAAM,EAAE,MAAM,EAAW,YAAY,EAAE,MAAM;IAI9F,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;CAI5B;AAED,qBAAa,mBAAoB,SAAQ,qBAAsB,YAAW,aAAa;IAIvE,QAAQ,CAAC,SAAS,EAAE,MAAM;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM;IAHrE,SAAS,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,CAAM;gBAErB,SAAS,EAAE,MAAM,EAAW,YAAY,EAAE,MAAM;IAqBrE,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;CAQvC;AAED,wBAAgB,6BAA6B,CACzC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,YAAY,SAAe,GAC5B,iBAAiB,CAInB"}
|
|
@@ -11,9 +11,12 @@ const messageReader_1 = require("vscode-jsonrpc/lib/messageReader");
|
|
|
11
11
|
const main_1 = require("vscode-jsonrpc/lib/main");
|
|
12
12
|
const vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
|
|
13
13
|
function isWindowMessage(value) {
|
|
14
|
-
return !!value &&
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
return (!!value &&
|
|
15
|
+
typeof value === "object" &&
|
|
16
|
+
"jsonrpc" in value &&
|
|
17
|
+
typeof value["jsonrpc"] === "string" &&
|
|
18
|
+
"serviceId" in value &&
|
|
19
|
+
typeof value["serviceId"] === "string");
|
|
17
20
|
}
|
|
18
21
|
class WindowMessageWriter extends messageWriter_1.AbstractMessageWriter {
|
|
19
22
|
constructor(serviceId, window, targetOrigin) {
|
|
@@ -34,8 +37,8 @@ class WindowMessageReader extends messageReader_1.AbstractMessageReader {
|
|
|
34
37
|
this.serviceId = serviceId;
|
|
35
38
|
this.sourceOrigin = sourceOrigin;
|
|
36
39
|
this.buffer = [];
|
|
37
|
-
window.addEventListener(
|
|
38
|
-
if (this.sourceOrigin !==
|
|
40
|
+
window.addEventListener("message", (event) => {
|
|
41
|
+
if (this.sourceOrigin !== "*" && event.origin !== this.sourceOrigin) {
|
|
39
42
|
return;
|
|
40
43
|
}
|
|
41
44
|
if (!isWindowMessage(event.data) || event.data.serviceId !== this.serviceId) {
|
|
@@ -51,7 +54,7 @@ class WindowMessageReader extends messageReader_1.AbstractMessageReader {
|
|
|
51
54
|
}
|
|
52
55
|
listen(callback) {
|
|
53
56
|
let message;
|
|
54
|
-
while (message = this.buffer.pop()) {
|
|
57
|
+
while ((message = this.buffer.pop())) {
|
|
55
58
|
callback(message);
|
|
56
59
|
}
|
|
57
60
|
Object.freeze(this.buffer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"window-connection.js","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,oEAAwF;AACxF,oEAAsG;AACtG,kDAAqF;AACrF,yDAAkD;AAKlD,SAAS,eAAe,CAAC,KAAU;IAC/B,OAAO,CAAC,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"window-connection.js","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,oEAAwF;AACxF,oEAAsG;AACtG,kDAAqF;AACrF,yDAAkD;AAKlD,SAAS,eAAe,CAAC,KAAU;IAC/B,OAAO,CACH,CAAC,CAAC,KAAK;QACP,OAAO,KAAK,KAAK,QAAQ;QACzB,SAAS,IAAI,KAAK;QAClB,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,QAAQ;QACpC,WAAW,IAAI,KAAK;QACpB,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ,CACzC,CAAC;AACN,CAAC;AAED,MAAa,mBAAoB,SAAQ,qCAAqB;IAC1D,YAAqB,SAAiB,EAAW,MAAc,EAAW,YAAoB;QAC1F,KAAK,EAAE,CAAC;QADS,cAAS,GAAT,SAAS,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;QAAW,iBAAY,GAAZ,YAAY,CAAQ;IAE9F,CAAC;IAED,KAAK,CAAC,GAAY;QACd,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAClF,CAAC;CACJ;AATD,kDASC;AAED,MAAa,mBAAoB,SAAQ,qCAAqB;IAI1D,YAAqB,SAAiB,EAAW,YAAoB;QACjE,KAAK,EAAE,CAAC;QADS,cAAS,GAAT,SAAS,CAAQ;QAAW,iBAAY,GAAZ,YAAY,CAAQ;QAFlD,WAAM,GAAc,EAAE,CAAC;QAItC,MAAM,CAAC,gBAAgB,CACnB,SAAS,EACT,CAAC,KAAK,EAAE,EAAE;YACN,IAAI,IAAI,CAAC,YAAY,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE;gBACjE,OAAO;aACV;YACD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE;gBACzE,OAAO;aACV;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC7B;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAChC;QACL,CAAC,EACD,KAAK,CACR,CAAC;IACN,CAAC;IAED,MAAM,CAAC,QAAsB;QACzB,IAAI,OAAO,CAAC;QACZ,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE;YAClC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACrB;QACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AAjCD,kDAiCC;AAED,SAAgB,6BAA6B,CACzC,SAAiB,EACjB,MAAc,EACd,YAAoB,EACpB,YAAY,GAAG,YAAY;IAE3B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACxE,OAAO,IAAA,8BAAuB,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,iCAAa,EAAE,CAAC,CAAC;AACxE,CAAC;AATD,sEASC"}
|