Skip to content

Commit d3978e1

Browse files
jeanp413jeanp413
committed
Update connect lib
1 parent 854045d commit d3978e1

File tree

6 files changed

+33
-25
lines changed

6 files changed

+33
-25
lines changed

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@
436436
"webpack-cli": "^4.7.2"
437437
},
438438
"dependencies": {
439+
"@connectrpc/connect-node": "1.1.2",
440+
"@connectrpc/connect": "1.1.2",
439441
"@gitpod/gitpod-protocol": "main-gha",
440442
"@gitpod/local-app-api-grpcweb": "main-gha",
441443
"@gitpod/public-api": "main-gha",
@@ -448,7 +450,6 @@
448450
"configcat-node": "^8.0.0",
449451
"js-yaml": "^4.1.0",
450452
"long": "^5.2.1",
451-
"mustard-connect-node": "^0.11.2",
452453
"nice-grpc": "^2.1.3",
453454
"nice-grpc-common": "^2.0.1",
454455
"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 '@bufbuild/connect';
13+
import { Code } from '@connectrpc/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 '@bufbuild/connect';
23+
import { ConnectError, Code } from '@connectrpc/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 '@bufbuild/connect';
8+
import { StreamResponse, UnaryResponse, Code, ConnectError, Interceptor, StreamRequest, UnaryRequest } from '@connectrpc/connect';
99
import { ILogService } from './services/logService';
1010
import { addCounter, addHistogram } from './common/metrics';
1111

‎src/publicApi.ts

Lines changed: 4 additions & 3 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 'mustard-connect-node';
7-
import { createPromiseClient, Interceptor, PromiseClient, ConnectError, Code } from '@bufbuild/connect';
6+
import { createConnectTransport } from '@connectrpc/connect-node';
7+
import { createPromiseClient, Interceptor, PromiseClient, ConnectError, Code } from '@connectrpc/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';
@@ -87,7 +87,8 @@ export class GitpodPublicApi extends Disposable implements IGitpodAPI {
8787
httpVersion: '2',
8888
interceptors: [authInterceptor, metricsInterceptor],
8989
useBinaryFormat: true,
90-
pingIntervalMs: 120000
90+
pingIntervalMs: 120000,
91+
pingTimeoutMs: 10000
9192
});
9293

9394
this.workspaceService = createPromiseClient(WorkspacesService, transport);

‎yarn.lock

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

52-
"@bufbuild/[email protected]":
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-
5752
"@bufbuild/[email protected]", "@bufbuild/protobuf@^0.1.1":
5853
version "0.1.1"
5954
resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-0.1.1.tgz#163dee03af49e82d300dfa2bf60c8c0f04c80b4c"
@@ -80,6 +75,18 @@
8075
dependencies:
8176
"@bufbuild/protobuf" "0.1.1"
8277

78+
"@connectrpc/[email protected]":
79+
version "1.1.2"
80+
resolved "https://registry.yarnpkg.com/@connectrpc/connect-node/-/connect-node-1.1.2.tgz#ac99a696bb1a2d376b3146315cea8b056b278529"
81+
integrity sha512-IAwQhh05Qm/T/+ZShEnQz+FFZsr2fbq/DCHhXbmwYjePxvo+kF9YIDkTpVy+vjrV+CwZPBfgOdSaRSJLHUykdg==
82+
dependencies:
83+
undici "^5.25.4"
84+
85+
"@connectrpc/[email protected]":
86+
version "1.1.2"
87+
resolved "https://registry.yarnpkg.com/@connectrpc/connect/-/connect-1.1.2.tgz#d1b5fa1dcec310a8210c1523c99abdc227643f4b"
88+
integrity sha512-oDuKJFRORtzyH4IhZyNgIQ5DKjlDnbP72AH55Aabpc0fwApyus/h4cmYU1KDvahVbqsvUOpd5qUTyMH8IhMmLA==
89+
8390
"@discoveryjs/json-ext@^0.5.0":
8491
version "0.5.7"
8592
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
@@ -100,6 +107,11 @@
100107
minimatch "^3.1.2"
101108
strip-json-comments "^3.1.1"
102109

110+
"@fastify/busboy@^2.0.0":
111+
version "2.0.0"
112+
resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
113+
integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
114+
103115
"@gitpod/gitpod-protocol@main-gha":
104116
version "0.1.5-main-gha.11049"
105117
resolved "https://registry.yarnpkg.com/@gitpod/gitpod-protocol/-/gitpod-protocol-0.1.5-main-gha.11049.tgz#1b6f3672c790e882d0863ee336e5729d6b5f06e8"
@@ -2211,11 +2223,6 @@ [email protected]:
22112223
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
22122224
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
22132225

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-
22192226
hexer@^1.5.0:
22202227
version "1.5.0"
22212228
resolved "https://registry.yarnpkg.com/hexer/-/hexer-1.5.0.tgz#b86ce808598e8a9d1892c571f3cedd86fc9f0653"
@@ -2802,14 +2809,6 @@ [email protected], ms@^2.0.0:
28022809
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
28032810
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
28042811

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-
28132812
mute-stream@~0.0.4:
28142813
version "0.0.8"
28152814
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -3976,6 +3975,13 @@ underscore@^1.12.1:
39763975
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
39773976
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
39783977

3978+
undici@^5.25.4:
3979+
version "5.25.4"
3980+
resolved "https://registry.yarnpkg.com/undici/-/undici-5.25.4.tgz#7d8ef81d94f84cd384986271e5e5599b6dff4296"
3981+
integrity sha512-450yJxT29qKMf3aoudzFpIciqpx6Pji3hEWaXqXmanbXF58LTAGCKxcJjxMXWu3iG+Mudgo3ZUfDB6YDFd/dAw==
3982+
dependencies:
3983+
"@fastify/busboy" "^2.0.0"
3984+
39793985
[email protected], unpipe@~1.0.0:
39803986
version "1.0.0"
39813987
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

0 commit comments

Comments
 (0)