@trpc/server 11.0.0-rc.433 → 11.0.0-rc.436

package/src/unstable-core-do-not-import/http/parseConnectionParams.ts

@@ -0,0 +1,49 @@
+import { TRPCError } from '../error/TRPCError';
+import { isObject } from '../utils';
+import type { TRPCRequestInfo } from './types';
+
+export function parseConnectionParamsFromUnknown(
+  parsed: unknown,
+): TRPCRequestInfo['connectionParams'] {
+  try {
+    if (parsed === null) {
+      return null;
+    }
+    if (!isObject(parsed)) {
+      throw new Error('Expected object');
+    }
+    const nonStringValues = Object.entries(parsed).filter(
+      ([_key, value]) => typeof value !== 'string',
+    );
+
+    if (nonStringValues.length > 0) {
+      throw new Error(
+        `Expected connectionParams to be string values. Got ${nonStringValues
+          .map(([key, value]) => `${key}: ${typeof value}`)
+          .join(', ')}`,
+      );
+    }
+    return parsed as Record<string, string>;
+  } catch (cause) {
+    throw new TRPCError({
+      code: 'PARSE_ERROR',
+      message: 'Invalid connection params shape',
+      cause,
+    });
+  }
+}
+export function parseConnectionParamsFromString(
+  str: string,
+): TRPCRequestInfo['connectionParams'] {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(str);
+  } catch (cause) {
+    throw new TRPCError({
+      code: 'PARSE_ERROR',
+      message: 'Not JSON-parsable query params',
+      cause,
+    });
+  }
+  return parseConnectionParamsFromUnknown(parsed);
+}

package/src/unstable-core-do-not-import/http/resolveResponse.ts

@@ -335,8 +335,8 @@ export async function resolveResponse<TRouter extends AnyRouter>(
                   config,
                   ctx,
                   error,
-                  input: call.result(),
-                  path: call.path,
+                  input: call!.result(),
+                  path: call!.path,
                   type: info.type,
                 }),
               }
@@ -370,7 +370,9 @@ export async function resolveResponse<TRouter extends AnyRouter>(
 
           if (!isObservable(data) && !isAsyncIterable(data)) {
             throw new TRPCError({
-              message: `Subscription ${call.path} did not return an observable or a AsyncGenerator`,
+              message: `Subscription ${
+                call!.path
+              } did not return an observable or a AsyncGenerator`,
               code: 'INTERNAL_SERVER_ERROR',
             });
           }
@@ -440,9 +442,9 @@ export async function resolveResponse<TRouter extends AnyRouter>(
                 config,
                 ctx,
                 error,
-                input: call.result(),
-                path: call.path,
-                type: call.procedure?._def.type ?? 'unknown',
+                input: call!.result(),
+                path: call!.path,
+                type: call!.procedure?._def.type ?? 'unknown',
               }),
             };
           }

package/src/unstable-core-do-not-import/http/types.ts

@@ -74,7 +74,11 @@ interface TRPCRequestInfoProcedureCall {
   procedure: AnyProcedure | null;
 }
 
-export interface TRPCRequestInfoBase {
+/**
+ * Information about the incoming request
+ * @public
+ */
+export interface TRPCRequestInfo {
   /**
    * The `trpc-accept` header
    */
@@ -91,23 +95,11 @@ export interface TRPCRequestInfoBase {
    * The calls being made
    */
   calls: TRPCRequestInfoProcedureCall[];
+  /**
+   * Connection params when using `httpSubscriptionLink` or `createWSClient`
+   */
+  connectionParams: Dict<string> | null;
 }
-interface TRPCRequestInfoBatchCall extends TRPCRequestInfoBase {
-  isBatchCall: true;
-  calls: TRPCRequestInfoProcedureCall[];
-}
-interface TRPCRequestInfoSingleCall extends TRPCRequestInfoBase {
-  isBatchCall: false;
-  calls: [TRPCRequestInfoProcedureCall];
-}
-
-/**
- * Information about the incoming request
- * @public
- */
-export type TRPCRequestInfo =
-  | TRPCRequestInfoBatchCall
-  | TRPCRequestInfoSingleCall;
 
 /**
  * Inner createContext function for `resolveResponse` used to forward `TRPCRequestInfo` to `createContext`

package/src/unstable-core-do-not-import/rpc/envelopes.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-namespace */
+import type { TRPCRequestInfo } from '../http/types';
 import type { ProcedureType } from '../procedure';
 import type { TRPC_ERROR_CODE_NUMBER } from './codes';
 
@@ -131,3 +132,11 @@ export type TRPCClientIncomingMessage<
   TResult = unknown,
   TError extends TRPCErrorShape = TRPCErrorShape,
 > = TRPCClientIncomingRequest | TRPCResponseMessage<TResult, TError>;
+
+/**
+ * The client sends connection params - always sent as the first message
+ */
+export interface TRPCConnectionParamsMessage
+  extends JSONRPC2.BaseRequest<'connectionParams'> {
+  data: TRPCRequestInfo['connectionParams'];
+}

package/src/unstable-core-do-not-import/rpc/index.ts

@@ -17,5 +17,6 @@ export type {
   TRPCResultMessage,
   TRPCSubscriptionStopNotification,
   TRPCSuccessResponse,
+  TRPCConnectionParamsMessage,
 } from './envelopes';
 export { parseTRPCMessage } from './parseTRPCMessage';

package/src/unstable-core-do-not-import.ts

@@ -12,10 +12,11 @@ export * from './unstable-core-do-not-import/clientish/inference';
 export * from './unstable-core-do-not-import/clientish/inferrable';
 export * from './unstable-core-do-not-import/clientish/serialize';
 export * from './unstable-core-do-not-import/createProxy';
-export * from './unstable-core-do-not-import/error/TRPCError';
 export * from './unstable-core-do-not-import/error/formatter';
 export * from './unstable-core-do-not-import/error/getErrorShape';
+export * from './unstable-core-do-not-import/error/TRPCError';
 export * from './unstable-core-do-not-import/http/batchStreamFormatter';
+export * from './unstable-core-do-not-import/http/parseConnectionParams';
 export * from './unstable-core-do-not-import/http/contentType';
 export * from './unstable-core-do-not-import/http/contentTypeParsers';
 export * from './unstable-core-do-not-import/http/getHTTPStatusCode';
@@ -30,8 +31,8 @@ export * from './unstable-core-do-not-import/procedureBuilder';
 export * from './unstable-core-do-not-import/rootConfig';
 export * from './unstable-core-do-not-import/router';
 export * from './unstable-core-do-not-import/rpc';
+export * from './unstable-core-do-not-import/stream/jsonl';
+export * from './unstable-core-do-not-import/stream/sse';
 export * from './unstable-core-do-not-import/transformer';
 export * from './unstable-core-do-not-import/types';
 export * from './unstable-core-do-not-import/utils';
-export * from './unstable-core-do-not-import/stream/jsonl';
-export * from './unstable-core-do-not-import/stream/sse';