@theia/core 1.71.0-next.36 → 1.71.0-next.41
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/lib/browser/catalog.json +6 -0
- package/lib/browser/messaging/ws-connection-source.js +1 -1
- package/lib/browser/messaging/ws-connection-source.js.map +1 -1
- package/lib/common/event.d.ts +16 -0
- package/lib/common/event.d.ts.map +1 -1
- package/lib/common/event.js +20 -2
- package/lib/common/event.js.map +1 -1
- package/lib/common/event.spec.js +63 -0
- package/lib/common/event.spec.js.map +1 -1
- package/lib/common/glob.d.ts +2 -0
- package/lib/common/glob.d.ts.map +1 -1
- package/lib/common/glob.js +8 -7
- package/lib/common/glob.js.map +1 -1
- package/lib/common/message-rpc/channel.d.ts +1 -1
- package/lib/common/message-rpc/channel.d.ts.map +1 -1
- package/lib/common/message-rpc/channel.js +12 -10
- package/lib/common/message-rpc/channel.js.map +1 -1
- package/lib/common/message-rpc/channel.spec.d.ts.map +1 -1
- package/lib/common/message-rpc/channel.spec.js +94 -0
- package/lib/common/message-rpc/channel.spec.js.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.d.ts.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.js +13 -3
- package/lib/common/message-rpc/rpc-protocol.js.map +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.d.ts.map +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.js +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.js.map +1 -1
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts +1 -0
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts.map +1 -1
- package/lib/node/messaging/websocket-frontend-connection-service.js +4 -0
- package/lib/node/messaging/websocket-frontend-connection-service.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/messaging/ws-connection-source.ts +1 -1
- package/src/common/event.spec.ts +80 -0
- package/src/common/event.ts +31 -2
- package/src/common/glob.ts +2 -2
- package/src/common/message-rpc/channel.spec.ts +116 -0
- package/src/common/message-rpc/channel.ts +13 -11
- package/src/common/message-rpc/rpc-protocol.ts +12 -3
- package/src/common/message-rpc/uint8-array-message-buffer.ts +1 -1
- package/src/node/messaging/websocket-frontend-connection-service.ts +5 -0
|
@@ -20,6 +20,7 @@ const chai_1 = require("chai");
|
|
|
20
20
|
const spies = require("chai-spies");
|
|
21
21
|
const uint8_array_message_buffer_1 = require("./uint8-array-message-buffer");
|
|
22
22
|
const channel_1 = require("./channel");
|
|
23
|
+
const rpc_protocol_1 = require("./rpc-protocol");
|
|
23
24
|
(0, chai_1.use)(spies);
|
|
24
25
|
/**
|
|
25
26
|
* A pipe with two channels at each end for testing.
|
|
@@ -75,6 +76,99 @@ describe('Message Channel', () => {
|
|
|
75
76
|
(0, chai_1.expect)(rightFirstSpy).to.be.called();
|
|
76
77
|
(0, chai_1.expect)(openChannelSpy).to.be.called.exactly(4);
|
|
77
78
|
});
|
|
79
|
+
it('should reject pending open() promises when underlying channel closes', async () => {
|
|
80
|
+
const pipe = new ChannelPipe();
|
|
81
|
+
const leftMultiplexer = new channel_1.ChannelMultiplexer(pipe.left);
|
|
82
|
+
// Don't create a right multiplexer, so no AckOpen will arrive
|
|
83
|
+
const openPromise = leftMultiplexer.open('test');
|
|
84
|
+
// Close the underlying channel
|
|
85
|
+
pipe.left.onCloseEmitter.fire({ reason: 'test close' });
|
|
86
|
+
// The open promise should reject, not hang forever
|
|
87
|
+
try {
|
|
88
|
+
await openPromise;
|
|
89
|
+
chai_1.assert.fail('Expected open() promise to be rejected');
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
(0, chai_1.expect)(err).to.be.instanceOf(Error);
|
|
93
|
+
(0, chai_1.expect)(err.message).to.contain('test close');
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
it('should fire onClose on sub-channels when underlying channel closes', async () => {
|
|
97
|
+
const pipe = new ChannelPipe();
|
|
98
|
+
const leftMultiplexer = new channel_1.ChannelMultiplexer(pipe.left);
|
|
99
|
+
const rightMultiplexer = new channel_1.ChannelMultiplexer(pipe.right);
|
|
100
|
+
const leftChannel = await leftMultiplexer.open('test');
|
|
101
|
+
const rightChannel = rightMultiplexer.getOpenChannel('test');
|
|
102
|
+
chai_1.assert.isDefined(rightChannel);
|
|
103
|
+
const leftCloseSpy = (0, chai_1.spy)(() => { });
|
|
104
|
+
leftChannel.onClose(leftCloseSpy);
|
|
105
|
+
// Close the underlying channel from the remote side
|
|
106
|
+
pipe.left.onCloseEmitter.fire({ reason: 'underlying closed' });
|
|
107
|
+
(0, chai_1.expect)(leftCloseSpy).to.have.been.called();
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
describe('Channel close event ordering', () => {
|
|
111
|
+
it('should not deliver onClose after close() has been called', () => {
|
|
112
|
+
const channel = new channel_1.ForwardingChannel('test', () => { }, () => new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer());
|
|
113
|
+
const closeSpy = (0, chai_1.spy)(() => { });
|
|
114
|
+
channel.onClose(closeSpy);
|
|
115
|
+
// Bug pattern: close() first (disposes emitters), then fire (no-op)
|
|
116
|
+
channel.close();
|
|
117
|
+
channel.onCloseEmitter.fire({ reason: 'too late' });
|
|
118
|
+
// The listener should not be called because close() already disposed the emitter
|
|
119
|
+
(0, chai_1.expect)(closeSpy).to.not.have.been.called();
|
|
120
|
+
});
|
|
121
|
+
it('should deliver onClose when fired before close()', () => {
|
|
122
|
+
const channel = new channel_1.ForwardingChannel('test', () => { }, () => new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer());
|
|
123
|
+
const closeSpy = (0, chai_1.spy)(() => { });
|
|
124
|
+
channel.onClose(closeSpy);
|
|
125
|
+
// Correct pattern: fire first, then close
|
|
126
|
+
channel.onCloseEmitter.fire({ reason: 'proper close' });
|
|
127
|
+
channel.close();
|
|
128
|
+
(0, chai_1.expect)(closeSpy).to.have.been.called();
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
describe('RPC protocol with write buffer overflow', () => {
|
|
132
|
+
it('should reject the promise when commit fails due to buffer overflow', async () => {
|
|
133
|
+
// Simulate a channel whose write buffer throws on commit (e.g. SocketWriteBuffer overflow)
|
|
134
|
+
const channel = new channel_1.ForwardingChannel('test', () => { }, () => {
|
|
135
|
+
const buffer = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
|
|
136
|
+
buffer.onCommit(() => {
|
|
137
|
+
throw new Error('Max disconnected buffer size exceeded');
|
|
138
|
+
});
|
|
139
|
+
return buffer;
|
|
140
|
+
});
|
|
141
|
+
const protocol = new rpc_protocol_1.RpcProtocol(channel, undefined, { mode: 'clientOnly' });
|
|
142
|
+
// sendRequest should return a rejected promise, not throw synchronously
|
|
143
|
+
const promise = protocol.sendRequest('testMethod', []);
|
|
144
|
+
try {
|
|
145
|
+
await promise;
|
|
146
|
+
chai_1.assert.fail('Expected promise to be rejected');
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
(0, chai_1.expect)(err).to.be.instanceOf(Error);
|
|
150
|
+
(0, chai_1.expect)(err.message).to.contain('buffer size exceeded');
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
it('should not leak pending requests when commit fails', async () => {
|
|
154
|
+
const channel = new channel_1.ForwardingChannel('test', () => { }, () => {
|
|
155
|
+
const buffer = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
|
|
156
|
+
buffer.onCommit(() => {
|
|
157
|
+
throw new Error('Max disconnected buffer size exceeded');
|
|
158
|
+
});
|
|
159
|
+
return buffer;
|
|
160
|
+
});
|
|
161
|
+
const protocol = new rpc_protocol_1.RpcProtocol(channel, undefined, { mode: 'clientOnly' });
|
|
162
|
+
// sendRequest should return a rejected promise and clean up pendingRequests
|
|
163
|
+
try {
|
|
164
|
+
await protocol.sendRequest('testMethod', []);
|
|
165
|
+
}
|
|
166
|
+
catch {
|
|
167
|
+
// expected: the promise is rejected due to buffer overflow
|
|
168
|
+
}
|
|
169
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
170
|
+
(0, chai_1.expect)(protocol.pendingRequests.size).to.equal(0);
|
|
171
|
+
});
|
|
78
172
|
});
|
|
79
173
|
});
|
|
80
174
|
//# sourceMappingURL=channel.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.spec.js","sourceRoot":"","sources":["../../../src/common/message-rpc/channel.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,+BAAgD;AAChD,oCAAoC;AACpC,6EAA2F;AAC3F,uCAAmF;
|
|
1
|
+
{"version":3,"file":"channel.spec.js","sourceRoot":"","sources":["../../../src/common/message-rpc/channel.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-protocol.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAqB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAc,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAgD,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAkB,MAAM,uBAAuB,CAAC;AAEvJ;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE3E;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;OAEG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,SAAS,GAAG,YAAY,GAAG,YAAY,CAAA;CACjD;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW;aAqBQ,OAAO,EAAE,OAAO;aAAkB,cAAc,EAAE,cAAc,GAAG,SAAS;IApBxG,MAAM,CAAC,QAAQ,CAAC,sBAAsB,4BAA4B;IAElE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAa;IAC3E,SAAS,CAAC,QAAQ,CAAC,wCAAwC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAa;IAExG,SAAS,CAAC,aAAa,EAAE,MAAM,CAAK;IAEpC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,YAAY,CAAC;IAEjE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,EAAE,CAAC;KAAE,CAAC,CAAiB;IACpG,SAAS,CAAC,QAAQ,CAAC,wBAAwB,uCAA8C;IAEzF,IAAI,cAAc,IAAI,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,EAAE,CAAC;KAAE,CAAC,CAE5D;IAED,SAAS,CAAC,SAAS,uBAA8B;gBAErB,OAAO,EAAE,OAAO,EAAkB,cAAc,EAAE,cAAc,GAAG,SAAS,EAAE,OAAO,GAAE,kBAAuB;IAmB1I,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;IAiCxC,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAanD,SAAS,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAatD,SAAS,CAAC,gCAAgC,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAQ5D,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -138,9 +138,19 @@ class RpcProtocol {
|
|
|
138
138
|
// register disposable before output.commit() even when not available yet
|
|
139
139
|
const disposableWrapper = new disposable_1.DisposableWrapper();
|
|
140
140
|
this.pendingRequestCancellationEventListeners.set(id, disposableWrapper);
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
141
|
+
try {
|
|
142
|
+
const output = this.channel.getWriteBuffer();
|
|
143
|
+
this.encoder.request(output, id, method, args);
|
|
144
|
+
output.commit();
|
|
145
|
+
}
|
|
146
|
+
catch (err) {
|
|
147
|
+
// The message could not be sent (e.g. write buffer overflow).
|
|
148
|
+
// Clean up the pending request and reject the promise.
|
|
149
|
+
this.pendingRequests.delete(id);
|
|
150
|
+
this.disposeCancellationEventListener(id);
|
|
151
|
+
reply.reject(err);
|
|
152
|
+
return reply.promise;
|
|
153
|
+
}
|
|
144
154
|
if (cancellationToken?.isCancellationRequested) {
|
|
145
155
|
this.sendCancel(id);
|
|
146
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-protocol.js","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-protocol.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rpc-protocol.js","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uint8-array-message-buffer.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/uint8-array-message-buffer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAW,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;;GAMG;AACH,qBAAa,qBAAsB,YAAW,WAAW,EAAE,UAAU;IAOrD,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,GAAG,CAAW;IACtB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEH,MAAM,GAAE,UAAiC,EAAE,aAAa,GAAE,MAAU;IAKxF,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAcnC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAajC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM/B,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAOjC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAQhC,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQnC,OAAO,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"uint8-array-message-buffer.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/uint8-array-message-buffer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAW,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;;GAMG;AACH,qBAAa,qBAAsB,YAAW,WAAW,EAAE,UAAU;IAOrD,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,GAAG,CAAW;IACtB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEH,MAAM,GAAE,UAAiC,EAAE,aAAa,GAAE,MAAU;IAKxF,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAcnC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAajC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM/B,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAOjC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAQhC,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQnC,OAAO,CAAC,eAAe,CAA2D;IAClF,IAAI,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,CAEhC;IAED,MAAM,IAAI,IAAI;IAQd,kBAAkB,IAAI,UAAU;IAIhC,OAAO,IAAI,IAAI;CAOlB;AACD;;;GAGG;AACH,qBAAa,oBAAqB,YAAW,UAAU;IAKvC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,GAAG,CAAW;IACtB,OAAO,CAAC,OAAO,CAAqB;gBAEP,MAAM,EAAE,UAAU,EAAE,YAAY,SAAI;IAKjE,SAAS,IAAI,MAAM;IAInB,UAAU,IAAI,MAAM;IAMpB,UAAU,IAAI,MAAM;IAMpB,UAAU,IAAI,MAAM;IAYpB,UAAU,IAAI,MAAM;IAMpB,UAAU,IAAI,MAAM;IAQpB,OAAO,CAAC,YAAY;IAIpB,SAAS,IAAI,UAAU;IAQvB,mBAAmB,IAAI,UAAU;CAIpC"}
|
|
@@ -14,7 +14,7 @@ class Uint8ArrayWriteBuffer {
|
|
|
14
14
|
this.buffer = buffer;
|
|
15
15
|
this.encoder = new TextEncoder();
|
|
16
16
|
this.isDisposed = false;
|
|
17
|
-
this.onCommitEmitter = new event_1.Emitter();
|
|
17
|
+
this.onCommitEmitter = new event_1.Emitter({ errorHandling: 'propagate' });
|
|
18
18
|
this.offset = buffer.byteOffset + writePosition;
|
|
19
19
|
this.msg = new DataView(buffer.buffer);
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uint8-array-message-buffer.js","sourceRoot":"","sources":["../../../src/common/message-rpc/uint8-array-message-buffer.ts"],"names":[],"mappings":";;;AAgBA,oCAA0C;AAG1C;;;;;;GAMG;AACH,MAAa,qBAAqB;IAO9B,YAAoB,SAAqB,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,gBAAwB,CAAC;QAApE,WAAM,GAAN,MAAM,CAAmC;QALrD,YAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAE5B,eAAU,GAAG,KAAK,CAAC;QAqFnB,oBAAe,GAAG,IAAI,eAAO,
|
|
1
|
+
{"version":3,"file":"uint8-array-message-buffer.js","sourceRoot":"","sources":["../../../src/common/message-rpc/uint8-array-message-buffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ export declare class ReconnectableSocketChannel extends AbstractChannel {
|
|
|
29
29
|
protected disposables: DisposableCollection;
|
|
30
30
|
connect(socket: Socket): void;
|
|
31
31
|
disconnect(): void;
|
|
32
|
+
drainBuffer(): void;
|
|
32
33
|
getWriteBuffer(): WriteBuffer;
|
|
33
34
|
}
|
|
34
35
|
//# sourceMappingURL=websocket-frontend-connection-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAsB,UAAU,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAsB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAc,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEhE,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC;IAEnD,SAAS,CAAC,QAAQ,CAAC,UAAU,8BAA4B;IACzD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,0CAAiD;IACzF,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IACrE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,cAAqB;IAE9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;cAIxG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"websocket-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAsB,UAAU,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAsB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAc,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEhE,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC;IAEnD,SAAS,CAAC,QAAQ,CAAC,UAAU,8BAA4B;IACzD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,0CAAiD;IACzF,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IACrE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,cAAqB;IAE9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;cAIxG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAenE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,0BAA0B;IAS1F,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAqBrG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIrC,OAAO,CAAC,yBAAyB;CAQpC;AAED,qBACa,0BAA2B,SAAQ,eAAe;IAC3D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAGrC,SAAS,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAE1C,SAAS,CAAC,WAAW,uBAA8B;IAEnD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IA0B7B,UAAU,IAAI,IAAI;IAKlB,WAAW,IAAI,IAAI;IAIV,cAAc,IAAI,WAAW;CAWzC"}
|
|
@@ -78,6 +78,7 @@ let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionServic
|
|
|
78
78
|
clearTimeout(pendingTimeout);
|
|
79
79
|
this.closeTimeouts.delete(frontEndId);
|
|
80
80
|
connection.onCloseEmitter.fire({ reason });
|
|
81
|
+
connection.drainBuffer();
|
|
81
82
|
connection.close();
|
|
82
83
|
}
|
|
83
84
|
createConnection(socket, frontEndId) {
|
|
@@ -164,6 +165,9 @@ let ReconnectableSocketChannel = class ReconnectableSocketChannel extends channe
|
|
|
164
165
|
this.disposables.dispose();
|
|
165
166
|
this.socket = undefined;
|
|
166
167
|
}
|
|
168
|
+
drainBuffer() {
|
|
169
|
+
this.socketBuffer.drain();
|
|
170
|
+
}
|
|
167
171
|
getWriteBuffer() {
|
|
168
172
|
const writeBuffer = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
|
|
169
173
|
writeBuffer.onCommit(data => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-frontend-connection-service.js","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;;;;AAIhF,yCAA2D;AAE3D,2EAAqF;AACrF,oFAA+E;AAE/E,8DAAmE;AACnE,oGAAkH;AAClH,gGAA0F;AAC1F,6DAAyD;AACzD,wFAA4F;AAC5F,yCAAgE;AAGzD,IAAM,kCAAkC,GAAxC,MAAM,kCAAkC;IAAxC;QAQgB,eAAU,GAAG,IAAI,8CAAkB,EAAE,CAAC;QACtC,0BAAqB,GAAG,IAAI,GAAG,EAAsC,CAAC;QACtE,kBAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;QAClD,2BAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-frontend-connection-service.js","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.71.0-next.
|
|
3
|
+
"version": "1.71.0-next.41+0c2a28923",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"@lumino/virtualdom": "^2.0.4",
|
|
18
18
|
"@lumino/widgets": "2.7.5",
|
|
19
19
|
"@parcel/watcher": "^2.5.6",
|
|
20
|
-
"@theia/application-package": "1.71.0-next.
|
|
21
|
-
"@theia/request": "1.71.0-next.
|
|
20
|
+
"@theia/application-package": "1.71.0-next.41+0c2a28923",
|
|
21
|
+
"@theia/request": "1.71.0-next.41+0c2a28923",
|
|
22
22
|
"@types/body-parser": "^1.19.6",
|
|
23
23
|
"@types/express": "^4.17.21",
|
|
24
24
|
"@types/fs-extra": "^4.0.2",
|
|
@@ -221,5 +221,5 @@
|
|
|
221
221
|
"nyc": {
|
|
222
222
|
"extends": "../../configs/nyc.json"
|
|
223
223
|
},
|
|
224
|
-
"gitHead": "
|
|
224
|
+
"gitHead": "0c2a289231e3c0186367d33cbe2d357ddb437ef3"
|
|
225
225
|
}
|
|
@@ -136,8 +136,8 @@ export class WebSocketConnectionSource implements ConnectionSource {
|
|
|
136
136
|
|
|
137
137
|
connectNewChannel(): void {
|
|
138
138
|
if (this.currentChannel) {
|
|
139
|
-
this.currentChannel.close();
|
|
140
139
|
this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
|
|
140
|
+
this.currentChannel.close();
|
|
141
141
|
}
|
|
142
142
|
this.writeBuffer.drain();
|
|
143
143
|
this.currentChannel = this.createChannel();
|
package/src/common/event.spec.ts
CHANGED
|
@@ -29,4 +29,84 @@ describe('Event Objects', () => {
|
|
|
29
29
|
expect(counter).eq(1);
|
|
30
30
|
});
|
|
31
31
|
|
|
32
|
+
describe('Emitter errorHandling option', () => {
|
|
33
|
+
|
|
34
|
+
it('should log errors by default', () => {
|
|
35
|
+
const emitter = new Emitter<void>();
|
|
36
|
+
const errors: unknown[] = [];
|
|
37
|
+
const originalError = console.error;
|
|
38
|
+
console.error = (e: unknown) => errors.push(e);
|
|
39
|
+
|
|
40
|
+
try {
|
|
41
|
+
emitter.event(() => { throw new Error('test error'); });
|
|
42
|
+
emitter.fire(undefined);
|
|
43
|
+
|
|
44
|
+
expect(errors).to.have.lengthOf(1);
|
|
45
|
+
expect((errors[0] as Error).message).to.equal('test error');
|
|
46
|
+
} finally {
|
|
47
|
+
console.error = originalError;
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it('should propagate a single error when errorHandling is propagate', () => {
|
|
52
|
+
const emitter = new Emitter<void>({ errorHandling: 'propagate' });
|
|
53
|
+
|
|
54
|
+
emitter.event(() => { throw new Error('boom'); });
|
|
55
|
+
|
|
56
|
+
expect(() => emitter.fire(undefined)).to.throw('boom');
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it('should call all listeners before propagating the error', () => {
|
|
60
|
+
const emitter = new Emitter<void>({ errorHandling: 'propagate' });
|
|
61
|
+
let secondCalled = false;
|
|
62
|
+
|
|
63
|
+
emitter.event(() => { throw new Error('first fails'); });
|
|
64
|
+
emitter.event(() => { secondCalled = true; });
|
|
65
|
+
|
|
66
|
+
expect(() => emitter.fire(undefined)).to.throw('first fails');
|
|
67
|
+
expect(secondCalled).to.be.true;
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it('should throw AggregateError when multiple listeners fail with propagate', () => {
|
|
71
|
+
const emitter = new Emitter<void>({ errorHandling: 'propagate' });
|
|
72
|
+
|
|
73
|
+
emitter.event(() => { throw new Error('error 1'); });
|
|
74
|
+
emitter.event(() => { throw new Error('error 2'); });
|
|
75
|
+
|
|
76
|
+
try {
|
|
77
|
+
emitter.fire(undefined);
|
|
78
|
+
expect.fail('Expected an error to be thrown');
|
|
79
|
+
} catch (err) {
|
|
80
|
+
expect(err).to.be.instanceOf(AggregateError);
|
|
81
|
+
const aggregate = err as AggregateError;
|
|
82
|
+
expect(aggregate.errors).to.have.lengthOf(2);
|
|
83
|
+
expect(aggregate.errors[0].message).to.equal('error 1');
|
|
84
|
+
expect(aggregate.errors[1].message).to.equal('error 2');
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
it('should invoke custom error handler for each error', () => {
|
|
89
|
+
const errors: unknown[] = [];
|
|
90
|
+
const emitter = new Emitter<void>({ errorHandling: e => errors.push(e) });
|
|
91
|
+
|
|
92
|
+
emitter.event(() => { throw new Error('handled 1'); });
|
|
93
|
+
emitter.event(() => { throw new Error('handled 2'); });
|
|
94
|
+
emitter.fire(undefined);
|
|
95
|
+
|
|
96
|
+
expect(errors).to.have.lengthOf(2);
|
|
97
|
+
expect((errors[0] as Error).message).to.equal('handled 1');
|
|
98
|
+
expect((errors[1] as Error).message).to.equal('handled 2');
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
it('should not throw when no listeners fail with propagate', () => {
|
|
102
|
+
const emitter = new Emitter<void>({ errorHandling: 'propagate' });
|
|
103
|
+
let called = false;
|
|
104
|
+
|
|
105
|
+
emitter.event(() => { called = true; });
|
|
106
|
+
emitter.fire(undefined);
|
|
107
|
+
|
|
108
|
+
expect(called).to.be.true;
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
|
|
32
112
|
});
|
package/src/common/event.ts
CHANGED
|
@@ -123,6 +123,8 @@ class CallbackList implements Iterable<Callback> {
|
|
|
123
123
|
private _callbacks: Function[] | undefined;
|
|
124
124
|
private _contexts: any[] | undefined;
|
|
125
125
|
|
|
126
|
+
constructor(private readonly errorHandling: ErrorHandlingStrategy = 'log') {}
|
|
127
|
+
|
|
126
128
|
get length(): number {
|
|
127
129
|
return this._callbacks && this._callbacks.length || 0;
|
|
128
130
|
}
|
|
@@ -179,13 +181,25 @@ class CallbackList implements Iterable<Callback> {
|
|
|
179
181
|
|
|
180
182
|
public invoke(...args: any[]): any[] {
|
|
181
183
|
const ret: any[] = [];
|
|
184
|
+
const errors: unknown[] = [];
|
|
182
185
|
for (const callback of this) {
|
|
183
186
|
try {
|
|
184
187
|
ret.push(callback(...args));
|
|
185
188
|
} catch (e) {
|
|
186
|
-
|
|
189
|
+
if (this.errorHandling === 'propagate') {
|
|
190
|
+
errors.push(e);
|
|
191
|
+
} else if (typeof this.errorHandling === 'function') {
|
|
192
|
+
this.errorHandling(e);
|
|
193
|
+
} else {
|
|
194
|
+
console.error(e);
|
|
195
|
+
}
|
|
187
196
|
}
|
|
188
197
|
}
|
|
198
|
+
if (errors.length === 1) {
|
|
199
|
+
throw errors[0];
|
|
200
|
+
} else if (errors.length > 1) {
|
|
201
|
+
throw new AggregateError(errors, 'Multiple event listeners failed');
|
|
202
|
+
}
|
|
189
203
|
return ret;
|
|
190
204
|
}
|
|
191
205
|
|
|
@@ -199,9 +213,24 @@ class CallbackList implements Iterable<Callback> {
|
|
|
199
213
|
}
|
|
200
214
|
}
|
|
201
215
|
|
|
216
|
+
/**
|
|
217
|
+
* A strategy for handling errors in firing an emitter's event, one of
|
|
218
|
+
*
|
|
219
|
+
* - `'log'` (default): errors are caught and logged via `console.error`
|
|
220
|
+
* - `'propagate'`: all listeners are called; if any throw, the errors are collected
|
|
221
|
+
* and re-thrown after all listeners complete (single error re-thrown directly,
|
|
222
|
+
* multiple errors wrapped in an `AggregateError`)
|
|
223
|
+
* - `(error: unknown) => void`: a custom callback invoked for each error
|
|
224
|
+
*/
|
|
225
|
+
export type ErrorHandlingStrategy = 'log' | 'propagate' | ((error: unknown) => void);
|
|
226
|
+
|
|
202
227
|
export interface EmitterOptions {
|
|
203
228
|
onFirstListenerAdd?: Function;
|
|
204
229
|
onLastListenerRemove?: Function;
|
|
230
|
+
/**
|
|
231
|
+
* How errors thrown by event listeners are handled during {@link Emitter.fire}.
|
|
232
|
+
*/
|
|
233
|
+
errorHandling?: ErrorHandlingStrategy;
|
|
205
234
|
}
|
|
206
235
|
|
|
207
236
|
export class Emitter<T = any> {
|
|
@@ -229,7 +258,7 @@ export class Emitter<T = any> {
|
|
|
229
258
|
if (!this._event) {
|
|
230
259
|
this._event = Object.assign((listener: (e: T) => any, thisArgs?: any, disposables?: DisposableGroup) => {
|
|
231
260
|
if (!this._callbacks) {
|
|
232
|
-
this._callbacks = new CallbackList();
|
|
261
|
+
this._callbacks = new CallbackList(this._options?.errorHandling);
|
|
233
262
|
}
|
|
234
263
|
if (this._options && this._options.onFirstListenerAdd && this._callbacks.isEmpty()) {
|
|
235
264
|
this._options.onFirstListenerAdd(this);
|
package/src/common/glob.ts
CHANGED
|
@@ -44,8 +44,8 @@ export interface SiblingClause {
|
|
|
44
44
|
when: string;
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
const GLOBSTAR = '**';
|
|
48
|
-
const GLOB_SPLIT = '/';
|
|
47
|
+
export const GLOBSTAR = '**';
|
|
48
|
+
export const GLOB_SPLIT = '/';
|
|
49
49
|
const PATH_REGEX = '[/\\\\]'; // any slash or backslash
|
|
50
50
|
const NO_PATH_REGEX = '[^/\\\\]'; // any non-slash and non-backslash
|
|
51
51
|
const ALL_FORWARD_SLASHES = /\//g;
|