@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
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
+
var ElectronBackendRequestService_1;
|
|
16
17
|
import { __decorate } from "tslib";
|
|
17
18
|
import { decorate, injectable, inject, named } from 'inversify';
|
|
18
19
|
import { NodeRequestService } from '@theia/request/lib/node-request-service';
|
|
@@ -20,6 +21,25 @@ import { ElectronSecurityToken } from '../../electron-common/electron-token.js';
|
|
|
20
21
|
import { ILogger } from '../../common/index.js';
|
|
21
22
|
decorate(injectable(), NodeRequestService);
|
|
22
23
|
let ElectronBackendRequestService = class ElectronBackendRequestService extends NodeRequestService {
|
|
24
|
+
static { ElectronBackendRequestService_1 = this; }
|
|
25
|
+
static { this.pendingProxyRequests = new Map(); }
|
|
26
|
+
static { this.proxyResponseListenerAttached = false; }
|
|
27
|
+
static attachProxyResponseListener() {
|
|
28
|
+
if (this.proxyResponseListenerAttached || !process.send) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
this.proxyResponseListenerAttached = true;
|
|
32
|
+
process.on('message', (msg) => {
|
|
33
|
+
const response = msg;
|
|
34
|
+
if (response?.type === 'resolve-proxy-response' && response.id) {
|
|
35
|
+
const handler = this.pendingProxyRequests.get(response.id);
|
|
36
|
+
if (handler) {
|
|
37
|
+
this.pendingProxyRequests.delete(response.id);
|
|
38
|
+
handler(response.result);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
}
|
|
23
43
|
async getProxyUrl(url) {
|
|
24
44
|
if (this.proxyUrl) {
|
|
25
45
|
return this.proxyUrl;
|
|
@@ -27,8 +47,15 @@ let ElectronBackendRequestService = class ElectronBackendRequestService extends
|
|
|
27
47
|
try {
|
|
28
48
|
const proxy = await this.resolveProxy(url);
|
|
29
49
|
if (proxy && proxy !== 'DIRECT') {
|
|
30
|
-
|
|
31
|
-
|
|
50
|
+
// Handle fallback proxies separated by semicolons, e.g., "PROXY proxy:8080; DIRECT"
|
|
51
|
+
const firstProxy = proxy.split(';')[0].trim();
|
|
52
|
+
const proxyType = firstProxy.split(' ')[0]; // e.g., "PROXY", "HTTPS"
|
|
53
|
+
const proxyHost = firstProxy.split(' ')[1];
|
|
54
|
+
if (!proxyHost) {
|
|
55
|
+
// Malformed proxy string, fall back
|
|
56
|
+
return super.getProxyUrl(url);
|
|
57
|
+
}
|
|
58
|
+
return this.buildProxyUrl(proxyHost, proxyType);
|
|
32
59
|
}
|
|
33
60
|
}
|
|
34
61
|
catch (e) {
|
|
@@ -37,20 +64,36 @@ let ElectronBackendRequestService = class ElectronBackendRequestService extends
|
|
|
37
64
|
return super.getProxyUrl(url);
|
|
38
65
|
}
|
|
39
66
|
async resolveProxy(url) {
|
|
40
|
-
|
|
41
|
-
|
|
67
|
+
if (!process.send) {
|
|
68
|
+
// Running in --no-cluster mode (in the Electron main process): call session directly.
|
|
69
|
+
const { session } = await import('../../../electron-shared/electron/index.cjs');
|
|
70
|
+
return session.defaultSession.resolveProxy(url);
|
|
71
|
+
}
|
|
72
|
+
// Running as a forked child process: ask the main process via Node IPC.
|
|
73
|
+
return new Promise(resolve => {
|
|
74
|
+
const id = Math.random().toString(36).slice(2);
|
|
75
|
+
ElectronBackendRequestService_1.attachProxyResponseListener();
|
|
76
|
+
const timer = setTimeout(() => {
|
|
77
|
+
ElectronBackendRequestService_1.pendingProxyRequests.delete(id);
|
|
78
|
+
resolve(undefined);
|
|
79
|
+
}, 5000);
|
|
80
|
+
ElectronBackendRequestService_1.pendingProxyRequests.set(id, (result) => {
|
|
81
|
+
clearTimeout(timer);
|
|
82
|
+
resolve(result);
|
|
83
|
+
});
|
|
84
|
+
process.send({ type: 'resolve-proxy', id, url });
|
|
85
|
+
});
|
|
42
86
|
}
|
|
43
|
-
buildProxyUrl(
|
|
87
|
+
buildProxyUrl(proxyHost, proxyType) {
|
|
88
|
+
if (proxyType !== 'HTTPS' && proxyType !== 'PROXY') {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
44
91
|
if (proxyHost.startsWith('http://') || proxyHost.startsWith('https://')) {
|
|
45
92
|
return proxyHost;
|
|
46
93
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
else if (url.startsWith('https://')) {
|
|
51
|
-
return 'https://' + proxyHost;
|
|
52
|
-
}
|
|
53
|
-
return proxyHost;
|
|
94
|
+
return proxyType === 'HTTPS'
|
|
95
|
+
? 'https://' + proxyHost
|
|
96
|
+
: 'http://' + proxyHost;
|
|
54
97
|
}
|
|
55
98
|
async processOptions(options) {
|
|
56
99
|
options = await super.processOptions(options);
|
|
@@ -76,7 +119,7 @@ __decorate([
|
|
|
76
119
|
inject(ILogger),
|
|
77
120
|
named('core:ElectronBackendRequestService')
|
|
78
121
|
], ElectronBackendRequestService.prototype, "logger", void 0);
|
|
79
|
-
ElectronBackendRequestService = __decorate([
|
|
122
|
+
ElectronBackendRequestService = ElectronBackendRequestService_1 = __decorate([
|
|
80
123
|
injectable()
|
|
81
124
|
], ElectronBackendRequestService);
|
|
82
125
|
export { ElectronBackendRequestService };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-backend-request-service.js","sourceRoot":"","sources":["../../../src/electron-node/request/electron-backend-request-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF
|
|
1
|
+
{"version":3,"file":"electron-backend-request-service.js","sourceRoot":"","sources":["../../../src/electron-node/request/electron-backend-request-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-application-module.d.ts","sourceRoot":"","sources":["../../src/node/backend-application-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAwB,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"backend-application-module.d.ts","sourceRoot":"","sources":["../../src/node/backend-application-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAwB,MAAM,WAAW,CAAC;AAmElE,eAAO,MAAM,wBAAwB,iBAoHnC,CAAC"}
|
|
@@ -24,6 +24,8 @@ import { ApplicationServerImpl } from './application-server.js';
|
|
|
24
24
|
import { ApplicationServer, applicationPath } from '../common/application-protocol.js';
|
|
25
25
|
import { EnvVariablesServer, envVariablesPath } from './../common/env-variables/index.js';
|
|
26
26
|
import { EnvVariablesServerImpl } from './env-variables/index.js';
|
|
27
|
+
import { ShellEnvironmentServer, shellEnvironmentPath } from '../common/shell-environment.js';
|
|
28
|
+
import { ShellEnvironmentServerImpl } from './shell-environment.js';
|
|
27
29
|
import { ConnectionContainerModule } from './messaging/connection-container-module.js';
|
|
28
30
|
import { QuickInputService, quickInputServicePath, QuickPickService, quickPickServicePath } from '../common/quick-pick-service.js';
|
|
29
31
|
import { WsRequestValidator, WsRequestValidatorContribution } from './ws-request-validators.js';
|
|
@@ -86,30 +88,36 @@ export const backendApplicationModule = new ContainerModule(bind => {
|
|
|
86
88
|
bind(IPCConnectionProvider).toSelf().inSingletonScope();
|
|
87
89
|
bind(ApplicationServerImpl).toSelf().inSingletonScope();
|
|
88
90
|
bind(ApplicationServer).toService(ApplicationServerImpl);
|
|
89
|
-
|
|
91
|
+
// The services of this module start no processes and the frontend needs them to start up,
|
|
92
|
+
// so they are not held until the login shell environment is known (see ConnectionHandler.independentOfShellEnvironment).
|
|
93
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(applicationPath, () => ctx.container.get(ApplicationServer), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
90
94
|
bind(EnvVariablesServer).to(EnvVariablesServerImpl).inSingletonScope();
|
|
91
95
|
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(envVariablesPath, () => {
|
|
92
96
|
const envVariablesServer = ctx.container.get(EnvVariablesServer);
|
|
93
97
|
return envVariablesServer;
|
|
94
|
-
})).inSingletonScope();
|
|
98
|
+
}, { independentOfShellEnvironment: true })).inSingletonScope();
|
|
99
|
+
bind(ShellEnvironmentServerImpl).toSelf().inSingletonScope();
|
|
100
|
+
bind(ShellEnvironmentServer).toService(ShellEnvironmentServerImpl);
|
|
101
|
+
bind(BackendApplicationContribution).toService(ShellEnvironmentServerImpl);
|
|
102
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(shellEnvironmentPath, () => ctx.container.get(ShellEnvironmentServer), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
95
103
|
bind(ApplicationPackage).toConstantValue(new ApplicationPackage({ projectPath: BackendApplicationPath }));
|
|
96
104
|
bind(WsRequestValidator).toSelf().inSingletonScope();
|
|
97
105
|
bindRootContributionProvider(bind, WsRequestValidatorContribution);
|
|
98
106
|
bind(KeyStoreService).to(KeyStoreServiceImpl).inSingletonScope();
|
|
99
|
-
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(keyStoreServicePath, () => ctx.container.get(KeyStoreService))).inSingletonScope();
|
|
107
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(keyStoreServicePath, () => ctx.container.get(KeyStoreService), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
100
108
|
bind(ContributionFilterRegistry).to(ContributionFilterRegistryImpl).inSingletonScope();
|
|
101
109
|
bind(EnvironmentUtils).toSelf().inSingletonScope();
|
|
102
110
|
bind(ProcessUtils).toSelf().inSingletonScope();
|
|
103
111
|
bind(OSBackendProviderImpl).toSelf().inSingletonScope();
|
|
104
112
|
bind(OSBackendProvider).toService(OSBackendProviderImpl);
|
|
105
|
-
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(OSBackendProviderPath, () => ctx.container.get(OSBackendProvider))).inSingletonScope();
|
|
113
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(OSBackendProviderPath, () => ctx.container.get(OSBackendProvider), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
106
114
|
bind(ProxyCliContribution).toSelf().inSingletonScope();
|
|
107
115
|
bind(CliContribution).toService(ProxyCliContribution);
|
|
108
116
|
bindRootContributionProvider(bind, RemoteCliContribution);
|
|
109
117
|
bind(BackendRemoteService).toSelf().inSingletonScope();
|
|
110
118
|
bindRootContributionProvider(bind, BackendRequestAllowedContribution);
|
|
111
119
|
bind(BackendRequestFacade).toSelf().inSingletonScope();
|
|
112
|
-
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(REQUEST_SERVICE_PATH, () => ctx.container.get(BackendRequestFacade))).inSingletonScope();
|
|
120
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(REQUEST_SERVICE_PATH, () => ctx.container.get(BackendRequestFacade), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
113
121
|
bindNodeStopwatch(bind);
|
|
114
122
|
bindBackendStopwatchServer(bind);
|
|
115
123
|
bind(FileSystemLocking).to(FileSystemLockingImpl).inSingletonScope();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-application-module.js","sourceRoot":"","sources":["../../src/node/backend-application-module.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"backend-application-module.js","sourceRoot":"","sources":["../../src/node/backend-application-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { EnvVariable, EnvVariablesServer } from '../../common/env-variables/index.js';
|
|
2
2
|
import { ILogger } from '../../common/logger.js';
|
|
3
|
+
/**
|
|
4
|
+
* Serves the environment variables of the backend process.
|
|
5
|
+
*
|
|
6
|
+
* The variables are read from `process.env` on every request rather than captured once, because the backend
|
|
7
|
+
* takes the `PATH` of the user's login shell after it has started, see `ShellEnvironmentServer`.
|
|
8
|
+
*/
|
|
3
9
|
export declare class EnvVariablesServerImpl implements EnvVariablesServer {
|
|
4
|
-
protected readonly envs: {
|
|
5
|
-
[key: string]: EnvVariable;
|
|
6
|
-
};
|
|
7
10
|
protected readonly homeDirUri: string;
|
|
8
11
|
protected readonly configDirUri: Promise<string>;
|
|
9
12
|
protected readonly pathExistenceCache: {
|
|
@@ -11,6 +14,13 @@ export declare class EnvVariablesServerImpl implements EnvVariablesServer {
|
|
|
11
14
|
};
|
|
12
15
|
protected readonly logger: ILogger;
|
|
13
16
|
constructor();
|
|
17
|
+
/**
|
|
18
|
+
* The variables of `process.env` as of now, keyed by name, which is lower-cased on Windows.
|
|
19
|
+
* Both `getVariables` and `getValue` answer from it.
|
|
20
|
+
*/
|
|
21
|
+
protected get envs(): {
|
|
22
|
+
[key: string]: EnvVariable;
|
|
23
|
+
};
|
|
14
24
|
protected createConfigDirUri(): Promise<string>;
|
|
15
25
|
getExecPath(): Promise<string>;
|
|
16
26
|
getVariables(): Promise<EnvVariable[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-variables-server.d.ts","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAKtF,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"env-variables-server.d.ts","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAKtF,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD;;;;;GAKG;AACH,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,SAAS,CAAC,QAAQ,CAAC,UAAU,SAAwC;IACrE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAM;IAGvE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;;IAOnC;;;OAGG;IACH,SAAS,KAAK,IAAI,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAOnD;cAEe,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAuB/C,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9B,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAItC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAK7D,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAapC;;OAEG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAY1D"}
|
|
@@ -24,21 +24,30 @@ import { FileUri } from '../../common/file-uri.js';
|
|
|
24
24
|
import { BackendApplicationPath } from '../backend-application.js';
|
|
25
25
|
import { BackendApplicationConfigProvider } from '../backend-application-config-provider.js';
|
|
26
26
|
import { ILogger } from '../../common/logger.js';
|
|
27
|
+
/**
|
|
28
|
+
* Serves the environment variables of the backend process.
|
|
29
|
+
*
|
|
30
|
+
* The variables are read from `process.env` on every request rather than captured once, because the backend
|
|
31
|
+
* takes the `PATH` of the user's login shell after it has started, see `ShellEnvironmentServer`.
|
|
32
|
+
*/
|
|
27
33
|
let EnvVariablesServerImpl = class EnvVariablesServerImpl {
|
|
28
34
|
constructor() {
|
|
29
|
-
this.envs = {};
|
|
30
35
|
this.homeDirUri = FileUri.create(homedir()).toString();
|
|
31
36
|
this.pathExistenceCache = {};
|
|
32
37
|
this.configDirUri = this.createConfigDirUri();
|
|
33
38
|
this.configDirUri.then(configDirUri => this.logger.info(`Configuration directory URI: '${configDirUri}'`));
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* The variables of `process.env` as of now, keyed by name, which is lower-cased on Windows.
|
|
42
|
+
* Both `getVariables` and `getValue` answer from it.
|
|
43
|
+
*/
|
|
44
|
+
get envs() {
|
|
45
|
+
const envs = {};
|
|
46
|
+
for (const [key, value] of Object.entries(process.env)) {
|
|
47
|
+
const name = isWindows ? key.toLowerCase() : key;
|
|
48
|
+
envs[name] = { name, value };
|
|
49
|
+
}
|
|
50
|
+
return envs;
|
|
42
51
|
}
|
|
43
52
|
async createConfigDirUri() {
|
|
44
53
|
if (process.env.THEIA_CONFIG_DIR) {
|
|
@@ -66,13 +75,11 @@ let EnvVariablesServerImpl = class EnvVariablesServerImpl {
|
|
|
66
75
|
return process.execPath;
|
|
67
76
|
}
|
|
68
77
|
async getVariables() {
|
|
69
|
-
return Object.
|
|
78
|
+
return Object.values(this.envs);
|
|
70
79
|
}
|
|
71
80
|
async getValue(key) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}
|
|
75
|
-
return this.envs[key];
|
|
81
|
+
// `process.env` is case-insensitive on Windows, where the name is reported in lower case as in `getVariables`.
|
|
82
|
+
return this.envs[isWindows ? key.toLowerCase() : key];
|
|
76
83
|
}
|
|
77
84
|
getConfigDirUri() {
|
|
78
85
|
return this.configDirUri;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-variables-server.js","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.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,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"env-variables-server.js","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-variables-server.spec.d.ts","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,83 @@
|
|
|
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 { ILogger } from '../../common/logger.js';
|
|
19
|
+
import { isWindows } from '../../common/os.js';
|
|
20
|
+
import { MockLogger } from '../../common/test/mock-logger.js';
|
|
21
|
+
import { EnvVariablesServerImpl } from './env-variables-server.js';
|
|
22
|
+
describe('EnvVariablesServerImpl', () => {
|
|
23
|
+
const variable = 'THEIA_ENV_VARIABLES_SERVER_SPEC';
|
|
24
|
+
// the server reports the names in lower case on Windows, where the environment is case-insensitive
|
|
25
|
+
const name = isWindows ? variable.toLowerCase() : variable;
|
|
26
|
+
let configDir;
|
|
27
|
+
beforeEach(() => {
|
|
28
|
+
configDir = process.env.THEIA_CONFIG_DIR;
|
|
29
|
+
// keeps the server from looking the configuration directory up in the application configuration
|
|
30
|
+
process.env.THEIA_CONFIG_DIR = '/tmp/theia-env-variables-server-spec';
|
|
31
|
+
delete process.env[variable];
|
|
32
|
+
});
|
|
33
|
+
afterEach(() => {
|
|
34
|
+
if (configDir === undefined) {
|
|
35
|
+
delete process.env.THEIA_CONFIG_DIR;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
process.env.THEIA_CONFIG_DIR = configDir;
|
|
39
|
+
}
|
|
40
|
+
delete process.env[variable];
|
|
41
|
+
});
|
|
42
|
+
const create = (type = EnvVariablesServerImpl) => {
|
|
43
|
+
const container = new Container();
|
|
44
|
+
container.bind(ILogger).to(MockLogger);
|
|
45
|
+
container.bind(type).toSelf();
|
|
46
|
+
return container.get(type);
|
|
47
|
+
};
|
|
48
|
+
/** A server that reports an environment of its own, as a subclass might to mask or add variables. */
|
|
49
|
+
class MaskedEnvVariablesServer extends EnvVariablesServerImpl {
|
|
50
|
+
get envs() {
|
|
51
|
+
return { [name]: { name, value: 'masked' } };
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
it('reports the environment as it is at the time of the request', async () => {
|
|
55
|
+
const server = create();
|
|
56
|
+
expect(await server.getValue(variable)).to.be.undefined;
|
|
57
|
+
expect((await server.getVariables()).map(env => env.name)).not.to.include(name);
|
|
58
|
+
process.env[variable] = 'set after the server was created';
|
|
59
|
+
expect(await server.getValue(variable)).to.deep.equal({ name, value: 'set after the server was created' });
|
|
60
|
+
expect(await server.getVariables()).to.deep.include({ name, value: 'set after the server was created' });
|
|
61
|
+
process.env[variable] = 'changed';
|
|
62
|
+
expect(await server.getValue(variable)).to.deep.equal({ name, value: 'changed' });
|
|
63
|
+
});
|
|
64
|
+
it('answers a single variable from the environment that it reports as a whole', async () => {
|
|
65
|
+
const server = create(MaskedEnvVariablesServer);
|
|
66
|
+
process.env[variable] = 'in the process';
|
|
67
|
+
expect(await server.getVariables()).to.deep.equal([{ name, value: 'masked' }]);
|
|
68
|
+
expect(await server.getValue(variable)).to.deep.equal({ name, value: 'masked' });
|
|
69
|
+
expect(await server.getValue('PATH')).to.be.undefined;
|
|
70
|
+
});
|
|
71
|
+
it('looks a variable up regardless of case on Windows only', async () => {
|
|
72
|
+
const server = create();
|
|
73
|
+
process.env[variable] = 'value';
|
|
74
|
+
const found = await server.getValue(variable.toLowerCase());
|
|
75
|
+
if (isWindows) {
|
|
76
|
+
expect(found).to.deep.equal({ name, value: 'value' });
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
expect(found).to.be.undefined;
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
//# sourceMappingURL=env-variables-server.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-variables-server.spec.js","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,13 +24,13 @@ import { LocalizationServer, LocalizationServerPath } from '../../common/i18n/lo
|
|
|
24
24
|
import { BackendApplicationContribution } from '../backend-application.js';
|
|
25
25
|
export default new ContainerModule(bind => {
|
|
26
26
|
bind(LocalizationProvider).toSelf().inSingletonScope();
|
|
27
|
-
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(localizationPath, () => ctx.container.get(LocalizationProvider))).inSingletonScope();
|
|
27
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(localizationPath, () => ctx.container.get(LocalizationProvider), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
28
28
|
bind(LocalizationRegistry).toSelf().inSingletonScope();
|
|
29
29
|
bindRootContributionProvider(bind, LocalizationContribution);
|
|
30
30
|
bind(LocalizationServerImpl).toSelf().inSingletonScope();
|
|
31
31
|
bind(LocalizationServer).toService(LocalizationServerImpl);
|
|
32
32
|
bind(BackendApplicationContribution).toService(LocalizationServerImpl);
|
|
33
|
-
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(LocalizationServerPath, () => ctx.container.get(LocalizationServer))).inSingletonScope();
|
|
33
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(LocalizationServerPath, () => ctx.container.get(LocalizationServer), { independentOfShellEnvironment: true })).inSingletonScope();
|
|
34
34
|
bind(TheiaLocalizationContribution).toSelf().inSingletonScope();
|
|
35
35
|
bind(LocalizationContribution).toService(TheiaLocalizationContribution);
|
|
36
36
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n-backend-module.js","sourceRoot":"","sources":["../../../src/node/i18n/i18n-backend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAC9G,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AACtG,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAE3E,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"i18n-backend-module.js","sourceRoot":"","sources":["../../../src/node/i18n/i18n-backend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAC9G,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AACtG,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAE3E,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,EAAE,6BAA6B,EAAE,IAAI,EAAE,CAAC,CACrI,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,4BAA4B,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;IAC7D,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,8BAA8B,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACvE,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,oBAAoB,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,EAAE,6BAA6B,EAAE,IAAI,EAAE,CAAC,CACzI,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAI,CAAC,6BAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC"}
|
package/lib/node/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export * from './cli.js';
|
|
|
7
7
|
export * from './setting-service.js';
|
|
8
8
|
export { FileSystemLocking } from './filesystem-locking.js';
|
|
9
9
|
export { BundledResourceProvider } from './bundled-resource-provider.js';
|
|
10
|
+
export { ShellEnvironmentServerImpl, ShellEnvironmentTimeoutError } from './shell-environment.js';
|
|
10
11
|
export { BackendRequestAllowedContribution } from './request/backend-request-facade.js';
|
|
11
12
|
export { HttpConnectionValidator } from './hosting/browser-connection-token.js';
|
|
12
13
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/node/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAgBA,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAgBA,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC"}
|
package/lib/node/index.js
CHANGED
|
@@ -22,6 +22,7 @@ export * from './cli.js';
|
|
|
22
22
|
export * from './setting-service.js';
|
|
23
23
|
export { FileSystemLocking } from './filesystem-locking.js';
|
|
24
24
|
export { BundledResourceProvider } from './bundled-resource-provider.js';
|
|
25
|
+
export { ShellEnvironmentServerImpl, ShellEnvironmentTimeoutError } from './shell-environment.js';
|
|
25
26
|
export { BackendRequestAllowedContribution } from './request/backend-request-facade.js';
|
|
26
27
|
export { HttpConnectionValidator } from './hosting/browser-connection-token.js';
|
|
27
28
|
//# sourceMappingURL=index.js.map
|
package/lib/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/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,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/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,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC"}
|
|
@@ -69,6 +69,6 @@ export const loggerBackendModule = new ContainerModule(bind => {
|
|
|
69
69
|
dispatching.clients.add(client);
|
|
70
70
|
client.onDidCloseConnection(() => dispatching.clients.delete(client));
|
|
71
71
|
return container.get(ILoggerServer);
|
|
72
|
-
})).inSingletonScope();
|
|
72
|
+
}, { independentOfShellEnvironment: true })).inSingletonScope();
|
|
73
73
|
});
|
|
74
74
|
//# sourceMappingURL=logger-backend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-backend-module.js","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,eAAe,EAAE,SAAS,EAAc,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,aAAa,EAAiB,UAAU,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,UAAU,UAAU,CAAC,IAAqB,EAAE,KAEjD;IACG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3G,IAAI,KAAK,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC;YAC1C,KAAK,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACzD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAChC,CAAC,IAAY,EAAE,EAAE;QACb,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CACJ,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IAC1D,IAAI,CAAC,8BAA8B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAC1D,CAAC;QACG,UAAU;YACN,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAU,OAAO,CAAC,CAAC,CAAC;QACvD,CAAC;KACJ,CAAC,CAAC,CAAC;IAEJ,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,UAAU,CAAC,IAAI,EAAE;QACb,wBAAwB,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,uBAAuB,GAAG,SAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACvE,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;YAE1C,8CAA8C;YAC9C,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACnD,uBAAuB,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;YAErE,yDAAyD;YACzD,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC,CAAC;QACN,CAAC;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACrD,IAAI,oBAAoB,CAAgB,UAAU,EAAE,MAAM,CAAC,EAAE;QACzD,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAC3D,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,GAAG,CAAgB,aAAa,CAAC,CAAC;IACvD,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"logger-backend-module.js","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,eAAe,EAAE,SAAS,EAAc,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,aAAa,EAAiB,UAAU,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,UAAU,UAAU,CAAC,IAAqB,EAAE,KAEjD;IACG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3G,IAAI,KAAK,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC;YAC1C,KAAK,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACzD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAChC,CAAC,IAAY,EAAE,EAAE;QACb,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CACJ,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IAC1D,IAAI,CAAC,8BAA8B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAC1D,CAAC;QACG,UAAU;YACN,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAU,OAAO,CAAC,CAAC,CAAC;QACvD,CAAC;KACJ,CAAC,CAAC,CAAC;IAEJ,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,UAAU,CAAC,IAAI,EAAE;QACb,wBAAwB,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,uBAAuB,GAAG,SAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACvE,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;YAE1C,8CAA8C;YAC9C,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACnD,uBAAuB,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;YAErE,yDAAyD;YACzD,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC,CAAC;QACN,CAAC;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACrD,IAAI,oBAAoB,CAAgB,UAAU,EAAE,MAAM,CAAC,EAAE;QACzD,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAC3D,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,GAAG,CAAgB,aAAa,CAAC,CAAC;IACvD,CAAC,EAAE,EAAE,6BAA6B,EAAE,IAAI,EAAE,CAAC,CAC9C,CAAC,gBAAgB,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { interfaces, ContainerModule } from 'inversify';
|
|
2
|
-
import { RpcProxy } from '../../common/index.js';
|
|
2
|
+
import { RpcConnectionHandlerOptions, RpcProxy } from '../../common/index.js';
|
|
3
3
|
export type BindFrontendService = <T extends object>(path: string, serviceIdentifier: interfaces.ServiceIdentifier<T>) => interfaces.BindingWhenOnSyntax<T>;
|
|
4
|
-
export type BindBackendService = <T extends object, C extends object = object>(path: string, serviceIdentifier: interfaces.ServiceIdentifier<T>, onActivation?: (service: T, proxy: RpcProxy<C>) => T) => void;
|
|
4
|
+
export type BindBackendService = <T extends object, C extends object = object>(path: string, serviceIdentifier: interfaces.ServiceIdentifier<T>, onActivation?: (service: T, proxy: RpcProxy<C>) => T, options?: RpcConnectionHandlerOptions<T>) => void;
|
|
5
5
|
export type ConnectionContainerModuleCallBack = (registry: {
|
|
6
6
|
bind: interfaces.Bind;
|
|
7
7
|
unbind: interfaces.Unbind;
|
|
@@ -39,6 +39,15 @@ export type ConnectionContainerModuleCallBack = (registry: {
|
|
|
39
39
|
* }
|
|
40
40
|
* ```
|
|
41
41
|
*
|
|
42
|
+
* A backend service is held until the environment of the user's login shell is known, unless it is declared independent of it,
|
|
43
|
+
* see `ConnectionHandler.independentOfShellEnvironment`:
|
|
44
|
+
* ```ts
|
|
45
|
+
* const myConnectionModule3 = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
|
|
46
|
+
* bind(MyStartupService).toSelf().inSingletonScope();
|
|
47
|
+
* bindBackendService(myStartupServicePath, MyStartupService, undefined, { independentOfShellEnvironment: true });
|
|
48
|
+
* });
|
|
49
|
+
* ```
|
|
50
|
+
*
|
|
42
51
|
* #### Injecting a frontend service
|
|
43
52
|
* ```ts
|
|
44
53
|
* @injectable()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-container-module.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/connection-container-module.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA4D,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"connection-container-module.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/connection-container-module.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA4D,2BAA2B,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAExI,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;AAC5J,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,EACzE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EACtH,OAAO,CAAC,EAAE,2BAA2B,CAAC,CAAC,CAAC,KACvC,IAAI,CAAC;AACV,MAAM,MAAM,iCAAiC,GAAG,CAAC,QAAQ,EAAE;IACvD,IAAI,EAAE,UAAU,CAAC,IAAI,CAAA;IACrB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAA;IACzB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAA;IAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,CAAA;IACzB,mBAAmB,EAAE,mBAAmB,CAAA;IACxC,kBAAkB,EAAE,kBAAkB,CAAA;CACzC,KAAK,IAAI,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,GAAG;IAAE,MAAM,CAAC,QAAQ,EAAE,iCAAiC,GAAG,eAAe,CAAA;CAyBrH,CAAC"}
|
|
@@ -45,6 +45,15 @@ import { RpcProxyFactory, ConnectionHandler, RpcConnectionHandler } from '../../
|
|
|
45
45
|
* }
|
|
46
46
|
* ```
|
|
47
47
|
*
|
|
48
|
+
* A backend service is held until the environment of the user's login shell is known, unless it is declared independent of it,
|
|
49
|
+
* see `ConnectionHandler.independentOfShellEnvironment`:
|
|
50
|
+
* ```ts
|
|
51
|
+
* const myConnectionModule3 = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
|
|
52
|
+
* bind(MyStartupService).toSelf().inSingletonScope();
|
|
53
|
+
* bindBackendService(myStartupServicePath, MyStartupService, undefined, { independentOfShellEnvironment: true });
|
|
54
|
+
* });
|
|
55
|
+
* ```
|
|
56
|
+
*
|
|
48
57
|
* #### Injecting a frontend service
|
|
49
58
|
* ```ts
|
|
50
59
|
* @injectable()
|
|
@@ -62,15 +71,17 @@ export const ConnectionContainerModule = Object.assign(Symbol('ConnectionContain
|
|
|
62
71
|
const service = serviceFactory.createProxy();
|
|
63
72
|
bind(ConnectionHandler).toConstantValue({
|
|
64
73
|
path,
|
|
74
|
+
// the backend only calls the frontend through this channel, so there is nothing to hold
|
|
75
|
+
independentOfShellEnvironment: true,
|
|
65
76
|
onConnection: connection => serviceFactory.listen(connection)
|
|
66
77
|
});
|
|
67
78
|
return bind(serviceIdentifier).toConstantValue(service);
|
|
68
79
|
};
|
|
69
|
-
const bindBackendService = (path, serviceIdentifier, onActivation) => {
|
|
80
|
+
const bindBackendService = (path, serviceIdentifier, onActivation, options) => {
|
|
70
81
|
bind(ConnectionHandler).toDynamicValue(context => new RpcConnectionHandler(path, proxy => {
|
|
71
82
|
const service = context.container.get(serviceIdentifier);
|
|
72
83
|
return onActivation ? onActivation(service, proxy) : service;
|
|
73
|
-
})).inSingletonScope();
|
|
84
|
+
}, options)).inSingletonScope();
|
|
74
85
|
};
|
|
75
86
|
callback({ bind, unbind, isBound, rebind, bindFrontendService, bindBackendService });
|
|
76
87
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-container-module.js","sourceRoot":"","sources":["../../../src/node/messaging/connection-container-module.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,uDAAuD;AAEvD,OAAO,EAAc,eAAe,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"connection-container-module.js","sourceRoot":"","sources":["../../../src/node/messaging/connection-container-module.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,uDAAuD;AAEvD,OAAO,EAAc,eAAe,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,oBAAoB,EAAyC,MAAM,uBAAuB,CAAC;AAgBxI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAsF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,2BAA2B,CAAC,EAAE;IAC3K,MAAM,CAAC,QAA2C;QAC9C,OAAO,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzD,MAAM,mBAAmB,GAAwB,CAAC,IAAI,EAAE,iBAAiB,EAAE,EAAE;gBACzE,MAAM,cAAc,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC7C,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;gBAC7C,IAAI,CAAoB,iBAAiB,CAAC,CAAC,eAAe,CAAC;oBACvD,IAAI;oBACJ,wFAAwF;oBACxF,6BAA6B,EAAE,IAAI;oBACnC,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC;iBAChE,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,OAAc,CAAC,CAAC;YACnE,CAAC,CAAC;YACF,MAAM,kBAAkB,GAAuB,CAAC,IAAI,EAAE,iBAAiB,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;gBAC9F,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAC7C,IAAI,oBAAoB,CAAM,IAAI,EAAE,KAAK,CAAC,EAAE;oBACxC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;oBACzD,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjE,CAAC,EAAE,OAAO,CAAC,CACd,CAAC,gBAAgB,EAAE,CAAC;YACzB,CAAC,CAAC;YACF,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC,CAAC"}
|