Add context values to clients

packages/connect-node/src/node-universal-handler.ts

@@ -127,7 +127,7 @@ export function universalRequestFromNodeRequest(
  header: nodeHeaderToWebHeader(nodeRequest.headers),
  body,
  signal: abortController.signal,
- values: contextValues,
+ contextValues: contextValues,
  };
 }
 

packages/connect-web-bench/README.md

@@ -10,5 +10,5 @@ it like a web server would usually do.
 
 | code generator | bundle size | minified | compressed |
 |----------------|-------------------:|-----------------------:|---------------------:|
-| connect | 113,658 b | 49,964 b | 13,486 b |
+| connect | 114,538 b | 50,308 b | 13,557 b |
 | grpc-web | 414,071 b | 300,352 b | 53,255 b |

packages/connect-web/src/connect-transport.ts

@@ -30,8 +30,9 @@ import type {
  Transport,
  UnaryRequest,
  UnaryResponse,
+ ContextValues,
 } from "@connectrpc/connect";
-import { appendHeaders } from "@connectrpc/connect";
+import { appendHeaders, createContextValues } from "@connectrpc/connect";
 import {
  createClientMethodSerializers,
  createEnvelopeReadableStream,
@@ -142,6 +143,7 @@ export function createConnectTransport(
  timeoutMs: number | undefined,
  header: HeadersInit | undefined,
  message: PartialMessage<I>,
+ contextValues?: ContextValues,
  ): Promise<UnaryResponse<I, O>> {
  const { serialize, parse } = createClientMethodSerializers(
  method,
@@ -176,6 +178,7 @@ export function createConnectTransport(
  timeoutMs,
  header,
  ),
+ contextValues: contextValues ?? createContextValues(),
  message,
  },
  next: async (req: UnaryRequest<I, O>): Promise<UnaryResponse<I, O>> => {
@@ -242,6 +245,7 @@ export function createConnectTransport(
  timeoutMs: number | undefined,
  header: HeadersInit | undefined,
  input: AsyncIterable<PartialMessage<I>>,
+ contextValues?: ContextValues,
  ): Promise<StreamResponse<I, O>> {
  const { serialize, parse } = createClientMethodSerializers(
  method,
@@ -320,6 +324,7 @@ export function createConnectTransport(
  timeoutMs,
  header,
  ),
+ contextValues: contextValues ?? createContextValues(),
  message: input,
  },
  next: async (req) => {

packages/connect-web/src/grpc-web-transport.ts

@@ -29,7 +29,9 @@ import type {
  Transport,
  UnaryRequest,
  UnaryResponse,
+ ContextValues,
 } from "@connectrpc/connect";
+import { createContextValues } from "@connectrpc/connect";
 import {
  createClientMethodSerializers,
  createEnvelopeReadableStream,
@@ -137,6 +139,7 @@ export function createGrpcWebTransport(
  timeoutMs: number | undefined,
  header: Headers,
  message: PartialMessage<I>,
+ contextValues?: ContextValues,
  ): Promise<UnaryResponse<I, O>> {
  const { serialize, parse } = createClientMethodSerializers(
  method,
@@ -166,6 +169,7 @@ export function createGrpcWebTransport(
  mode: "cors",
  },
  header: requestHeader(useBinaryFormat, timeoutMs, header),
+ contextValues: contextValues ?? createContextValues(),
  message,
  },
  next: async (req: UnaryRequest<I, O>): Promise<UnaryResponse<I, O>> => {
@@ -233,6 +237,7 @@ export function createGrpcWebTransport(
  timeoutMs: number | undefined,
  header: HeadersInit | undefined,
  input: AsyncIterable<PartialMessage<I>>,
+ contextValues?: ContextValues,
  ): Promise<StreamResponse<I, O>> {
  const { serialize, parse } = createClientMethodSerializers(
  method,
@@ -323,6 +328,7 @@ export function createGrpcWebTransport(
  mode: "cors",
  },
  header: requestHeader(useBinaryFormat, timeoutMs, header),
+ contextValues: contextValues ?? createContextValues(),
  message: input,
  },
  next: async (req) => {

packages/connect/src/call-options.ts

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import type { ContextValues } from "./context-values.js";
+
 /**
  * Options for a call. Every client should accept CallOptions as optional
  * argument in its RPC methods.
@@ -44,4 +46,9 @@ export interface CallOptions {
  * Called when response trailers are received.
  */
  onTrailer?(trailers: Headers): void;
+
+ /**
+ * ContextValues to pass to the interceptors.
+ */
+ contextValues?: ContextValues;
 }

packages/connect/src/callback-client.ts

@@ -99,6 +99,7 @@ function createUnaryFn<I extends Message<I>, O extends Message<O>>(
  options.timeoutMs,
  options.headers,
  requestMessage,
+ options.contextValues,
  )
  .then(
  (response) => {
@@ -146,6 +147,7 @@ function createServerStreamingFn<I extends Message<I>, O extends Message<O>>(
  options.timeoutMs,
  options.headers,
  createAsyncIterable([input]),
+ options.contextValues,
  );
  options.onHeader?.(response.header);
  for await (const message of response.message) {

packages/connect/src/implementation.ts

@@ -140,7 +140,7 @@ interface HandlerContextInit {
  requestHeader?: HeadersInit;
  responseHeader?: HeadersInit;
  responseTrailer?: HeadersInit;
- values?: ContextValues;
+ contextValues?: ContextValues;
 }
 
 interface HandlerContextController extends HandlerContext {
@@ -181,7 +181,7 @@ export function createHandlerContext(
  deadline.cleanup();
  abortController.abort(reason);
  },
- values: init.values ?? createContextValues(),
+ values: init.contextValues ?? createContextValues(),
  };
 }
 

packages/connect/src/interceptor.ts

@@ -18,6 +18,7 @@ import type {
  MethodInfo,
  ServiceType,
 } from "@bufbuild/protobuf";
+import type { ContextValues } from "./context-values.js";
 
 /**
  * An interceptor can add logic to clients, similar to the decorators
@@ -164,6 +165,11 @@ interface RequestCommon<I extends Message<I>, O extends Message<O>> {
  * Headers that will be sent along with the request.
  */
  readonly header: Headers;
+
+ /**
+ * The context values for the current call.
+ */
+ readonly contextValues: ContextValues;
 }
 
 interface ResponseCommon<I extends Message<I>, O extends Message<O>> {