@trpc/server 11.0.0-rc.633 → 11.0.0-rc.638

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

@@ -1,11 +1,11 @@
 import { Unpromise } from '../../../vendor/unpromise/unpromise.mjs';
-import { disposablePromiseTimerResult, disposablePromiseTimer } from './disposablePromiseTimer.mjs';
+import { disposablePromiseTimerResult, timerResource } from './timerResource.mjs';
 
 /**
  * Derives a new {@link AsyncGenerator} based on {@link iterable}, that automatically stops after the specified duration.
  */ async function* withMaxDuration(iterable, opts) {
     const iterator = iterable[Symbol.asyncIterator]();
-    const timer = disposablePromiseTimer(opts.maxDurationMs);
+    const timer = timerResource(opts.maxDurationMs);
     try {
         const timerPromise = timer.start();
         // declaration outside the loop for garbage collection reasons
@@ -17,7 +17,6 @@ import { disposablePromiseTimerResult, disposablePromiseTimer } from './disposab
             ]);
             if (result === disposablePromiseTimerResult) {
                 // cancelled due to timeout
-                opts.abortCtrl.abort();
                 const res = await iterator.return?.();
                 return res?.value;
             }
@@ -42,7 +41,7 @@ import { disposablePromiseTimerResult, disposablePromiseTimer } from './disposab
     const iterator = iterable[Symbol.asyncIterator]();
     // declaration outside the loop for garbage collection reasons
     let result;
-    const timer = disposablePromiseTimer(opts.gracePeriodMs);
+    const timer = timerResource(opts.gracePeriodMs);
     try {
         let count = opts.count;
         let timerPromise = new Promise(()=>{
@@ -64,8 +63,6 @@ import { disposablePromiseTimerResult, disposablePromiseTimer } from './disposab
             yield result.value;
             if (--count === 0) {
                 timerPromise = timer.start();
-                // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                timerPromise.then(()=>opts.abortCtrl.abort());
             }
             // free up reference for garbage collection
             result = null;

package/dist/unstable-core-do-not-import/stream/utils/{disposablePromiseTimer.d.ts → timerResource.d.ts}

@@ -1,6 +1,6 @@
 export declare const disposablePromiseTimerResult: unique symbol;
-export declare function disposablePromiseTimer(ms: number): {
+export declare function timerResource(ms: number): {
     start(): Promise<typeof disposablePromiseTimerResult>;
     [Symbol.dispose]: () => void;
 };
-//# sourceMappingURL=disposablePromiseTimer.d.ts.map
+//# sourceMappingURL=timerResource.d.ts.map

package/dist/unstable-core-do-not-import/stream/utils/timerResource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timerResource.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/timerResource.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,eAAW,CAAC;AACrD,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM;;;EAsBvC"}

package/dist/unstable-core-do-not-import/stream/utils/{disposablePromiseTimer.js → timerResource.js}

@@ -4,7 +4,7 @@
 var _Symbol;
 (_Symbol = Symbol).dispose ?? (_Symbol.dispose = Symbol());
 const disposablePromiseTimerResult = Symbol();
-function disposablePromiseTimer(ms) {
+function timerResource(ms) {
     let timer = null;
     return {
         start () {
@@ -24,5 +24,5 @@ function disposablePromiseTimer(ms) {
     };
 }
 
-exports.disposablePromiseTimer = disposablePromiseTimer;
 exports.disposablePromiseTimerResult = disposablePromiseTimerResult;
+exports.timerResource = timerResource;

package/dist/unstable-core-do-not-import/stream/utils/{disposablePromiseTimer.mjs → timerResource.mjs}

@@ -2,7 +2,7 @@
 var _Symbol;
 (_Symbol = Symbol).dispose ?? (_Symbol.dispose = Symbol());
 const disposablePromiseTimerResult = Symbol();
-function disposablePromiseTimer(ms) {
+function timerResource(ms) {
     let timer = null;
     return {
         start () {
@@ -22,4 +22,4 @@ function disposablePromiseTimer(ms) {
     };
 }
 
-export { disposablePromiseTimer, disposablePromiseTimerResult };
+export { disposablePromiseTimerResult, timerResource };

package/dist/unstable-core-do-not-import/stream/utils/withPing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withPing.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/withPing.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ,eAAiB,CAAC;AAEvC;;;GAGG;AACH,wBAAuB,QAAQ,CAAC,MAAM,EACpC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,EAC/B,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,GAAG,OAAO,QAAQ,CAAC,CAmC1C"}
+{"version":3,"file":"withPing.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/withPing.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,eAAiB,CAAC;AAEvC;;;GAGG;AACH,wBAAuB,QAAQ,CAAC,MAAM,EACpC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,EAC/B,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,GAAG,OAAO,QAAQ,CAAC,CAmC1C"}

package/dist/unstable-core-do-not-import/stream/utils/withPing.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var unpromise = require('../../../vendor/unpromise/unpromise.js');
-var disposablePromiseTimer = require('./disposablePromiseTimer.js');
+var timerResource = require('./timerResource.js');
 
 const PING_SYM = Symbol('ping');
 /**
@@ -13,13 +13,13 @@ const PING_SYM = Symbol('ping');
     let result;
     let nextPromise = iterator.next();
     while(true){
-        const pingPromise = disposablePromiseTimer.disposablePromiseTimer(pingIntervalMs);
+        const pingPromise = timerResource.timerResource(pingIntervalMs);
         try {
             result = await unpromise.Unpromise.race([
                 nextPromise,
                 pingPromise.start()
             ]);
-            if (result === disposablePromiseTimer.disposablePromiseTimerResult) {
+            if (result === timerResource.disposablePromiseTimerResult) {
                 // cancelled
                 yield PING_SYM;
                 continue;

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

@@ -1,5 +1,5 @@
 import { Unpromise } from '../../../vendor/unpromise/unpromise.mjs';
-import { disposablePromiseTimerResult, disposablePromiseTimer } from './disposablePromiseTimer.mjs';
+import { disposablePromiseTimerResult, timerResource } from './timerResource.mjs';
 
 const PING_SYM = Symbol('ping');
 /**
@@ -11,7 +11,7 @@ const PING_SYM = Symbol('ping');
     let result;
     let nextPromise = iterator.next();
     while(true){
-        const pingPromise = disposablePromiseTimer(pingIntervalMs);
+        const pingPromise = timerResource(pingIntervalMs);
         try {
             result = await Unpromise.race([
                 nextPromise,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.633+55512768a",
+  "version": "11.0.0-rc.638+09a76869e",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -110,7 +110,8 @@
     "rpc",
     "shared",
     "unstable-core-do-not-import",
-    "!**/*.test.*"
+    "!**/*.test.*",
+    "!**/__tests__"
   ],
   "publishConfig": {
     "access": "public"
@@ -156,5 +157,5 @@
     "next": "*",
     "ws": "*"
   },
-  "gitHead": "55512768ac9e57c472c9b03d8e39f606a8c1e1c6"
+  "gitHead": "09a76869e7b1c0b56db4b5bc20ef7cde3015cbdb"
 }

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

@@ -466,7 +466,6 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           const stream = sseStreamProducer({
             ...config.sse,
             data: iterable,
-            abortCtrl: result?.abortCtrl ?? new AbortController(),
             serialize: (v) => config.transformer.output.serialize(v),
             formatError(errorOpts) {
               const error = getTRPCErrorFromUnknown(errorOpts.error);

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/stream/jsonl.ts

@@ -425,13 +425,20 @@ export async function jsonlStreamConsumer<THead>(opts: {
 
   type ControllerChunk = ChunkData | StreamInterruptedError;
   type ChunkController = ReadableStreamDefaultController<ControllerChunk>;
+  /**
+   * This is needed as new values can come in before the controller has read the chunk
+   * Not pretty, could likely be refactored and omitted somehow
+   */
+  const chunkDeferred = new Map<ChunkIndex, Deferred<ChunkController>>();
 
-  const controllers = withRefCount(
-    new Map<ChunkIndex, ChunkController>(),
-    () => {
+  const controllers = new Map<ChunkIndex, ChunkController>();
+
+  const maybeAbort = () => {
+    if (chunkDeferred.size === 0 && controllers.size === 0) {
+      // nothing is listening to the stream anymore
       opts.abortController?.abort();
-    },
-  );
+    }
+  };
 
   function decodeChunkDefinition(value: ChunkDefinition) {
     const [_path, type, chunkId] = value;
@@ -440,6 +447,13 @@ export async function jsonlStreamConsumer<THead>(opts: {
 
     controllers.set(chunkId, stream.controller);
 
+    // resolve chunk deferred if it exists
+    const deferred = chunkDeferred.get(chunkId);
+    if (deferred) {
+      deferred.resolve(stream.controller);
+      chunkDeferred.delete(chunkId);
+    }
+
     switch (type) {
       case CHUNK_VALUE_TYPE_PROMISE: {
         return new Promise((resolve, reject) => {
@@ -473,60 +487,66 @@ export async function jsonlStreamConsumer<THead>(opts: {
             .catch(reject)
             .finally(() => {
               controllers.delete(chunkId);
+              maybeAbort();
             });
         });
       }
       case CHUNK_VALUE_TYPE_ASYNC_ITERABLE: {
-        return {
-          [Symbol.asyncIterator]: () => {
-            const reader = stream.readable.getReader();
-            const iterator: AsyncIterator<unknown> = {
-              next: async () => {
-                const { done, value } = await reader.read();
-                if (value instanceof StreamInterruptedError) {
-                  throw value;
-                }
-                if (done) {
-                  controllers.delete(chunkId);
-                  return {
-                    done: true,
-                    value: undefined,
-                  };
-                }
-
-                const [_chunkId, status, data] = value as IterableChunk;
-
-                switch (status) {
-                  case ASYNC_ITERABLE_STATUS_VALUE:
-                    return {
-                      done: false,
-                      value: decode(data),
-                    };
-                  case ASYNC_ITERABLE_STATUS_RETURN:
-                    controllers.delete(chunkId);
-                    return {
-                      done: true,
-                      value: decode(data),
-                    };
-                  case ASYNC_ITERABLE_STATUS_ERROR:
-                    controllers.delete(chunkId);
-                    throw (
-                      opts.formatError?.({ error: data }) ??
-                      new AsyncError(data)
-                    );
-                }
-              },
-              return: async () => {
+        const reader = stream.readable.getReader();
+        const iterator: AsyncIterator<unknown> = {
+          next: async () => {
+            const { done, value } = await reader.read();
+            if (value instanceof StreamInterruptedError) {
+              throw value;
+            }
+            if (done) {
+              controllers.delete(chunkId);
+              maybeAbort();
+
+              return {
+                done: true,
+                value: undefined,
+              };
+            }
+
+            const [_chunkId, status, data] = value as IterableChunk;
+
+            switch (status) {
+              case ASYNC_ITERABLE_STATUS_VALUE:
+                return {
+                  done: false,
+                  value: decode(data),
+                };
+              case ASYNC_ITERABLE_STATUS_RETURN:
                 controllers.delete(chunkId);
+                maybeAbort();
+
                 return {
                   done: true,
-                  value: undefined,
+                  value: decode(data),
                 };
-              },
+              case ASYNC_ITERABLE_STATUS_ERROR:
+                controllers.delete(chunkId);
+                maybeAbort();
+
+                throw (
+                  opts.formatError?.({ error: data }) ?? new AsyncError(data)
+                );
+            }
+          },
+          return: async () => {
+            controllers.delete(chunkId);
+            maybeAbort();
+
+            return {
+              done: true,
+              value: undefined,
             };
-            return iterator;
           },
         };
+        return {
+          [Symbol.asyncIterator]: () => iterator,
+        };
       }
     }
   }
@@ -571,19 +591,29 @@ export async function jsonlStreamConsumer<THead>(opts: {
             headDeferred.resolve(head as THead);
             headDeferred = null;
 
-            controllers.activate();
             return;
           }
           const chunk = chunkOrHead as ChunkData;
           const [idx] = chunk;
 
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          const controller = controllers.get(idx)!;
-          controller.enqueue(chunk);
+          let readController = controllers.get(idx)!;
+          if (!readController) {
+            let deferred = chunkDeferred.get(idx);
+            if (!deferred) {
+              deferred = createDeferred();
+              chunkDeferred.set(idx, deferred);
+            }
+            readController = await deferred.promise;
+          }
+          readController.enqueue(chunk);
         },
         close: closeOrAbort,
         abort: closeOrAbort,
       }),
+      {
+        signal: opts.abortController.signal,
+      },
     )
     .catch((error) => {
       opts.onError?.({ error });

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

@@ -32,7 +32,7 @@ export interface PingOptions {
 export interface SSEStreamProducerOptions<TValue = unknown> {
   serialize?: Serialize;
   data: AsyncIterable<TValue>;
-  abortCtrl: AbortController;
+
   maxDepth?: number;
   ping?: PingOptions;
   /**
@@ -85,7 +85,6 @@ export function sseStreamProducer<TValue = unknown>(
       iterable = takeWithGrace(iterable, {
         count: 1,
         gracePeriodMs: 1,
-        abortCtrl: opts.abortCtrl,
       });
     }
 
@@ -96,7 +95,6 @@ export function sseStreamProducer<TValue = unknown>(
     ) {
       iterable = withMaxDuration(iterable, {
         maxDurationMs: opts.maxDurationMs,
-        abortCtrl: opts.abortCtrl,
       });
     }
 

package/src/unstable-core-do-not-import/stream/utils/asyncIterable.ts

@@ -1,19 +1,16 @@
 import { Unpromise } from '../../../vendor/unpromise';
-import {
-  disposablePromiseTimer,
-  disposablePromiseTimerResult,
-} from './disposablePromiseTimer';
+import { disposablePromiseTimerResult, timerResource } from './timerResource';
 
 /**
  * Derives a new {@link AsyncGenerator} based on {@link iterable}, that automatically stops after the specified duration.
  */
 export async function* withMaxDuration<T>(
   iterable: AsyncIterable<T>,
-  opts: { maxDurationMs: number; abortCtrl: AbortController },
+  opts: { maxDurationMs: number },
 ): AsyncGenerator<T> {
   const iterator = iterable[Symbol.asyncIterator]();
 
-  const timer = disposablePromiseTimer(opts.maxDurationMs);
+  const timer = timerResource(opts.maxDurationMs);
   try {
     const timerPromise = timer.start();
 
@@ -24,7 +21,7 @@ export async function* withMaxDuration<T>(
       result = await Unpromise.race([iterator.next(), timerPromise]);
       if (result === disposablePromiseTimerResult) {
         // cancelled due to timeout
-        opts.abortCtrl.abort();
+
         const res = await iterator.return?.();
         return res?.value;
       }
@@ -52,7 +49,6 @@ export async function* takeWithGrace<T>(
   opts: {
     count: number;
     gracePeriodMs: number;
-    abortCtrl: AbortController;
   },
 ): AsyncGenerator<T> {
   const iterator = iterable[Symbol.asyncIterator]();
@@ -60,7 +56,7 @@ export async function* takeWithGrace<T>(
   // declaration outside the loop for garbage collection reasons
   let result: null | IteratorResult<T> | typeof disposablePromiseTimerResult;
 
-  const timer = disposablePromiseTimer(opts.gracePeriodMs);
+  const timer = timerResource(opts.gracePeriodMs);
   try {
     let count = opts.count;
 
@@ -81,8 +77,6 @@ export async function* takeWithGrace<T>(
       yield result.value;
       if (--count === 0) {
         timerPromise = timer.start();
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        timerPromise.then(() => opts.abortCtrl.abort());
       }
       // free up reference for garbage collection
       result = null;

package/src/unstable-core-do-not-import/stream/utils/{disposablePromiseTimer.ts → timerResource.ts}

@@ -2,7 +2,7 @@
 Symbol.dispose ??= Symbol();
 
 export const disposablePromiseTimerResult = Symbol();
-export function disposablePromiseTimer(ms: number) {
+export function timerResource(ms: number) {
   let timer: ReturnType<typeof setTimeout> | null = null;
 
   return {

package/src/unstable-core-do-not-import/stream/utils/withPing.ts

@@ -1,8 +1,5 @@
 import { Unpromise } from '../../../vendor/unpromise';
-import {
-  disposablePromiseTimer,
-  disposablePromiseTimerResult,
-} from './disposablePromiseTimer';
+import { disposablePromiseTimerResult, timerResource } from './timerResource';
 
 export const PING_SYM = Symbol('ping');
 
@@ -23,7 +20,7 @@ export async function* withPing<TValue>(
 
   let nextPromise = iterator.next();
   while (true) {
-    const pingPromise = disposablePromiseTimer(pingIntervalMs);
+    const pingPromise = timerResource(pingIntervalMs);
 
     try {
       result = await Unpromise.race([nextPromise, pingPromise.start()]);

package/dist/unstable-core-do-not-import/stream/utils/createServer.d.ts

@@ -1,7 +0,0 @@
-import http from 'http';
-export declare function createServer(handler: (req: http.IncomingMessage, res: http.ServerResponse) => void): {
-    url: string;
-    close: () => Promise<void>;
-    restart: () => Promise<void>;
-};
-//# sourceMappingURL=createServer.d.ts.map

package/dist/unstable-core-do-not-import/stream/utils/createServer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/createServer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,wBAAgB,YAAY,CAC1B,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,KAAK,IAAI;;;;EAuCvE"}

package/dist/unstable-core-do-not-import/stream/utils/disposablePromiseTimer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"disposablePromiseTimer.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/disposablePromiseTimer.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,eAAW,CAAC;AACrD,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM;;;EAsBhD"}

package/src/unstable-core-do-not-import/stream/utils/createServer.ts

@@ -1,44 +0,0 @@
-import http from 'http';
-import type { Socket } from 'net';
-
-export function createServer(
-  handler: (req: http.IncomingMessage, res: http.ServerResponse) => void,
-) {
-  const server = http.createServer(async (req, res) => {
-    handler(req, res);
-  });
-  server.listen(0);
-
-  const connections = new Set<Socket>();
-  server.on('connection', (conn) => {
-    connections.add(conn);
-    conn.once('close', () => {
-      connections.delete(conn);
-    });
-  });
-
-  const port = (server.address() as any).port;
-
-  const url = `http://localhost:${port}`;
-
-  async function forceClose() {
-    for (const conn of connections) {
-      conn.destroy();
-    }
-    await new Promise((resolve) => {
-      server.close(resolve);
-    });
-  }
-
-  return {
-    url,
-    close: async () => {
-      await forceClose();
-    },
-    restart: async () => {
-      await forceClose();
-
-      server.listen(port);
-    },
-  };
-}