@theia/core 1.26.0-next.34 → 1.26.0-next.35

package/README.md

@@ -86,9 +86,9 @@ export class SomeClass {
     - `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
     - `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
     - `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
-    - `@theia/application-package` (from [`@theia/application-package@1.26.0-next.34+1732179729e`](https://www.npmjs.com/package/@theia/application-package/v/1.26.0-next.34))
-    - `@theia/application-package/lib/api` (from [`@theia/application-package@1.26.0-next.34+1732179729e`](https://www.npmjs.com/package/@theia/application-package/v/1.26.0-next.34))
-    - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.26.0-next.34+1732179729e`](https://www.npmjs.com/package/@theia/application-package/v/1.26.0-next.34))
+    - `@theia/application-package` (from [`@theia/application-package@1.26.0-next.35+0ec8075c1ef`](https://www.npmjs.com/package/@theia/application-package/v/1.26.0-next.35))
+    - `@theia/application-package/lib/api` (from [`@theia/application-package@1.26.0-next.35+0ec8075c1ef`](https://www.npmjs.com/package/@theia/application-package/v/1.26.0-next.35))
+    - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.26.0-next.35+0ec8075c1ef`](https://www.npmjs.com/package/@theia/application-package/v/1.26.0-next.35))
     - `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
     - `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
     - `inversify` (from [`inversify@^5.1.1`](https://www.npmjs.com/package/inversify))
@@ -96,7 +96,6 @@ export class SomeClass {
     - `react-virtualized` (from [`react-virtualized@^9.20.0`](https://www.npmjs.com/package/react-virtualized))
     - `vscode-languageserver-protocol` (from [`vscode-languageserver-protocol@~3.15.3`](https://www.npmjs.com/package/vscode-languageserver-protocol))
     - `vscode-uri` (from [`vscode-uri@^2.1.1`](https://www.npmjs.com/package/vscode-uri))
-    - `vscode-ws-jsonrpc` (from [`vscode-ws-jsonrpc@^0.2.0`](https://www.npmjs.com/package/vscode-ws-jsonrpc))
     - `dompurify` (from [`dompurify@^2.2.9`](https://www.npmjs.com/package/dompurify))
     - `express` (from [`express@^4.16.3`](https://www.npmjs.com/package/express))
     - `lodash.debounce` (from [`lodash.debounce@^4.0.8`](https://www.npmjs.com/package/lodash.debounce))

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

@@ -1,8 +1,8 @@
 import { interfaces } from 'inversify';
-import { JsonRpcProxy, Emitter, Event } from '../../common';
-import { WebSocketChannel } from '../../common/messaging/web-socket-channel';
+import { JsonRpcProxy, Emitter, Event, Channel } from '../../common';
 import { AbstractConnectionProvider } from '../../common/messaging/abstract-connection-provider';
 import { Socket } from 'socket.io-client';
+import { IWebSocket } from '../../common/messaging/web-socket-channel';
 export interface WebSocketOptions {
     /**
      * True by default.
@@ -11,14 +11,14 @@ export interface WebSocketOptions {
 }
 export declare class WebSocketConnectionProvider extends AbstractConnectionProvider<WebSocketOptions> {
     protected readonly onSocketDidOpenEmitter: Emitter<void>;
+    protected socket: Socket;
     get onSocketDidOpen(): Event<void>;
     protected readonly onSocketDidCloseEmitter: Emitter<void>;
     get onSocketDidClose(): Event<void>;
     static createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): JsonRpcProxy<T>;
-    protected readonly socket: Socket;
-    constructor();
-    openChannel(path: string, handler: (channel: WebSocketChannel) => void, options?: WebSocketOptions): void;
-    protected createChannel(id: number): WebSocketChannel;
+    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.
      */

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,EAAuB,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAM,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK9C,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,YAAY,CAAC,CAAC,CAAC;IAI3H,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;;IAsBzB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAYlH,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB;IAQrD;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD;;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,EAAuB,MAAM,WAAW,CAAC;AACxE,OAAO,EAAuB,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE1F,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAM,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAoB,MAAM,2CAA2C,CAAC;AAKzF,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;IAEzE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,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,YAAY,CAAC,CAAC,CAAC;IAI3H,SAAS,CAAC,iBAAiB,IAAI,OAAO;IActC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU;IAgBnC,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;;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"}

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

@@ -20,41 +20,22 @@ 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 WebSocketConnectionProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketConnectionProvider = void 0;
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
-const web_socket_channel_1 = require("../../common/messaging/web-socket-channel");
 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");
 (0, inversify_1.decorate)((0, inversify_1.injectable)(), common_1.JsonRpcProxyFactory);
 (0, inversify_1.decorate)((0, inversify_1.unmanaged)(), common_1.JsonRpcProxyFactory, 0);
 let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocketConnectionProvider extends abstract_connection_provider_1.AbstractConnectionProvider {
     constructor() {
-        super();
+        super(...arguments);
         this.onSocketDidOpenEmitter = new common_1.Emitter();
         this.onSocketDidCloseEmitter = new common_1.Emitter();
-        const url = this.createWebSocketUrl(web_socket_channel_1.WebSocketChannel.wsPath);
-        const socket = this.createWebSocket(url);
-        socket.on('connect', () => {
-            this.fireSocketDidOpen();
-        });
-        socket.on('disconnect', reason => {
-            for (const channel of [...this.channels.values()]) {
-                channel.close(undefined, reason);
-            }
-            this.fireSocketDidClose();
-        });
-        socket.on('message', data => {
-            this.handleIncomingRawMessage(data);
-        });
-        socket.connect();
-        this.socket = socket;
     }
     get onSocketDidOpen() {
         return this.onSocketDidOpenEmitter.event;
@@ -65,9 +46,36 @@ let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocke
     static createProxy(container, path, arg) {
         return container.get(WebSocketConnectionProvider_1).createProxy(path, arg);
     }
-    openChannel(path, handler, options) {
+    createMainChannel() {
+        const url = this.createWebSocketUrl(web_socket_channel_1.WebSocketChannel.wsPath);
+        const socket = this.createWebSocket(url);
+        const channel = new web_socket_channel_1.WebSocketChannel(this.toIWebSocket(socket));
+        socket.on('connect', () => {
+            this.fireSocketDidOpen();
+        });
+        channel.onClose(() => this.fireSocketDidClose());
+        socket.connect();
+        this.socket = socket;
+        return channel;
+    }
+    toIWebSocket(socket) {
+        return {
+            close: () => {
+                socket.removeAllListeners('disconnect');
+                socket.removeAllListeners('error');
+                socket.removeAllListeners('message');
+                socket.close();
+            },
+            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) {
-            super.openChannel(path, handler, options);
+            return super.openChannel(path, handler, options);
         }
         else {
             const openChannel = () => {
@@ -77,13 +85,6 @@ let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocke
             this.socket.on('connect', openChannel);
         }
     }
-    createChannel(id) {
-        return new web_socket_channel_1.WebSocketChannel(id, content => {
-            if (this.socket.connected) {
-                this.socket.send(content);
-            }
-        });
-    }
     /**
      * @param path The handler to reach in the backend.
      */
@@ -133,8 +134,7 @@ let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocke
     }
 };
 WebSocketConnectionProvider = WebSocketConnectionProvider_1 = __decorate([
-    (0, inversify_1.injectable)(),
-    __metadata("design:paramtypes", [])
+    (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":"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"}

package/lib/browser/progress-status-bar-item.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="lodash" />
-import { CancellationToken } from 'vscode-ws-jsonrpc';
+import { CancellationToken } from '../../shared/vscode-languageserver-protocol';
 import { ProgressClient, ProgressMessage, ProgressUpdate } from '../common';
 import { StatusBar } from './status-bar';
 export declare class ProgressStatusBarItem implements ProgressClient {

package/lib/browser/progress-status-bar-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progress-status-bar-item.d.ts","sourceRoot":"","sources":["../../src/browser/progress-status-bar-item.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAsB,MAAM,cAAc,CAAC;AAI7D,qBACa,qBAAsB,YAAW,cAAc;IAExD,SAAS,CAAC,QAAQ,CAAC,EAAE,oCAAoC;IAGzD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAExC,SAAS,CAAC,kBAAkB,kCAAyC;IAErE,SAAS,CAAC,aAAa,WAAuB;IAE9C,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAU7H,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAW3F,SAAS,CAAC,QAAQ,CAAC,aAAa,6CAA6F;IAEvH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxJ,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAczD"}
+{"version":3,"file":"progress-status-bar-item.d.ts","sourceRoot":"","sources":["../../src/browser/progress-status-bar-item.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAsB,MAAM,cAAc,CAAC;AAI7D,qBACa,qBAAsB,YAAW,cAAc;IAExD,SAAS,CAAC,QAAQ,CAAC,EAAE,oCAAoC;IAGzD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAExC,SAAS,CAAC,kBAAkB,kCAAyC;IAErE,SAAS,CAAC,aAAa,WAAuB;IAE9C,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAU7H,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAW3F,SAAS,CAAC,QAAQ,CAAC,aAAa,6CAA6F;IAEvH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxJ,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAczD"}

package/lib/common/cancellation.d.ts

@@ -6,6 +6,7 @@ export interface CancellationToken {
 export declare namespace CancellationToken {
     const None: CancellationToken;
     const Cancelled: CancellationToken;
+    function is(value: any): value is CancellationToken;
 }
 export declare class CancellationError extends Error {
     constructor();

package/lib/common/cancellation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancellation.d.ts","sourceRoot":"","sources":["../../src/common/cancellation.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,KAAK,EAAW,MAAM,SAAS,CAAC;AAEzC,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAK1C,QAAQ,CAAC,uBAAuB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CACjD;AAWD,yBAAiB,iBAAiB,CAAC;IAExB,MAAM,IAAI,EAAE,iBAGjB,CAAC;IAEI,MAAM,SAAS,EAAE,iBAGtB,CAAC;CACN;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAK3C;AAgCD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,MAAM,CAAoB;IAElC,IAAI,KAAK,IAAI,iBAAiB,CAO7B;IAED,MAAM,IAAI,IAAI;IAWd,OAAO,IAAI,IAAI;CAGlB;AAID,wBAAgB,SAAS,IAAI,KAAK,CAEjC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAE3D;AAED,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAI9D"}
+{"version":3,"file":"cancellation.d.ts","sourceRoot":"","sources":["../../src/common/cancellation.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,KAAK,EAAW,MAAM,SAAS,CAAC;AAEzC,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAK1C,QAAQ,CAAC,uBAAuB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CACjD;AAWD,yBAAiB,iBAAiB,CAAC;IAExB,MAAM,IAAI,EAAE,iBAGjB,CAAC;IAEI,MAAM,SAAS,EAAE,iBAGtB,CAAC;IAGH,SAAgB,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,iBAAiB,CAKzD;CACJ;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAK3C;AAgCD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,MAAM,CAAoB;IAElC,IAAI,KAAK,IAAI,iBAAiB,CAO7B;IAED,MAAM,IAAI,IAAI;IAWd,OAAO,IAAI,IAAI;CAGlB;AAID,wBAAgB,SAAS,IAAI,KAAK,CAEjC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAE3D;AAED,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAI9D"}

package/lib/common/cancellation.js

@@ -39,6 +39,14 @@ var CancellationToken;
         isCancellationRequested: true,
         onCancellationRequested: shortcutEvent
     });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    function is(value) {
+        const candidate = value;
+        return candidate && (candidate === CancellationToken.None
+            || candidate === CancellationToken.Cancelled
+            || (typeof candidate.isCancellationRequested === 'boolean' && !!candidate.onCancellationRequested));
+    }
+    CancellationToken.is = is;
 })(CancellationToken = exports.CancellationToken || (exports.CancellationToken = {}));
 class CancellationError extends Error {
     constructor() {

package/lib/common/cancellation.js.map

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

package/lib/common/index.d.ts

@@ -13,6 +13,7 @@ export * from './contribution-provider';
 export * from './path';
 export * from './logger';
 export * from './messaging';
+export * from './message-rpc';
 export * from './message-service';
 export * from './message-service-protocol';
 export * from './progress-service';

package/lib/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAgBA,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,MAAM,CAAC;AACrB,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAgBA,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,MAAM,CAAC;AACrB,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/lib/common/index.js

@@ -41,6 +41,7 @@ __exportStar(require("./contribution-provider"), exports);
 __exportStar(require("./path"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./messaging"), exports);
+__exportStar(require("./message-rpc"), exports);
 __exportStar(require("./message-service"), exports);
 __exportStar(require("./message-service-protocol"), exports);
 __exportStar(require("./progress-service"), exports);

package/lib/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,0CAAwB;AACxB,+CAA6B;AAC7B,8CAA4B;AAC5B,0CAAwB;AACxB,iDAA+B;AAC/B,4CAA0B;AAC1B,yCAAuB;AACvB,sDAAoC;AACpC,4CAA0B;AAC1B,uCAAqB;AACrB,6CAA2B;AAC3B,0DAAwC;AACxC,yCAAuB;AACvB,2CAAyB;AACzB,8CAA4B;AAC5B,oDAAkC;AAClC,6DAA2C;AAC3C,qDAAmC;AACnC,8DAA4C;AAC5C,8CAA4B;AAC5B,4CAA0B;AAC1B,sDAAoC;AACpC,8CAA4B;AAC5B,wDAAsC;AACtC,wCAAsB;AACtB,4CAA0B;AAC1B,gDAA8B;AAE9B,4EAAyE;AAChE,4FADA,yBAAW,OACA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,0CAAwB;AACxB,+CAA6B;AAC7B,8CAA4B;AAC5B,0CAAwB;AACxB,iDAA+B;AAC/B,4CAA0B;AAC1B,yCAAuB;AACvB,sDAAoC;AACpC,4CAA0B;AAC1B,uCAAqB;AACrB,6CAA2B;AAC3B,0DAAwC;AACxC,yCAAuB;AACvB,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,oDAAkC;AAClC,6DAA2C;AAC3C,qDAAmC;AACnC,8DAA4C;AAC5C,8CAA4B;AAC5B,4CAA0B;AAC1B,sDAAoC;AACpC,8CAA4B;AAC5B,wDAAsC;AACtC,wCAAsB;AACtB,4CAA0B;AAC1B,gDAA8B;AAE9B,4EAAyE;AAChE,4FADA,yBAAW,OACA"}

package/lib/common/message-rpc/channel.d.ts

@@ -0,0 +1,103 @@
+import { Emitter, Event } from '../event';
+import { ReadBuffer, WriteBuffer } from './message-buffer';
+/**
+ * A channel is a bidirectional communications channel with lifecycle and
+ * error signalling. Note that creation of channels is specific to particular
+ * implementations and thus not part of the protocol.
+ */
+export interface Channel {
+    /**
+     * The remote side has closed the channel
+     */
+    onClose: Event<ChannelCloseEvent>;
+    /**
+     * An error has occurred while writing to or reading from the channel
+     */
+    onError: Event<unknown>;
+    /**
+     * A message has arrived and can be read  by listeners using a {@link MessageProvider}.
+     */
+    onMessage: Event<MessageProvider>;
+    /**
+     * Obtain a {@link WriteBuffer} to write a message to the channel.
+     */
+    getWriteBuffer(): WriteBuffer;
+    /**
+     * Close this channel. No {@link onClose} event should be sent
+     */
+    close(): void;
+}
+/**
+ * The event that is emitted when a channel is closed from the remote side.
+ */
+export interface ChannelCloseEvent {
+    reason: string;
+    code?: number;
+}
+/**
+ * The `MessageProvider` is emitted when a channel receives a new message.
+ * Listeners can invoke the provider to obtain a new {@link ReadBuffer} for the received message.
+ * This ensures that each listener has its own isolated {@link ReadBuffer} instance.
+ *
+ */
+export declare type MessageProvider = () => ReadBuffer;
+/**
+ * Helper class to implement the single channels on a {@link ChannelMultiplexer}. Simply forwards write requests to
+ * the given write buffer source i.e. the main channel of the {@link ChannelMultiplexer}.
+ */
+export declare class ForwardingChannel implements Channel {
+    readonly id: string;
+    protected readonly closeHandler: () => void;
+    protected readonly writeBufferSource: () => WriteBuffer;
+    constructor(id: string, closeHandler: () => void, writeBufferSource: () => WriteBuffer);
+    onCloseEmitter: Emitter<ChannelCloseEvent>;
+    get onClose(): Event<ChannelCloseEvent>;
+    onErrorEmitter: Emitter<unknown>;
+    get onError(): Event<unknown>;
+    onMessageEmitter: Emitter<MessageProvider>;
+    get onMessage(): Event<MessageProvider>;
+    getWriteBuffer(): WriteBuffer;
+    send(message: Uint8Array): void;
+    close(): void;
+}
+/**
+ * The different message types used in the messaging protocol of the {@link ChannelMultiplexer}
+ */
+export declare enum MessageTypes {
+    Open = 1,
+    Close = 2,
+    AckOpen = 3,
+    Data = 4
+}
+/**
+ * The write buffers in this implementation immediately write to the underlying
+ * channel, so we rely on writers to the multiplexed channels to always commit their
+ * messages and always in one go.
+ */
+export declare class ChannelMultiplexer {
+    protected readonly underlyingChannel: Channel;
+    protected pendingOpen: Map<string, (channel: ForwardingChannel) => void>;
+    protected openChannels: Map<string, ForwardingChannel>;
+    protected readonly onOpenChannelEmitter: Emitter<{
+        id: string;
+        channel: Channel;
+    }>;
+    get onDidOpenChannel(): Event<{
+        id: string;
+        channel: Channel;
+    }>;
+    constructor(underlyingChannel: Channel);
+    protected handleError(error: unknown): void;
+    closeUnderlyingChannel(event?: ChannelCloseEvent): void;
+    protected handleMessage(buffer: ReadBuffer): void;
+    protected handleAckOpen(id: string): void;
+    protected handleOpen(id: string): void;
+    protected handleClose(id: string): void;
+    protected handleData(id: string, data: ReadBuffer): void;
+    protected createChannel(id: string): ForwardingChannel;
+    protected prepareWriteBuffer(id: string): WriteBuffer;
+    protected closeChannel(id: string): void;
+    open(id: string): Promise<Channel>;
+    getOpenChannel(id: string): Channel | undefined;
+}
+//# sourceMappingURL=channel.d.ts.map

package/lib/common/message-rpc/channel.d.ts.map

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

package/lib/common/message-rpc/channel.js

@@ -0,0 +1,184 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2021 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChannelMultiplexer = exports.MessageTypes = exports.ForwardingChannel = void 0;
+const event_1 = require("../event");
+;
+/**
+ * Helper class to implement the single channels on a {@link ChannelMultiplexer}. Simply forwards write requests to
+ * the given write buffer source i.e. the main channel of the {@link ChannelMultiplexer}.
+ */
+class ForwardingChannel {
+    constructor(id, closeHandler, writeBufferSource) {
+        this.id = id;
+        this.closeHandler = closeHandler;
+        this.writeBufferSource = writeBufferSource;
+        this.onCloseEmitter = new event_1.Emitter();
+        this.onErrorEmitter = new event_1.Emitter();
+        this.onMessageEmitter = new event_1.Emitter();
+    }
+    get onClose() {
+        return this.onCloseEmitter.event;
+    }
+    ;
+    get onError() {
+        return this.onErrorEmitter.event;
+    }
+    ;
+    get onMessage() {
+        return this.onMessageEmitter.event;
+    }
+    ;
+    getWriteBuffer() {
+        return this.writeBufferSource();
+    }
+    send(message) {
+        const writeBuffer = this.getWriteBuffer();
+        writeBuffer.writeBytes(message);
+        writeBuffer.commit();
+    }
+    close() {
+        this.closeHandler();
+    }
+}
+exports.ForwardingChannel = ForwardingChannel;
+/**
+ * The different message types used in the messaging protocol of the {@link ChannelMultiplexer}
+ */
+var MessageTypes;
+(function (MessageTypes) {
+    MessageTypes[MessageTypes["Open"] = 1] = "Open";
+    MessageTypes[MessageTypes["Close"] = 2] = "Close";
+    MessageTypes[MessageTypes["AckOpen"] = 3] = "AckOpen";
+    MessageTypes[MessageTypes["Data"] = 4] = "Data";
+})(MessageTypes = exports.MessageTypes || (exports.MessageTypes = {}));
+/**
+ * The write buffers in this implementation immediately write to the underlying
+ * channel, so we rely on writers to the multiplexed channels to always commit their
+ * messages and always in one go.
+ */
+class ChannelMultiplexer {
+    constructor(underlyingChannel) {
+        this.underlyingChannel = underlyingChannel;
+        this.pendingOpen = new Map();
+        this.openChannels = new Map();
+        this.onOpenChannelEmitter = new event_1.Emitter();
+        this.underlyingChannel.onMessage(buffer => this.handleMessage(buffer()));
+        this.underlyingChannel.onClose(event => this.closeUnderlyingChannel(event));
+        this.underlyingChannel.onError(error => this.handleError(error));
+    }
+    get onDidOpenChannel() {
+        return this.onOpenChannelEmitter.event;
+    }
+    handleError(error) {
+        this.openChannels.forEach(channel => {
+            channel.onErrorEmitter.fire(error);
+        });
+    }
+    closeUnderlyingChannel(event) {
+        this.pendingOpen.clear();
+        this.openChannels.forEach(channel => {
+            channel.onCloseEmitter.fire(event !== null && event !== void 0 ? event : { reason: 'Multiplexer main channel has been closed from the remote side!' });
+        });
+        this.openChannels.clear();
+    }
+    handleMessage(buffer) {
+        const type = buffer.readUint8();
+        const id = buffer.readString();
+        switch (type) {
+            case MessageTypes.AckOpen: {
+                return this.handleAckOpen(id);
+            }
+            case MessageTypes.Open: {
+                return this.handleOpen(id);
+            }
+            case MessageTypes.Close: {
+                return this.handleClose(id);
+            }
+            case MessageTypes.Data: {
+                return this.handleData(id, buffer.sliceAtReadPosition());
+            }
+        }
+    }
+    handleAckOpen(id) {
+        // edge case: both side try to open a channel at the same time.
+        const resolve = this.pendingOpen.get(id);
+        if (resolve) {
+            const channel = this.createChannel(id);
+            this.pendingOpen.delete(id);
+            this.openChannels.set(id, channel);
+            resolve(channel);
+            this.onOpenChannelEmitter.fire({ id, channel });
+        }
+    }
+    handleOpen(id) {
+        if (!this.openChannels.has(id)) {
+            const channel = this.createChannel(id);
+            this.openChannels.set(id, channel);
+            const resolve = this.pendingOpen.get(id);
+            if (resolve) {
+                // edge case: both side try to open a channel at the same time.
+                resolve(channel);
+            }
+            this.underlyingChannel.getWriteBuffer().writeUint8(MessageTypes.AckOpen).writeString(id).commit();
+            this.onOpenChannelEmitter.fire({ id, channel });
+        }
+    }
+    handleClose(id) {
+        const channel = this.openChannels.get(id);
+        if (channel) {
+            channel.onCloseEmitter.fire({ reason: 'Channel has been closed from the remote side' });
+            this.openChannels.delete(id);
+        }
+    }
+    handleData(id, data) {
+        const channel = this.openChannels.get(id);
+        if (channel) {
+            channel.onMessageEmitter.fire(() => data);
+        }
+    }
+    createChannel(id) {
+        return new ForwardingChannel(id, () => this.closeChannel(id), () => this.prepareWriteBuffer(id));
+    }
+    // Prepare the write buffer for the channel with the give, id. The channel id has to be encoded
+    // and written to the buffer before the actual message.
+    prepareWriteBuffer(id) {
+        const underlying = this.underlyingChannel.getWriteBuffer();
+        underlying.writeUint8(MessageTypes.Data);
+        underlying.writeString(id);
+        return underlying;
+    }
+    closeChannel(id) {
+        this.underlyingChannel.getWriteBuffer()
+            .writeUint8(MessageTypes.Close)
+            .writeString(id)
+            .commit();
+        this.openChannels.delete(id);
+    }
+    open(id) {
+        const result = new Promise((resolve, reject) => {
+            this.pendingOpen.set(id, resolve);
+        });
+        this.underlyingChannel.getWriteBuffer().writeUint8(MessageTypes.Open).writeString(id).commit();
+        return result;
+    }
+    getOpenChannel(id) {
+        return this.openChannels.get(id);
+    }
+}
+exports.ChannelMultiplexer = ChannelMultiplexer;
+//# sourceMappingURL=channel.js.map

package/lib/common/message-rpc/channel.js.map

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

package/lib/common/message-rpc/channel.spec.d.ts

@@ -0,0 +1,9 @@
+import { ForwardingChannel } from './channel';
+/**
+ * A pipe with two channels at each end for testing.
+ */
+export declare class ChannelPipe {
+    readonly left: ForwardingChannel;
+    readonly right: ForwardingChannel;
+}
+//# sourceMappingURL=channel.spec.d.ts.map

package/lib/common/message-rpc/channel.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"channel.spec.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/channel.spec.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAsB,iBAAiB,EAAmB,MAAM,WAAW,CAAC;AAInF;;GAEG;AACH,qBAAa,WAAW;IACpB,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAM7B;IACH,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAM9B;CACN"}