@theia/core 1.78.0-next.0 → 1.78.0-next.19
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 +208 -32
- package/lib/browser/encoding-registry.js +1 -1
- package/lib/browser/encoding-registry.js.map +1 -1
- package/lib/browser/encoding-registry.spec.d.ts +2 -0
- package/lib/browser/encoding-registry.spec.d.ts.map +1 -0
- package/lib/browser/encoding-registry.spec.js +43 -0
- package/lib/browser/encoding-registry.spec.js.map +1 -0
- package/lib/browser/messaging/service-connection-provider.d.ts.map +1 -1
- package/lib/browser/messaging/service-connection-provider.js +9 -1
- package/lib/browser/messaging/service-connection-provider.js.map +1 -1
- package/lib/browser/messaging/service-connection-provider.spec.d.ts +2 -0
- package/lib/browser/messaging/service-connection-provider.spec.d.ts.map +1 -0
- package/lib/browser/messaging/service-connection-provider.spec.js +76 -0
- package/lib/browser/messaging/service-connection-provider.spec.js.map +1 -0
- package/lib/browser/shell/tab-bars.d.ts +7 -0
- package/lib/browser/shell/tab-bars.d.ts.map +1 -1
- package/lib/browser/shell/tab-bars.js +25 -11
- package/lib/browser/shell/tab-bars.js.map +1 -1
- package/lib/browser/shell/tab-bars.spec.js +20 -0
- package/lib/browser/shell/tab-bars.spec.js.map +1 -1
- package/lib/common/core-preferences.d.ts +1 -0
- package/lib/common/core-preferences.d.ts.map +1 -1
- package/lib/common/core-preferences.js +11 -1
- package/lib/common/core-preferences.js.map +1 -1
- package/lib/common/messaging/handler.d.ts +11 -0
- package/lib/common/messaging/handler.d.ts.map +1 -1
- package/lib/common/messaging/proxy-factory.d.ts +8 -1
- package/lib/common/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/common/messaging/proxy-factory.js +4 -2
- package/lib/common/messaging/proxy-factory.js.map +1 -1
- package/lib/common/messaging/proxy-factory.spec.js +16 -1
- package/lib/common/messaging/proxy-factory.spec.js.map +1 -1
- package/lib/common/shell-environment.d.ts +61 -0
- package/lib/common/shell-environment.d.ts.map +1 -0
- package/lib/common/shell-environment.js +29 -0
- package/lib/common/shell-environment.js.map +1 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.d.ts +20 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.d.ts.map +1 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.js +72 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.js.map +1 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.spec.d.ts +2 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.spec.d.ts.map +1 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.spec.js +86 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-contribution.spec.js.map +1 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-module.d.ts +4 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-module.d.ts.map +1 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-module.js +26 -0
- package/lib/electron-browser/shell-environment/electron-shell-environment-module.js.map +1 -0
- package/lib/electron-main/electron-main-application.d.ts.map +1 -1
- package/lib/electron-main/electron-main-application.js +12 -4
- package/lib/electron-main/electron-main-application.js.map +1 -1
- package/lib/electron-node/keyboard/electron-backend-keyboard-module.d.ts.map +1 -1
- package/lib/electron-node/keyboard/electron-backend-keyboard-module.js +1 -1
- package/lib/electron-node/keyboard/electron-backend-keyboard-module.js.map +1 -1
- package/lib/electron-node/request/electron-backend-request-service.d.ts +4 -1
- package/lib/electron-node/request/electron-backend-request-service.d.ts.map +1 -1
- package/lib/electron-node/request/electron-backend-request-service.js +56 -13
- package/lib/electron-node/request/electron-backend-request-service.js.map +1 -1
- package/lib/node/backend-application-module.d.ts.map +1 -1
- package/lib/node/backend-application-module.js +13 -5
- package/lib/node/backend-application-module.js.map +1 -1
- package/lib/node/env-variables/env-variables-server.d.ts +13 -3
- package/lib/node/env-variables/env-variables-server.d.ts.map +1 -1
- package/lib/node/env-variables/env-variables-server.js +21 -14
- package/lib/node/env-variables/env-variables-server.js.map +1 -1
- package/lib/node/env-variables/env-variables-server.spec.d.ts +2 -0
- package/lib/node/env-variables/env-variables-server.spec.d.ts.map +1 -0
- package/lib/node/env-variables/env-variables-server.spec.js +83 -0
- package/lib/node/env-variables/env-variables-server.spec.js.map +1 -0
- package/lib/node/i18n/i18n-backend-module.js +2 -2
- package/lib/node/i18n/i18n-backend-module.js.map +1 -1
- package/lib/node/index.d.ts +1 -0
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +1 -0
- package/lib/node/index.js.map +1 -1
- package/lib/node/logger-backend-module.js +1 -1
- package/lib/node/logger-backend-module.js.map +1 -1
- package/lib/node/messaging/connection-container-module.d.ts +11 -2
- package/lib/node/messaging/connection-container-module.d.ts.map +1 -1
- package/lib/node/messaging/connection-container-module.js +13 -2
- package/lib/node/messaging/connection-container-module.js.map +1 -1
- package/lib/node/messaging/connection-container-module.spec.d.ts +2 -0
- package/lib/node/messaging/connection-container-module.spec.d.ts.map +1 -0
- package/lib/node/messaging/connection-container-module.spec.js +37 -0
- package/lib/node/messaging/connection-container-module.spec.js.map +1 -0
- package/lib/node/messaging/default-messaging-service.d.ts +33 -4
- package/lib/node/messaging/default-messaging-service.d.ts.map +1 -1
- package/lib/node/messaging/default-messaging-service.js +52 -10
- package/lib/node/messaging/default-messaging-service.js.map +1 -1
- package/lib/node/messaging/gated-channel-multiplexer.d.ts +20 -0
- package/lib/node/messaging/gated-channel-multiplexer.d.ts.map +1 -0
- package/lib/node/messaging/gated-channel-multiplexer.js +50 -0
- package/lib/node/messaging/gated-channel-multiplexer.js.map +1 -0
- package/lib/node/messaging/gated-channel-multiplexer.spec.d.ts +2 -0
- package/lib/node/messaging/gated-channel-multiplexer.spec.d.ts.map +1 -0
- package/lib/node/messaging/gated-channel-multiplexer.spec.js +74 -0
- package/lib/node/messaging/gated-channel-multiplexer.spec.js.map +1 -0
- package/lib/node/messaging/index.d.ts +1 -0
- package/lib/node/messaging/index.d.ts.map +1 -1
- package/lib/node/messaging/index.js +1 -0
- package/lib/node/messaging/index.js.map +1 -1
- package/lib/node/messaging/messaging-backend-module.js +1 -1
- package/lib/node/messaging/messaging-backend-module.js.map +1 -1
- package/lib/node/messaging/messaging-service.d.ts +5 -1
- package/lib/node/messaging/messaging-service.d.ts.map +1 -1
- package/lib/node/messaging/messaging-service.js.map +1 -1
- package/lib/node/messaging/test/default-messaging-service.spec.js +82 -2
- package/lib/node/messaging/test/default-messaging-service.spec.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 +8 -0
- package/lib/node/messaging/websocket-frontend-connection-service.js.map +1 -1
- package/lib/node/messaging/websocket-frontend-connection-service.spec.d.ts +2 -0
- package/lib/node/messaging/websocket-frontend-connection-service.spec.d.ts.map +1 -0
- package/lib/node/messaging/websocket-frontend-connection-service.spec.js +141 -0
- package/lib/node/messaging/websocket-frontend-connection-service.spec.js.map +1 -0
- package/lib/node/performance/measurement-backend-bindings.js +1 -1
- package/lib/node/performance/measurement-backend-bindings.js.map +1 -1
- package/lib/node/process-utils.d.ts +125 -2
- package/lib/node/process-utils.d.ts.map +1 -1
- package/lib/node/process-utils.js +297 -25
- package/lib/node/process-utils.js.map +1 -1
- package/lib/node/process-utils.slow-spec.js +78 -3
- package/lib/node/process-utils.slow-spec.js.map +1 -1
- package/lib/node/process-utils.spec.js +237 -2
- package/lib/node/process-utils.spec.js.map +1 -1
- package/lib/node/shell-environment.d.ts +107 -0
- package/lib/node/shell-environment.d.ts.map +1 -0
- package/lib/node/shell-environment.js +396 -0
- package/lib/node/shell-environment.js.map +1 -0
- package/lib/node/shell-environment.spec.d.ts +2 -0
- package/lib/node/shell-environment.spec.d.ts.map +1 -0
- package/lib/node/shell-environment.spec.js +348 -0
- package/lib/node/shell-environment.spec.js.map +1 -0
- package/lib/node/test/exiting-backend.d.ts +5 -0
- package/lib/node/test/exiting-backend.d.ts.map +1 -1
- package/lib/node/test/exiting-backend.js +16 -3
- package/lib/node/test/exiting-backend.js.map +1 -1
- package/package.json +7 -4
- package/src/browser/encoding-registry.spec.ts +48 -0
- package/src/browser/encoding-registry.ts +1 -1
- package/src/browser/messaging/service-connection-provider.spec.ts +88 -0
- package/src/browser/messaging/service-connection-provider.ts +9 -2
- package/src/browser/shell/tab-bars.spec.ts +22 -0
- package/src/browser/shell/tab-bars.ts +25 -12
- package/src/common/core-preferences.ts +12 -1
- package/src/common/messaging/handler.ts +11 -0
- package/src/common/messaging/proxy-factory.spec.ts +17 -1
- package/src/common/messaging/proxy-factory.ts +16 -2
- package/src/common/shell-environment.ts +81 -0
- package/src/electron-browser/shell-environment/electron-shell-environment-contribution.spec.ts +95 -0
- package/src/electron-browser/shell-environment/electron-shell-environment-contribution.ts +72 -0
- package/src/electron-browser/shell-environment/electron-shell-environment-module.ts +29 -0
- package/src/electron-main/electron-main-application.ts +15 -4
- package/src/electron-node/keyboard/electron-backend-keyboard-module.ts +2 -1
- package/src/electron-node/request/electron-backend-request-service.ts +59 -11
- package/src/node/backend-application-module.ts +19 -5
- package/src/node/env-variables/env-variables-server.spec.ts +93 -0
- package/src/node/env-variables/env-variables-server.ts +22 -14
- package/src/node/i18n/i18n-backend-module.ts +2 -2
- package/src/node/index.ts +1 -0
- package/src/node/logger-backend-module.ts +1 -1
- package/src/node/messaging/connection-container-module.spec.ts +39 -0
- package/src/node/messaging/connection-container-module.ts +16 -4
- package/src/node/messaging/default-messaging-service.ts +64 -10
- package/src/node/messaging/gated-channel-multiplexer.spec.ts +80 -0
- package/src/node/messaging/gated-channel-multiplexer.ts +52 -0
- package/src/node/messaging/index.ts +1 -0
- package/src/node/messaging/messaging-backend-module.ts +1 -1
- package/src/node/messaging/messaging-service.ts +5 -1
- package/src/node/messaging/test/default-messaging-service.spec.ts +89 -2
- package/src/node/messaging/websocket-frontend-connection-service.spec.ts +158 -0
- package/src/node/messaging/websocket-frontend-connection-service.ts +9 -0
- package/src/node/performance/measurement-backend-bindings.ts +1 -1
- package/src/node/process-utils.slow-spec.ts +90 -3
- package/src/node/process-utils.spec.ts +268 -3
- package/src/node/process-utils.ts +342 -24
- package/src/node/shell-environment.spec.ts +388 -0
- package/src/node/shell-environment.ts +406 -0
- package/src/node/test/exiting-backend.ts +17 -3
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 STMicroelectronics and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
import { ChannelMultiplexer } from '../../common/message-rpc/channel.js';
|
|
17
|
+
/**
|
|
18
|
+
* A channel multiplexer that can defer the acknowledgement of a channel that the other side opens until a gate opens.
|
|
19
|
+
* The other side sends nothing on a channel before the acknowledgement, so nothing is lost while the channel is held.
|
|
20
|
+
*
|
|
21
|
+
* The backend holds the service channels of a frontend until the `PATH` of the user's login shell has been
|
|
22
|
+
* applied to `process.env`, so that the services find the user's tools,
|
|
23
|
+
* see `ShellEnvironmentServer` and `ConnectionHandler.independentOfShellEnvironment`.
|
|
24
|
+
*/
|
|
25
|
+
export class GatedChannelMultiplexer extends ChannelMultiplexer {
|
|
26
|
+
/**
|
|
27
|
+
* @param underlyingChannel the channel on which the channels are multiplexed
|
|
28
|
+
* @param gate tells how long to hold the channel of a given id before acknowledging it,
|
|
29
|
+
* or `undefined` to acknowledge it at once. The channel is acknowledged whether the promise resolves or rejects.
|
|
30
|
+
*/
|
|
31
|
+
constructor(underlyingChannel, gate) {
|
|
32
|
+
super(underlyingChannel);
|
|
33
|
+
this.gate = gate;
|
|
34
|
+
}
|
|
35
|
+
handleOpen(id) {
|
|
36
|
+
const hold = this.gate(id);
|
|
37
|
+
if (!hold) {
|
|
38
|
+
super.handleOpen(id);
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const open = () => {
|
|
42
|
+
// the connection may have been closed while the channel was held
|
|
43
|
+
if (!this.toDispose.disposed) {
|
|
44
|
+
super.handleOpen(id);
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
hold.then(open, open);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=gated-channel-multiplexer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gated-channel-multiplexer.js","sourceRoot":"","sources":["../../../src/node/messaging/gated-channel-multiplexer.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;AAChF,gFAAgF;AAEhF,OAAO,EAAW,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAElF;;;;;;;GAOG;AACH,MAAM,OAAO,uBAAwB,SAAQ,kBAAkB;IAE3D;;;;OAIG;IACH,YAAY,iBAA0B,EAAqB,IAA+C;QACtG,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAD8B,SAAI,GAAJ,IAAI,CAA2C;IAE1G,CAAC;IAEkB,UAAU,CAAC,EAAU;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QACD,MAAM,IAAI,GAAG,GAAS,EAAE;YACpB,iEAAiE;YACjE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC3B,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gated-channel-multiplexer.spec.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/gated-channel-multiplexer.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 STMicroelectronics and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { ChannelMultiplexer } from '../../common/message-rpc/channel.js';
|
|
18
|
+
import { ChannelPipe } from '../../common/message-rpc/channel.spec.js';
|
|
19
|
+
import { Deferred, wait } from '../../common/promise-util.js';
|
|
20
|
+
import { GatedChannelMultiplexer } from './gated-channel-multiplexer.js';
|
|
21
|
+
describe('GatedChannelMultiplexer', () => {
|
|
22
|
+
const setup = () => {
|
|
23
|
+
const pipe = new ChannelPipe();
|
|
24
|
+
const gate = new Deferred();
|
|
25
|
+
const frontend = new ChannelMultiplexer(pipe.left);
|
|
26
|
+
const backend = new GatedChannelMultiplexer(pipe.right, id => id.startsWith('/held') ? gate.promise : undefined);
|
|
27
|
+
const opened = [];
|
|
28
|
+
backend.onDidOpenChannel(({ id }) => opened.push(id));
|
|
29
|
+
return { pipe, gate, frontend, backend, opened };
|
|
30
|
+
};
|
|
31
|
+
it('acknowledges a held channel only once the gate has opened', async () => {
|
|
32
|
+
const { gate, frontend, opened } = setup();
|
|
33
|
+
let acknowledged = false;
|
|
34
|
+
const open = frontend.open('/held/task').then(channel => {
|
|
35
|
+
acknowledged = true;
|
|
36
|
+
return channel;
|
|
37
|
+
});
|
|
38
|
+
await wait(0);
|
|
39
|
+
expect(acknowledged).to.be.false;
|
|
40
|
+
expect(opened).to.be.empty;
|
|
41
|
+
gate.resolve();
|
|
42
|
+
await open;
|
|
43
|
+
expect(opened).to.deep.equal(['/held/task']);
|
|
44
|
+
});
|
|
45
|
+
it('acknowledges a channel that the gate lets through at once', async () => {
|
|
46
|
+
const { frontend, opened } = setup();
|
|
47
|
+
await frontend.open('/services/filesystem');
|
|
48
|
+
expect(opened).to.deep.equal(['/services/filesystem']);
|
|
49
|
+
});
|
|
50
|
+
it('delivers a message sent right after the acknowledgement to the handler attached when the channel opened', async () => {
|
|
51
|
+
const { gate, frontend, backend } = setup();
|
|
52
|
+
const received = [];
|
|
53
|
+
backend.onDidOpenChannel(event => event.channel.onMessage(buffer => received.push(buffer().readString())));
|
|
54
|
+
const open = frontend.open('/held/task');
|
|
55
|
+
gate.resolve();
|
|
56
|
+
const channel = await open;
|
|
57
|
+
channel.getWriteBuffer().writeString('hello').commit();
|
|
58
|
+
expect(received).to.deep.equal(['hello']);
|
|
59
|
+
});
|
|
60
|
+
it('does not open a held channel once the connection has closed', async () => {
|
|
61
|
+
const { pipe, gate, frontend, opened } = setup();
|
|
62
|
+
let rejected;
|
|
63
|
+
const open = frontend.open('/held/task').catch(error => { rejected = error; });
|
|
64
|
+
// the socket closes: each side learns of it through its own channel
|
|
65
|
+
pipe.right.onCloseEmitter.fire({ reason: 'The frontend went away' });
|
|
66
|
+
pipe.left.onCloseEmitter.fire({ reason: 'The backend went away' });
|
|
67
|
+
gate.resolve();
|
|
68
|
+
await wait(0);
|
|
69
|
+
expect(opened).to.be.empty;
|
|
70
|
+
await open;
|
|
71
|
+
expect(rejected).to.be.instanceOf(Error);
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=gated-channel-multiplexer.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gated-channel-multiplexer.spec.js","sourceRoot":"","sources":["../../../src/node/messaging/gated-channel-multiplexer.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/index.ts"],"names":[],"mappings":"AAgBA,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4CAA4C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/index.ts"],"names":[],"mappings":"AAgBA,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gCAAgC,CAAC"}
|
|
@@ -17,4 +17,5 @@ export * from './messaging-service.js';
|
|
|
17
17
|
export * from './ipc-connection-provider.js';
|
|
18
18
|
export * from './ipc-channel.js';
|
|
19
19
|
export * from './websocket-frontend-connection-service.js';
|
|
20
|
+
export * from './gated-channel-multiplexer.js';
|
|
20
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/messaging/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4CAA4C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/messaging/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gCAAgC,CAAC"}
|
|
@@ -48,7 +48,7 @@ export const messagingBackendModule = new ContainerModule(bind => {
|
|
|
48
48
|
markForClose: (channelId) => {
|
|
49
49
|
connectionService.markForClose(channelId);
|
|
50
50
|
}
|
|
51
|
-
}));
|
|
51
|
+
}), { independentOfShellEnvironment: true });
|
|
52
52
|
}).inSingletonScope();
|
|
53
53
|
});
|
|
54
54
|
//# sourceMappingURL=messaging-backend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging-backend-module.js","sourceRoot":"","sources":["../../../src/node/messaging/messaging-backend-module.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"messaging-backend-module.js","sourceRoot":"","sources":["../../../src/node/messaging/messaging-backend-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export interface MessagingService {
|
|
|
4
4
|
* Accept a web socket channel on the given path.
|
|
5
5
|
* A path supports the route syntax: https://github.com/rcs/route-parser#what-can-i-use-in-my-routes.
|
|
6
6
|
*/
|
|
7
|
-
registerChannelHandler(path: string, handler: (params: MessagingService.PathParams, channel: Channel) => void): void;
|
|
7
|
+
registerChannelHandler(path: string, handler: (params: MessagingService.PathParams, channel: Channel) => void, options?: MessagingService.ChannelHandlerOptions): void;
|
|
8
8
|
/**
|
|
9
9
|
* Accept a web socket connection on the given path.
|
|
10
10
|
* A path supports the route syntax: https://github.com/rcs/route-parser#what-can-i-use-in-my-routes.
|
|
@@ -21,6 +21,10 @@ export declare namespace MessagingService {
|
|
|
21
21
|
interface PathParams {
|
|
22
22
|
[name: string]: string;
|
|
23
23
|
}
|
|
24
|
+
interface ChannelHandlerOptions {
|
|
25
|
+
/** See `ConnectionHandler.independentOfShellEnvironment`. The default is `false`. */
|
|
26
|
+
independentOfShellEnvironment?: boolean;
|
|
27
|
+
}
|
|
24
28
|
const Contribution: unique symbol;
|
|
25
29
|
interface Contribution {
|
|
26
30
|
configure(service: MessagingService): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/messaging-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC7B;;;OAGG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"messaging-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/messaging-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC7B;;;OAGG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACvK;;;;;;;OAOG;IACH,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAC;CAChI;AAED,yBAAiB,gBAAgB,CAAC;IAC9B,2EAA2E;IACpE,MAAM,UAAU,eAA6B,CAAC;IACrD,UAAiB,UAAU;QACvB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KACzB;IACD,UAAiB,qBAAqB;QAClC,qFAAqF;QACrF,6BAA6B,CAAC,EAAE,OAAO,CAAC;KAC3C;IACM,MAAM,YAAY,eAA0C,CAAC;IACpE,UAAiB,YAAY;QACzB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;KAC9C;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging-service.js","sourceRoot":"","sources":["../../../src/node/messaging/messaging-service.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;AAqBhF,MAAM,KAAW,gBAAgB,
|
|
1
|
+
{"version":3,"file":"messaging-service.js","sourceRoot":"","sources":["../../../src/node/messaging/messaging-service.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;AAqBhF,MAAM,KAAW,gBAAgB,CAchC;AAdD,WAAiB,gBAAgB;IAC7B,2EAA2E;IAC9D,2BAAU,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAQxC,6BAAY,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AAIxE,CAAC,EAdgB,gBAAgB,KAAhB,gBAAgB,QAchC"}
|
|
@@ -17,13 +17,16 @@ import { __decorate } from "tslib";
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { Container, injectable, preDestroy } from 'inversify';
|
|
19
19
|
import { ConnectionHandler, bindContributionProvider, servicesPath, ILogger } from '../../../common/index.js';
|
|
20
|
-
import { BasicChannel } from '../../../common/message-rpc/channel.js';
|
|
20
|
+
import { BasicChannel, ChannelMultiplexer } from '../../../common/message-rpc/channel.js';
|
|
21
21
|
import { Uint8ArrayWriteBuffer } from '../../../common/message-rpc/uint8-array-message-buffer.js';
|
|
22
22
|
import { ConnectionContainerModule } from '../connection-container-module.js';
|
|
23
|
-
import { DefaultMessagingService, MessagingContainer } from '../default-messaging-service.js';
|
|
23
|
+
import { ConnectionHandlers, DefaultMessagingService, MessagingContainer } from '../default-messaging-service.js';
|
|
24
24
|
import { FrontendConnectionService } from '../frontend-connection-service.js';
|
|
25
25
|
import { MessagingService } from '../messaging-service.js';
|
|
26
26
|
import { MockLogger } from '../../../common/test/mock-logger.js';
|
|
27
|
+
import { ChannelPipe } from '../../../common/message-rpc/channel.spec.js';
|
|
28
|
+
import { Deferred } from '../../../common/promise-util.js';
|
|
29
|
+
import { ShellEnvironmentServer } from '../../../common/shell-environment.js';
|
|
27
30
|
describe('DefaultMessagingService', () => {
|
|
28
31
|
describe('when a frontend connection closes', () => {
|
|
29
32
|
it('disposes the connection-scoped child container, invoking @preDestroy on bound singleton services', async () => {
|
|
@@ -63,6 +66,10 @@ describe('DefaultMessagingService', () => {
|
|
|
63
66
|
};
|
|
64
67
|
container.bind(FrontendConnectionService).toConstantValue(frontendConnectionService);
|
|
65
68
|
container.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
69
|
+
container.bind(ShellEnvironmentServer).toConstantValue({
|
|
70
|
+
whenResolved: async () => ({ status: 'skipped', reason: 'test' }),
|
|
71
|
+
setResolutionTimeout: async () => { }
|
|
72
|
+
});
|
|
66
73
|
const messagingService = container.get(DefaultMessagingService);
|
|
67
74
|
messagingService.initialize();
|
|
68
75
|
expect(serviceHandler, 'connection handler not registered on the services path').to.not.be.undefined;
|
|
@@ -74,5 +81,78 @@ describe('DefaultMessagingService', () => {
|
|
|
74
81
|
expect(canaryDisposed, 'canary @preDestroy was not invoked').to.be.true;
|
|
75
82
|
});
|
|
76
83
|
});
|
|
84
|
+
describe('when a frontend opens service channels', () => {
|
|
85
|
+
let resolution;
|
|
86
|
+
let connections;
|
|
87
|
+
let connected;
|
|
88
|
+
const setup = () => {
|
|
89
|
+
resolution = new Deferred();
|
|
90
|
+
connections = [];
|
|
91
|
+
connected = [];
|
|
92
|
+
const container = new Container({ defaultScope: 'Singleton' });
|
|
93
|
+
container.bind(ILogger).to(MockLogger);
|
|
94
|
+
container.bind(MessagingContainer).toConstantValue(container);
|
|
95
|
+
container.bind(FrontendConnectionService).toConstantValue({
|
|
96
|
+
registerConnectionHandler: (path, callback) => { connections.push(callback); }
|
|
97
|
+
});
|
|
98
|
+
bindContributionProvider(container, ConnectionContainerModule);
|
|
99
|
+
bindContributionProvider(container, MessagingService.Contribution);
|
|
100
|
+
container.bind(ShellEnvironmentServer).toConstantValue({
|
|
101
|
+
whenResolved: () => resolution.promise,
|
|
102
|
+
setResolutionTimeout: async () => { }
|
|
103
|
+
});
|
|
104
|
+
const handler = (path, independentOfShellEnvironment) => ({
|
|
105
|
+
path, independentOfShellEnvironment, onConnection: () => { connected.push(path); }
|
|
106
|
+
});
|
|
107
|
+
container.bind(ConnectionHandler).toConstantValue(handler('/services/task'));
|
|
108
|
+
container.bind(ConnectionHandler).toConstantValue(handler('/services/filesystem', true));
|
|
109
|
+
container.bind(DefaultMessagingService).toSelf();
|
|
110
|
+
const service = container.get(DefaultMessagingService);
|
|
111
|
+
service.initialize();
|
|
112
|
+
return service;
|
|
113
|
+
};
|
|
114
|
+
it('holds the services that depend on the shell environment and lets the others through', async () => {
|
|
115
|
+
const service = setup();
|
|
116
|
+
service.registerChannelHandler('/services/terminals/:id', ({ id }) => { connected.push(`/services/terminals/${id}`); });
|
|
117
|
+
service.registerChannelHandler('/services/keyboard', () => { connected.push('/services/keyboard'); }, { independentOfShellEnvironment: true });
|
|
118
|
+
expect(connections).to.have.lengthOf(1);
|
|
119
|
+
const pipe = new ChannelPipe();
|
|
120
|
+
connections[0]({}, pipe.right);
|
|
121
|
+
const frontend = new ChannelMultiplexer(pipe.left);
|
|
122
|
+
const held = Promise.all([frontend.open('/services/task'), frontend.open('/services/terminals/1')]);
|
|
123
|
+
await Promise.all([frontend.open('/services/filesystem'), frontend.open('/services/keyboard')]);
|
|
124
|
+
expect(connected).to.have.members(['/services/filesystem', '/services/keyboard']);
|
|
125
|
+
resolution.resolve({ status: 'applied' });
|
|
126
|
+
await held;
|
|
127
|
+
expect(connected).to.have.members(['/services/filesystem', '/services/keyboard', '/services/task', '/services/terminals/1']);
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
describe('ConnectionHandlers', () => {
|
|
132
|
+
it('holds every path until the shell environment is resolved unless its handler is declared independent of it', () => {
|
|
133
|
+
const handlers = new ConnectionHandlers();
|
|
134
|
+
handlers.push('/services/terminals/:id', () => { });
|
|
135
|
+
handlers.push('/services/filesystem', () => { }, { independentOfShellEnvironment: true });
|
|
136
|
+
expect(handlers.isIndependentOfShellEnvironment('/services/terminals/42')).to.be.false;
|
|
137
|
+
expect(handlers.isIndependentOfShellEnvironment('/services/filesystem')).to.be.true;
|
|
138
|
+
expect(handlers.isIndependentOfShellEnvironment('/services/unknown')).to.be.false;
|
|
139
|
+
});
|
|
140
|
+
it('consults the parent handlers', () => {
|
|
141
|
+
const parent = new ConnectionHandlers();
|
|
142
|
+
parent.push('/services/os', () => { }, { independentOfShellEnvironment: true });
|
|
143
|
+
const child = new ConnectionHandlers(parent);
|
|
144
|
+
child.push('/services/task', () => { });
|
|
145
|
+
expect(child.isIndependentOfShellEnvironment('/services/os')).to.be.true;
|
|
146
|
+
expect(child.isIndependentOfShellEnvironment('/services/task')).to.be.false;
|
|
147
|
+
});
|
|
148
|
+
it('does not invoke the handlers when asked about their independence', () => {
|
|
149
|
+
let invoked = 0;
|
|
150
|
+
const handlers = new ConnectionHandlers();
|
|
151
|
+
handlers.push('/services/:name', () => { invoked++; }, { independentOfShellEnvironment: true });
|
|
152
|
+
expect(handlers.isIndependentOfShellEnvironment('/services/anything')).to.be.true;
|
|
153
|
+
expect(invoked).to.equal(0);
|
|
154
|
+
expect(handlers.route('/services/anything', 'connection')).to.equal('/services/anything');
|
|
155
|
+
expect(invoked).to.equal(1);
|
|
156
|
+
});
|
|
77
157
|
});
|
|
78
158
|
//# sourceMappingURL=default-messaging-service.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-messaging-service.spec.js","sourceRoot":"","sources":["../../../../src/node/messaging/test/default-messaging-service.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,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,YAAY,EAAW,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"default-messaging-service.spec.js","sourceRoot":"","sources":["../../../../src/node/messaging/test/default-messaging-service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ export declare class ReconnectableSocketChannel extends AbstractChannel {
|
|
|
30
30
|
protected disposables: DisposableCollection;
|
|
31
31
|
connect(socket: Socket): void;
|
|
32
32
|
disconnect(): void;
|
|
33
|
+
isConnectedTo(socket: Socket): boolean;
|
|
33
34
|
drainBuffer(): void;
|
|
34
35
|
getWriteBuffer(): WriteBuffer;
|
|
35
36
|
}
|
|
@@ -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,mCAAmC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAsB,UAAU,EAAS,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAsB,MAAM,gCAAgC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAGtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAc,oBAAoB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAElF,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,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;
|
|
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,mCAAmC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAsB,UAAU,EAAS,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAsB,MAAM,gCAAgC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAGtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAc,oBAAoB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAElF,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,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;IA0BrG,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,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAItC,WAAW,IAAI,IAAI;IAIV,cAAc,IAAI,WAAW;CAWzC"}
|
|
@@ -87,6 +87,11 @@ let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionServic
|
|
|
87
87
|
}
|
|
88
88
|
handleSocketDisconnect(socket, channel, frontEndId) {
|
|
89
89
|
socket.on('disconnect', evt => {
|
|
90
|
+
if (this.connectionsByFrontend.get(frontEndId) !== channel || !channel.isConnectedTo(socket)) {
|
|
91
|
+
// The front end has moved to another socket since: leave its connection alone.
|
|
92
|
+
this.logger.info(`superseded socket closed for ${frontEndId}`);
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
90
95
|
this.logger.info('socket closed');
|
|
91
96
|
channel.disconnect();
|
|
92
97
|
const timeout = this.frontendConnectionTimeout();
|
|
@@ -164,6 +169,9 @@ let ReconnectableSocketChannel = class ReconnectableSocketChannel extends Abstra
|
|
|
164
169
|
this.disposables.dispose();
|
|
165
170
|
this.socket = undefined;
|
|
166
171
|
}
|
|
172
|
+
isConnectedTo(socket) {
|
|
173
|
+
return this.socket === socket;
|
|
174
|
+
}
|
|
167
175
|
drainBuffer() {
|
|
168
176
|
this.socketBuffer.drain();
|
|
169
177
|
}
|
|
@@ -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,OAAO,EAAE,MAAM,EAAE,UAAU,EAAc,KAAK,EAAE,MAAM,WAAW,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AACrH,OAAO,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iDAAiD,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAG3E,IAAM,kCAAkC,GAAxC,MAAM,kCAAkC;IAAxC;QAWgB,eAAU,GAAG,IAAI,kBAAkB,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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"websocket-frontend-connection-service.spec.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 CodeSignal and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import * as http from 'http';
|
|
18
|
+
import { Container } from 'inversify';
|
|
19
|
+
import { Server } from 'socket.io';
|
|
20
|
+
import { io } from 'socket.io-client';
|
|
21
|
+
import { ILogger } from '../../common/index.js';
|
|
22
|
+
import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from '../../common/message-rpc/uint8-array-message-buffer.js';
|
|
23
|
+
import { ConnectionManagementMessages } from '../../common/messaging/connection-management.js';
|
|
24
|
+
import { SocketWriteBuffer } from '../../common/messaging/socket-write-buffer.js';
|
|
25
|
+
import { timeout } from '../../common/promise-util.js';
|
|
26
|
+
import { MockLogger } from '../../common/test/mock-logger.js';
|
|
27
|
+
import { MessagingContainer } from './default-messaging-service.js';
|
|
28
|
+
import { WebsocketEndpoint } from './websocket-endpoint.js';
|
|
29
|
+
import { ReconnectableSocketChannel, WebsocketFrontendConnectionService } from './websocket-frontend-connection-service.js';
|
|
30
|
+
const FRONTEND_ID = 'frontend-1';
|
|
31
|
+
const CLOSE_TIMEOUT_MS = 300;
|
|
32
|
+
class TestConnectionService extends WebsocketFrontendConnectionService {
|
|
33
|
+
constructor() {
|
|
34
|
+
super(...arguments);
|
|
35
|
+
this.channels = [];
|
|
36
|
+
}
|
|
37
|
+
accept(socket) {
|
|
38
|
+
this.handleConnection(socket, channel => this.channels.push(channel));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function encode(text) {
|
|
42
|
+
const buffer = new Uint8ArrayWriteBuffer();
|
|
43
|
+
buffer.writeString(text);
|
|
44
|
+
return buffer.getCurrentContents();
|
|
45
|
+
}
|
|
46
|
+
describe('WebsocketFrontendConnectionService', () => {
|
|
47
|
+
let httpServer;
|
|
48
|
+
let ioServer;
|
|
49
|
+
let url;
|
|
50
|
+
let service;
|
|
51
|
+
let serverSockets;
|
|
52
|
+
let clients;
|
|
53
|
+
let savedTimeout;
|
|
54
|
+
beforeEach(async () => {
|
|
55
|
+
savedTimeout = process.env.FRONTEND_CONNECTION_TIMEOUT;
|
|
56
|
+
process.env.FRONTEND_CONNECTION_TIMEOUT = String(CLOSE_TIMEOUT_MS);
|
|
57
|
+
const container = new Container();
|
|
58
|
+
container.bind(MessagingContainer).toConstantValue(container);
|
|
59
|
+
container.bind(ILogger).to(MockLogger);
|
|
60
|
+
container.bind(WebsocketEndpoint).toConstantValue(new WebsocketEndpoint());
|
|
61
|
+
container.bind(SocketWriteBuffer).toSelf();
|
|
62
|
+
container.bind(ReconnectableSocketChannel).toSelf();
|
|
63
|
+
container.bind(TestConnectionService).toSelf().inSingletonScope();
|
|
64
|
+
service = container.get(TestConnectionService);
|
|
65
|
+
serverSockets = [];
|
|
66
|
+
clients = [];
|
|
67
|
+
httpServer = http.createServer();
|
|
68
|
+
ioServer = new Server(httpServer);
|
|
69
|
+
ioServer.on('connection', socket => {
|
|
70
|
+
serverSockets.push(socket);
|
|
71
|
+
service.accept(socket);
|
|
72
|
+
});
|
|
73
|
+
await new Promise(resolve => httpServer.listen(0, '127.0.0.1', resolve));
|
|
74
|
+
url = `http://127.0.0.1:${httpServer.address().port}`;
|
|
75
|
+
});
|
|
76
|
+
afterEach(async () => {
|
|
77
|
+
clients.forEach(client => client.disconnect());
|
|
78
|
+
await timeout(CLOSE_TIMEOUT_MS * 2);
|
|
79
|
+
await new Promise(resolve => ioServer.close(() => resolve()));
|
|
80
|
+
if (savedTimeout === undefined) {
|
|
81
|
+
delete process.env.FRONTEND_CONNECTION_TIMEOUT;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
process.env.FRONTEND_CONNECTION_TIMEOUT = savedTimeout;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
async function connect(message) {
|
|
88
|
+
const client = io(url, { transports: ['websocket'], reconnection: false });
|
|
89
|
+
clients.push(client);
|
|
90
|
+
await new Promise(resolve => client.once('connect', () => resolve()));
|
|
91
|
+
const received = [];
|
|
92
|
+
client.on('message', (data) => received.push(new Uint8ArrayReadBuffer(new Uint8Array(data)).readString()));
|
|
93
|
+
const answered = new Promise(resolve => client.once(message, resolve));
|
|
94
|
+
client.emit(message, FRONTEND_ID);
|
|
95
|
+
await answered;
|
|
96
|
+
return { client, received };
|
|
97
|
+
}
|
|
98
|
+
async function closeServerSide(index) {
|
|
99
|
+
const socket = serverSockets[index];
|
|
100
|
+
const closed = new Promise(resolve => socket.once('disconnect', resolve));
|
|
101
|
+
socket.disconnect(true);
|
|
102
|
+
await closed;
|
|
103
|
+
}
|
|
104
|
+
it("keeps the channel on the new socket when the old socket's disconnect arrives after a reconnect", async () => {
|
|
105
|
+
await connect(ConnectionManagementMessages.INITIAL_CONNECT);
|
|
106
|
+
const channel = service.channels[0];
|
|
107
|
+
let closed = false;
|
|
108
|
+
channel.onClose(() => closed = true);
|
|
109
|
+
const backendReceived = [];
|
|
110
|
+
channel.onMessage(read => backendReceived.push(read().readString()));
|
|
111
|
+
const fresh = await connect(ConnectionManagementMessages.RECONNECT);
|
|
112
|
+
await closeServerSide(0);
|
|
113
|
+
channel.getWriteBuffer().writeString('to frontend').commit();
|
|
114
|
+
fresh.client.send(encode('to backend'));
|
|
115
|
+
await timeout(CLOSE_TIMEOUT_MS * 2);
|
|
116
|
+
expect(fresh.received).to.deep.equal(['to frontend']);
|
|
117
|
+
expect(backendReceived).to.deep.equal(['to backend']);
|
|
118
|
+
expect(closed).to.be.false;
|
|
119
|
+
});
|
|
120
|
+
it('keeps the connection a front end opened again when its first socket closes later', async () => {
|
|
121
|
+
await connect(ConnectionManagementMessages.INITIAL_CONNECT);
|
|
122
|
+
const again = await connect(ConnectionManagementMessages.INITIAL_CONNECT);
|
|
123
|
+
const channel = service.channels[1];
|
|
124
|
+
let closed = false;
|
|
125
|
+
channel.onClose(() => closed = true);
|
|
126
|
+
await closeServerSide(0);
|
|
127
|
+
channel.getWriteBuffer().writeString('to frontend').commit();
|
|
128
|
+
await timeout(CLOSE_TIMEOUT_MS * 2);
|
|
129
|
+
expect(again.received).to.deep.equal(['to frontend']);
|
|
130
|
+
expect(closed).to.be.false;
|
|
131
|
+
});
|
|
132
|
+
it('closes the channel when its current socket disconnects and the front end does not come back', async () => {
|
|
133
|
+
await connect(ConnectionManagementMessages.INITIAL_CONNECT);
|
|
134
|
+
const channel = service.channels[0];
|
|
135
|
+
const closed = new Promise(resolve => channel.onClose(resolve));
|
|
136
|
+
await connect(ConnectionManagementMessages.RECONNECT);
|
|
137
|
+
await closeServerSide(1);
|
|
138
|
+
await closed;
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
//# sourceMappingURL=websocket-frontend-connection-service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"websocket-frontend-connection-service.spec.js","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.spec.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,4CAA4C;AAC5C,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,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,MAAM,EAA0B,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,EAAE,EAA0B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AACrH,OAAO,EAAE,4BAA4B,EAAE,MAAM,iDAAiD,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAE5H,MAAM,WAAW,GAAG,YAAY,CAAC;AACjC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAE7B,MAAM,qBAAsB,SAAQ,kCAAkC;IAAtE;;QACa,aAAQ,GAAc,EAAE,CAAC;IAKtC,CAAC;IAHG,MAAM,CAAC,MAAoB;QACvB,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC;CACJ;AAED,SAAS,MAAM,CAAC,IAAY;IACxB,MAAM,MAAM,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,MAAM,CAAC,kBAAkB,EAAE,CAAC;AACvC,CAAC;AAED,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAChD,IAAI,UAAuB,CAAC;IAC5B,IAAI,QAAgB,CAAC;IACrB,IAAI,GAAW,CAAC;IAChB,IAAI,OAA8B,CAAC;IACnC,IAAI,aAA6B,CAAC;IAClC,IAAI,OAAuB,CAAC;IAC5B,IAAI,YAAgC,CAAC;IAErC,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC9D,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QACvC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAC3E,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC;QACpD,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAClE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAE/C,aAAa,GAAG,EAAE,CAAC;QACnB,OAAO,GAAG,EAAE,CAAC;QACb,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACjC,QAAQ,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QAClC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE;YAC/B,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/E,GAAG,GAAG,oBAAqB,UAAU,CAAC,OAAO,EAAkB,CAAC,IAAI,EAAE,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACjB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAC/C,MAAM,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;QACpC,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACpE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QACnD,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,YAAY,CAAC;QAC3D,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,UAAU,OAAO,CAAC,OAAe;QAClC,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,CAAC,WAAW,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACvH,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAClC,MAAM,QAAQ,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,KAAa;QACxC,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,MAAM,CAAC;IACjB,CAAC;IAED,EAAE,CAAC,gGAAgG,EAAE,KAAK,IAAI,EAAE;QAC5G,MAAM,OAAO,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACrC,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAErE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;QACpE,MAAM,eAAe,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7D,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;QACxC,MAAM,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;QAEpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QACtD,MAAM,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;QAC9F,MAAM,OAAO,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QAErC,MAAM,eAAe,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7D,MAAM,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;QAEpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6FAA6F,EAAE,KAAK,IAAI,EAAE;QACzG,MAAM,OAAO,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAChE,MAAM,OAAO,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;QAEtD,MAAM,eAAe,CAAC,CAAC,CAAC,CAAC;QAEzB,MAAM,MAAM,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -19,7 +19,7 @@ export function bindNodeStopwatch(bind) {
|
|
|
19
19
|
return bind(Stopwatch).to(NodeStopwatch).inSingletonScope();
|
|
20
20
|
}
|
|
21
21
|
export function bindBackendStopwatchServer(bind) {
|
|
22
|
-
bind(ConnectionHandler).toDynamicValue(({ container }) => new RpcConnectionHandler(stopwatchPath, () => container.get(BackendStopwatch))).inSingletonScope();
|
|
22
|
+
bind(ConnectionHandler).toDynamicValue(({ container }) => new RpcConnectionHandler(stopwatchPath, () => container.get(BackendStopwatch), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
23
23
|
bind(DefaultBackendStopwatch).toSelf().inSingletonScope();
|
|
24
24
|
return bind(BackendStopwatch).to(DefaultBackendStopwatch).inSingletonScope();
|
|
25
25
|
}
|