@theia/core 1.44.0 → 1.45.0

package/lib/browser/messaging/service-connection-provider.js

@@ -0,0 +1,115 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceConnectionProvider = exports.RemoteConnectionProvider = exports.LocalConnectionProvider = void 0;
+const inversify_1 = require("inversify");
+const common_1 = require("../../common");
+const channel_1 = require("../../common/message-rpc/channel");
+const promise_util_1 = require("../../common/promise-util");
+const connection_source_1 = require("./connection-source");
+exports.LocalConnectionProvider = Symbol('LocalConnectionProvider');
+exports.RemoteConnectionProvider = Symbol('RemoteConnectionProvider');
+/**
+ * This class manages the channels for remote services in the back end
+ */
+let ServiceConnectionProvider = class ServiceConnectionProvider {
+    constructor() {
+        this.channelHandlers = new Map();
+        this.channelReadyDeferred = new promise_util_1.Deferred();
+    }
+    static createProxy(container, path, arg) {
+        return container.get(exports.RemoteConnectionProvider).createProxy(path, arg);
+    }
+    static createLocalProxy(container, path, arg) {
+        return container.get(exports.LocalConnectionProvider).createProxy(path, arg);
+    }
+    static createHandler(container, path, arg) {
+        const remote = container.get(exports.RemoteConnectionProvider);
+        const local = container.get(exports.LocalConnectionProvider);
+        remote.createProxy(path, arg);
+        if (remote !== local) {
+            local.createProxy(path, arg);
+        }
+    }
+    createProxy(path, arg) {
+        const factory = arg instanceof common_1.RpcProxyFactory ? arg : new common_1.RpcProxyFactory(arg);
+        this.listen(path, (_, c) => factory.listen(c), true);
+        return factory.createProxy();
+    }
+    get channelReady() {
+        return this.channelReadyDeferred.promise;
+    }
+    init() {
+        this.connectionSource.onConnectionDidOpen(channel => this.handleChannelCreated(channel));
+    }
+    /**
+     * This method must be invoked by subclasses when they have created the main channel.
+     * @param mainChannel
+     */
+    handleChannelCreated(channel) {
+        channel.onClose(() => {
+            this.handleChannelClosed(channel);
+        });
+        this.channelMultiplexer = new channel_1.ChannelMultiplexer(channel);
+        this.channelReadyDeferred.resolve();
+        for (const entry of this.channelHandlers.entries()) {
+            this.openChannel(entry[0], entry[1]);
+        }
+    }
+    handleChannelClosed(channel) {
+        this.channelReadyDeferred = new promise_util_1.Deferred();
+    }
+    /**
+     * Install a connection handler for the given path.
+     */
+    listen(path, handler, reconnect) {
+        this.openChannel(path, handler).then(() => {
+            if (reconnect) {
+                this.channelHandlers.set(path, handler);
+            }
+        });
+    }
+    async openChannel(path, handler) {
+        await this.channelReady;
+        const newChannel = await this.channelMultiplexer.open(path);
+        handler(path, newChannel);
+    }
+};
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ServiceConnectionProvider.prototype, "init", null);
+__decorate([
+    (0, inversify_1.inject)(connection_source_1.ConnectionSource),
+    __metadata("design:type", Object)
+], ServiceConnectionProvider.prototype, "connectionSource", void 0);
+ServiceConnectionProvider = __decorate([
+    (0, inversify_1.injectable)()
+], ServiceConnectionProvider);
+exports.ServiceConnectionProvider = ServiceConnectionProvider;
+//# sourceMappingURL=service-connection-provider.js.map

package/lib/browser/messaging/service-connection-provider.js.map

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

package/lib/browser/messaging/ws-connection-provider.d.ts

@@ -1,44 +1,13 @@
 import { interfaces } from 'inversify';
-import { RpcProxy, Emitter, Event, Channel } from '../../common';
-import { Endpoint } from '../endpoint';
-import { AbstractConnectionProvider } from '../../common/messaging/abstract-connection-provider';
-import { Socket } from 'socket.io-client';
-import { IWebSocket } from '../../common/messaging/web-socket-channel';
-export declare const LocalWebSocketConnectionProvider: unique symbol;
-export interface WebSocketOptions {
-    /**
-     * True by default.
-     */
-    reconnecting?: boolean;
-}
-export declare class WebSocketConnectionProvider extends AbstractConnectionProvider<WebSocketOptions> {
-    protected readonly onSocketDidOpenEmitter: Emitter<void>;
-    get onSocketDidOpen(): Event<void>;
-    protected readonly onSocketDidCloseEmitter: Emitter<void>;
-    get onSocketDidClose(): Event<void>;
+import { RpcProxy } from '../../common';
+/**
+ * @deprecated This class serves to keep API compatibility for a while. Use {@linkcode ServiceConnectionProvider} instead.
+ */
+export declare class WebSocketConnectionProvider {
+    private readonly remoteConnectionProvider;
     static createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): RpcProxy<T>;
     static createLocalProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): RpcProxy<T>;
     static createHandler(container: interfaces.Container, path: string, arg?: object): void;
-    protected readonly socket: Socket;
-    constructor();
-    protected createMainChannel(): Channel;
-    protected toIWebSocket(socket: Socket): IWebSocket;
-    openChannel(path: string, handler: (channel: Channel) => void, options?: WebSocketOptions): Promise<void>;
-    /**
-     * @param path The handler to reach in the backend.
-     */
-    protected createWebSocketUrl(path: string): string;
-    protected createHttpWebSocketUrl(path: string): string;
-    protected createEndpoint(path: string): Endpoint;
-    /**
-     * Creates a web socket for the given url
-     */
-    protected createWebSocket(url: string): Socket;
-    /**
-     * Path for Socket.io to make its requests to.
-     */
-    protected createSocketIoPath(url: string): string | undefined;
-    protected fireSocketDidOpen(): void;
-    protected fireSocketDidClose(): void;
+    createProxy<T extends object>(path: string, target?: object): RpcProxy<T>;
 }
 //# sourceMappingURL=ws-connection-provider.d.ts.map

package/lib/browser/messaging/ws-connection-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAuB,MAAM,WAAW,CAAC;AACxE,OAAO,EAAmB,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAM,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAoB,MAAM,2CAA2C,CAAC;AAKzF,eAAO,MAAM,gCAAgC,eAA6C,CAAC;AAE3F,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,qBACa,2BAA4B,SAAQ,0BAA0B,CAAC,gBAAgB,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;WAEe,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAIvH,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAInH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IASvF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;;IAmBlC,SAAS,CAAC,iBAAiB,IAAI,OAAO;IAItC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU;IAenC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxH;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAIhD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAe9C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAW7D,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAInC,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAGvC"}
+{"version":3,"file":"ws-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAA+B,MAAM,WAAW,CAAC;AAChF,OAAO,EAAmB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMzD;;GAEG;AACH,qBACa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4B;IAErE,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAI9G,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAInH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAIvF,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;CAI5E"}

package/lib/browser/messaging/ws-connection-provider.js

@@ -23,140 +23,36 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var WebSocketConnectionProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketConnectionProvider = exports.LocalWebSocketConnectionProvider = void 0;
+exports.WebSocketConnectionProvider = void 0;
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
-const endpoint_1 = require("../endpoint");
-const abstract_connection_provider_1 = require("../../common/messaging/abstract-connection-provider");
-const socket_io_client_1 = require("socket.io-client");
-const web_socket_channel_1 = require("../../common/messaging/web-socket-channel");
+const service_connection_provider_1 = require("./service-connection-provider");
 (0, inversify_1.decorate)((0, inversify_1.injectable)(), common_1.RpcProxyFactory);
 (0, inversify_1.decorate)((0, inversify_1.unmanaged)(), common_1.RpcProxyFactory, 0);
-exports.LocalWebSocketConnectionProvider = Symbol('LocalWebSocketConnectionProvider');
-let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocketConnectionProvider extends abstract_connection_provider_1.AbstractConnectionProvider {
-    constructor() {
-        super();
-        this.onSocketDidOpenEmitter = new common_1.Emitter();
-        this.onSocketDidCloseEmitter = new common_1.Emitter();
-        const url = this.createWebSocketUrl(web_socket_channel_1.WebSocketChannel.wsPath);
-        this.socket = this.createWebSocket(url);
-        this.socket.on('connect', () => {
-            this.initializeMultiplexer();
-            if (this.reconnectChannelOpeners.length > 0) {
-                this.reconnectChannelOpeners.forEach(opener => opener());
-                this.reconnectChannelOpeners = [];
-            }
-            this.socket.on('disconnect', () => this.fireSocketDidClose());
-            this.socket.on('message', () => this.onIncomingMessageActivityEmitter.fire(undefined));
-            this.fireSocketDidOpen();
-        });
-        this.socket.connect();
-    }
-    get onSocketDidOpen() {
-        return this.onSocketDidOpenEmitter.event;
-    }
-    get onSocketDidClose() {
-        return this.onSocketDidCloseEmitter.event;
-    }
+/**
+ * @deprecated This class serves to keep API compatibility for a while. Use {@linkcode ServiceConnectionProvider} instead.
+ */
+let WebSocketConnectionProvider = class WebSocketConnectionProvider {
     static createProxy(container, path, arg) {
-        return container.get(WebSocketConnectionProvider_1).createProxy(path, arg);
+        return service_connection_provider_1.ServiceConnectionProvider.createProxy(container, path, arg);
     }
     static createLocalProxy(container, path, arg) {
-        return container.get(exports.LocalWebSocketConnectionProvider).createProxy(path, arg);
+        return service_connection_provider_1.ServiceConnectionProvider.createLocalProxy(container, path, arg);
     }
     static createHandler(container, path, arg) {
-        const remote = container.get(WebSocketConnectionProvider_1);
-        const local = container.get(exports.LocalWebSocketConnectionProvider);
-        remote.createProxy(path, arg);
-        if (remote !== local) {
-            local.createProxy(path, arg);
-        }
-    }
-    createMainChannel() {
-        return new web_socket_channel_1.WebSocketChannel(this.toIWebSocket(this.socket));
-    }
-    toIWebSocket(socket) {
-        return {
-            close: () => {
-                socket.removeAllListeners('disconnect');
-                socket.removeAllListeners('error');
-                socket.removeAllListeners('message');
-            },
-            isConnected: () => socket.connected,
-            onClose: cb => socket.on('disconnect', reason => cb(reason)),
-            onError: cb => socket.on('error', reason => cb(reason)),
-            onMessage: cb => socket.on('message', data => cb(data)),
-            send: message => socket.emit('message', message)
-        };
-    }
-    async openChannel(path, handler, options) {
-        if (this.socket.connected) {
-            return super.openChannel(path, handler, options);
-        }
-        else {
-            const openChannel = () => {
-                this.socket.off('connect', openChannel);
-                this.openChannel(path, handler, options);
-            };
-            this.socket.on('connect', openChannel);
-        }
-    }
-    /**
-     * @param path The handler to reach in the backend.
-     */
-    createWebSocketUrl(path) {
-        // Since we are using Socket.io, the path should look like the following:
-        // proto://domain.com/{path}
-        return this.createEndpoint(path).getWebSocketUrl().withPath(path).toString();
-    }
-    createHttpWebSocketUrl(path) {
-        return this.createEndpoint(path).getRestUrl().toString();
-    }
-    createEndpoint(path) {
-        return new endpoint_1.Endpoint({ path });
-    }
-    /**
-     * Creates a web socket for the given url
-     */
-    createWebSocket(url) {
-        return (0, socket_io_client_1.io)(url, {
-            path: this.createSocketIoPath(url),
-            reconnection: true,
-            reconnectionDelay: 1000,
-            reconnectionDelayMax: 10000,
-            reconnectionAttempts: Infinity,
-            extraHeaders: {
-                // Socket.io strips the `origin` header
-                // We need to provide our own for validation
-                'fix-origin': window.location.origin
-            }
-        });
-    }
-    /**
-     * Path for Socket.io to make its requests to.
-     */
-    createSocketIoPath(url) {
-        if (location.protocol === endpoint_1.Endpoint.PROTO_FILE) {
-            return '/socket.io';
-        }
-        let { pathname } = location;
-        if (!pathname.endsWith('/')) {
-            pathname += '/';
-        }
-        return pathname + 'socket.io';
-    }
-    fireSocketDidOpen() {
-        this.onSocketDidOpenEmitter.fire(undefined);
+        return service_connection_provider_1.ServiceConnectionProvider.createHandler(container, path, arg);
     }
-    fireSocketDidClose() {
-        this.onSocketDidCloseEmitter.fire(undefined);
+    createProxy(path, factory) {
+        return this.remoteConnectionProvider.createProxy(path, factory);
     }
 };
-WebSocketConnectionProvider = WebSocketConnectionProvider_1 = __decorate([
-    (0, inversify_1.injectable)(),
-    __metadata("design:paramtypes", [])
+__decorate([
+    (0, inversify_1.inject)(service_connection_provider_1.RemoteConnectionProvider),
+    __metadata("design:type", service_connection_provider_1.ServiceConnectionProvider)
+], WebSocketConnectionProvider.prototype, "remoteConnectionProvider", void 0);
+WebSocketConnectionProvider = __decorate([
+    (0, inversify_1.injectable)()
 ], WebSocketConnectionProvider);
 exports.WebSocketConnectionProvider = WebSocketConnectionProvider;
 //# sourceMappingURL=ws-connection-provider.js.map

package/lib/browser/messaging/ws-connection-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ws-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.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,yCAAgF;AAChF,yCAAyD;AACzD,+EAAoG;AAEpG,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,wBAAe,CAAC,CAAC;AACxC,IAAA,oBAAQ,EAAC,IAAA,qBAAS,GAAE,EAAE,wBAAe,EAAE,CAAC,CAAC,CAAC;AAE1C;;GAEG;AAEH,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAIpC,MAAM,CAAC,WAAW,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QAC5F,OAAO,uDAAyB,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QACjG,OAAO,uDAAyB,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,SAA+B,EAAE,IAAY,EAAE,GAAY;QAC5E,OAAO,uDAAyB,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACzE,CAAC;IAGD,WAAW,CAAmB,IAAY,EAAE,OAA2B;QACnE,OAAO,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;CACJ,CAAA;AAlBG;IADC,IAAA,kBAAM,EAAC,sDAAwB,CAAC;8BACU,uDAAyB;6EAAC;AAF5D,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAoBvC;AApBY,kEAA2B"}

package/lib/browser/messaging/ws-connection-source.d.ts

@@ -0,0 +1,41 @@
+import { AbstractChannel, Channel, Emitter, Event } from '../../common';
+import { ConnectionSource } from './connection-source';
+import { Socket } from 'socket.io-client';
+import { Endpoint } from '../endpoint';
+import { FrontendIdProvider } from './frontend-id-provider';
+export declare class WebSocketConnectionSource implements ConnectionSource {
+    static readonly NO_CONNECTION = "<none>";
+    protected readonly frontendIdProvider: FrontendIdProvider;
+    private readonly writeBuffer;
+    private _socket;
+    get socket(): Socket;
+    protected currentChannel: AbstractChannel;
+    protected readonly onConnectionDidOpenEmitter: Emitter<Channel>;
+    get onConnectionDidOpen(): Event<Channel>;
+    protected readonly onSocketDidOpenEmitter: Emitter<void>;
+    get onSocketDidOpen(): Event<void>;
+    protected readonly onSocketDidCloseEmitter: Emitter<void>;
+    get onSocketDidClose(): Event<void>;
+    protected readonly onIncomingMessageActivityEmitter: Emitter<void>;
+    get onIncomingMessageActivity(): Event<void>;
+    constructor();
+    openSocket(): void;
+    protected handleSocketConnected(): void;
+    connectNewChannel(): void;
+    protected createChannel(): AbstractChannel;
+    /**
+     * @param path The handler to reach in the backend.
+     */
+    protected createWebSocketUrl(path: string): string;
+    protected createHttpWebSocketUrl(path: string): string;
+    protected createEndpoint(path: string): Endpoint;
+    /**
+     * Creates a web socket for the given url
+     */
+    protected createWebSocket(url: string): Socket;
+    /**
+     * Path for Socket.io to make its requests to.
+     */
+    protected createSocketIoPath(url: string): string | undefined;
+}
+//# sourceMappingURL=ws-connection-source.d.ts.map

package/lib/browser/messaging/ws-connection-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAoC,OAAO,EAAE,KAAK,EAAgB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAK5D,qBACa,yBAA0B,YAAW,gBAAgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;IAEvD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;;IAMD,UAAU,IAAI,IAAI;IAqBlB,SAAS,CAAC,qBAAqB,IAAI,IAAI;IA0BvC,iBAAiB,IAAI,IAAI;IAUzB,SAAS,CAAC,aAAa,IAAI,eAAe;IAoC1C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAIhD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAe9C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAUhE"}

package/lib/browser/messaging/ws-connection-source.js

@@ -0,0 +1,210 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2023 STMicroelectronics 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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketConnectionSource = void 0;
+const common_1 = require("../../common");
+const socket_io_client_1 = require("socket.io-client");
+const endpoint_1 = require("../endpoint");
+const channel_1 = require("../../common/message-rpc/channel");
+const uint8_array_message_buffer_1 = require("../../common/message-rpc/uint8-array-message-buffer");
+const inversify_1 = require("inversify");
+const frontend_id_provider_1 = require("./frontend-id-provider");
+const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
+const socket_write_buffer_1 = require("../../common/messaging/socket-write-buffer");
+const connection_management_1 = require("../../common/messaging/connection-management");
+let WebSocketConnectionSource = class WebSocketConnectionSource {
+    constructor() {
+        this.writeBuffer = new socket_write_buffer_1.SocketWriteBuffer();
+        this.onConnectionDidOpenEmitter = new common_1.Emitter();
+        this.onSocketDidOpenEmitter = new common_1.Emitter();
+        this.onSocketDidCloseEmitter = new common_1.Emitter();
+        this.onIncomingMessageActivityEmitter = new common_1.Emitter();
+    }
+    get socket() {
+        return this._socket;
+    }
+    get onConnectionDidOpen() {
+        return this.onConnectionDidOpenEmitter.event;
+    }
+    get onSocketDidOpen() {
+        return this.onSocketDidOpenEmitter.event;
+    }
+    get onSocketDidClose() {
+        return this.onSocketDidCloseEmitter.event;
+    }
+    get onIncomingMessageActivity() {
+        return this.onIncomingMessageActivityEmitter.event;
+    }
+    openSocket() {
+        const url = this.createWebSocketUrl(common_1.servicesPath);
+        this._socket = this.createWebSocket(url);
+        this._socket.on('connect', () => {
+            this.onSocketDidOpenEmitter.fire();
+            this.handleSocketConnected();
+        });
+        this._socket.on('disconnect', () => {
+            this.onSocketDidCloseEmitter.fire();
+        });
+        this._socket.on('error', reason => {
+            if (this.currentChannel) {
+                this.currentChannel.onErrorEmitter.fire(reason);
+            }
+            ;
+        });
+        this._socket.connect();
+    }
+    handleSocketConnected() {
+        if (this.currentChannel) {
+            const reconnectListener = (hasConnection) => {
+                this._socket.off(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
+                if (hasConnection) {
+                    this.writeBuffer.flush(this.socket);
+                }
+                else {
+                    if (frontend_application_config_provider_1.FrontendApplicationConfigProvider.get().reloadOnReconnect) {
+                        window.location.reload(); // this might happen in the preload module, when we have no window service yet
+                    }
+                    else {
+                        this.connectNewChannel();
+                    }
+                }
+            };
+            this._socket.on(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
+            this._socket.emit(connection_management_1.ConnectionManagementMessages.RECONNECT, this.frontendIdProvider.getId());
+        }
+        else {
+            const initialConnectListener = () => {
+                this._socket.off(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+                this.connectNewChannel();
+            };
+            this._socket.on(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+            this._socket.emit(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
+        }
+    }
+    connectNewChannel() {
+        if (this.currentChannel) {
+            this.writeBuffer.drain();
+            this.currentChannel.close();
+            this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
+        }
+        this.currentChannel = this.createChannel();
+        this.onConnectionDidOpenEmitter.fire(this.currentChannel);
+    }
+    createChannel() {
+        const toDispose = new common_1.DisposableCollection();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const messageHandler = (data) => {
+            this.onIncomingMessageActivityEmitter.fire();
+            if (this.currentChannel) {
+                // In the browser context socketIO receives binary messages as ArrayBuffers.
+                // So we have to convert them to a Uint8Array before delegating the message to the read buffer.
+                const buffer = data instanceof ArrayBuffer ? new Uint8Array(data) : data;
+                this.currentChannel.onMessageEmitter.fire(() => new uint8_array_message_buffer_1.Uint8ArrayReadBuffer(buffer));
+            }
+            ;
+        };
+        this._socket.on('message', messageHandler);
+        toDispose.push(common_1.Disposable.create(() => {
+            this.socket.off('message', messageHandler);
+        }));
+        const channel = new channel_1.ForwardingChannel('any', () => {
+            toDispose.dispose();
+        }, () => {
+            const result = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
+            result.onCommit(buffer => {
+                if (this.socket.connected) {
+                    this.socket.send(buffer);
+                }
+                else {
+                    this.writeBuffer.buffer(buffer);
+                }
+            });
+            return result;
+        });
+        return channel;
+    }
+    /**
+     * @param path The handler to reach in the backend.
+     */
+    createWebSocketUrl(path) {
+        // Since we are using Socket.io, the path should look like the following:
+        // proto://domain.com/{path}
+        return this.createEndpoint(path).getWebSocketUrl().withPath(path).toString();
+    }
+    createHttpWebSocketUrl(path) {
+        return this.createEndpoint(path).getRestUrl().toString();
+    }
+    createEndpoint(path) {
+        return new endpoint_1.Endpoint({ path });
+    }
+    /**
+     * Creates a web socket for the given url
+     */
+    createWebSocket(url) {
+        return (0, socket_io_client_1.io)(url, {
+            path: this.createSocketIoPath(url),
+            reconnection: true,
+            reconnectionDelay: 1000,
+            reconnectionDelayMax: 10000,
+            reconnectionAttempts: Infinity,
+            extraHeaders: {
+                // Socket.io strips the `origin` header
+                // We need to provide our own for validation
+                'fix-origin': window.location.origin
+            }
+        });
+    }
+    /**
+     * Path for Socket.io to make its requests to.
+     */
+    createSocketIoPath(url) {
+        if (location.protocol === endpoint_1.Endpoint.PROTO_FILE) {
+            return '/socket.io';
+        }
+        let { pathname } = location;
+        if (!pathname.endsWith('/')) {
+            pathname += '/';
+        }
+        return pathname + 'socket.io';
+    }
+};
+WebSocketConnectionSource.NO_CONNECTION = '<none>';
+__decorate([
+    (0, inversify_1.inject)(frontend_id_provider_1.FrontendIdProvider),
+    __metadata("design:type", Object)
+], WebSocketConnectionSource.prototype, "frontendIdProvider", void 0);
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], WebSocketConnectionSource.prototype, "openSocket", null);
+WebSocketConnectionSource = __decorate([
+    (0, inversify_1.injectable)(),
+    __metadata("design:paramtypes", [])
+], WebSocketConnectionSource);
+exports.WebSocketConnectionSource = WebSocketConnectionSource;
+//# sourceMappingURL=ws-connection-source.js.map

package/lib/browser/messaging/ws-connection-source.js.map

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

package/lib/browser/preload/i18n-preload-contribution.js

@@ -37,7 +37,7 @@ let I18nPreloadContribution = class I18nPreloadContribution {
                 locale: defaultLocale
             });
         }
-        if (nls_1.nls.locale) {
+        if (nls_1.nls.locale && nls_1.nls.locale !== nls_1.nls.defaultLocale) {
             const localization = await this.localizationServer.loadLocalization(nls_1.nls.locale);
             if (localization.languagePack) {
                 nls_1.nls.localization = localization;

package/lib/browser/preload/i18n-preload-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18n-preload-contribution.js","sourceRoot":"","sources":["../../../src/browser/preload/i18n-preload-contribution.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;;;;;;;;;;;;AAGhF,kGAA4F;AAC5F,0CAAuC;AACvC,yCAA+C;AAC/C,+EAA2E;AAG3E,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAKhC,KAAK,CAAC,UAAU;QACZ,MAAM,aAAa,GAAG,wEAAiC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;QAC5E,IAAI,aAAa,IAAI,CAAC,SAAG,CAAC,MAAM,EAAE;YAC9B,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;gBACf,MAAM,EAAE,aAAa;aACxB,CAAC,CAAC;SACN;QACD,IAAI,SAAG,CAAC,MAAM,EAAE;YACZ,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAG,CAAC,MAAM,CAAC,CAAC;YAChF,IAAI,YAAY,CAAC,YAAY,EAAE;gBAC3B,SAAG,CAAC,YAAY,GAAG,YAAY,CAAC;aACnC;iBAAM;gBACH,uGAAuG;gBACvG,kDAAkD;gBAClD,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;oBACf,MAAM,EAAE,aAAa,IAAI,SAAS;iBACrC,CAAC,CAAC;aACN;SACJ;IACL,CAAC;CAEJ,CAAA;AAvBG;IADC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;;mEAC+B;AAHjD,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA0BnC;AA1BY,0DAAuB"}
+{"version":3,"file":"i18n-preload-contribution.js","sourceRoot":"","sources":["../../../src/browser/preload/i18n-preload-contribution.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;;;;;;;;;;;;AAGhF,kGAA4F;AAC5F,0CAAuC;AACvC,yCAA+C;AAC/C,+EAA2E;AAG3E,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAKhC,KAAK,CAAC,UAAU;QACZ,MAAM,aAAa,GAAG,wEAAiC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;QAC5E,IAAI,aAAa,IAAI,CAAC,SAAG,CAAC,MAAM,EAAE;YAC9B,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;gBACf,MAAM,EAAE,aAAa;aACxB,CAAC,CAAC;SACN;QACD,IAAI,SAAG,CAAC,MAAM,IAAI,SAAG,CAAC,MAAM,KAAK,SAAG,CAAC,aAAa,EAAE;YAChD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAG,CAAC,MAAM,CAAC,CAAC;YAChF,IAAI,YAAY,CAAC,YAAY,EAAE;gBAC3B,SAAG,CAAC,YAAY,GAAG,YAAY,CAAC;aACnC;iBAAM;gBACH,uGAAuG;gBACvG,kDAAkD;gBAClD,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;oBACf,MAAM,EAAE,aAAa,IAAI,SAAS;iBACrC,CAAC,CAAC;aACN;SACJ;IACL,CAAC;CAEJ,CAAA;AAvBG;IADC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;;mEAC+B;AAHjD,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA0BnC;AA1BY,0DAAuB"}