feat: upgrade connect v1 to v2

buf.ts.gen.yaml

@@ -2,10 +2,7 @@ version: v2
 plugins:
   - local: protoc-gen-es
     out: connect/src
-    opt: target=ts
-  - local: protoc-gen-connect-es
-    out: connect/src
-    opt: target=ts
+    opt: target=ts,import_extension=js
   - local: protoc-gen-connect-query
     out: connect/src
-    opt: target=ts
+    opt: target=ts,import_extension=js

cli/package.json

@@ -41,9 +41,9 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@bufbuild/protobuf": "1.9.0",
-    "@connectrpc/connect": "1.4.0",
-    "@connectrpc/connect-node": "1.4.0",
+    "@bufbuild/protobuf": "^2.2.2",
+    "@connectrpc/connect": "^2.0.0",
+    "@connectrpc/connect-node": "^2.0.0",
     "@graphql-tools/utils": "11.0.0",
     "@modelcontextprotocol/sdk": "1.26.0",
     "@octokit/rest": "22.0.0",

cli/src/commands/graph/federated-graph/utils.ts

@@ -1,5 +1,5 @@
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
-import { Subgraph as ProtoSubgraph } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { Subgraph as ProtoSubgraph } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import { program } from 'commander';
 import jwtDecode from 'jwt-decode';
 import pc from 'picocolors';

cli/src/commands/mcp/tools/get-subgraphs.ts

@@ -1,6 +1,6 @@
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
 import { z } from 'zod';
-import { Subgraph } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { Subgraph } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import { getBaseHeaders } from '../../../core/config.js';
 import { ToolContext } from './types.js';
 

cli/src/commands/operations/commands/push.ts

@@ -1,16 +1,18 @@
 import crypto from 'node:crypto';
 import { readFile } from 'node:fs/promises';
 
+import { create } from '@bufbuild/protobuf';
+
 import { Command } from 'commander';
 import pc from 'picocolors';
 import cliProgress from 'cli-progress';
 
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
 import {
-  PublishedOperation,
+  PersistedOperationSchema,
   PublishedOperationStatus,
-  PersistedOperation,
 } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { PublishedOperation, PersistedOperation } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 
 import { BaseCommandOptions } from '../../../core/types/types.js';
 import { getBaseHeaders } from '../../../core/config.js';
@@ -50,7 +52,7 @@ const parseApolloPersistedQueryManifest = (data: ApolloPersistedQueryManifest):
   return (
     data.operations
       ?.filter((op) => op.id && op.body)
-      .map((op) => new PersistedOperation({ id: op.id, contents: op.body })) ?? []
+      .map((op) => create(PersistedOperationSchema, { id: op.id, contents: op.body })) ?? []
   );
 };
 
@@ -66,15 +68,15 @@ const isRelayQueryMap = (data: any): boolean => {
 };
 
 const parseRelayQueryMap = (data: Array<any>): PersistedOperation[] => {
-  return data.map((x: any) => new PersistedOperation({ id: x[0], contents: x[1] }));
+  return data.map((x: any) => create(PersistedOperationSchema, { id: x[0], contents: x[1] }));
 };
 
 const isRelayQueryObject = (data: any): boolean => {
   return Object.keys(data).every((key) => typeof key === 'string' && typeof data[key] === 'string');
 };
 
 const parseRelayQueryObject = (data: any): PersistedOperation[] => {
-  return Object.keys(data).map((key) => new PersistedOperation({ id: key, contents: data[key] }));
+  return Object.keys(data).map((key) => create(PersistedOperationSchema, { id: key, contents: data[key] }));
 };
 
 const parseOperationsJson = (data: any): PersistedOperation[] => {
@@ -127,7 +129,7 @@ export const parseOperations = (contents: string): PersistedOperation[] => {
   } catch {
     // Assume it's plain graphql
     const id = crypto.createHash('sha256').update(contents).digest('hex');
-    return [new PersistedOperation({ id, contents })];
+    return [create(PersistedOperationSchema, { id, contents })];
   }
   return parseOperationsJson(data);
 };

cli/src/commands/proposal/utils.ts

@@ -1,9 +1,11 @@
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
+import { create } from '@bufbuild/protobuf';
 import { program } from 'commander';
 import pc from 'picocolors';
 import { resolve } from 'pathe';
-import { Label } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import { LabelSchema } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { Label } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import { splitLabel } from '@wundergraph/cosmo-shared';
 
 // Define interfaces for parsing parameters
@@ -82,7 +84,7 @@ export const processProposalSubgraphs = async ({
       if (part.startsWith('labels:')) {
         const labelsStr = part.slice('labels:'.length);
         const labelStrings = labelsStr.trim().split(' ');
-        labels = labelStrings.map((label: string) => new Label(splitLabel(label)));
+        labels = labelStrings.map((label: string) => create(LabelSchema, splitLabel(label)));
       } else {
         const [key, value] = part.split(':');
         if (key && value) {

cli/src/commands/router/commands/compose.ts

@@ -1,5 +1,6 @@
 import { existsSync } from 'node:fs';
 import { readFile, writeFile } from 'node:fs/promises';
+import { create, fromJsonString, toJsonString } from '@bufbuild/protobuf';
 import {
   buildRouterConfig,
   type ComposedSubgraph,
@@ -18,11 +19,20 @@ import * as yaml from 'js-yaml';
 import { basename, dirname, resolve } from 'pathe';
 import pc from 'picocolors';
 import { printSchemaWithDirectives } from '@graphql-tools/utils';
+
 import {
+  FeatureFlagRouterExecutionConfigSchema,
+  FeatureFlagRouterExecutionConfigsSchema,
+  GRPCMappingSchema,
+  RouterConfigSchema,
+} from '@wundergraph/cosmo-connect/dist/node/v1/node_pb';
+
+import type {
   FeatureFlagRouterExecutionConfig,
   FeatureFlagRouterExecutionConfigs,
   GRPCMapping,
 } from '@wundergraph/cosmo-connect/dist/node/v1/node_pb';
+
 import Table from 'cli-table3';
 import { FederationSuccess, ROUTER_COMPATIBILITY_VERSION_ONE } from '@wundergraph/composition';
 import { BaseCommandOptions } from '../../../core/types/types.js';
@@ -269,10 +279,10 @@ export default (opts: BaseCommandOptions) => {
     }
 
     if (options.out) {
-      await writeFile(options.out, routerConfig.toJsonString());
+      await writeFile(options.out, toJsonString(RouterConfigSchema, routerConfig));
       console.log(pc.green(`Router config successfully written to ${pc.bold(options.out)}`));
     } else {
-      console.log(routerConfig.toJsonString());
+      console.log(toJsonString(RouterConfigSchema, routerConfig));
     }
   });
 
@@ -300,7 +310,7 @@ async function toSubgraphMetadataGRPC(inputFileLocation: string, s: GRPCSubgraph
   validateGRPCSubgraph(inputFileLocation, s);
 
   const mappingFileContent = await readFile(resolve(inputFileLocation, s.grpc.mapping_file), 'utf8');
-  const mapping = GRPCMapping.fromJsonString(mappingFileContent);
+  const mapping = fromJsonString(GRPCMappingSchema, mappingFileContent);
 
   const protoSchemaFileContent = await readFile(resolve(inputFileLocation, s.grpc.proto_file), 'utf8');
   const sdl = await readFile(resolve(inputFileLocation, s.grpc.schema_file), 'utf8');
@@ -345,7 +355,7 @@ async function toSubgraphMetadataPlugin(
     protoSchema,
     version: s.plugin.version,
     sdl,
-    mapping: GRPCMapping.fromJsonString(mappingFile),
+    mapping: fromJsonString(GRPCMappingSchema, mappingFile),
   };
 }
 
@@ -513,7 +523,7 @@ async function buildFeatureFlagsConfig(
   subgraphs: SubgraphMetadata[],
   options: any,
 ): Promise<FeatureFlagRouterExecutionConfigs> {
-  const ffConfigs: FeatureFlagRouterExecutionConfigs = new FeatureFlagRouterExecutionConfigs();
+  const ffConfigs: FeatureFlagRouterExecutionConfigs = create(FeatureFlagRouterExecutionConfigsSchema);
 
   // @TODO This logic should exist only once in the shared package and reused across
   // control-plane and cli
@@ -671,7 +681,7 @@ async function buildFeatureFlagsConfig(
       }),
     });
 
-    ffConfigs.configByFeatureFlagName[ff.name] = new FeatureFlagRouterExecutionConfig({
+    ffConfigs.configByFeatureFlagName[ff.name] = create(FeatureFlagRouterExecutionConfigSchema, {
       version: featureRouterConfig.version,
       subgraphs: featureRouterConfig.subgraphs,
       engineConfig: featureRouterConfig.engineConfig,

cli/src/commands/subgraph/commands/check.ts

@@ -1,9 +1,11 @@
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
+import { create } from '@bufbuild/protobuf';
 import { Command, program } from 'commander';
 import { resolve } from 'pathe';
 import pc from 'picocolors';
-import { VCSContext } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import { VCSContextSchema } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { VCSContext } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import { splitLabel } from '@wundergraph/cosmo-shared';
 import { config, getBaseHeaders } from '../../../core/config.js';
 import { BaseCommandOptions } from '../../../core/types/types.js';
@@ -70,7 +72,7 @@ export default (opts: BaseCommandOptions) => {
     let vcsContext: VCSContext | undefined;
 
     if (config.checkAuthor || config.checkCommitSha || config.checkBranch) {
-      vcsContext = new VCSContext({
+      vcsContext = create(VCSContextSchema, {
         author: config.checkAuthor,
         commitSha: config.checkCommitSha,
         branch: config.checkBranch,

cli/src/commands/subgraph/commands/fetch.ts

@@ -1,5 +1,5 @@
 import { writeFile } from 'node:fs/promises';
-import { Response } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { Response } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import { Command, program } from 'commander';
 import { resolve } from 'pathe';
 import pc from 'picocolors';

cli/src/commands/subgraph/commands/publish.ts

@@ -1,5 +1,6 @@
-import { readFile } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { create } from '@bufbuild/protobuf';
 import Table from 'cli-table3';
 import { Command, program } from 'commander';
 import ora from 'ora';
@@ -11,7 +12,7 @@ import {
   parseGraphQLWebsocketSubprotocol,
   splitLabel,
 } from '@wundergraph/cosmo-shared';
-import { SubgraphPublishStats, SubgraphType } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import { SubgraphPublishStatsSchema, SubgraphType } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import { BaseCommandOptions } from '../../../core/types/types.js';
 import { getBaseHeaders } from '../../../core/config.js';
 import { printTruncationWarning, validateSubscriptionProtocols } from '../../../utils.js';
@@ -192,7 +193,7 @@ export default (opts: BaseCommandOptions) => {
         if (options.failOnCompositionError) {
           // Only composition errors were displayed at this point, warnings come after switch
           printTruncationWarning({
-            displayedErrorCounts: new SubgraphPublishStats({
+            displayedErrorCounts: create(SubgraphPublishStatsSchema, {
               compositionErrors: resp.compositionErrors.length,
               compositionWarnings: 0,
               deploymentErrors: 0,
@@ -232,7 +233,7 @@ export default (opts: BaseCommandOptions) => {
         if (options.failOnAdmissionWebhookError) {
           // Only deployment errors were displayed at this point, warnings come after switch
           printTruncationWarning({
-            displayedErrorCounts: new SubgraphPublishStats({
+            displayedErrorCounts: create(SubgraphPublishStatsSchema, {
               compositionErrors: 0,
               compositionWarnings: 0,
               deploymentErrors: resp.deploymentErrors.length,
@@ -282,7 +283,7 @@ export default (opts: BaseCommandOptions) => {
     }
 
     // Determine what was actually displayed based on the response code
-    const displayedErrorCounts = new SubgraphPublishStats({
+    const displayedErrorCounts = create(SubgraphPublishStatsSchema, {
       compositionErrors:
         resp.response?.code === EnumStatusCode.ERR_SUBGRAPH_COMPOSITION_FAILED ? resp.compositionErrors.length : 0,
       compositionWarnings: displayedWarnings,

cli/src/core/client/client.ts

@@ -1,7 +1,7 @@
 import { compressionBrotli, compressionGzip, createConnectTransport } from '@connectrpc/connect-node';
-import { createPromiseClient, PromiseClient } from '@connectrpc/connect';
-import { PlatformService } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_connect';
-import { NodeService } from '@wundergraph/cosmo-connect/dist/node/v1/node_connect';
+import { createClient, Client as ConnectClient } from '@connectrpc/connect';
+import { PlatformService } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import { NodeService } from '@wundergraph/cosmo-connect/dist/node/v1/node_pb';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 
 export interface ClientOptions {
@@ -11,8 +11,8 @@ export interface ClientOptions {
 }
 
 export interface Client {
-  platform: PromiseClient<typeof PlatformService>;
-  node?: PromiseClient<typeof NodeService>;
+  platform: ConnectClient<typeof PlatformService>;
+  node?: ConnectClient<typeof NodeService>;
 }
 
 export const CreateClient = (opts: ClientOptions): Client => {
@@ -41,7 +41,7 @@ export const CreateClient = (opts: ClientOptions): Client => {
   });
 
   return {
-    platform: createPromiseClient(PlatformService, transport),
-    node: createPromiseClient(NodeService, transport),
+    platform: createClient(PlatformService, transport),
+    node: createClient(NodeService, transport),
   };
 };

cli/src/core/types/types.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   CompositionError,
   CompositionWarning,
   DeploymentError,

cli/src/github.ts

@@ -1,6 +1,7 @@
 import { readFileSync } from 'node:fs';
-import { PartialMessage } from '@bufbuild/protobuf';
-import { GitInfo } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import { create } from '@bufbuild/protobuf';
+import { GitInfoSchema } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+import type { GitInfo } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
 import envCi from 'env-ci';
 import { Client } from './core/client/client.js';
 import { getBaseHeaders } from './core/config.js';
@@ -44,16 +45,16 @@ export function useGitHub() {
 }
 
 export const verifyGitHubIntegration = async (client: Client) => {
-  let gitInfo: PartialMessage<GitInfo> | undefined;
+  let gitInfo: GitInfo | undefined;
   const { isPr, commit: commitSha, repository, accountId } = useGitHub();
   if (isPr && commitSha && repository && accountId) {
     const [ownerSlug, repositorySlug] = repository?.split('/');
-    gitInfo = {
+    gitInfo = create(GitInfoSchema, {
       commitSha,
       accountId,
       ownerSlug,
       repositorySlug,
-    };
+    });
   }
 
   let ignoreErrorsDueToGitHubIntegration = false;

cli/src/handle-composition-result.ts

@@ -1,14 +1,19 @@
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
+import { create } from '@bufbuild/protobuf';
 // eslint-disable-next-line import/named
 import { Ora } from 'ora';
 import Table from 'cli-table3';
 import pc from 'picocolors';
-import {
+
+import { SubgraphPublishStatsSchema } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+
+import type {
   CompositionError,
   CompositionWarning,
   DeploymentError,
   SubgraphPublishStats,
 } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';
+
 import { SubgraphCommandJsonOutput } from './core/types/types.js';
 import { printTruncationWarning } from './utils.js';
 
@@ -110,7 +115,7 @@ export function handleCompositionResult({
       if (failOnCompositionError) {
         // Only composition errors were displayed at this point; warnings come after the switch statement
         printTruncationWarning({
-          displayedErrorCounts: new SubgraphPublishStats({
+          displayedErrorCounts: create(SubgraphPublishStatsSchema, {
             compositionErrors: compositionErrors.length,
             compositionWarnings: 0,
             deploymentErrors: 0,
@@ -160,7 +165,7 @@ export function handleCompositionResult({
       if (failOnAdmissionWebhookError) {
         // Only deployment errors were displayed at this point; warnings come after the switch statement
         printTruncationWarning({
-          displayedErrorCounts: new SubgraphPublishStats({
+          displayedErrorCounts: create(SubgraphPublishStatsSchema, {
             compositionErrors: 0,
             compositionWarnings: 0,
             deploymentErrors: deploymentErrors.length,
@@ -225,7 +230,7 @@ export function handleCompositionResult({
   }
 
   // Determine what was actually displayed based on the response code
-  const displayedErrorCounts = new SubgraphPublishStats({
+  const displayedErrorCounts = create(SubgraphPublishStatsSchema, {
     compositionErrors: responseCode === EnumStatusCode.ERR_SUBGRAPH_COMPOSITION_FAILED ? compositionErrors.length : 0,
     compositionWarnings: displayedWarnings,
     deploymentErrors: responseCode === EnumStatusCode.ERR_DEPLOYMENT_FAILED ? deploymentErrors.length : 0,

cli/src/handle-proposal-result.ts

@@ -1,5 +1,5 @@
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
-import {
+import type {
   CreateProposalResponse,
   UpdateProposalResponse,
 } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb';