Skip to content

Commit 4cf5d7d

Browse files
jeanp413jeanp413
committed
Revert connect update
1 parent b842949 commit 4cf5d7d

File tree

6 files changed

+24
-38
lines changed

6 files changed

+24
-38
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@
434434
"webpack-cli": "^4.7.2"
435435
},
436436
"dependencies": {
437-
"@connectrpc/connect-node": "^0.13.2",
438437
"@gitpod/gitpod-protocol": "main-gha",
439438
"@gitpod/local-app-api-grpcweb": "main-gha",
440439
"@gitpod/public-api": "main-gha",
@@ -447,6 +446,7 @@
447446
"configcat-node": "^8.0.0",
448447
"js-yaml": "^4.1.0",
449448
"long": "^5.2.1",
449+
"mustard-connect-node": "^0.11.2",
450450
"nice-grpc": "^2.1.3",
451451
"nice-grpc-common": "^2.0.1",
452452
"node-fetch-commonjs": "^3.2.4",

‎src/internalApi.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import WebSocket, { ErrorEvent } from 'ws';
1010
import ReconnectingWebSocket from 'reconnecting-websocket';
1111
import * as vscode from 'vscode';
1212
import { ILogService } from './services/logService';
13-
import { Code } from '@connectrpc/connect';
13+
import { Code } from '@bufbuild/connect';
1414
import { WrapError } from './common/utils';
1515

1616
type UsedGitpodFunction = ['getLoggedInUser', 'getWorkspace', 'getOwnerToken', 'getSSHPublicKeys', 'sendHeartBeat'];

‎src/local-ssh/ipc/extensionServiceServer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { CreateSSHKeyPairRequest } from '@gitpod/supervisor-api-grpcweb/lib/cont
2020
import * as ssh2 from 'ssh2';
2121
import { ParsedKey } from 'ssh2-streams';
2222
import { WrapError } from '../../common/utils';
23-
import { ConnectError, Code } from '@connectrpc/connect';
23+
import { ConnectError, Code } from '@bufbuild/connect';
2424
import { rawWorkspaceToWorkspaceData } from '../../publicApi';
2525

2626
function isServiceError(obj: any): obj is ServiceError {

‎src/metrics.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { Registry, Counter, Histogram, metric } from 'prom-client';
77
import { MethodKind } from '@bufbuild/protobuf';
8-
import { StreamResponse, UnaryResponse, Code, ConnectError, Interceptor, StreamRequest, UnaryRequest } from '@connectrpc/connect';
8+
import { StreamResponse, UnaryResponse, Code, ConnectError, Interceptor, StreamRequest, UnaryRequest } from '@bufbuild/connect';
99
import { ILogService } from './services/logService';
1010
import { addCounter, addHistogram } from './common/metrics';
1111

‎src/publicApi.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { createConnectTransport } from '@connectrpc/connect-node';
7-
import { createPromiseClient, Interceptor, PromiseClient, ConnectError, Code } from '@connectrpc/connect';
6+
import { createConnectTransport } from 'mustard-connect-node';
7+
import { createPromiseClient, Interceptor, PromiseClient, ConnectError, Code } from '@bufbuild/connect';
88
import { WorkspacesService } from '@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connectweb';
99
import { IDEClientService } from '@gitpod/public-api/lib/gitpod/experimental/v1/ide_client_connectweb';
1010
import { UserService } from '@gitpod/public-api/lib/gitpod/experimental/v1/user_connectweb';

‎yarn.lock‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
resolved "https://registry.yarnpkg.com/@bufbuild/connect-web/-/connect-web-0.2.1.tgz#a7ee2914bf1b77d640fc4ee3c3a89d626f3015fa"
5050
integrity sha512-L580cL9VZCXcjwXMCvIvdFBqdQofVBQcL+jmSis7m8ZxPj5NQ4p7fUhQRTsZMWHkyWINdlZnr7WsHQL0BT7wPQ==
5151

52+
"@bufbuild/connect@0.11.0":
53+
version "0.11.0"
54+
resolved "https://registry.yarnpkg.com/@bufbuild/connect/-/connect-0.11.0.tgz#b7afeabf0fe0cf665af736bb6b6d16814cbb2e88"
55+
integrity sha512-a6hrNtBzDzj4hpqylPqpJfMpIP4+O/SnszGgOuRzcuifpTvkwjSmVHLtcvkUYh0wpvjYB0CFmTYzrvAMOftbHw==
56+
5257
"@bufbuild/protobuf@0.1.1", "@bufbuild/protobuf@^0.1.1":
5358
version "0.1.1"
5459
resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-0.1.1.tgz#163dee03af49e82d300dfa2bf60c8c0f04c80b4c"
@@ -75,19 +80,6 @@
7580
dependencies:
7681
"@bufbuild/protobuf" "0.1.1"
7782

78-
"@connectrpc/connect-node@^0.13.2":
79-
version "0.13.2"
80-
resolved "https://registry.yarnpkg.com/@connectrpc/connect-node/-/connect-node-0.13.2.tgz#6f5fb37c90634d4d45f6713ea57d9fb6f070764b"
81-
integrity sha512-dAoBuQ+fYFw22KYgZXPw1t19i6TRwNmk6c6XsOYLhBl1Y5vzXoMfMX2jm7lmkmLQFIcM9Xc2EYoUKtjNXH5bjw==
82-
dependencies:
83-
"@connectrpc/connect" "0.13.2"
84-
undici "^5.23.0"
85-
86-
"@connectrpc/connect@0.13.2":
87-
version "0.13.2"
88-
resolved "https://registry.yarnpkg.com/@connectrpc/connect/-/connect-0.13.2.tgz#491147e3021ac544fa109563e9d23adec0282641"
89-
integrity sha512-KZg6EH8gYnQZm/d2IXXMVB2mom/A1dCD8+7JScm2tKN9OQyQSeCJOLqtv/M4M5XVS0Y9JM2/VCbiUwfhl9Rqmg==
90-
9183
"@discoveryjs/json-ext@^0.5.0":
9284
version "0.5.7"
9385
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
@@ -1148,13 +1140,6 @@ buildcheck@0.0.3:
11481140
resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5"
11491141
integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==
11501142

1151-
busboy@^1.6.0:
1152-
version "1.6.0"
1153-
resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
1154-
integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
1155-
dependencies:
1156-
streamsearch "^1.1.0"
1157-
11581143
bytes@3.1.2:
11591144
version "3.1.2"
11601145
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -2226,6 +2211,11 @@ he@1.2.0:
22262211
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
22272212
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
22282213

2214+
headers-polyfill@^3.1.2:
2215+
version "3.1.2"
2216+
resolved "https://registry.yarnpkg.com/headers-polyfill/-/headers-polyfill-3.1.2.tgz#9a4dcb545c5b95d9569592ef7ec0708aab763fbe"
2217+
integrity sha512-tWCK4biJ6hcLqTviLXVR9DTRfYGQMXEIUj3gwJ2rZ5wO/at3XtkI4g8mCvFdUF9l1KMBNCfmNAdnahm1cgavQA==
2218+
22292219
hexer@^1.5.0:
22302220
version "1.5.0"
22312221
resolved "https://registry.yarnpkg.com/hexer/-/hexer-1.5.0.tgz#b86ce808598e8a9d1892c571f3cedd86fc9f0653"
@@ -2812,6 +2802,14 @@ ms@2.1.3, ms@^2.0.0:
28122802
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
28132803
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
28142804

2805+
mustard-connect-node@^0.11.2:
2806+
version "0.11.2"
2807+
resolved "https://registry.yarnpkg.com/mustard-connect-node/-/mustard-connect-node-0.11.2.tgz#89628232d6e2a7b035fe9199f4d525cf64d75cf1"
2808+
integrity sha512-NrH576KU4TfTzk3tPDT0ow8vQ104f8iLEeDN5PP5fathrKZ3OSitdr7D0EAhetZYHNRUL/1aZWzjsKEruimaXw==
2809+
dependencies:
2810+
"@bufbuild/connect" "0.11.0"
2811+
headers-polyfill "^3.1.2"
2812+
28152813
mute-stream@~0.0.4:
28162814
version "0.0.8"
28172815
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -3677,11 +3675,6 @@ statuses@2.0.1:
36773675
resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
36783676
integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
36793677

3680-
streamsearch@^1.1.0:
3681-
version "1.1.0"
3682-
resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
3683-
integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
3684-
36853678
string-template@~0.2.1:
36863679
version "0.2.1"
36873680
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -3983,13 +3976,6 @@ underscore@^1.12.1:
39833976
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
39843977
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
39853978

3986-
undici@^5.23.0:
3987-
version "5.23.0"
3988-
resolved "https://registry.yarnpkg.com/undici/-/undici-5.23.0.tgz#e7bdb0ed42cebe7b7aca87ced53e6eaafb8f8ca0"
3989-
integrity sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==
3990-
dependencies:
3991-
busboy "^1.6.0"
3992-
39933979
unpipe@1.0.0, unpipe@~1.0.0:
39943980
version "1.0.0"
39953981
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

0 commit comments

Comments
 (0)