@theia/core 1.44.0 → 1.45.0

package/lib/node/messaging/messaging-contribution.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"messaging-contribution.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/messaging-contribution.ts"],"names":[],"mappings":"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"}

package/lib/node/messaging/messaging-contribution.js

@@ -1,210 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2018 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var MessagingContribution_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessagingContribution = exports.MessagingContainer = void 0;
-const socket_io_1 = require("socket.io");
-const inversify_1 = require("inversify");
-const common_1 = require("../../common");
-const web_socket_channel_1 = require("../../common/messaging/web-socket-channel");
-const messaging_service_1 = require("./messaging-service");
-const connection_container_module_1 = require("./connection-container-module");
-const Route = require("route-parser");
-const ws_request_validators_1 = require("../ws-request-validators");
-const messaging_listeners_1 = require("./messaging-listeners");
-const channel_1 = require("../../common/message-rpc/channel");
-exports.MessagingContainer = Symbol('MessagingContainer');
-let MessagingContribution = MessagingContribution_1 = class MessagingContribution {
-    constructor() {
-        this.wsHandlers = new MessagingContribution_1.ConnectionHandlers();
-        this.channelHandlers = new MessagingContribution_1.ConnectionHandlers();
-        this.checkAliveTimeout = 30000; // 30 seconds
-        this.maxHttpBufferSize = 1e8; // 100 MB
-    }
-    init() {
-        this.ws(web_socket_channel_1.WebSocketChannel.wsPath, (_, socket) => this.handleChannels(socket));
-        for (const contribution of this.contributions.getContributions()) {
-            contribution.configure(this);
-        }
-    }
-    wsChannel(spec, callback) {
-        this.channelHandlers.push(spec, (params, channel) => callback(params, channel));
-    }
-    ws(spec, callback) {
-        this.wsHandlers.push(spec, callback);
-    }
-    onStart(server) {
-        const socketServer = new socket_io_1.Server(server, {
-            pingInterval: this.checkAliveTimeout,
-            pingTimeout: this.checkAliveTimeout * 2,
-            maxHttpBufferSize: this.maxHttpBufferSize
-        });
-        // Accept every namespace by using /.*/
-        socketServer.of(/.*/).on('connection', async (socket) => {
-            const request = socket.request;
-            // Socket.io strips the `origin` header of the incoming request
-            // We provide a `fix-origin` header in the `WebSocketConnectionProvider`
-            request.headers.origin = request.headers['fix-origin'];
-            if (await this.allowConnect(socket.request)) {
-                await this.handleConnection(socket);
-                this.messagingListener.onDidWebSocketUpgrade(socket.request, socket);
-            }
-            else {
-                socket.disconnect(true);
-            }
-        });
-    }
-    async handleConnection(socket) {
-        const pathname = socket.nsp.name;
-        if (pathname && !this.wsHandlers.route(pathname, socket)) {
-            console.error('Cannot find a ws handler for the path: ' + pathname);
-        }
-    }
-    async allowConnect(request) {
-        try {
-            return this.wsRequestValidator.allowWsUpgrade(request);
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    handleChannels(socket) {
-        const socketChannel = new web_socket_channel_1.WebSocketChannel(this.toIWebSocket(socket));
-        const multiplexer = new channel_1.ChannelMultiplexer(socketChannel);
-        const channelHandlers = this.getConnectionChannelHandlers(socket);
-        multiplexer.onDidOpenChannel(event => {
-            if (channelHandlers.route(event.id, event.channel)) {
-                console.debug(`Opening channel for service path '${event.id}'.`);
-                event.channel.onClose(() => console.debug(`Closing channel on service path '${event.id}'.`));
-            }
-        });
-    }
-    toIWebSocket(socket) {
-        return {
-            close: () => {
-                socket.removeAllListeners('disconnect');
-                socket.removeAllListeners('error');
-                socket.removeAllListeners('message');
-                socket.disconnect();
-            },
-            isConnected: () => socket.connected,
-            onClose: cb => socket.on('disconnect', reason => cb(reason)),
-            onError: cb => socket.on('error', error => cb(error)),
-            onMessage: cb => socket.on('message', data => cb(data)),
-            send: message => socket.emit('message', message)
-        };
-    }
-    createSocketContainer(socket) {
-        const connectionContainer = this.container.createChild();
-        connectionContainer.bind(socket_io_1.Socket).toConstantValue(socket);
-        return connectionContainer;
-    }
-    getConnectionChannelHandlers(socket) {
-        const connectionContainer = this.createSocketContainer(socket);
-        (0, common_1.bindContributionProvider)(connectionContainer, common_1.ConnectionHandler);
-        connectionContainer.load(...this.connectionModules.getContributions());
-        const connectionChannelHandlers = new MessagingContribution_1.ConnectionHandlers(this.channelHandlers);
-        const connectionHandlers = connectionContainer.getNamed(common_1.ContributionProvider, common_1.ConnectionHandler);
-        for (const connectionHandler of connectionHandlers.getContributions(true)) {
-            connectionChannelHandlers.push(connectionHandler.path, (_, channel) => {
-                connectionHandler.onConnection(channel);
-            });
-        }
-        return connectionChannelHandlers;
-    }
-};
-__decorate([
-    (0, inversify_1.inject)(exports.MessagingContainer),
-    __metadata("design:type", Object)
-], MessagingContribution.prototype, "container", void 0);
-__decorate([
-    (0, inversify_1.inject)(common_1.ContributionProvider),
-    (0, inversify_1.named)(connection_container_module_1.ConnectionContainerModule),
-    __metadata("design:type", Object)
-], MessagingContribution.prototype, "connectionModules", void 0);
-__decorate([
-    (0, inversify_1.inject)(common_1.ContributionProvider),
-    (0, inversify_1.named)(messaging_service_1.MessagingService.Contribution),
-    __metadata("design:type", Object)
-], MessagingContribution.prototype, "contributions", void 0);
-__decorate([
-    (0, inversify_1.inject)(ws_request_validators_1.WsRequestValidator),
-    __metadata("design:type", ws_request_validators_1.WsRequestValidator)
-], MessagingContribution.prototype, "wsRequestValidator", void 0);
-__decorate([
-    (0, inversify_1.inject)(messaging_listeners_1.MessagingListener),
-    __metadata("design:type", messaging_listeners_1.MessagingListener)
-], MessagingContribution.prototype, "messagingListener", void 0);
-__decorate([
-    (0, inversify_1.postConstruct)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], MessagingContribution.prototype, "init", null);
-MessagingContribution = MessagingContribution_1 = __decorate([
-    (0, inversify_1.injectable)()
-], MessagingContribution);
-exports.MessagingContribution = MessagingContribution;
-(function (MessagingContribution) {
-    class ConnectionHandlers {
-        constructor(parent) {
-            this.parent = parent;
-            this.handlers = [];
-        }
-        push(spec, callback) {
-            const route = new Route(spec);
-            const handler = (path, channel) => {
-                const params = route.match(path);
-                if (!params) {
-                    return false;
-                }
-                callback(params, channel);
-                return route.reverse(params);
-            };
-            this.handlers.push(handler);
-        }
-        route(path, connection) {
-            for (const handler of this.handlers) {
-                try {
-                    const result = handler(path, connection);
-                    if (result) {
-                        return result;
-                    }
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }
-            if (this.parent) {
-                return this.parent.route(path, connection);
-            }
-            return false;
-        }
-    }
-    MessagingContribution.ConnectionHandlers = ConnectionHandlers;
-})(MessagingContribution = exports.MessagingContribution || (exports.MessagingContribution = {}));
-exports.MessagingContribution = MessagingContribution;
-//# sourceMappingURL=messaging-contribution.js.map

package/lib/node/messaging/messaging-contribution.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"messaging-contribution.js","sourceRoot":"","sources":["../../../src/node/messaging/messaging-contribution.ts"],"names":[],"mappings":"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"}

package/src/common/messaging/abstract-connection-provider.ts

@@ -1,115 +0,0 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, interfaces } from 'inversify';
-import { Emitter, Event } from '../event';
-import { ConnectionHandler } from './handler';
-import { RpcProxy, RpcProxyFactory } from './proxy-factory';
-import { Channel, ChannelMultiplexer } from '../message-rpc/channel';
-
-/**
- * Factor common logic according to `ElectronIpcConnectionProvider` and
- * `WebSocketConnectionProvider`. This class handles channels in a somewhat
- * generic way.
- */
-@injectable()
-export abstract class AbstractConnectionProvider<AbstractOptions extends object> {
-
-    /**
-     * Create a proxy object to remote interface of T type
-     * over an electron ipc connection for the given path and proxy factory.
-     */
-    static createProxy<T extends object>(container: interfaces.Container, path: string, factory: RpcProxyFactory<T>): RpcProxy<T>;
-    /**
-     * Create a proxy object to remote interface of T type
-     * over an electron ipc connection for the given path.
-     *
-     * An optional target can be provided to handle
-     * notifications and requests from a remote side.
-     */
-    static createProxy<T extends object>(container: interfaces.Container, path: string, target?: object): RpcProxy<T> {
-        throw new Error('abstract');
-    }
-
-    protected readonly onIncomingMessageActivityEmitter: Emitter<void> = new Emitter();
-    get onIncomingMessageActivity(): Event<void> {
-        return this.onIncomingMessageActivityEmitter.event;
-    }
-
-    /**
-     * Create a proxy object to remote interface of T type
-     * over a web socket connection for the given path and proxy factory.
-     */
-    createProxy<T extends object>(path: string, factory: RpcProxyFactory<T>): RpcProxy<T>;
-    /**
-     * Create a proxy object to remote interface of T type
-     * over a web socket connection for the given path.
-     *
-     * An optional target can be provided to handle
-     * notifications and requests from a remote side.
-     */
-    createProxy<T extends object>(path: string, target?: object): RpcProxy<T>;
-    createProxy<T extends object>(path: string, arg?: object): RpcProxy<T> {
-        const factory = arg instanceof RpcProxyFactory ? arg : new RpcProxyFactory<T>(arg);
-        this.listen({
-            path,
-            onConnection: c => factory.listen(c)
-        });
-        return factory.createProxy();
-    }
-
-    protected channelMultiplexer?: ChannelMultiplexer;
-
-    // A set of channel opening functions that are executed if the backend reconnects to restore the
-    // the channels that were open before the disconnect occurred.
-    protected reconnectChannelOpeners: Array<() => Promise<void>> = [];
-
-    protected initializeMultiplexer(): void {
-        const mainChannel = this.createMainChannel();
-        mainChannel.onMessage(() => this.onIncomingMessageActivityEmitter.fire());
-        this.channelMultiplexer = new ChannelMultiplexer(mainChannel);
-    }
-
-    /**
-     * Install a connection handler for the given path.
-     */
-    listen(handler: ConnectionHandler, options?: AbstractOptions): void {
-        this.openChannel(handler.path, channel => {
-            handler.onConnection(channel);
-        }, options);
-    }
-
-    async openChannel(path: string, handler: (channel: Channel) => void, options?: AbstractOptions): Promise<void> {
-        if (!this.channelMultiplexer) {
-            throw new Error('The channel multiplexer has not been initialized yet!');
-        }
-        const newChannel = await this.channelMultiplexer.open(path);
-        newChannel.onClose(() => {
-            const { reconnecting } = { reconnecting: true, ...options };
-            if (reconnecting) {
-                this.reconnectChannelOpeners.push(() => this.openChannel(path, handler, options));
-            }
-        });
-
-        handler(newChannel);
-    }
-
-    /**
-     * Create the main connection that is used for multiplexing all service channels.
-     */
-    protected abstract createMainChannel(): Channel;
-
-}

package/src/electron-node/token/electron-token-messaging-contribution.ts

@@ -1,41 +0,0 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as http from 'http';
-import { injectable, inject } from 'inversify';
-import { MessagingContribution } from '../../node/messaging/messaging-contribution';
-import { ElectronTokenValidator } from './electron-token-validator';
-
-/**
- * Override the browser MessagingContribution class to refuse connections that do not include a specific token.
- * @deprecated since 1.8.0
- */
-@injectable()
-export class ElectronMessagingContribution extends MessagingContribution {
-
-    @inject(ElectronTokenValidator)
-    protected readonly tokenValidator: ElectronTokenValidator;
-
-    /**
-     * Only allow token-bearers.
-     */
-    protected override async allowConnect(request: http.IncomingMessage): Promise<boolean> {
-        if (this.tokenValidator.allowRequest(request)) {
-            return super.allowConnect(request);
-        }
-        return false;
-    }
-}

package/src/node/messaging/messaging-contribution.ts

@@ -1,197 +0,0 @@
-// *****************************************************************************
-// Copyright (C) 2018 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as http from 'http';
-import * as https from 'https';
-import { Server, Socket } from 'socket.io';
-import { injectable, inject, named, postConstruct, interfaces, Container } from 'inversify';
-import { ContributionProvider, ConnectionHandler, bindContributionProvider } from '../../common';
-import { IWebSocket, WebSocketChannel } from '../../common/messaging/web-socket-channel';
-import { BackendApplicationContribution } from '../backend-application';
-import { MessagingService } from './messaging-service';
-import { ConnectionContainerModule } from './connection-container-module';
-import Route = require('route-parser');
-import { WsRequestValidator } from '../ws-request-validators';
-import { MessagingListener } from './messaging-listeners';
-import { Channel, ChannelMultiplexer } from '../../common/message-rpc/channel';
-
-export const MessagingContainer = Symbol('MessagingContainer');
-
-@injectable()
-export class MessagingContribution implements BackendApplicationContribution, MessagingService {
-
-    @inject(MessagingContainer)
-    protected readonly container: interfaces.Container;
-
-    @inject(ContributionProvider) @named(ConnectionContainerModule)
-    protected readonly connectionModules: ContributionProvider<interfaces.ContainerModule>;
-
-    @inject(ContributionProvider) @named(MessagingService.Contribution)
-    protected readonly contributions: ContributionProvider<MessagingService.Contribution>;
-
-    @inject(WsRequestValidator)
-    protected readonly wsRequestValidator: WsRequestValidator;
-
-    @inject(MessagingListener)
-    protected readonly messagingListener: MessagingListener;
-
-    protected readonly wsHandlers = new MessagingContribution.ConnectionHandlers<Socket>();
-    protected readonly channelHandlers = new MessagingContribution.ConnectionHandlers<Channel>();
-
-    @postConstruct()
-    protected init(): void {
-        this.ws(WebSocketChannel.wsPath, (_, socket) => this.handleChannels(socket));
-        for (const contribution of this.contributions.getContributions()) {
-            contribution.configure(this);
-        }
-    }
-
-    wsChannel(spec: string, callback: (params: MessagingService.PathParams, channel: Channel) => void): void {
-        this.channelHandlers.push(spec, (params, channel) => callback(params, channel));
-    }
-
-    ws(spec: string, callback: (params: MessagingService.PathParams, socket: Socket) => void): void {
-        this.wsHandlers.push(spec, callback);
-    }
-
-    protected checkAliveTimeout = 30000; // 30 seconds
-    protected maxHttpBufferSize = 1e8; // 100 MB
-
-    onStart(server: http.Server | https.Server): void {
-        const socketServer = new Server(server, {
-            pingInterval: this.checkAliveTimeout,
-            pingTimeout: this.checkAliveTimeout * 2,
-            maxHttpBufferSize: this.maxHttpBufferSize
-        });
-        // Accept every namespace by using /.*/
-        socketServer.of(/.*/).on('connection', async socket => {
-            const request = socket.request;
-            // Socket.io strips the `origin` header of the incoming request
-            // We provide a `fix-origin` header in the `WebSocketConnectionProvider`
-            request.headers.origin = request.headers['fix-origin'] as string;
-            if (await this.allowConnect(socket.request)) {
-                await this.handleConnection(socket);
-                this.messagingListener.onDidWebSocketUpgrade(socket.request, socket);
-            } else {
-                socket.disconnect(true);
-            }
-        });
-    }
-
-    protected async handleConnection(socket: Socket): Promise<void> {
-        const pathname = socket.nsp.name;
-        if (pathname && !this.wsHandlers.route(pathname, socket)) {
-            console.error('Cannot find a ws handler for the path: ' + pathname);
-        }
-    }
-
-    protected async allowConnect(request: http.IncomingMessage): Promise<boolean> {
-        try {
-            return this.wsRequestValidator.allowWsUpgrade(request);
-        } catch (e) {
-            return false;
-        }
-    }
-
-    protected handleChannels(socket: Socket): void {
-        const socketChannel = new WebSocketChannel(this.toIWebSocket(socket));
-        const multiplexer = new ChannelMultiplexer(socketChannel);
-        const channelHandlers = this.getConnectionChannelHandlers(socket);
-        multiplexer.onDidOpenChannel(event => {
-            if (channelHandlers.route(event.id, event.channel)) {
-                console.debug(`Opening channel for service path '${event.id}'.`);
-                event.channel.onClose(() => console.debug(`Closing channel on service path '${event.id}'.`));
-            }
-        });
-    }
-
-    protected toIWebSocket(socket: Socket): IWebSocket {
-        return {
-            close: () => {
-                socket.removeAllListeners('disconnect');
-                socket.removeAllListeners('error');
-                socket.removeAllListeners('message');
-                socket.disconnect();
-            },
-            isConnected: () => socket.connected,
-            onClose: cb => socket.on('disconnect', reason => cb(reason)),
-            onError: cb => socket.on('error', error => cb(error)),
-            onMessage: cb => socket.on('message', data => cb(data)),
-            send: message => socket.emit('message', message)
-        };
-    }
-
-    protected createSocketContainer(socket: Socket): Container {
-        const connectionContainer: Container = this.container.createChild() as Container;
-        connectionContainer.bind(Socket).toConstantValue(socket);
-        return connectionContainer;
-    }
-
-    protected getConnectionChannelHandlers(socket: Socket): MessagingContribution.ConnectionHandlers<Channel> {
-        const connectionContainer = this.createSocketContainer(socket);
-        bindContributionProvider(connectionContainer, ConnectionHandler);
-        connectionContainer.load(...this.connectionModules.getContributions());
-        const connectionChannelHandlers = new MessagingContribution.ConnectionHandlers(this.channelHandlers);
-        const connectionHandlers = connectionContainer.getNamed<ContributionProvider<ConnectionHandler>>(ContributionProvider, ConnectionHandler);
-        for (const connectionHandler of connectionHandlers.getContributions(true)) {
-            connectionChannelHandlers.push(connectionHandler.path, (_, channel) => {
-                connectionHandler.onConnection(channel);
-            });
-        }
-        return connectionChannelHandlers;
-    }
-
-}
-
-export namespace MessagingContribution {
-    export class ConnectionHandlers<T> {
-        protected readonly handlers: ((path: string, connection: T) => string | false)[] = [];
-
-        constructor(
-            protected readonly parent?: ConnectionHandlers<T>
-        ) { }
-
-        push(spec: string, callback: (params: MessagingService.PathParams, connection: T) => void): void {
-            const route = new Route(spec);
-            const handler = (path: string, channel: T): string | false => {
-                const params = route.match(path);
-                if (!params) {
-                    return false;
-                }
-                callback(params, channel);
-                return route.reverse(params);
-            };
-            this.handlers.push(handler);
-        }
-
-        route(path: string, connection: T): string | false {
-            for (const handler of this.handlers) {
-                try {
-                    const result = handler(path, connection);
-                    if (result) {
-                        return result;
-                    }
-                } catch (e) {
-                    console.error(e);
-                }
-            }
-            if (this.parent) {
-                return this.parent.route(path, connection);
-            }
-            return false;
-        }
-    }
-}