@trpc/server 11.0.0-rc.452 → 11.0.0-rc.456

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

@@ -34,6 +34,7 @@ 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/stream/utils/createDeferred';
 export * from './unstable-core-do-not-import/transformer';
 export * from './unstable-core-do-not-import/types';
 export * from './unstable-core-do-not-import/utils';

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

@@ -1 +1 @@
-{"version":3,"file":"unstable-core-do-not-import.d.ts","sourceRoot":"","sources":["../src/unstable-core-do-not-import.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,cAAc,mDAAmD,CAAC;AAClE,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uDAAuD,CAAC;AACtE,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,0DAA0D,CAAC;AACzE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,0CAA0C,CAAC;AACzD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC"}
+{"version":3,"file":"unstable-core-do-not-import.d.ts","sourceRoot":"","sources":["../src/unstable-core-do-not-import.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,cAAc,mDAAmD,CAAC;AAClE,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uDAAuD,CAAC;AACtE,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,0DAA0D,CAAC;AACzE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,0CAA0C,CAAC;AACzD,cAAc,2DAA2D,CAAC;AAC1E,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC"}

package/dist/unstable-core-do-not-import.js

@@ -23,6 +23,7 @@ var codes = require('./unstable-core-do-not-import/rpc/codes.js');
 var parseTRPCMessage = require('./unstable-core-do-not-import/rpc/parseTRPCMessage.js');
 var jsonl = require('./unstable-core-do-not-import/stream/jsonl.js');
 var sse = require('./unstable-core-do-not-import/stream/sse.js');
+var createDeferred = require('./unstable-core-do-not-import/stream/utils/createDeferred.js');
 var transformer = require('./unstable-core-do-not-import/transformer.js');
 var types = require('./unstable-core-do-not-import/types.js');
 var utils = require('./unstable-core-do-not-import/utils.js');
@@ -71,6 +72,8 @@ exports.sse = sse.sse;
 exports.sseHeaders = sse.sseHeaders;
 exports.sseStreamConsumer = sse.sseStreamConsumer;
 exports.sseStreamProducer = sse.sseStreamProducer;
+exports.createDeferred = createDeferred.createDeferred;
+exports.createTimeoutPromise = createDeferred.createTimeoutPromise;
 exports.defaultTransformer = transformer.defaultTransformer;
 exports.getDataTransformer = transformer.getDataTransformer;
 exports.transformResult = transformer.transformResult;

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

@@ -21,6 +21,7 @@ export { TRPC_ERROR_CODES_BY_KEY, TRPC_ERROR_CODES_BY_NUMBER } from './unstable-
 export { parseTRPCMessage } from './unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
 export { isPromise, jsonlStreamConsumer, jsonlStreamProducer } from './unstable-core-do-not-import/stream/jsonl.mjs';
 export { isSSEMessageEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-core-do-not-import/stream/sse.mjs';
+export { createDeferred, createTimeoutPromise } from './unstable-core-do-not-import/stream/utils/createDeferred.mjs';
 export { defaultTransformer, getDataTransformer, transformResult, transformTRPCResponse } from './unstable-core-do-not-import/transformer.mjs';
 export { ERROR_SYMBOL } from './unstable-core-do-not-import/types.mjs';
 export { isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, omitPrototype, run, unsetMarker } from './unstable-core-do-not-import/utils.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.452+8f18c400c",
+  "version": "11.0.0-rc.456+a9a2c25b1",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "8f18c400cbb76a66b5897032e59d17a8770f0667"
+  "gitHead": "a9a2c25b1ead6113bde45bb26c627e3696fb61a8"
 }

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

@@ -71,7 +71,9 @@ export async function nodeHTTPRequestHandler<
           // console.error('reader.cancel() error', err);
         });
       };
-      req.signal.addEventListener('abort', onAbort);
+      req.signal.addEventListener('abort', onAbort, {
+        once: true,
+      });
 
       while (true) {
         const { done, value } = await reader.read();

package/src/adapters/ws.ts

@@ -97,6 +97,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
 
   return async (client: ws.WebSocket, req: IncomingMessage) => {
     const clientSubscriptions = new Map<number | string, AbortController>();
+    const abortController = new AbortController();
 
     function respond(untransformedJSON: TRPCResponseMessage) {
       client.send(
@@ -119,6 +120,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
             isBatchCall: false,
             accept: null,
             type: 'unknown',
+            signal: abortController.signal,
           },
         });
 
@@ -410,6 +412,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         sub.abort();
       }
       clientSubscriptions.clear();
+      abortController.abort();
     });
 
     if (ctxPromise !== unsetContextSymbol) {

package/src/observable/observable.ts

@@ -90,19 +90,11 @@ function pipeReducer(prev: any, fn: UnaryFunction<any, any>) {
   return fn(prev);
 }
 
-class ObservableAbortError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = 'ObservableAbortError';
-    Object.setPrototypeOf(this, ObservableAbortError.prototype);
-  }
-}
-
 /** @internal */
 export function observableToPromise<TValue>(
   observable: Observable<TValue, unknown>,
 ) {
-  let abort: () => void;
+  const ac = new AbortController();
   const promise = new Promise<TValue>((resolve, reject) => {
     let isDone = false;
     function onDone() {
@@ -110,9 +102,11 @@ export function observableToPromise<TValue>(
         return;
       }
       isDone = true;
-      reject(new ObservableAbortError('This operation was aborted.'));
       obs$.unsubscribe();
     }
+    ac.signal.addEventListener('abort', () => {
+      reject(ac.signal.reason);
+    });
     const obs$ = observable.subscribe({
       next(data) {
         isDone = true;
@@ -120,22 +114,15 @@ export function observableToPromise<TValue>(
         onDone();
       },
       error(data) {
-        isDone = true;
         reject(data);
-        onDone();
       },
       complete() {
-        isDone = true;
+        ac.abort();
         onDone();
       },
     });
-    abort = onDone;
   });
-  return {
-    promise,
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    abort: abort!,
-  };
+  return promise;
 }
 
 /**

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

@@ -173,6 +173,7 @@ const jsonContentTypeHandler: ContentTypeHandler = {
         connectionParamsStr === null
           ? null
           : parseConnectionParamsFromString(connectionParamsStr),
+      signal: req.signal,
     };
     return info;
   },
@@ -208,6 +209,7 @@ const formDataContentTypeHandler: ContentTypeHandler = {
       isBatchCall: false,
       type: 'mutation',
       connectionParams: null,
+      signal: req.signal,
     };
   },
 };
@@ -243,6 +245,7 @@ const octetStreamContentTypeHandler: ContentTypeHandler = {
       accept: null,
       type: 'mutation',
       connectionParams: null,
+      signal: req.signal,
     };
   },
 };

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

@@ -10,8 +10,8 @@ const JSONRPC2_TO_HTTP_CODE: Record<
   PARSE_ERROR: 400,
   BAD_REQUEST: 400,
   UNAUTHORIZED: 401,
-  NOT_FOUND: 404,
   FORBIDDEN: 403,
+  NOT_FOUND: 404,
   METHOD_NOT_SUPPORTED: 405,
   TIMEOUT: 408,
   CONFLICT: 409,
@@ -23,6 +23,9 @@ const JSONRPC2_TO_HTTP_CODE: Record<
   CLIENT_CLOSED_REQUEST: 499,
   INTERNAL_SERVER_ERROR: 500,
   NOT_IMPLEMENTED: 501,
+  BAD_GATEWAY: 502,
+  SERVICE_UNAVAILABLE: 503,
+  GATEWAY_TIMEOUT: 504,
 };
 
 function getStatusCodeFromKey(code: keyof typeof TRPC_ERROR_CODES_BY_KEY) {

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

@@ -99,6 +99,11 @@ export interface TRPCRequestInfo {
    * Connection params when using `httpSubscriptionLink` or `createWSClient`
    */
   connectionParams: Dict<string> | null;
+  /**
+   * Signal when the request is aborted
+   * Can be used to abort async operations during the request, e.g. `fetch()`-requests
+   */
+  signal: AbortSignal;
 }
 
 /**

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

@@ -20,8 +20,11 @@ export const TRPC_ERROR_CODES_BY_KEY = {
   BAD_REQUEST: -32600, // 400
 
   // Internal JSON-RPC error
-  INTERNAL_SERVER_ERROR: -32603,
-  NOT_IMPLEMENTED: -32603,
+  INTERNAL_SERVER_ERROR: -32603, // 500
+  NOT_IMPLEMENTED: -32603, // 501
+  BAD_GATEWAY: -32603, // 502
+  SERVICE_UNAVAILABLE: -32603, // 503
+  GATEWAY_TIMEOUT: -32603, // 504
 
   // Implementation specific errors
   UNAUTHORIZED: -32001, // 401
@@ -31,8 +34,8 @@ export const TRPC_ERROR_CODES_BY_KEY = {
   TIMEOUT: -32008, // 408
   CONFLICT: -32009, // 409
   PRECONDITION_FAILED: -32012, // 412
-  UNSUPPORTED_MEDIA_TYPE: -32015, // 415
   PAYLOAD_TOO_LARGE: -32013, // 413
+  UNSUPPORTED_MEDIA_TYPE: -32015, // 415
   UNPROCESSABLE_CONTENT: -32022, // 422
   TOO_MANY_REQUESTS: -32029, // 429
   CLIENT_CLOSED_REQUEST: -32099, // 499

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

@@ -94,18 +94,16 @@ export function isPromise(value: unknown): value is Promise<unknown> {
 type Serialize = (value: any) => any;
 type Deserialize = (value: any) => any;
 
+type PathArray = readonly (string | number)[];
 export type ProducerOnError = (opts: {
   error: unknown;
-  path: (string | number)[];
+  path: PathArray;
 }) => void;
 export interface ProducerOptions {
   serialize?: Serialize;
   data: Record<string, unknown> | unknown[];
   onError?: ProducerOnError;
-  formatError?: (opts: {
-    error: unknown;
-    path: (string | number)[];
-  }) => unknown;
+  formatError?: (opts: { error: unknown; path: PathArray }) => unknown;
   maxDepth?: number;
 }
 
@@ -424,6 +422,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
   deserialize?: Deserialize;
   onError?: ConsumerOnError;
   formatError?: (opts: { error: unknown }) => Error;
+  abortController: AbortController | null;
 }) {
   const { deserialize = (v) => v } = opts;
 
@@ -441,19 +440,38 @@ export async function jsonlStreamConsumer<THead>(opts: {
 
   type ControllerChunk = ChunkData | StreamInterruptedError;
   type ChunkController = ReadableStreamDefaultController<ControllerChunk>;
-  const chunkDeferred = new Map<ChunkIndex, Deferred<ChunkController>>();
-  const controllers = new Map<ChunkIndex, ChunkController>();
+  type ControllerWrapper = {
+    controller: ChunkController;
+    returned: boolean;
+  };
+  const chunkDeferred = new Map<ChunkIndex, Deferred<ControllerWrapper>>();
+  const controllers = new Map<ChunkIndex, ControllerWrapper>();
+
+  const maybeAbort = () => {
+    if (
+      chunkDeferred.size === 0 &&
+      Array.from(controllers.values()).every((it) => it.returned)
+    ) {
+      // nothing is listening to the stream anymore
+      opts.abortController?.abort();
+    }
+  };
 
   function hydrateChunkDefinition(value: ChunkDefinition) {
     const [_path, type, chunkId] = value;
 
     const { readable, controller } = createReadableStream<ChunkData>();
-    controllers.set(chunkId, controller);
+
+    const wrapper: ControllerWrapper = {
+      controller,
+      returned: false,
+    };
+    controllers.set(chunkId, wrapper);
 
     // resolve chunk deferred if it exists
     const deferred = chunkDeferred.get(chunkId);
     if (deferred) {
-      deferred.resolve(controller);
+      deferred.resolve(wrapper);
       chunkDeferred.delete(chunkId);
     }
 
@@ -478,6 +496,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
               switch (status) {
                 case PROMISE_STATUS_FULFILLED:
                   resolve(hydrate(data));
+
                   break;
                 case PROMISE_STATUS_REJECTED:
                   reject(
@@ -490,38 +509,64 @@ export async function jsonlStreamConsumer<THead>(opts: {
             .finally(() => {
               // reader.releaseLock();
               controllers.delete(chunkId);
+
+              maybeAbort();
             });
         });
       }
       case CHUNK_VALUE_TYPE_ASYNC_ITERABLE: {
         return {
-          [Symbol.asyncIterator]: async function* () {
+          [Symbol.asyncIterator]: () => {
             const reader = readable.getReader();
-            while (true) {
-              const { done, value } = await reader.read();
-              if (done) {
-                break;
-              }
-              if (value instanceof StreamInterruptedError) {
-                throw value;
-              }
-
-              const [_chunkId, status, data] = value as IterableChunk;
-
-              switch (status) {
-                case ASYNC_ITERABLE_STATUS_VALUE:
-                  yield hydrate(data);
-                  break;
-                case ASYNC_ITERABLE_STATUS_DONE:
-                  controllers.delete(chunkId);
-                  return;
-                case ASYNC_ITERABLE_STATUS_ERROR:
+            const iterator: AsyncIterator<unknown> = {
+              next: async () => {
+                const { done, value } = await reader.read();
+                if (value instanceof StreamInterruptedError) {
+                  throw value;
+                }
+                if (done) {
                   controllers.delete(chunkId);
-                  throw (
-                    opts.formatError?.({ error: data }) ?? new AsyncError(data)
-                  );
-              }
-            }
+                  maybeAbort();
+                  return {
+                    done: true,
+                    value: undefined,
+                  };
+                }
+
+                const [_chunkId, status, data] = value as IterableChunk;
+
+                switch (status) {
+                  case ASYNC_ITERABLE_STATUS_VALUE:
+                    return {
+                      done: false,
+                      value: hydrate(data),
+                    };
+                  case ASYNC_ITERABLE_STATUS_DONE:
+                    controllers.delete(chunkId);
+                    maybeAbort();
+                    return {
+                      done: true,
+                      value: undefined,
+                    };
+                  case ASYNC_ITERABLE_STATUS_ERROR:
+                    controllers.delete(chunkId);
+                    maybeAbort();
+                    throw (
+                      opts.formatError?.({ error: data }) ??
+                      new AsyncError(data)
+                    );
+                }
+              },
+              return: async () => {
+                wrapper.returned = true;
+                maybeAbort();
+                return {
+                  done: true,
+                  value: undefined,
+                };
+              },
+            };
+            return iterator;
           },
         };
       }
@@ -532,14 +577,14 @@ export async function jsonlStreamConsumer<THead>(opts: {
     const [[data], ...asyncProps] = value;
 
     for (const value of asyncProps) {
+      const [key] = value;
       const hydrated = hydrateChunkDefinition(value);
 
-      const [path] = value;
-      if (path === null) {
+      if (key === null) {
         return hydrated;
       }
 
-      (data as any)[path] = hydrated;
+      (data as any)[key] = hydrated;
     }
     return data;
   }
@@ -552,7 +597,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
       deferred.reject(error);
     }
     chunkDeferred.clear();
-    for (const controller of controllers.values()) {
+    for (const { controller } of controllers.values()) {
       controller.enqueue(error);
       controller.close();
     }
@@ -575,17 +620,17 @@ export async function jsonlStreamConsumer<THead>(opts: {
           }
           const chunk = chunkOrHead as ChunkData;
           const [idx] = chunk;
-          let controller = controllers.get(idx);
-          if (!controller) {
+          let wrapper = controllers.get(idx);
+          if (!wrapper) {
             let deferred = chunkDeferred.get(idx);
             if (!deferred) {
-              deferred = createDeferred<ChunkController>();
+              deferred = createDeferred();
               chunkDeferred.set(idx, deferred);
             }
 
-            controller = await deferred.promise;
+            wrapper = await deferred.promise;
           }
-          controller.enqueue(chunk);
+          wrapper.controller.enqueue(chunk);
         },
         close: closeOrAbort,
         abort: closeOrAbort,

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

@@ -33,9 +33,7 @@ export function createServer(
   return {
     url,
     close: async () => {
-      await new Promise((resolve) => {
-        server.close(resolve);
-      });
+      await forceClose();
     },
     restart: async () => {
       await forceClose();

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

@@ -34,6 +34,7 @@ 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/stream/utils/createDeferred';
 export * from './unstable-core-do-not-import/transformer';
 export * from './unstable-core-do-not-import/types';
 export * from './unstable-core-do-not-import/utils';