@trpc/server 11.0.0-rc.632 → 11.0.0-rc.637

package/dist/unstable-core-do-not-import/stream/sse.mjs

@@ -1,3 +1,4 @@
+import { Unpromise } from '../../vendor/unpromise/unpromise.mjs';
 import { getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
 import { isAbortError } from '../http/isAbortError.mjs';
 import { run, identity } from '../utils.mjs';
@@ -6,6 +7,7 @@ import { takeWithGrace, withMaxDuration } from './utils/asyncIterable.mjs';
 import { createReadableStream } from './utils/createReadableStream.mjs';
 import { withPing, PING_SYM } from './utils/withPing.mjs';
 
+const PING_EVENT = 'ping';
 const SERIALIZED_ERROR_EVENT = 'serialized-error';
 /**
  *
@@ -46,7 +48,8 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
             for await (value of iterable){
                 if (value === PING_SYM) {
                     stream.controller.enqueue({
-                        comment: 'ping'
+                        event: PING_EVENT,
+                        data: ''
                     });
                     continue;
                 }
@@ -108,97 +111,158 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
         }
     }));
 }
+async function withTimeout(opts) {
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve)=>{
+        timeoutId = setTimeout(()=>{
+            resolve(null);
+        }, opts.timeoutMs);
+    });
+    let res;
+    try {
+        res = await Unpromise.race([
+            opts.promise,
+            timeoutPromise
+        ]);
+    } finally{
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        clearTimeout(timeoutId);
+    }
+    if (res === null) {
+        return await opts.onTimeout();
+    }
+    return res;
+}
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamConsumer(opts) {
     const { deserialize = (v)=>v } = opts;
     const signal = opts.signal;
     let _es = null;
-    const stream = new ReadableStream({
-        async start (controller) {
-            const [url, init] = await Promise.all([
-                opts.url(),
-                opts.init()
-            ]);
-            const eventSource = _es = new opts.EventSource(url, init);
-            controller.enqueue({
-                type: 'connecting',
-                eventSource: _es,
-                event: null
-            });
-            eventSource.addEventListener('open', ()=>{
+    const createStream = ()=>new ReadableStream({
+            async start (controller) {
+                const [url, init] = await Promise.all([
+                    opts.url(),
+                    opts.init()
+                ]);
+                const eventSource = _es = new opts.EventSource(url, init);
                 controller.enqueue({
-                    type: 'opened',
-                    eventSource
+                    type: 'connecting',
+                    eventSource: _es,
+                    event: null
                 });
-            });
-            eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (_msg)=>{
-                const msg = _msg;
-                controller.enqueue({
-                    type: 'serialized-error',
-                    error: deserialize(JSON.parse(msg.data)),
-                    eventSource
+                eventSource.addEventListener('open', ()=>{
+                    controller.enqueue({
+                        type: 'opened',
+                        eventSource
+                    });
                 });
-            });
-            eventSource.addEventListener('error', (event)=>{
-                if (eventSource.readyState === EventSource.CLOSED) {
-                    controller.error(event);
-                } else {
+                eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (_msg)=>{
+                    const msg = _msg;
                     controller.enqueue({
-                        type: 'connecting',
-                        eventSource,
-                        event
+                        type: 'serialized-error',
+                        error: deserialize(JSON.parse(msg.data)),
+                        eventSource
                     });
-                }
-            });
-            eventSource.addEventListener('message', (_msg)=>{
-                const msg = _msg;
-                const chunk = deserialize(JSON.parse(msg.data));
-                const def = {
-                    data: chunk
+                });
+                eventSource.addEventListener(PING_EVENT, ()=>{
+                    controller.enqueue({
+                        type: 'ping',
+                        eventSource
+                    });
+                });
+                eventSource.addEventListener('error', (event)=>{
+                    if (eventSource.readyState === EventSource.CLOSED) {
+                        controller.error(event);
+                    } else {
+                        controller.enqueue({
+                            type: 'connecting',
+                            eventSource,
+                            event
+                        });
+                    }
+                });
+                eventSource.addEventListener('message', (_msg)=>{
+                    const msg = _msg;
+                    const chunk = deserialize(JSON.parse(msg.data));
+                    const def = {
+                        data: chunk
+                    };
+                    if (msg.lastEventId) {
+                        def.id = msg.lastEventId;
+                    }
+                    controller.enqueue({
+                        type: 'data',
+                        data: def,
+                        eventSource
+                    });
+                });
+                const onAbort = ()=>{
+                    controller.close();
+                    eventSource.close();
                 };
-                if (msg.lastEventId) {
-                    def.id = msg.lastEventId;
+                if (signal.aborted) {
+                    onAbort();
+                } else {
+                    signal.addEventListener('abort', onAbort);
                 }
-                controller.enqueue({
-                    type: 'data',
-                    data: def,
-                    eventSource
-                });
-            });
-            const onAbort = ()=>{
-                controller.close();
-                eventSource.close();
-            };
-            if (signal.aborted) {
-                onAbort();
-            } else {
-                signal.addEventListener('abort', onAbort);
+            },
+            cancel () {
+                _es?.close();
             }
-        },
-        cancel () {
-            _es?.close();
-        }
-    });
+        });
+    const getNewStreamAndReader = ()=>{
+        const stream = createStream();
+        const reader = stream.getReader();
+        return {
+            reader,
+            cancel: ()=>{
+                reader.releaseLock();
+                return stream.cancel();
+            }
+        };
+    };
     return {
         [Symbol.asyncIterator] () {
-            const reader = stream.getReader();
+            let stream = getNewStreamAndReader();
             const iterator = {
                 async next () {
-                    const value = await reader.read();
-                    if (value.done) {
+                    let promise = stream.reader.read();
+                    if (opts.reconnectAfterInactivityMs) {
+                        promise = withTimeout({
+                            promise,
+                            timeoutMs: opts.reconnectAfterInactivityMs,
+                            onTimeout: async ()=>{
+                                // Close and release old reader
+                                await stream.cancel();
+                                // Create new reader
+                                stream = getNewStreamAndReader();
+                                return {
+                                    value: {
+                                        type: 'timeout',
+                                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                                        eventSource: _es
+                                    },
+                                    done: false
+                                };
+                            }
+                        });
+                    }
+                    const result = await promise;
+                    // console.debug('result', result, 'done', result.done);
+                    if (result.done) {
                         return {
-                            value: undefined,
+                            value: result.value,
                             done: true
                         };
                     }
                     return {
-                        value: value.value,
+                        value: result.value,
                         done: false
                     };
                 },
                 async return () {
-                    reader.releaseLock();
+                    await stream.cancel();
                     return {
                         value: undefined,
                         done: true

package/dist/unstable-core-do-not-import/transformer.d.ts

@@ -87,10 +87,7 @@ declare function transformResultInner<TRouter extends AnyRouter, TOutput>(respon
     } | {
         type: "stopped";
         data?: never;
-    } | (import("./rpc").TRPCResult<TOutput> & {
-        type: "data";
-        id?: string;
-    });
+    } | import("./rpc").TRPCResult<TOutput>;
     readonly error?: undefined;
 };
 /**

package/dist/unstable-core-do-not-import/transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,OAAO,CAAC;AAGf;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,oBAAqB,SAAQ,eAAe;IACpD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,qBAAsB,SAAQ,eAAe;IACrD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,KAAK,EAAE,oBAAoB,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3D,MAAM,EAAE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC;CAChE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,uBAAuB,GAAG,eAAe,CAAC;AAE/E;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,sBAAsB,GAClC,uBAAuB,CAKzB;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,uBAGhC,CAAC;AAyBF;;IAEI;AACJ,wBAAgB,qBAAqB,CACnC,SAAS,SACL,YAAY,GACZ,YAAY,EAAE,GACd,mBAAmB,GACnB,mBAAmB,EAAE,EACzB,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS;;yEAIzD;AAKD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;EAuB7B;AAQD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe,GAC3B,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}
+{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,OAAO,CAAC;AAGf;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,oBAAqB,SAAQ,eAAe;IACpD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,qBAAsB,SAAQ,eAAe;IACrD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,KAAK,EAAE,oBAAoB,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3D,MAAM,EAAE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC;CAChE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,uBAAuB,GAAG,eAAe,CAAC;AAE/E;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,sBAAsB,GAClC,uBAAuB,CAKzB;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,uBAGhC,CAAC;AAyBF;;IAEI;AACJ,wBAAgB,qBAAqB,CACnC,SAAS,SACL,YAAY,GACZ,YAAY,EAAE,GACd,mBAAmB,GACnB,mBAAmB,EAAE,EACzB,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS;;yEAIzD;AAKD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;EAuB7B;AAQD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe,GAC3B,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.632+3df8b21be",
+  "version": "11.0.0-rc.637+19da060cb",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -156,5 +156,5 @@
     "next": "*",
     "ws": "*"
   },
-  "gitHead": "3df8b21beb4925cf73194fc776d1a88603a3c420"
+  "gitHead": "19da060cb0e05c75682ec813c606b51c6c52ee19"
 }

package/src/adapters/node-http/writeResponse.ts

@@ -42,11 +42,6 @@ export async function writeResponseBody(opts: {
         await writeResponseBodyChunk(res, chunk);
         res.flush?.();
       },
-      abort() {
-        if (!res.headersSent) {
-          res.statusCode = 500;
-        }
-      },
     });
 
     await opts.body.pipeTo(writableStream, {

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

@@ -26,7 +26,7 @@ type IsRecord<T extends object> = keyof WithoutIndexSignature<T> extends never
 export type Serialize<T> =
   IsAny<T> extends true ? any :
   unknown extends T ? unknown :
-  T extends AsyncGenerator<infer $T, infer $Return, infer $Next> ? AsyncGenerator<Serialize<$T>, Serialize<$Return>, Serialize<$Next>> :
+  T extends AsyncIterable<infer $T, infer $Return, infer $Next> ? AsyncIterable<Serialize<$T>, Serialize<$Return>, Serialize<$Next>> :
   T extends JsonReturnable ? T :
   T extends Map<any, any> | Set<any> ? object :
   T extends NonJsonPrimitive ? never :

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

@@ -300,9 +300,8 @@ export async function resolveResponse<TRouter extends AnyRouter>(
   const isStreamCall = req.headers.get('trpc-accept') === 'application/jsonl';
 
   const experimentalIterablesAndDeferreds =
-    router._def._config.experimental?.iterablesAndDeferreds ?? true;
-  const experimentalSSE =
-    router._def._config.experimental?.sseSubscriptions?.enabled ?? true;
+    config.iterablesAndDeferreds ?? true;
+  const experimentalSSE = config.sse?.enabled ?? true;
   try {
     const [infoError, info] = infoTuple;
     if (infoError) {
@@ -465,7 +464,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           });
 
           const stream = sseStreamProducer({
-            ...config.experimental?.sseSubscriptions,
+            ...config.sse,
             data: iterable,
             abortCtrl: result?.abortCtrl ?? new AbortController(),
             serialize: (v) => config.transformer.output.serialize(v),

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

@@ -76,6 +76,7 @@ class TRPCBuilder<TContext extends object, TMeta extends object> {
     }>;
 
     const config: RootConfig<$Root> = {
+      ...opts,
       transformer: getDataTransformer(opts?.transformer ?? defaultTransformer),
       isDev:
         opts?.isDev ??
@@ -89,7 +90,6 @@ class TRPCBuilder<TContext extends object, TMeta extends object> {
        * @internal
        */
       $types: null as any,
-      experimental: opts?.experimental ?? {},
     };
 
     {

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

@@ -44,21 +44,22 @@ type DefaultValue<TValue, TFallback> = TValue extends UnsetMarker
   ? TFallback
   : TValue;
 
-type inferAsyncIterator<TOutput> =
-  TOutput extends AsyncIterator<infer $Yield, infer $Return, infer $Next>
+type inferAsyncIterable<TOutput> =
+  TOutput extends AsyncIterable<infer $Yield, infer $Return, infer $Next>
     ? {
         yield: $Yield;
         return: $Return;
         next: $Next;
       }
     : never;
-type inferSubscriptionOutput<TOutput> = TOutput extends AsyncGenerator
-  ? AsyncGenerator<
-      inferTrackedOutput<inferAsyncIterator<TOutput>['yield']>,
-      inferAsyncIterator<TOutput>['return'],
-      inferAsyncIterator<TOutput>['next']
-    >
-  : TypeError<'Subscription output could not be inferred'>;
+type inferSubscriptionOutput<TOutput> =
+  TOutput extends AsyncIterable<any>
+    ? AsyncIterable<
+        inferTrackedOutput<inferAsyncIterable<TOutput>['yield']>,
+        inferAsyncIterable<TOutput>['return'],
+        inferAsyncIterable<TOutput>['next']
+      >
+    : TypeError<'Subscription output could not be inferred'>;
 
 export type CallerOverride<TContext> = (opts: {
   args: unknown[];

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

@@ -65,26 +65,26 @@ export interface RootConfig<TTypes extends RootTypes> {
 
   defaultMeta?: TTypes['meta'] extends object ? TTypes['meta'] : never;
 
-  experimental?: {
+  /**
+   * Enable support for returning async iterables and returning deferred promises when using `httpBatchStreamLink`
+   * @default true
+   */
+  iterablesAndDeferreds?: boolean;
+  /**
+   * Options for server-sent events (SSE) subscriptions
+   * @see https://trpc.io/docs/client/links/httpSubscriptionLink
+   */
+  sse?: {
     /**
-     * Enable support for returning async iterables and returning deferred promises when using `httpBatchStreamLink`
+     * Enable server-sent events (SSE) subscriptions
      * @default true
      */
-    iterablesAndDeferreds?: boolean;
-    /**
-     * Enable support for server-sent events (SSE) subscriptions
-     */
-    sseSubscriptions?: {
-      /**
-       * Enable server-sent events (SSE) subscriptions
-       * @default true
-       */
-      enabled?: boolean;
-    } & Pick<
-      SSEStreamProducerOptions,
-      'ping' | 'emitAndEndImmediately' | 'maxDurationMs'
-    >;
-  };
+    enabled?: boolean;
+  } & Pick<
+    SSEStreamProducerOptions,
+    'ping' | 'emitAndEndImmediately' | 'maxDurationMs'
+  >;
+  experimental?: {};
 }
 
 /**

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

@@ -63,14 +63,15 @@ export interface TRPCRequest
 
 export interface TRPCResult<TData = unknown> {
   data: TData;
+  type?: 'data';
+  /**
+   * The id of the message to keep track of in case of a reconnect
+   */
+  id?: string;
 }
 
 export interface TRPCSuccessResponse<TData>
-  extends JSONRPC2.ResultResponse<
-    TRPCResult<TData> & {
-      type?: 'data';
-    }
-  > {}
+  extends JSONRPC2.ResultResponse<TRPCResult<TData>> {}
 
 export interface TRPCErrorResponse<
   TError extends TRPCErrorShape = TRPCErrorShape,
@@ -111,13 +112,7 @@ export interface TRPCResultMessage<TData>
   extends JSONRPC2.ResultResponse<
     | { type: 'started'; data?: never }
     | { type: 'stopped'; data?: never }
-    | (TRPCResult<TData> & {
-        type: 'data';
-        /**
-         * The id of the message to keep track of in case of a reconnect
-         */
-        id?: string;
-      })
+    | TRPCResult<TData>
   > {}
 
 export type TRPCResponseMessage<