@theia/core 1.44.0 → 1.45.0

package/lib/common/messaging/connection-management.d.ts

@@ -0,0 +1,25 @@
+export declare const ConnectionCloseService: unique symbol;
+export declare const connectionCloseServicePath = "/services/ChannelCloseService";
+/**
+ * These messages are used to negotiate service reconnection between a front ends and back end.
+ * Whenever a front end first connects to a back end, it sends the ${@link ConnectionManagementMessages#INITIAL_CONNECT} message
+ * together with its front end id.
+ * The back end then starts a new front end connection context for that front end. If the back end already had another connection context
+ * for the given front end id, it gets discarded.
+ * If the front end reconnects after a websocket disconnect, it sends the ${@link ConnectionManagementMessages#RECONNECT} message
+ * together with its front end id..
+ * If the back end still has a connection context for the front end id, the context is reconnected and the back end replies with the value true.
+ * If there is no context anymore, the back end replies with value false. The front end can then either do an initial connect or reload
+ * the whole UI.
+ */
+export declare namespace ConnectionManagementMessages {
+    const INITIAL_CONNECT = "initialConnection";
+    const RECONNECT = "reconnect";
+}
+/**
+ * A service to mark a front end as unused. As soon as it disconnects from the back end, the connection context will be discarded.
+ */
+export interface ConnectionCloseService {
+    markForClose(frontEndId: string): Promise<void>;
+}
+//# sourceMappingURL=connection-management.d.ts.map

package/lib/common/messaging/connection-management.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-management.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/connection-management.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,eAAO,MAAM,0BAA0B,kCAAkC,CAAC;AAE1E;;;;;;;;;;;GAWG;AACH,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,eAAe,sBAAsB,CAAC;IAC5C,MAAM,SAAS,cAAc,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD"}

package/lib/common/messaging/connection-management.js

@@ -0,0 +1,38 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionManagementMessages = exports.connectionCloseServicePath = exports.ConnectionCloseService = void 0;
+exports.ConnectionCloseService = Symbol('ConnectionCloseService');
+exports.connectionCloseServicePath = '/services/ChannelCloseService';
+/**
+ * These messages are used to negotiate service reconnection between a front ends and back end.
+ * Whenever a front end first connects to a back end, it sends the ${@link ConnectionManagementMessages#INITIAL_CONNECT} message
+ * together with its front end id.
+ * The back end then starts a new front end connection context for that front end. If the back end already had another connection context
+ * for the given front end id, it gets discarded.
+ * If the front end reconnects after a websocket disconnect, it sends the ${@link ConnectionManagementMessages#RECONNECT} message
+ * together with its front end id..
+ * If the back end still has a connection context for the front end id, the context is reconnected and the back end replies with the value true.
+ * If there is no context anymore, the back end replies with value false. The front end can then either do an initial connect or reload
+ * the whole UI.
+ */
+var ConnectionManagementMessages;
+(function (ConnectionManagementMessages) {
+    ConnectionManagementMessages.INITIAL_CONNECT = 'initialConnection';
+    ConnectionManagementMessages.RECONNECT = 'reconnect';
+})(ConnectionManagementMessages = exports.ConnectionManagementMessages || (exports.ConnectionManagementMessages = {}));
+//# sourceMappingURL=connection-management.js.map

package/lib/common/messaging/connection-management.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-management.js","sourceRoot":"","sources":["../../../src/common/messaging/connection-management.ts"],"names":[],"mappings":";AACA,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;;;AAEnE,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAC1D,QAAA,0BAA0B,GAAG,+BAA+B,CAAC;AAE1E;;;;;;;;;;;GAWG;AACH,IAAiB,4BAA4B,CAG5C;AAHD,WAAiB,4BAA4B;IAC5B,4CAAe,GAAG,mBAAmB,CAAC;IACtC,sCAAS,GAAG,WAAW,CAAC;AACzC,CAAC,EAHgB,4BAA4B,GAA5B,oCAA4B,KAA5B,oCAA4B,QAG5C"}

package/lib/common/messaging/handler.d.ts

@@ -1,4 +1,5 @@
 import { Channel } from '../message-rpc/channel';
+export declare const servicesPath = "/services";
 export declare const ConnectionHandler: unique symbol;
 export interface ConnectionHandler {
     readonly path: string;

package/lib/common/messaging/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI,CAAC;CAC3C"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,eAAO,MAAM,YAAY,cAAc,CAAC;AAExC,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI,CAAC;CAC3C"}

package/lib/common/messaging/handler.js

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionHandler = void 0;
+exports.ConnectionHandler = exports.servicesPath = void 0;
+exports.servicesPath = '/services';
 exports.ConnectionHandler = Symbol('ConnectionHandler');
 //# sourceMappingURL=handler.js.map

package/lib/common/messaging/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/common/messaging/handler.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;;;AAInE,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/common/messaging/handler.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;;;AAInE,QAAA,YAAY,GAAG,WAAW,CAAC;AAE3B,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}

package/lib/common/messaging/socket-write-buffer.d.ts

@@ -0,0 +1,11 @@
+import { WebSocket } from './web-socket-channel';
+export declare class SocketWriteBuffer {
+    private static DISCONNECTED_BUFFER_SIZE;
+    private disconnectedBuffer;
+    private bufferWritePosition;
+    buffer(data: Uint8Array): void;
+    protected ensureWriteBuffer(byteLength: number): void;
+    flush(socket: WebSocket): void;
+    drain(): void;
+}
+//# sourceMappingURL=socket-write-buffer.d.ts.map

package/lib/common/messaging/socket-write-buffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket-write-buffer.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/socket-write-buffer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAc;IAErD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,mBAAmB,CAAK;IAEhC,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAM9B,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAWrD,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAO9B,KAAK,IAAI,IAAI;CAGhB"}

package/lib/common/messaging/socket-write-buffer.js

@@ -0,0 +1,50 @@
+"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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocketWriteBuffer = void 0;
+class SocketWriteBuffer {
+    constructor() {
+        this.bufferWritePosition = 0;
+    }
+    buffer(data) {
+        var _a;
+        this.ensureWriteBuffer(data.byteLength);
+        (_a = this.disconnectedBuffer) === null || _a === void 0 ? void 0 : _a.set(data, this.bufferWritePosition);
+        this.bufferWritePosition += data.byteLength;
+    }
+    ensureWriteBuffer(byteLength) {
+        if (!this.disconnectedBuffer) {
+            this.disconnectedBuffer = new Uint8Array(SocketWriteBuffer.DISCONNECTED_BUFFER_SIZE);
+            this.bufferWritePosition = 0;
+        }
+        if (this.bufferWritePosition + byteLength > this.disconnectedBuffer.byteLength) {
+            throw new Error(`Max disconnected buffer size exceeded by adding ${byteLength} bytes`);
+        }
+    }
+    flush(socket) {
+        if (this.disconnectedBuffer) {
+            socket.send(this.disconnectedBuffer.slice(0, this.bufferWritePosition));
+            this.disconnectedBuffer = undefined;
+        }
+    }
+    drain() {
+        this.disconnectedBuffer = undefined;
+    }
+}
+exports.SocketWriteBuffer = SocketWriteBuffer;
+SocketWriteBuffer.DISCONNECTED_BUFFER_SIZE = 100 * 1024;
+//# sourceMappingURL=socket-write-buffer.js.map

package/lib/common/messaging/socket-write-buffer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket-write-buffer.js","sourceRoot":"","sources":["../../../src/common/messaging/socket-write-buffer.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;;;AAIhF,MAAa,iBAAiB;IAA9B;QAIY,wBAAmB,GAAG,CAAC,CAAC;IA6BpC,CAAC;IA3BG,MAAM,CAAC,IAAgB;;QACnB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxC,MAAA,IAAI,CAAC,kBAAkB,0CAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7D,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC;IAChD,CAAC;IAES,iBAAiB,CAAC,UAAkB;QAC1C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,IAAI,CAAC,kBAAkB,GAAG,IAAI,UAAU,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,CAAC;YACrF,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;SAChC;QAED,IAAI,IAAI,CAAC,mBAAmB,GAAG,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE;YAC5E,MAAM,IAAI,KAAK,CAAC,mDAAmD,UAAU,QAAQ,CAAC,CAAC;SAC1F;IACL,CAAC;IAED,KAAK,CAAC,MAAiB;QACnB,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;SACvC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;IACxC,CAAC;;AAhCL,8CAiCC;AAhCkB,0CAAwB,GAAG,GAAG,GAAG,IAAI,CAAC"}

package/lib/common/messaging/web-socket-channel.d.ts

@@ -1,48 +1,20 @@
 import { WriteBuffer } from '../message-rpc';
 import { AbstractChannel } from '../message-rpc/channel';
+import { Socket as ClientSocket } from 'socket.io-client';
+import { Socket as ServerSocket } from 'socket.io';
+export declare type WebSocket = ClientSocket | ServerSocket;
 /**
  * A channel that manages the main websocket connection between frontend and backend. All service channels
  * are reusing this main channel. (multiplexing). An {@link IWebSocket} abstraction is used to keep the implementation
  * independent of the actual websocket implementation and its execution context (backend vs. frontend).
  */
 export declare class WebSocketChannel extends AbstractChannel {
-    protected readonly socket: IWebSocket;
+    protected readonly socket: WebSocket;
     static wsPath: string;
-    constructor(socket: IWebSocket);
+    private onDidConnectEmitter;
+    onDidConnect: import("vscode-languageserver-protocol").Event<void>;
+    constructor(socket: WebSocket);
     getWriteBuffer(): WriteBuffer;
-}
-/**
- * An abstraction that enables reuse of the `{@link WebSocketChannel} class in the frontend and backend
- * independent of the actual underlying socket implementation.
- */
-export interface IWebSocket {
-    /**
-     * Sends the given message over the web socket in binary format.
-     * @param message The binary message.
-     */
-    send(message: Uint8Array): void;
-    /**
-     * Closes the websocket from the local side.
-     */
     close(): void;
-    /**
-     * The connection state of the web socket.
-     */
-    isConnected(): boolean;
-    /**
-     * Listener callback to handle incoming messages.
-     * @param cb The callback.
-     */
-    onMessage(cb: (message: Uint8Array) => void): void;
-    /**
-     * Listener callback to handle socket errors.
-     * @param cb The callback.
-     */
-    onError(cb: (reason: any) => void): void;
-    /**
-     * Listener callback to handle close events (Remote side).
-     * @param cb The callback.
-     */
-    onClose(cb: (reason: string, code?: number) => void): void;
 }
 //# sourceMappingURL=web-socket-channel.d.ts.map

package/lib/common/messaging/web-socket-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-socket-channel.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/web-socket-channel.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,eAAe;IAGrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IAFjD,MAAM,CAAC,MAAM,SAAe;gBAEG,MAAM,EAAE,UAAU;IAcjD,cAAc,IAAI,WAAW;CAWhC;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACvB;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IAChC;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;IACd;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC;IACvB;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACnD;;;OAGG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;CAC9D"}
+{"version":3,"file":"web-socket-channel.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/web-socket-channel.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AAGnD,oBAAY,SAAS,GAAG,YAAY,GAAG,YAAY,CAAC;AAEpD;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,eAAe;IAMrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS;IALhD,MAAM,CAAC,MAAM,SAAe;IAE5B,OAAO,CAAC,mBAAmB,CAAuB;IAClD,YAAY,uDAAkC;gBAEf,MAAM,EAAE,SAAS;IAqBhD,cAAc,IAAI,WAAW;IAYpB,KAAK,IAAI,IAAI;CAIzB"}

package/lib/common/messaging/web-socket-channel.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketChannel = void 0;
 const uint8_array_message_buffer_1 = require("../message-rpc/uint8-array-message-buffer");
 const channel_1 = require("../message-rpc/channel");
-const disposable_1 = require("../disposable");
+const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
 /**
  * A channel that manages the main websocket connection between frontend and backend. All service channels
  * are reusing this main channel. (multiplexing). An {@link IWebSocket} abstraction is used to keep the implementation
@@ -28,26 +28,37 @@ class WebSocketChannel extends channel_1.AbstractChannel {
     constructor(socket) {
         super();
         this.socket = socket;
-        this.toDispose.push(disposable_1.Disposable.create(() => socket.close()));
-        socket.onClose((reason, code) => this.onCloseEmitter.fire({ reason, code }));
-        socket.onClose(() => this.close());
-        socket.onError(error => this.onErrorEmitter.fire(error));
-        socket.onMessage(data => this.onMessageEmitter.fire(() => {
+        this.onDidConnectEmitter = new vscode_languageserver_protocol_1.Emitter();
+        this.onDidConnect = this.onDidConnectEmitter.event;
+        socket.on('connect', () => {
+            this.onDidConnectEmitter.fire();
+        });
+        socket.on('disconnect', reason => {
+            this.onCloseEmitter.fire({
+                reason: reason
+            });
+        });
+        socket.on('error', reason => this.onErrorEmitter.fire(reason));
+        socket.on('message', data => {
             // 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;
-            return new uint8_array_message_buffer_1.Uint8ArrayReadBuffer(buffer);
-        }));
+            this.onMessageEmitter.fire(() => new uint8_array_message_buffer_1.Uint8ArrayReadBuffer(buffer));
+        });
     }
     getWriteBuffer() {
         const result = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
         result.onCommit(buffer => {
-            if (this.socket.isConnected()) {
+            if (this.socket.connected) {
                 this.socket.send(buffer);
             }
         });
         return result;
     }
+    close() {
+        this.socket.disconnect();
+        super.close();
+    }
 }
 exports.WebSocketChannel = WebSocketChannel;
 WebSocketChannel.wsPath = '/services';

package/lib/common/messaging/web-socket-channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-socket-channel.js","sourceRoot":"","sources":["../../../src/common/messaging/web-socket-channel.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;;;AAKhF,0FAAwG;AACxG,oDAAyD;AACzD,8CAA2C;AAE3C;;;;GAIG;AACH,MAAa,gBAAiB,SAAQ,yBAAe;IAGjD,YAA+B,MAAkB;QAC7C,KAAK,EAAE,CAAC;QADmB,WAAM,GAAN,MAAM,CAAY;QAE7C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE;YACrD,4EAA4E;YAC5E,+FAA+F;YAC/F,MAAM,MAAM,GAAG,IAAI,YAAY,WAAW,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzE,OAAO,IAAI,iDAAoB,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,cAAc;QACV,MAAM,MAAM,GAAG,IAAI,kDAAqB,EAAE,CAAC;QAE3C,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACrB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5B;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;;AA3BL,4CA4BC;AA3BU,uBAAM,GAAG,WAAW,CAAC"}
+{"version":3,"file":"web-socket-channel.js","sourceRoot":"","sources":["../../../src/common/messaging/web-socket-channel.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;;;AAKhF,0FAAwG;AACxG,oDAAyD;AAGzD,mFAAyD;AAIzD;;;;GAIG;AACH,MAAa,gBAAiB,SAAQ,yBAAe;IAMjD,YAA+B,MAAiB;QAC5C,KAAK,EAAE,CAAC;QADmB,WAAM,GAAN,MAAM,CAAW;QAHxC,wBAAmB,GAAG,IAAI,wCAAO,EAAQ,CAAC;QAClD,iBAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;QAI1C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACtB,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBACrB,MAAM,EAAE,MAAM;aACjB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;YACxB,4EAA4E;YAC5E,+FAA+F;YAC/F,MAAM,MAAM,GAAG,IAAI,YAAY,WAAW,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,iDAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,cAAc;QACV,MAAM,MAAM,GAAG,IAAI,kDAAqB,EAAE,CAAC;QAE3C,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACrB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5B;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,KAAK;QACV,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACzB,KAAK,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;;AA1CL,4CA2CC;AA1CU,uBAAM,GAAG,WAAW,CAAC"}

package/lib/electron-browser/messaging/electron-frontend-id-provider.d.ts

@@ -0,0 +1,5 @@
+import { FrontendIdProvider } from '../../browser/messaging/frontend-id-provider';
+export declare class ElectronFrontendIdProvider implements FrontendIdProvider {
+    getId(): string;
+}
+//# sourceMappingURL=electron-frontend-id-provider.d.ts.map

package/lib/electron-browser/messaging/electron-frontend-id-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"electron-frontend-id-provider.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-frontend-id-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAElF,qBACa,0BAA2B,YAAW,kBAAkB;IACjE,KAAK,IAAI,MAAM;CAGlB"}

package/lib/{electron-node/token/electron-token-messaging-contribution.js → electron-browser/messaging/electron-frontend-id-provider.js}

@@ -1,6 +1,6 @@
 "use strict";
 // *****************************************************************************
-// Copyright (C) 2020 Ericsson and others.
+// 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
@@ -20,35 +20,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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.ElectronMessagingContribution = void 0;
+exports.ElectronFrontendIdProvider = void 0;
 const inversify_1 = require("inversify");
-const messaging_contribution_1 = require("../../node/messaging/messaging-contribution");
-const electron_token_validator_1 = require("./electron-token-validator");
-/**
- * Override the browser MessagingContribution class to refuse connections that do not include a specific token.
- * @deprecated since 1.8.0
- */
-let ElectronMessagingContribution = class ElectronMessagingContribution extends messaging_contribution_1.MessagingContribution {
-    /**
-     * Only allow token-bearers.
-     */
-    async allowConnect(request) {
-        if (this.tokenValidator.allowRequest(request)) {
-            return super.allowConnect(request);
-        }
-        return false;
+let ElectronFrontendIdProvider = class ElectronFrontendIdProvider {
+    getId() {
+        return window.electronTheiaCore.WindowMetadata.webcontentId;
     }
 };
-__decorate([
-    (0, inversify_1.inject)(electron_token_validator_1.ElectronTokenValidator),
-    __metadata("design:type", electron_token_validator_1.ElectronTokenValidator)
-], ElectronMessagingContribution.prototype, "tokenValidator", void 0);
-ElectronMessagingContribution = __decorate([
+ElectronFrontendIdProvider = __decorate([
     (0, inversify_1.injectable)()
-], ElectronMessagingContribution);
-exports.ElectronMessagingContribution = ElectronMessagingContribution;
-//# sourceMappingURL=electron-token-messaging-contribution.js.map
+], ElectronFrontendIdProvider);
+exports.ElectronFrontendIdProvider = ElectronFrontendIdProvider;
+//# sourceMappingURL=electron-frontend-id-provider.js.map

package/lib/electron-browser/messaging/electron-frontend-id-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"electron-frontend-id-provider.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-frontend-id-provider.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,yCAAuC;AAIvC,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IACnC,KAAK;QACD,OAAO,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC;IAChE,CAAC;CACJ,CAAA;AAJY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAItC;AAJY,gEAA0B"}

package/lib/electron-browser/messaging/electron-ipc-connection-source.d.ts

@@ -0,0 +1,24 @@
+import { interfaces } from 'inversify';
+import { RpcProxy } from '../../common/messaging';
+import { AbstractChannel, Channel, Emitter, Event, MaybePromise, WriteBuffer } from '../../common';
+import { ConnectionSource } from '../../browser/messaging/connection-source';
+import { FrontendApplicationContribution } from '../../browser';
+export interface ElectronIpcOptions {
+}
+export declare const ElectronMainConnectionProvider: unique symbol;
+/**
+ * Connection provider between the Theia frontend and the electron-main process via IPC.
+ */
+export declare namespace ElectronIpcConnectionProvider {
+    function createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): RpcProxy<T>;
+}
+export declare class ElectronIpcConnectionSource implements ConnectionSource, FrontendApplicationContribution {
+    protected readonly onConnectionDidOpenEmitter: Emitter<Channel>;
+    onConnectionDidOpen: Event<Channel>;
+    onStart(): MaybePromise<void>;
+}
+export declare class ElectronIpcRendererChannel extends AbstractChannel {
+    constructor();
+    getWriteBuffer(): WriteBuffer;
+}
+//# sourceMappingURL=electron-ipc-connection-source.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"electron-ipc-connection-source.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-ipc-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAEhE,MAAM,WAAW,kBAAkB;CAClC;AAED,eAAO,MAAM,8BAA8B,eAA2C,CAAC;AAEvF;;GAEG;AACH,yBAAiB,6BAA6B,CAAC;IAE3C,SAAgB,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,CAEtH;CACJ;AAED,qBACa,2BAA4B,YAAW,gBAAgB,EAAE,+BAA+B;IACjG,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAyC;IAE5E,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC;CAIhC;AAED,qBAAa,0BAA2B,SAAQ,eAAe;;IAQ3D,cAAc,IAAI,WAAW;CAMhC"}

package/lib/electron-browser/messaging/{electron-ipc-connection-provider.js → electron-ipc-connection-source.js}

@@ -20,36 +20,36 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 ElectronIpcConnectionProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElectronIpcRendererChannel = exports.ElectronIpcConnectionProvider = void 0;
+exports.ElectronIpcRendererChannel = exports.ElectronIpcConnectionSource = exports.ElectronIpcConnectionProvider = exports.ElectronMainConnectionProvider = void 0;
 const inversify_1 = require("inversify");
-const abstract_connection_provider_1 = require("../../common/messaging/abstract-connection-provider");
 const common_1 = require("../../common");
 const uint8_array_message_buffer_1 = require("../../common/message-rpc/uint8-array-message-buffer");
+exports.ElectronMainConnectionProvider = Symbol('ElectronMainConnectionProvider');
 /**
  * Connection provider between the Theia frontend and the electron-main process via IPC.
  */
-let ElectronIpcConnectionProvider = ElectronIpcConnectionProvider_1 = class ElectronIpcConnectionProvider extends abstract_connection_provider_1.AbstractConnectionProvider {
-    static createProxy(container, path, arg) {
-        return container.get(ElectronIpcConnectionProvider_1).createProxy(path, arg);
+var ElectronIpcConnectionProvider;
+(function (ElectronIpcConnectionProvider) {
+    function createProxy(container, path, arg) {
+        return container.get(exports.ElectronMainConnectionProvider).createProxy(path, arg);
     }
+    ElectronIpcConnectionProvider.createProxy = createProxy;
+})(ElectronIpcConnectionProvider = exports.ElectronIpcConnectionProvider || (exports.ElectronIpcConnectionProvider = {}));
+let ElectronIpcConnectionSource = class ElectronIpcConnectionSource {
     constructor() {
-        super();
-        this.initializeMultiplexer();
+        this.onConnectionDidOpenEmitter = new common_1.Emitter();
+        this.onConnectionDidOpen = this.onConnectionDidOpenEmitter.event;
     }
-    createMainChannel() {
-        return new ElectronIpcRendererChannel();
+    onStart() {
+        const channel = new ElectronIpcRendererChannel();
+        this.onConnectionDidOpenEmitter.fire(channel);
     }
 };
-ElectronIpcConnectionProvider = ElectronIpcConnectionProvider_1 = __decorate([
-    (0, inversify_1.injectable)(),
-    __metadata("design:paramtypes", [])
-], ElectronIpcConnectionProvider);
-exports.ElectronIpcConnectionProvider = ElectronIpcConnectionProvider;
+ElectronIpcConnectionSource = __decorate([
+    (0, inversify_1.injectable)()
+], ElectronIpcConnectionSource);
+exports.ElectronIpcConnectionSource = ElectronIpcConnectionSource;
 class ElectronIpcRendererChannel extends common_1.AbstractChannel {
     constructor() {
         super();
@@ -62,4 +62,4 @@ class ElectronIpcRendererChannel extends common_1.AbstractChannel {
     }
 }
 exports.ElectronIpcRendererChannel = ElectronIpcRendererChannel;
-//# sourceMappingURL=electron-ipc-connection-provider.js.map
+//# sourceMappingURL=electron-ipc-connection-source.js.map

package/lib/electron-browser/messaging/electron-ipc-connection-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"electron-ipc-connection-source.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-ipc-connection-source.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,yCAAmD;AAEnD,yCAAmG;AACnG,oGAAkH;AAQrG,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAEvF;;GAEG;AACH,IAAiB,6BAA6B,CAK7C;AALD,WAAiB,6BAA6B;IAE1C,SAAgB,WAAW,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QACrG,OAAO,SAAS,CAAC,GAAG,CAA4B,sCAA8B,CAAC,CAAC,WAAW,CAAI,IAAI,EAAE,GAAG,CAAC,CAAC;IAC9G,CAAC;IAFe,yCAAW,cAE1B,CAAA;AACL,CAAC,EALgB,6BAA6B,GAA7B,qCAA6B,KAA7B,qCAA6B,QAK7C;AAGD,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACuB,+BAA0B,GAAqB,IAAI,gBAAO,EAAE,CAAC;QAChF,wBAAmB,GAAmB,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;IAMhF,CAAC;IAJG,OAAO;QACH,MAAM,OAAO,GAAG,IAAI,0BAA0B,EAAE,CAAC;QACjD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ,CAAA;AARY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAQvC;AARY,kEAA2B;AAUxC,MAAa,0BAA2B,SAAQ,wBAAe;IAE3D;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,iDAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnI,CAAC;IAED,cAAc;QACV,MAAM,MAAM,GAAG,IAAI,kDAAqB,EAAE,CAAC;QAC3C,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ;AAdD,gEAcC"}

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

@@ -0,0 +1,7 @@
+import { Endpoint } from '../../browser/endpoint';
+import { WebSocketConnectionSource } from '../../browser/messaging/ws-connection-source';
+export declare function getLocalPort(): string | undefined;
+export declare class ElectronLocalWebSocketConnectionSource extends WebSocketConnectionSource {
+    protected createEndpoint(path: string): Endpoint;
+}
+//# sourceMappingURL=electron-local-ws-connection-source.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"electron-local-ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-local-ws-connection-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAEzF,wBAAgB,YAAY,IAAI,MAAM,GAAG,SAAS,CAGjD;AAED,qBACa,sCAAuC,SAAQ,yBAAyB;cAE9D,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;CAgB5D"}

package/lib/electron-browser/messaging/{electron-local-ws-connection-provider.js → electron-local-ws-connection-source.js}

@@ -21,17 +21,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElectronLocalWebSocketConnectionProvider = exports.getLocalPort = void 0;
+exports.ElectronLocalWebSocketConnectionSource = exports.getLocalPort = void 0;
 const inversify_1 = require("inversify");
-const ws_connection_provider_1 = require("../../browser/messaging/ws-connection-provider");
 const endpoint_1 = require("../../browser/endpoint");
+const ws_connection_source_1 = require("../../browser/messaging/ws-connection-source");
 function getLocalPort() {
     var _a;
     const params = new URLSearchParams(location.search);
     return (_a = params.get('localPort')) !== null && _a !== void 0 ? _a : undefined;
 }
 exports.getLocalPort = getLocalPort;
-let ElectronLocalWebSocketConnectionProvider = class ElectronLocalWebSocketConnectionProvider extends ws_connection_provider_1.WebSocketConnectionProvider {
+let ElectronLocalWebSocketConnectionSource = class ElectronLocalWebSocketConnectionSource extends ws_connection_source_1.WebSocketConnectionSource {
     createEndpoint(path) {
         const localPort = getLocalPort();
         if (!localPort) {
@@ -48,8 +48,8 @@ let ElectronLocalWebSocketConnectionProvider = class ElectronLocalWebSocketConne
         return endpoint;
     }
 };
-ElectronLocalWebSocketConnectionProvider = __decorate([
+ElectronLocalWebSocketConnectionSource = __decorate([
     (0, inversify_1.injectable)()
-], ElectronLocalWebSocketConnectionProvider);
-exports.ElectronLocalWebSocketConnectionProvider = ElectronLocalWebSocketConnectionProvider;
-//# sourceMappingURL=electron-local-ws-connection-provider.js.map
+], ElectronLocalWebSocketConnectionSource);
+exports.ElectronLocalWebSocketConnectionSource = ElectronLocalWebSocketConnectionSource;
+//# sourceMappingURL=electron-local-ws-connection-source.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"electron-local-ws-connection-source.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-local-ws-connection-source.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,yCAAuC;AACvC,qDAAkD;AAClD,uFAAyF;AAEzF,SAAgB,YAAY;;IACxB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpD,OAAO,MAAA,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,SAAS,CAAC;AAChD,CAAC;AAHD,oCAGC;AAGD,IAAa,sCAAsC,GAAnD,MAAa,sCAAuC,SAAQ,gDAAyB;IAE9D,cAAc,CAAC,IAAY;QAC1C,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC;YAC1B,IAAI;SACP,EAAE;YACC,IAAI,EAAE,aAAa,SAAS,EAAE;YAC9B,QAAQ,EAAE,GAAG;YACb,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,EAAE;SACb,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IACpB,CAAC;CAEJ,CAAA;AAlBY,sCAAsC;IADlD,IAAA,sBAAU,GAAE;GACA,sCAAsC,CAkBlD;AAlBY,wFAAsC"}

package/lib/electron-browser/messaging/electron-messaging-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAO5C,eAAO,MAAM,uBAAuB,iBAiBlC,CAAC"}
+{"version":3,"file":"electron-messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAgB5C,eAAO,MAAM,uBAAuB,iBA6ClC,CAAC"}

package/lib/electron-browser/messaging/electron-messaging-frontend-module.js

@@ -18,27 +18,59 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.messagingFrontendModule = void 0;
 const inversify_1 = require("inversify");
 const frontend_application_contribution_1 = require("../../browser/frontend-application-contribution");
-const ws_connection_provider_1 = require("../../browser/messaging/ws-connection-provider");
-const electron_ws_connection_provider_1 = require("./electron-ws-connection-provider");
-const electron_ipc_connection_provider_1 = require("./electron-ipc-connection-provider");
-const electron_local_ws_connection_provider_1 = require("./electron-local-ws-connection-provider");
+const electron_ws_connection_source_1 = require("./electron-ws-connection-source");
+const electron_ipc_connection_source_1 = require("./electron-ipc-connection-source");
+const electron_local_ws_connection_source_1 = require("./electron-local-ws-connection-source");
+const electron_frontend_id_provider_1 = require("./electron-frontend-id-provider");
+const frontend_id_provider_1 = require("../../browser/messaging/frontend-id-provider");
+const connection_source_1 = require("../../browser/messaging/connection-source");
+const service_connection_provider_1 = require("../../browser/messaging/service-connection-provider");
+const browser_1 = require("../../browser");
+const connection_management_1 = require("../../common/messaging/connection-management");
+const ws_connection_source_1 = require("../../browser/messaging/ws-connection-source");
+const backendServiceProvider = Symbol('backendServiceProvider2');
+const localServiceProvider = Symbol('localServiceProvider');
 exports.messagingFrontendModule = new inversify_1.ContainerModule(bind => {
-    bind(electron_ws_connection_provider_1.ElectronWebSocketConnectionProvider).toSelf().inSingletonScope();
-    bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(electron_ws_connection_provider_1.ElectronWebSocketConnectionProvider);
-    bind(ws_connection_provider_1.WebSocketConnectionProvider).toService(electron_ws_connection_provider_1.ElectronWebSocketConnectionProvider);
-    bind(electron_local_ws_connection_provider_1.ElectronLocalWebSocketConnectionProvider).toSelf().inSingletonScope();
-    bind(ws_connection_provider_1.LocalWebSocketConnectionProvider).toDynamicValue(ctx => {
-        const localPort = (0, electron_local_ws_connection_provider_1.getLocalPort)();
+    bind(connection_management_1.ConnectionCloseService).toDynamicValue(ctx => browser_1.WebSocketConnectionProvider.createProxy(ctx.container, connection_management_1.connectionCloseServicePath)).inSingletonScope();
+    bind(electron_ws_connection_source_1.ElectronWebSocketConnectionSource).toSelf().inSingletonScope();
+    bind(ws_connection_source_1.WebSocketConnectionSource).toService(electron_ws_connection_source_1.ElectronWebSocketConnectionSource);
+    bind(electron_ipc_connection_source_1.ElectronIpcConnectionSource).toSelf().inSingletonScope();
+    bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(electron_ipc_connection_source_1.ElectronIpcConnectionSource);
+    bind(electron_local_ws_connection_source_1.ElectronLocalWebSocketConnectionSource).toSelf().inSingletonScope();
+    bind(backendServiceProvider).toDynamicValue(ctx => {
+        const container = ctx.container.createChild();
+        container.bind(service_connection_provider_1.ServiceConnectionProvider).toSelf().inSingletonScope();
+        container.bind(connection_source_1.ConnectionSource).toService(electron_ws_connection_source_1.ElectronWebSocketConnectionSource);
+        return container.get(service_connection_provider_1.ServiceConnectionProvider);
+    }).inSingletonScope();
+    bind(localServiceProvider).toDynamicValue(ctx => {
+        const container = ctx.container.createChild();
+        container.bind(service_connection_provider_1.ServiceConnectionProvider).toSelf().inSingletonScope();
+        container.bind(connection_source_1.ConnectionSource).toService(electron_local_ws_connection_source_1.ElectronLocalWebSocketConnectionSource);
+        return container.get(service_connection_provider_1.ServiceConnectionProvider);
+    }).inSingletonScope();
+    bind(electron_ipc_connection_source_1.ElectronMainConnectionProvider).toDynamicValue(ctx => {
+        const container = ctx.container.createChild();
+        container.bind(service_connection_provider_1.ServiceConnectionProvider).toSelf().inSingletonScope();
+        container.bind(connection_source_1.ConnectionSource).toService(electron_ipc_connection_source_1.ElectronIpcConnectionSource);
+        return container.get(service_connection_provider_1.ServiceConnectionProvider);
+    }).inSingletonScope();
+    bind(service_connection_provider_1.LocalConnectionProvider).toDynamicValue(ctx => {
+        const localPort = (0, electron_local_ws_connection_source_1.getLocalPort)();
         if (localPort) {
             // Return new web socket provider that connects to local app
-            return ctx.container.get(electron_local_ws_connection_provider_1.ElectronLocalWebSocketConnectionProvider);
+            return ctx.container.get(localServiceProvider);
         }
         else {
             // Return the usual web socket provider that already established its connection
             // That way we don't create a second socket connection
-            return ctx.container.get(ws_connection_provider_1.WebSocketConnectionProvider);
+            return ctx.container.get(backendServiceProvider);
         }
     }).inSingletonScope();
-    bind(electron_ipc_connection_provider_1.ElectronIpcConnectionProvider).toSelf().inSingletonScope();
+    bind(service_connection_provider_1.RemoteConnectionProvider).toService(backendServiceProvider);
+    bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(electron_ws_connection_source_1.ElectronWebSocketConnectionSource);
+    bind(electron_frontend_id_provider_1.ElectronFrontendIdProvider).toSelf().inSingletonScope();
+    bind(frontend_id_provider_1.FrontendIdProvider).toService(electron_frontend_id_provider_1.ElectronFrontendIdProvider);
+    bind(browser_1.WebSocketConnectionProvider).toSelf().inSingletonScope();
 });
 //# sourceMappingURL=electron-messaging-frontend-module.js.map