@theia/core 1.26.0-next.9 → 1.26.0

package/src/node/backend-application-module.ts

@@ -16,6 +16,7 @@
 
 import { ContainerModule, decorate, injectable } from 'inversify';
 import { ApplicationPackage } from '@theia/application-package';
+import { REQUEST_SERVICE_PATH } from '@theia/request';
 import {
     bindContributionProvider, MessageService, MessageClient, ConnectionHandler, JsonRpcConnectionHandler,
     CommandService, commandServicePath, messageServicePath
@@ -35,8 +36,10 @@ import { KeytarServiceImpl } from './keytar-server';
 import { ContributionFilterRegistry, ContributionFilterRegistryImpl } from '../common/contribution-filter';
 import { EnvironmentUtils } from './environment-utils';
 import { ProcessUtils } from './process-utils';
+import { ProxyCliContribution } from './request/proxy-cli-contribution';
 import { bindNodeStopwatch, bindBackendStopwatchServer } from './performance';
 import { OSBackendApplicationContribution } from './os-backend-application-contribution';
+import { BackendRequestFacade } from './request/backend-request-facade';
 
 decorate(injectable(), ApplicationPackage);
 
@@ -115,6 +118,14 @@ export const backendApplicationModule = new ContainerModule(bind => {
     bind(OSBackendApplicationContribution).toSelf().inSingletonScope();
     bind(BackendApplicationContribution).toService(OSBackendApplicationContribution);
 
+    bind(ProxyCliContribution).toSelf().inSingletonScope();
+    bind(CliContribution).toService(ProxyCliContribution);
+
+    bind(BackendRequestFacade).toSelf().inSingletonScope();
+    bind(ConnectionHandler).toDynamicValue(
+        ctx => new JsonRpcConnectionHandler(REQUEST_SERVICE_PATH, () => ctx.container.get(BackendRequestFacade))
+    ).inSingletonScope();
+
     bindNodeStopwatch(bind);
     bindBackendStopwatchServer(bind);
 });

package/src/node/cli.spec.ts

@@ -35,7 +35,7 @@ beforeEach(() => {
 describe('CliManager', () => {
     it('Parses simple option', async () => {
         const value = new Deferred<string>();
-        const mnr = new TestCliManager({
+        const manager = new TestCliManager({
             configure(conf: yargs.Argv): void {
                 conf.option('foo', { alias: 'f', description: 'Some foo.' });
                 conf.option('bar', { alias: 'b', description: 'Some bla.', default: 'my-default', type: 'string' });
@@ -44,13 +44,13 @@ describe('CliManager', () => {
                 value.resolve(args['foo'] as string);
             }
         });
-        await mnr.initializeCli(['-f', 'bla']);
+        await manager.initializeCli(['-f', 'bla']);
         chai.assert.equal(await value.promise, 'bla');
     });
 
     it('resolves with default', async () => {
         const value = new Deferred<string>();
-        const mnr = new TestCliManager({
+        const manager = new TestCliManager({
             configure(conf: yargs.Argv): void {
                 conf.option('foo', { alias: 'f', description: 'Some foo.' });
                 conf.option('bar', { alias: 'b', description: 'Some bla.', default: 'my-default', type: 'string' });
@@ -59,14 +59,14 @@ describe('CliManager', () => {
                 value.resolve(args['bar'] as string);
             }
         });
-        await mnr.initializeCli(['--foo']);
+        await manager.initializeCli(['--foo']);
         chai.assert.equal(await value.promise, 'my-default');
     });
 
     it('prints help and exits', async () =>
         assertExits(async () => {
-            const mnr = new TestCliManager();
-            await mnr.initializeCli(['--help']);
+            const manager = new TestCliManager();
+            await manager.initializeCli(['--help']);
         })
     );
 });

package/src/node/request/backend-request-facade.ts

@@ -0,0 +1,39 @@
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { inject, injectable } from 'inversify';
+import { RequestConfiguration, RequestContext, RequestOptions, RequestService } from '@theia/request';
+
+@injectable()
+export class BackendRequestFacade implements RequestService {
+
+    @inject(RequestService)
+    protected readonly requestService: RequestService;
+
+    configure(config: RequestConfiguration): Promise<void> {
+        return this.requestService.configure(config);
+    }
+
+    async request(options: RequestOptions): Promise<RequestContext> {
+        const context = await this.requestService.request(options);
+        return RequestContext.compress(context);
+    }
+
+    resolveProxy(url: string): Promise<string | undefined> {
+        return this.requestService.resolveProxy(url);
+    }
+
+}

package/src/node/request/backend-request-module.ts

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { ContainerModule, decorate, injectable } from 'inversify';
+import { RequestService } from '@theia/request';
+import { NodeRequestService } from '@theia/request/lib/node-request-service';
+
+decorate(injectable(), NodeRequestService);
+
+export default new ContainerModule(bind => {
+    bind(RequestService).to(NodeRequestService).inSingletonScope();
+});

package/src/node/request/proxy-cli-contribution.ts

@@ -0,0 +1,65 @@
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { inject, injectable } from 'inversify';
+import { MaybePromise } from '../../common/types';
+import { RequestConfiguration, RequestService } from '@theia/request';
+import { Argv, Arguments } from 'yargs';
+import { CliContribution } from '../cli';
+
+export const ProxyUrl = 'proxy-url';
+export const ProxyAuthorization = 'proxy-authorization';
+export const StrictSSL = 'strict-ssl';
+
+@injectable()
+export class ProxyCliContribution implements CliContribution {
+
+    @inject(RequestService)
+    protected readonly requestService: RequestService;
+
+    configure(conf: Argv): void {
+        conf.option(ProxyUrl, {
+            description: 'Sets the proxy URL for outgoing requests.',
+            type: 'string'
+        });
+        conf.option(ProxyAuthorization, {
+            description: 'Sets the proxy authorization header for outgoing requests.',
+            type: 'string'
+        });
+        conf.option(StrictSSL, {
+            description: 'Detemines whether SSL is strictly set for outgoing requests.',
+            type: 'boolean'
+        });
+    }
+
+    setArguments(args: Arguments): MaybePromise<void> {
+        const proxyUrl = args[ProxyUrl];
+        const authorization = args[ProxyAuthorization];
+        const strictSSL = args[StrictSSL];
+        const config: RequestConfiguration = {};
+        if (typeof proxyUrl === 'string') {
+            config.proxyUrl = proxyUrl.trim();
+        }
+        if (typeof authorization === 'string') {
+            config.proxyAuthorization = authorization;
+        }
+        if (typeof strictSSL === 'boolean') {
+            config.strictSSL = strictSSL;
+        }
+        this.requestService.configure(config);
+    }
+
+}