Revert "Integrate new message-rpc prototype into core messaging API (…

…extensions) (eclipse-theia#11011) (eclipse-theia#11228)"

This reverts commit 83d4308.

package.json

@@ -10,8 +10,6 @@
     "**/@types/node": "14"
   },
   "devDependencies": {
-    "@types/chai": "4.3.0",
-    "@types/chai-spies": "1.0.3",
     "@types/chai-string": "^1.4.0",
     "@types/jsdom": "^11.0.4",
     "@types/node": "14",
@@ -22,8 +20,6 @@
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "@typescript-eslint/eslint-plugin-tslint": "^4.8.1",
     "@typescript-eslint/parser": "^4.8.1",
-    "chai": "4.3.4",
-    "chai-spies": "1.0.0",
     "chai-string": "^1.4.0",
     "chalk": "4.0.0",
     "concurrently": "^3.5.0",

packages/core/README.md

@@ -99,6 +99,7 @@ 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))

packages/core/package.json

@@ -61,6 +61,7 @@
     "react-dom": "^16.8.0",
     "react-tooltip": "^4.2.21",
     "react-virtualized": "^9.20.0",
+    "reconnecting-websocket": "^4.2.0",
     "reflect-metadata": "^0.1.10",
     "route-parser": "^0.0.5",
     "safer-buffer": "^2.1.2",
@@ -69,6 +70,7 @@
     "uuid": "^8.3.2",
     "vscode-languageserver-protocol": "~3.15.3",
     "vscode-uri": "^2.1.1",
+    "vscode-ws-jsonrpc": "^0.2.0",
     "ws": "^7.1.2",
     "yargs": "^15.3.1"
   },
@@ -111,7 +113,8 @@
         "react-dom",
         "react-virtualized",
         "vscode-languageserver-protocol",
-        "vscode-uri"
+        "vscode-uri",
+        "vscode-ws-jsonrpc"
       ],
       "export =": [
         "dompurify as DOMPurify",

packages/core/shared/vscode-ws-jsonrpc/index.d.ts

@@ -0,0 +1 @@
+export * from 'vscode-ws-jsonrpc';

packages/core/shared/vscode-ws-jsonrpc/index.js

@@ -0,0 +1 @@
+module.exports = require('vscode-ws-jsonrpc');

packages/core/src/browser/messaging/ws-connection-provider.ts

@@ -15,11 +15,11 @@
 // *****************************************************************************
 
 import { injectable, interfaces, decorate, unmanaged } from 'inversify';
-import { JsonRpcProxyFactory, JsonRpcProxy, Emitter, Event, Channel } from '../../common';
+import { JsonRpcProxyFactory, JsonRpcProxy, Emitter, Event } from '../../common';
+import { WebSocketChannel } from '../../common/messaging/web-socket-channel';
 import { Endpoint } from '../endpoint';
 import { AbstractConnectionProvider } from '../../common/messaging/abstract-connection-provider';
 import { io, Socket } from 'socket.io-client';
-import { IWebSocket, WebSocketChannel } from '../../common/messaging/web-socket-channel';
 
 decorate(injectable(), JsonRpcProxyFactory);
 decorate(unmanaged(), JsonRpcProxyFactory, 0);
@@ -53,42 +53,26 @@ export class WebSocketConnectionProvider extends AbstractConnectionProvider<WebS
     constructor() {
         super();
         const url = this.createWebSocketUrl(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));
+        const socket = this.createWebSocket(url);
+        socket.on('connect', () => {
             this.fireSocketDidOpen();
         });
-        this.socket.connect();
-    }
-
-    protected createMainChannel(): Channel {
-        return new WebSocketChannel(this.toIWebSocket(this.socket));
-    }
-
-    protected toIWebSocket(socket: Socket): IWebSocket {
-        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)
-        };
+        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;
     }
 
-    override async openChannel(path: string, handler: (channel: Channel) => void, options?: WebSocketOptions): Promise<void> {
+    override openChannel(path: string, handler: (channel: WebSocketChannel) => void, options?: WebSocketOptions): void {
         if (this.socket.connected) {
-            return super.openChannel(path, handler, options);
+            super.openChannel(path, handler, options);
         } else {
             const openChannel = () => {
                 this.socket.off('connect', openChannel);
@@ -98,6 +82,14 @@ export class WebSocketConnectionProvider extends AbstractConnectionProvider<WebS
         }
     }
 
+    protected createChannel(id: number): WebSocketChannel {
+        return new WebSocketChannel(id, content => {
+            if (this.socket.connected) {
+                this.socket.send(content);
+            }
+        });
+    }
+
     /**
      * @param path The handler to reach in the backend.
      */
@@ -151,4 +143,3 @@ export class WebSocketConnectionProvider extends AbstractConnectionProvider<WebS
         this.onSocketDidCloseEmitter.fire(undefined);
     }
 }
-

packages/core/src/browser/progress-status-bar-item.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject } from 'inversify';
-import { CancellationToken } from '../../shared/vscode-languageserver-protocol';
+import { CancellationToken } from 'vscode-ws-jsonrpc';
 import { ProgressClient, ProgressMessage, ProgressUpdate } from '../common';
 import { StatusBar, StatusBarAlignment } from './status-bar';
 import { Deferred } from '../common/promise-util';

packages/core/src/common/cancellation.ts

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

packages/core/src/common/index.ts

@@ -29,7 +29,6 @@ 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';