Integrate improved original message encoder

+ Remove depdendency to vscode-ws-jsonrpc Contributed on behalf of STMicroelectronics
eclipse-theia · May 6, 2022 · 750aecd · 750aecd
1 parent 154c56c
commit 750aecd
Show file tree

Hide file tree

Showing 15 changed files with 173 additions and 159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,11 @@
 
 - [core] Refactored the core messaging API. Replaced `vscode-ws-jsonrpc` with a custom RPC protocol that is better suited for handling binary data and enables message tunneling.
   This impacts all main concepts of the messaging API. The API no longer exposes a `Connection` object and uses a generic `Channel` implementation instead.
-  * `MessagingService`: No longer offers the `listen` and `forward` method. Use `wsChannel`instead. [#11011](https://github.com/eclipse-theia/theia/pull/11011) - Contributed on behalf of STMicroelectronics.
-<a name="breaking_changes_1.25.0">[Breaking Changes:](#breaking_changes_1.25.0)</a>
+  - `MessagingService`: No longer offers the `listen` and `forward` method. Use `wsChannel` instead.
+  [#11011](https://github.com/eclipse-theia/theia/pull/11011) - Contributed on behalf of STMicroelectronics.
+
+<a name="breaking_changes_1.26.0">[Breaking Changes:](#breaking_changes_1.26.0)</a>
+
 ## v1.25.0 - 4/28/2022
 
 [1.25.0 Milestone](https://github.com/eclipse-theia/theia/milestone/35)

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -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))

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -68,7 +68,6 @@
     "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"
   },
@@ -108,8 +107,7 @@
         "react-dom",
         "react-virtualized",
         "vscode-languageserver-protocol",
-        "vscode-uri",
-        "vscode-ws-jsonrpc"
+        "vscode-uri"
       ],
       "export =": [
         "dompurify as DOMPurify",

diff --git a/packages/core/shared/vscode-ws-jsonrpc/index.d.ts b/packages/core/shared/vscode-ws-jsonrpc/index.d.ts
diff --git a/packages/core/shared/vscode-ws-jsonrpc/index.js b/packages/core/shared/vscode-ws-jsonrpc/index.js
diff --git a/packages/core/src/browser/progress-status-bar-item.ts b/packages/core/src/browser/progress-status-bar-item.ts
@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject } from 'inversify';
-import { CancellationToken } from 'vscode-ws-jsonrpc';
+import { CancellationToken } from '../../shared/vscode-languageserver-protocol';
 import { ProgressClient, ProgressMessage, ProgressUpdate } from '../common';
 import { StatusBar, StatusBarAlignment } from './status-bar';
 import { Deferred } from '../common/promise-util';

diff --git a/packages/core/src/common/message-rpc/message-buffer.ts b/packages/core/src/common/message-rpc/message-buffer.ts
@@ -20,9 +20,10 @@
 export interface WriteBuffer {
     writeUint8(byte: number): WriteBuffer
     writeUint16(value: number): WriteBuffer
-    writeUint32(value: number): WriteBuffer;
-    writeString(value: string): WriteBuffer;
-    writeBytes(value: Uint8Array): WriteBuffer;
+    writeUint32(value: number): WriteBuffer
+    writeString(value: string): WriteBuffer
+    writeBytes(value: Uint8Array): WriteBuffer
+    writeNumber(value: number): WriteBuffer
     writeLength(value: number): WriteBuffer
     /**
      * Makes any writes to the buffer permanent, for example by sending the writes over a channel.
@@ -65,6 +66,11 @@ export class ForwardingWriteBuffer implements WriteBuffer {
         return this;
     }
 
+    writeNumber(value: number): WriteBuffer {
+        this.underlying.writeNumber(value);
+        return this;
+    }
+
     commit(): void {
         this.underlying.commit();
     }