@theia/core 1.78.0-next.0 → 1.78.0-next.23
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 +247 -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/application-shell.d.ts.map +1 -1
- package/lib/browser/shell/application-shell.js +13 -1
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/shell/tab-bars.d.ts +78 -1
- package/lib/browser/shell/tab-bars.d.ts.map +1 -1
- package/lib/browser/shell/tab-bars.js +267 -18
- package/lib/browser/shell/tab-bars.js.map +1 -1
- package/lib/browser/shell/tab-bars.spec.js +401 -1
- package/lib/browser/shell/tab-bars.spec.js.map +1 -1
- package/lib/browser/widgets/widget.d.ts.map +1 -1
- package/lib/browser/widgets/widget.js +34 -1
- package/lib/browser/widgets/widget.js.map +1 -1
- package/lib/common/core-preferences.d.ts +2 -0
- package/lib/common/core-preferences.d.ts.map +1 -1
- package/lib/common/core-preferences.js +21 -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/messaging/socket-write-buffer.d.ts +8 -2
- package/lib/common/messaging/socket-write-buffer.d.ts.map +1 -1
- package/lib/common/messaging/socket-write-buffer.js +18 -12
- package/lib/common/messaging/socket-write-buffer.js.map +1 -1
- package/lib/common/messaging/socket-write-buffer.spec.d.ts +2 -0
- package/lib/common/messaging/socket-write-buffer.spec.d.ts.map +1 -0
- package/lib/common/messaging/socket-write-buffer.spec.js +72 -0
- package/lib/common/messaging/socket-write-buffer.spec.js.map +1 -0
- 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/application-shell.ts +14 -1
- package/src/browser/shell/tab-bars.spec.ts +452 -1
- package/src/browser/shell/tab-bars.ts +285 -20
- package/src/browser/style/tabs.css +58 -3
- package/src/browser/widgets/widget.ts +36 -1
- package/src/common/core-preferences.ts +23 -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/messaging/socket-write-buffer.spec.ts +90 -0
- package/src/common/messaging/socket-write-buffer.ts +18 -14
- 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 @@
|
|
|
1
|
+
{"version":3,"file":"connection-container-module.spec.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/connection-container-module.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,37 @@
|
|
|
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 { Container } from 'inversify';
|
|
18
|
+
import { ConnectionHandler } from '../../common/messaging/handler.js';
|
|
19
|
+
import { ConnectionContainerModule } from './connection-container-module.js';
|
|
20
|
+
describe('ConnectionContainerModule', () => {
|
|
21
|
+
it('declares frontend services independent of the shell environment, and backend services as told', () => {
|
|
22
|
+
const BackendService = Symbol('BackendService');
|
|
23
|
+
const module = ConnectionContainerModule.create(({ bind, bindFrontendService, bindBackendService }) => {
|
|
24
|
+
bindFrontendService('/services/frontend', Symbol('FrontendService'));
|
|
25
|
+
bind(BackendService).toConstantValue({});
|
|
26
|
+
bindBackendService('/services/held', BackendService);
|
|
27
|
+
bindBackendService('/services/independent', BackendService, undefined, { independentOfShellEnvironment: true });
|
|
28
|
+
});
|
|
29
|
+
const container = new Container();
|
|
30
|
+
container.load(module);
|
|
31
|
+
const independence = new Map(container.getAll(ConnectionHandler).map(handler => [handler.path, handler.independentOfShellEnvironment]));
|
|
32
|
+
expect(independence.get('/services/frontend')).to.be.true;
|
|
33
|
+
expect(independence.get('/services/held')).to.be.false;
|
|
34
|
+
expect(independence.get('/services/independent')).to.be.true;
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
//# sourceMappingURL=connection-container-module.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection-container-module.spec.js","sourceRoot":"","sources":["../../../src/node/messaging/connection-container-module.spec.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,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAEvC,EAAE,CAAC,+FAA+F,EAAE,GAAG,EAAE;QACrG,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,EAAE,EAAE;YAClG,mBAAmB,CAAC,oBAAoB,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YACzC,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YACrD,kBAAkB,CAAC,uBAAuB,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,6BAA6B,EAAE,IAAI,EAAE,CAAC,CAAC;QACpH,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,CAAoB,iBAAiB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;QAC3J,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC1D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACvD,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACjE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { interfaces, Container } from 'inversify';
|
|
2
2
|
import { ContributionProvider } from '../../common/index.js';
|
|
3
3
|
import { MessagingService } from './messaging-service.js';
|
|
4
|
-
import
|
|
4
|
+
import Route from 'route-parser';
|
|
5
|
+
import { Channel, ChannelMultiplexer } from '../../common/message-rpc/channel.js';
|
|
5
6
|
import { FrontendConnectionService } from './frontend-connection-service.js';
|
|
6
7
|
import { BackendApplicationContribution } from '../backend-application.js';
|
|
7
8
|
import { ILogger } from '../../common/logger.js';
|
|
9
|
+
import { ShellEnvironmentServer } from '../../common/shell-environment.js';
|
|
8
10
|
export declare const MessagingContainer: unique symbol;
|
|
9
11
|
export declare const MainChannel: unique symbol;
|
|
10
12
|
export declare class DefaultMessagingService implements MessagingService, BackendApplicationContribution {
|
|
@@ -13,19 +15,46 @@ export declare class DefaultMessagingService implements MessagingService, Backen
|
|
|
13
15
|
protected readonly connectionModules: ContributionProvider<interfaces.ContainerModule>;
|
|
14
16
|
protected readonly logger: ILogger;
|
|
15
17
|
protected readonly contributions: ContributionProvider<MessagingService.Contribution>;
|
|
18
|
+
protected readonly shellEnvironment: ShellEnvironmentServer;
|
|
16
19
|
protected readonly channelHandlers: ConnectionHandlers<Channel>;
|
|
17
20
|
initialize(): void;
|
|
18
21
|
registerConnectionHandler(path: string, callback: (params: MessagingService.PathParams, mainChannel: Channel) => void): void;
|
|
19
|
-
registerChannelHandler(spec: string, callback: (params: MessagingService.PathParams, channel: Channel) => void): void;
|
|
22
|
+
registerChannelHandler(spec: string, callback: (params: MessagingService.PathParams, channel: Channel) => void, options?: MessagingService.ChannelHandlerOptions): void;
|
|
20
23
|
protected handleConnection(channel: Channel): void;
|
|
24
|
+
/**
|
|
25
|
+
* Creates the multiplexer of the service channels on the main channel of a frontend. It holds the channels of the
|
|
26
|
+
* services that depend on the environment of the user's login shell until that environment is known, see {@link holdChannel}.
|
|
27
|
+
*/
|
|
28
|
+
protected createChannelMultiplexer(mainChannel: Channel, channelHandlers: ConnectionHandlers<Channel>): ChannelMultiplexer;
|
|
29
|
+
/**
|
|
30
|
+
* Holds the opening of a service channel until the `PATH` of the user's login shell has been applied to `process.env`,
|
|
31
|
+
* unless the service is declared independent of it (see `ConnectionHandler.independentOfShellEnvironment`). Terminals, tasks,
|
|
32
|
+
* debug sessions, the plugin host and whatever else runs the user's tools are requested through these channels, so by the
|
|
33
|
+
* time a request arrives, they find those tools. In a browser deployment and on Windows, nothing is held.
|
|
34
|
+
*
|
|
35
|
+
* @returns the promise to wait for, or `undefined` if the channel is not to be held
|
|
36
|
+
*/
|
|
37
|
+
protected holdChannel(id: string, channelHandlers: ConnectionHandlers<Channel>): Promise<void> | undefined;
|
|
21
38
|
protected createMainChannelContainer(socket: Channel): Container;
|
|
22
39
|
protected getConnectionChannelHandlers(socket: Channel): ConnectionHandlers<Channel>;
|
|
23
40
|
}
|
|
24
41
|
export declare class ConnectionHandlers<T> {
|
|
25
42
|
protected readonly parent?: ConnectionHandlers<T> | undefined;
|
|
26
|
-
protected readonly handlers:
|
|
43
|
+
protected readonly handlers: ConnectionHandlers.Entry<T>[];
|
|
27
44
|
constructor(parent?: ConnectionHandlers<T> | undefined);
|
|
28
|
-
push(spec: string, callback: (params: MessagingService.PathParams, connection: T) => void): void;
|
|
45
|
+
push(spec: string, callback: (params: MessagingService.PathParams, connection: T) => void, options?: MessagingService.ChannelHandlerOptions): void;
|
|
29
46
|
route(path: string, connection: T): string | false;
|
|
47
|
+
/**
|
|
48
|
+
* Whether the handler of the given path is declared independent of the shell environment,
|
|
49
|
+
* see {@link ConnectionHandler.independentOfShellEnvironment}. A path without a handler is not.
|
|
50
|
+
*/
|
|
51
|
+
isIndependentOfShellEnvironment(path: string): boolean;
|
|
52
|
+
}
|
|
53
|
+
export declare namespace ConnectionHandlers {
|
|
54
|
+
interface Entry<T> {
|
|
55
|
+
readonly route: Route;
|
|
56
|
+
readonly handle: (path: string, connection: T) => string | false;
|
|
57
|
+
readonly independentOfShellEnvironment: boolean;
|
|
58
|
+
}
|
|
30
59
|
}
|
|
31
60
|
//# sourceMappingURL=default-messaging-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-messaging-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/default-messaging-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAA6B,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAA6D,MAAM,uBAAuB,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"default-messaging-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/default-messaging-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,9 +19,10 @@ import { ContributionProvider, ConnectionHandler, bindContributionProvider, serv
|
|
|
19
19
|
import { MessagingService } from './messaging-service.js';
|
|
20
20
|
import { ConnectionContainerModule } from './connection-container-module.js';
|
|
21
21
|
import Route from 'route-parser';
|
|
22
|
-
import { ChannelMultiplexer } from '../../common/message-rpc/channel.js';
|
|
23
22
|
import { FrontendConnectionService } from './frontend-connection-service.js';
|
|
24
23
|
import { ILogger } from '../../common/logger.js';
|
|
24
|
+
import { ShellEnvironmentServer } from '../../common/shell-environment.js';
|
|
25
|
+
import { GatedChannelMultiplexer } from './gated-channel-multiplexer.js';
|
|
25
26
|
export const MessagingContainer = Symbol('MessagingContainer');
|
|
26
27
|
export const MainChannel = Symbol('MainChannel');
|
|
27
28
|
let DefaultMessagingService = class DefaultMessagingService {
|
|
@@ -37,12 +38,12 @@ let DefaultMessagingService = class DefaultMessagingService {
|
|
|
37
38
|
registerConnectionHandler(path, callback) {
|
|
38
39
|
this.frontendConnectionService.registerConnectionHandler(path, callback);
|
|
39
40
|
}
|
|
40
|
-
registerChannelHandler(spec, callback) {
|
|
41
|
-
this.channelHandlers.push(spec, (params, channel) => callback(params, channel));
|
|
41
|
+
registerChannelHandler(spec, callback, options) {
|
|
42
|
+
this.channelHandlers.push(spec, (params, channel) => callback(params, channel), options);
|
|
42
43
|
}
|
|
43
44
|
handleConnection(channel) {
|
|
44
|
-
const multiplexer = new ChannelMultiplexer(channel);
|
|
45
45
|
const channelHandlers = this.getConnectionChannelHandlers(channel);
|
|
46
|
+
const multiplexer = this.createChannelMultiplexer(channel, channelHandlers);
|
|
46
47
|
multiplexer.onDidOpenChannel(event => {
|
|
47
48
|
if (channelHandlers.route(event.id, event.channel)) {
|
|
48
49
|
this.logger.debug(`Opening channel for service path '${event.id}'.`);
|
|
@@ -50,6 +51,33 @@ let DefaultMessagingService = class DefaultMessagingService {
|
|
|
50
51
|
}
|
|
51
52
|
});
|
|
52
53
|
}
|
|
54
|
+
/**
|
|
55
|
+
* Creates the multiplexer of the service channels on the main channel of a frontend. It holds the channels of the
|
|
56
|
+
* services that depend on the environment of the user's login shell until that environment is known, see {@link holdChannel}.
|
|
57
|
+
*/
|
|
58
|
+
createChannelMultiplexer(mainChannel, channelHandlers) {
|
|
59
|
+
return new GatedChannelMultiplexer(mainChannel, id => this.holdChannel(id, channelHandlers));
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Holds the opening of a service channel until the `PATH` of the user's login shell has been applied to `process.env`,
|
|
63
|
+
* unless the service is declared independent of it (see `ConnectionHandler.independentOfShellEnvironment`). Terminals, tasks,
|
|
64
|
+
* debug sessions, the plugin host and whatever else runs the user's tools are requested through these channels, so by the
|
|
65
|
+
* time a request arrives, they find those tools. In a browser deployment and on Windows, nothing is held.
|
|
66
|
+
*
|
|
67
|
+
* @returns the promise to wait for, or `undefined` if the channel is not to be held
|
|
68
|
+
*/
|
|
69
|
+
holdChannel(id, channelHandlers) {
|
|
70
|
+
if (channelHandlers.isIndependentOfShellEnvironment(id)) {
|
|
71
|
+
return undefined;
|
|
72
|
+
}
|
|
73
|
+
const start = performance.now();
|
|
74
|
+
return this.shellEnvironment.whenResolved().then(() => {
|
|
75
|
+
const held = performance.now() - start;
|
|
76
|
+
if (held >= 10) {
|
|
77
|
+
this.logger.debug(`Held the channel '${id}' for ${held.toFixed(0)} ms until the login shell environment was resolved.`);
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
}
|
|
53
81
|
createMainChannelContainer(socket) {
|
|
54
82
|
const connectionContainer = this.container.createChild();
|
|
55
83
|
connectionContainer.bind(MainChannel).toConstantValue(socket);
|
|
@@ -65,7 +93,7 @@ let DefaultMessagingService = class DefaultMessagingService {
|
|
|
65
93
|
for (const connectionHandler of connectionHandlers.getContributions(true)) {
|
|
66
94
|
connectionChannelHandlers.push(connectionHandler.path, (_, channel) => {
|
|
67
95
|
connectionHandler.onConnection(channel);
|
|
68
|
-
});
|
|
96
|
+
}, { independentOfShellEnvironment: connectionHandler.independentOfShellEnvironment });
|
|
69
97
|
}
|
|
70
98
|
return connectionChannelHandlers;
|
|
71
99
|
}
|
|
@@ -88,6 +116,9 @@ __decorate([
|
|
|
88
116
|
inject(ContributionProvider),
|
|
89
117
|
named(MessagingService.Contribution)
|
|
90
118
|
], DefaultMessagingService.prototype, "contributions", void 0);
|
|
119
|
+
__decorate([
|
|
120
|
+
inject(ShellEnvironmentServer)
|
|
121
|
+
], DefaultMessagingService.prototype, "shellEnvironment", void 0);
|
|
91
122
|
DefaultMessagingService = __decorate([
|
|
92
123
|
injectable()
|
|
93
124
|
], DefaultMessagingService);
|
|
@@ -97,9 +128,9 @@ export class ConnectionHandlers {
|
|
|
97
128
|
this.parent = parent;
|
|
98
129
|
this.handlers = [];
|
|
99
130
|
}
|
|
100
|
-
push(spec, callback) {
|
|
131
|
+
push(spec, callback, options = {}) {
|
|
101
132
|
const route = new Route(spec);
|
|
102
|
-
const
|
|
133
|
+
const handle = (path, channel) => {
|
|
103
134
|
const params = route.match(path);
|
|
104
135
|
if (!params) {
|
|
105
136
|
return false;
|
|
@@ -107,12 +138,12 @@ export class ConnectionHandlers {
|
|
|
107
138
|
callback(params, channel);
|
|
108
139
|
return route.reverse(params);
|
|
109
140
|
};
|
|
110
|
-
this.handlers.push(
|
|
141
|
+
this.handlers.push({ route, handle, independentOfShellEnvironment: options.independentOfShellEnvironment ?? false });
|
|
111
142
|
}
|
|
112
143
|
route(path, connection) {
|
|
113
|
-
for (const
|
|
144
|
+
for (const { handle } of this.handlers) {
|
|
114
145
|
try {
|
|
115
|
-
const result =
|
|
146
|
+
const result = handle(path, connection);
|
|
116
147
|
if (result) {
|
|
117
148
|
return result;
|
|
118
149
|
}
|
|
@@ -126,5 +157,16 @@ export class ConnectionHandlers {
|
|
|
126
157
|
}
|
|
127
158
|
return false;
|
|
128
159
|
}
|
|
160
|
+
/**
|
|
161
|
+
* Whether the handler of the given path is declared independent of the shell environment,
|
|
162
|
+
* see {@link ConnectionHandler.independentOfShellEnvironment}. A path without a handler is not.
|
|
163
|
+
*/
|
|
164
|
+
isIndependentOfShellEnvironment(path) {
|
|
165
|
+
const entry = this.handlers.find(({ route }) => !!route.match(path));
|
|
166
|
+
if (entry) {
|
|
167
|
+
return entry.independentOfShellEnvironment;
|
|
168
|
+
}
|
|
169
|
+
return this.parent?.isIndependentOfShellEnvironment(path) ?? false;
|
|
170
|
+
}
|
|
129
171
|
}
|
|
130
172
|
//# sourceMappingURL=default-messaging-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-messaging-service.js","sourceRoot":"","sources":["../../../src/node/messaging/default-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;;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAyB,MAAM,WAAW,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"default-messaging-service.js","sourceRoot":"","sources":["../../../src/node/messaging/default-messaging-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Channel, ChannelMultiplexer } from '../../common/message-rpc/channel.js';
|
|
2
|
+
/**
|
|
3
|
+
* A channel multiplexer that can defer the acknowledgement of a channel that the other side opens until a gate opens.
|
|
4
|
+
* The other side sends nothing on a channel before the acknowledgement, so nothing is lost while the channel is held.
|
|
5
|
+
*
|
|
6
|
+
* The backend holds the service channels of a frontend until the `PATH` of the user's login shell has been
|
|
7
|
+
* applied to `process.env`, so that the services find the user's tools,
|
|
8
|
+
* see `ShellEnvironmentServer` and `ConnectionHandler.independentOfShellEnvironment`.
|
|
9
|
+
*/
|
|
10
|
+
export declare class GatedChannelMultiplexer extends ChannelMultiplexer {
|
|
11
|
+
protected readonly gate: (id: string) => Promise<void> | undefined;
|
|
12
|
+
/**
|
|
13
|
+
* @param underlyingChannel the channel on which the channels are multiplexed
|
|
14
|
+
* @param gate tells how long to hold the channel of a given id before acknowledging it,
|
|
15
|
+
* or `undefined` to acknowledge it at once. The channel is acknowledged whether the promise resolves or rejects.
|
|
16
|
+
*/
|
|
17
|
+
constructor(underlyingChannel: Channel, gate: (id: string) => Promise<void> | undefined);
|
|
18
|
+
protected handleOpen(id: string): void;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=gated-channel-multiplexer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gated-channel-multiplexer.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/gated-channel-multiplexer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAElF;;;;;;;GAOG;AACH,qBAAa,uBAAwB,SAAQ,kBAAkB;IAOnB,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS;IAL1G;;;;OAIG;gBACS,iBAAiB,EAAE,OAAO,EAAqB,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS;cAIvF,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAclD"}
|
|
@@ -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"}
|