@trpc/server 11.0.0-rc.553 → 11.0.0-rc.560

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 136392,
-  "bundleOrigSize": 182813,
-  "bundleReduction": 25.39,
+  "bundleSize": 136868,
+  "bundleOrigSize": 183401,
+  "bundleReduction": 25.37,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 13.52,
+      "percent": 13.47,
       "reduction": 0
     },
     {
@@ -31,7 +31,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 12.88,
+      "percent": 12.83,
       "reduction": 4.31
     },
     {
@@ -47,7 +47,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 11.94,
+      "percent": 11.9,
       "reduction": 0
     },
     {
@@ -62,7 +62,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.64,
+      "percent": 5.62,
       "reduction": 0
     },
     {
@@ -80,13 +80,13 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.71,
+      "percent": 4.69,
       "reduction": 40.09
     },
     {
       "id": "/src/unstable-core-do-not-import/stream/sse.ts",
-      "size": 5910,
-      "origSize": 6971,
+      "size": 6386,
+      "origSize": 7559,
       "renderedExports": [
         "sseStreamProducer",
         "sseStreamConsumer",
@@ -97,8 +97,8 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 4.33,
-      "reduction": 15.22
+      "percent": 4.67,
+      "reduction": 15.52
     },
     {
       "id": "/src/unstable-core-do-not-import/procedureBuilder.ts",
@@ -112,7 +112,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.25,
+      "percent": 4.23,
       "reduction": 64.74
     },
     {
@@ -126,7 +126,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 3.97,
+      "percent": 3.96,
       "reduction": 11.38
     },
     {
@@ -146,7 +146,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.02,
+      "percent": 3.01,
       "reduction": 0
     },
     {
@@ -160,7 +160,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 2.36,
+      "percent": 2.35,
       "reduction": 22.57
     },
     {
@@ -174,7 +174,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 2.1,
+      "percent": 2.09,
       "reduction": 6.07
     },
     {
@@ -190,7 +190,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.02,
+      "percent": 2.01,
       "reduction": 0
     },
     {
@@ -210,7 +210,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 2.01,
+      "percent": 2,
       "reduction": 45.94
     },
     {
@@ -224,7 +224,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 1.98,
+      "percent": 1.97,
       "reduction": 40.98
     },
     {
@@ -244,7 +244,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.93,
+      "percent": 1.92,
       "reduction": 55.78
     },
     {
@@ -260,7 +260,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.71,
+      "percent": 1.7,
       "reduction": 0
     },
     {
@@ -289,7 +289,7 @@
         "/src/adapters/node-http/index.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 1.61,
+      "percent": 1.6,
       "reduction": 13.79
     },
     {
@@ -353,7 +353,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.25,
+      "percent": 1.24,
       "reduction": 19.29
     },
     {
@@ -432,11 +432,11 @@
         "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
         "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
+        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/error/TRPCError.ts",
         "/src/unstable-core-do-not-import/transformer.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
@@ -487,7 +487,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.78,
+      "percent": 0.77,
       "reduction": 0
     },
     {
@@ -551,7 +551,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.56,
+      "percent": 0.55,
       "reduction": 66.9
     },
     {
@@ -636,7 +636,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.21,
+      "percent": 0.2,
       "reduction": 72.92
     },
     {
@@ -725,9 +725,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -735,9 +735,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -745,9 +745,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -789,6 +789,16 @@
       "percent": 0,
       "reduction": 100
     },
+    {
+      "id": "/src/adapters/fastify/index.ts",
+      "size": 0,
+      "origSize": 78,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0,
+      "reduction": 100
+    },
     {
       "id": "/src/adapters/fetch/index.ts",
       "size": 0,
@@ -813,16 +823,6 @@
       ],
       "percent": 0,
       "reduction": 100
-    },
-    {
-      "id": "/src/adapters/fastify/index.ts",
-      "size": 0,
-      "origSize": 78,
-      "renderedExports": [],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 0,
-      "reduction": 100
     }
   ],
   "moduleCount": 55

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

@@ -54,9 +54,10 @@ type ConsumerStreamResult<TData> = {
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
 export declare function sseStreamConsumer<TData>(opts: {
-    from: EventSource;
+    from: Pick<EventSource, 'addEventListener' | 'readyState'>;
     onError?: ConsumerOnError;
     deserialize?: Deserialize;
+    tryHandleError?: (error: Event) => Promise<boolean>;
 }): AsyncIterable<ConsumerStreamResult<TData>>;
 export declare const sseHeaders: {
     readonly 'Content-Type': "text/event-stream";

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

@@ -1 +1 @@
-{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAKpD,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC;CACrD;AAUD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,0BAoH/D;AAED,KAAK,oBAAoB,CAAC,KAAK,IAC3B;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACjC,GACD;IACE,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEN;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;IAC7C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CA6E7C;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAKpD,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC;CACrD;AAUD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,0BAoH/D;AAED,KAAK,oBAAoB,CAAC,KAAK,IAC3B;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACjC,GACD;IACE,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEN;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;IAC7C,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,kBAAkB,GAAG,YAAY,CAAC,CAAC;IAC3D,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACrD,GAAG,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAgG7C;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}

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

@@ -131,13 +131,26 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
             });
         }
     });
+    let errorLock = undefined;
     eventSource.addEventListener('message', (msg)=>{
         stream.controller.enqueue(msg);
     });
     eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (msg)=>{
         stream.controller.enqueue(msg);
     });
-    eventSource.addEventListener('error', (cause)=>{
+    eventSource.addEventListener('error', async (cause)=>{
+        // We prevent more than 1 error handler from waiting at the same time
+        const result = await errorLock;
+        if (result === 'CANCEL_ALL') {
+            return;
+        }
+        const resolvable = createDeferred.createDeferred();
+        errorLock = resolvable.promise;
+        const handled = await opts.tryHandleError?.(cause);
+        resolvable.resolve();
+        if (handled === true) {
+            return;
+        }
         if (eventSource.readyState === EventSource.CLOSED) {
             stream.controller.error(cause);
         }

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

@@ -1,7 +1,7 @@
 import { getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
 import { run } from '../utils.mjs';
 import { isTrackedEnvelope } from './tracked.mjs';
-import { createTimeoutPromise } from './utils/createDeferred.mjs';
+import { createTimeoutPromise, createDeferred } from './utils/createDeferred.mjs';
 import { createReadableStream } from './utils/createReadableStream.mjs';
 
 const SERIALIZED_ERROR_EVENT = 'serialized-error';
@@ -129,13 +129,26 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
             });
         }
     });
+    let errorLock = undefined;
     eventSource.addEventListener('message', (msg)=>{
         stream.controller.enqueue(msg);
     });
     eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (msg)=>{
         stream.controller.enqueue(msg);
     });
-    eventSource.addEventListener('error', (cause)=>{
+    eventSource.addEventListener('error', async (cause)=>{
+        // We prevent more than 1 error handler from waiting at the same time
+        const result = await errorLock;
+        if (result === 'CANCEL_ALL') {
+            return;
+        }
+        const resolvable = createDeferred();
+        errorLock = resolvable.promise;
+        const handled = await opts.tryHandleError?.(cause);
+        resolvable.resolve();
+        if (handled === true) {
+            return;
+        }
         if (eventSource.readyState === EventSource.CLOSED) {
             stream.controller.error(cause);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.553+9b629cc67",
+  "version": "11.0.0-rc.560+137b085f8",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "9b629cc672aad7908af1d5355e3f2dd8f03f048d"
+  "gitHead": "137b085f86cb4ceb397b29c69ccbe38a93dbe79a"
 }

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

@@ -3,7 +3,7 @@ import { run } from '../utils';
 import type { ConsumerOnError } from './jsonl';
 import type { inferTrackedOutput } from './tracked';
 import { isTrackedEnvelope } from './tracked';
-import { createTimeoutPromise } from './utils/createDeferred';
+import { createDeferred, createTimeoutPromise } from './utils/createDeferred';
 import { createReadableStream } from './utils/createReadableStream';
 
 type Serialize = (value: any) => any;
@@ -189,9 +189,10 @@ type ConsumerStreamResult<TData> =
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
 export function sseStreamConsumer<TData>(opts: {
-  from: EventSource;
+  from: Pick<EventSource, 'addEventListener' | 'readyState'>;
   onError?: ConsumerOnError;
   deserialize?: Deserialize;
+  tryHandleError?: (error: Event) => Promise<boolean>;
 }): AsyncIterable<ConsumerStreamResult<TData>> {
   const { deserialize = (v) => v } = opts;
   const eventSource = opts.from;
@@ -227,19 +228,38 @@ export function sseStreamConsumer<TData>(opts: {
     },
   });
 
+  let errorLock: Promise<void | 'CANCEL_ALL'> | undefined = undefined;
   eventSource.addEventListener('message', (msg) => {
     stream.controller.enqueue(msg);
   });
   eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (msg) => {
     stream.controller.enqueue(msg);
   });
-  eventSource.addEventListener('error', (cause) => {
+  eventSource.addEventListener('error', async (cause) => {
+    // We prevent more than 1 error handler from waiting at the same time
+    const result = await errorLock;
+    if (result === 'CANCEL_ALL') {
+      return;
+    }
+
+    const resolvable = createDeferred<void | 'CANCEL_ALL'>();
+    errorLock = resolvable.promise;
+
+    const handled = await opts.tryHandleError?.(cause);
+
+    resolvable.resolve();
+
+    if (handled === true) {
+      return;
+    }
+
     if (eventSource.readyState === EventSource.CLOSED) {
       stream.controller.error(cause);
     }
   });
 
   const readable = stream.readable.pipeThrough(transform);
+
   return {
     [Symbol.asyncIterator]() {
       const reader = readable.getReader();