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

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 136868,
-  "bundleOrigSize": 183401,
-  "bundleReduction": 25.37,
+  "bundleSize": 139502,
+  "bundleOrigSize": 186355,
+  "bundleReduction": 25.14,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -14,13 +14,13 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 13.47,
+      "percent": 13.22,
       "reduction": 0
     },
     {
       "id": "/src/unstable-core-do-not-import/stream/jsonl.ts",
       "size": 17567,
-      "origSize": 18359,
+      "origSize": 18465,
       "renderedExports": [
         "isPromise",
         "jsonlStreamProducer",
@@ -31,8 +31,8 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 12.83,
-      "reduction": 4.31
+      "percent": 12.59,
+      "reduction": 4.86
     },
     {
       "id": "/src/adapters/ws.ts",
@@ -47,9 +47,26 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 11.9,
+      "percent": 11.67,
       "reduction": 0
     },
+    {
+      "id": "/src/unstable-core-do-not-import/stream/sse.ts",
+      "size": 9020,
+      "origSize": 10407,
+      "renderedExports": [
+        "sseStreamProducer",
+        "sseStreamConsumer",
+        "sseHeaders"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts"
+      ],
+      "percent": 6.47,
+      "reduction": 13.33
+    },
     {
       "id": "/src/unstable-core-do-not-import/http/contentType.ts",
       "size": 7688,
@@ -62,7 +79,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.62,
+      "percent": 5.51,
       "reduction": 0
     },
     {
@@ -80,26 +97,9 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.69,
+      "percent": 4.6,
       "reduction": 40.09
     },
-    {
-      "id": "/src/unstable-core-do-not-import/stream/sse.ts",
-      "size": 6386,
-      "origSize": 7559,
-      "renderedExports": [
-        "sseStreamProducer",
-        "sseStreamConsumer",
-        "sseHeaders"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/unstable-core-do-not-import.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts"
-      ],
-      "percent": 4.67,
-      "reduction": 15.52
-    },
     {
       "id": "/src/unstable-core-do-not-import/procedureBuilder.ts",
       "size": 5795,
@@ -112,7 +112,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.23,
+      "percent": 4.15,
       "reduction": 64.74
     },
     {
@@ -126,7 +126,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 3.96,
+      "percent": 3.88,
       "reduction": 11.38
     },
     {
@@ -146,7 +146,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.01,
+      "percent": 2.95,
       "reduction": 0
     },
     {
@@ -160,7 +160,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 2.35,
+      "percent": 2.31,
       "reduction": 22.57
     },
     {
@@ -174,7 +174,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 2.09,
+      "percent": 2.05,
       "reduction": 6.07
     },
     {
@@ -190,7 +190,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.01,
+      "percent": 1.98,
       "reduction": 0
     },
     {
@@ -210,7 +210,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 2,
+      "percent": 1.97,
       "reduction": 45.94
     },
     {
@@ -224,7 +224,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 1.97,
+      "percent": 1.93,
       "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.92,
+      "percent": 1.88,
       "reduction": 55.78
     },
     {
@@ -260,7 +260,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.7,
+      "percent": 1.67,
       "reduction": 0
     },
     {
@@ -274,7 +274,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 1.65,
+      "percent": 1.62,
       "reduction": 2.17
     },
     {
@@ -289,7 +289,7 @@
         "/src/adapters/node-http/index.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 1.6,
+      "percent": 1.57,
       "reduction": 13.79
     },
     {
@@ -303,7 +303,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 1.5,
+      "percent": 1.47,
       "reduction": 5.79
     },
     {
@@ -317,7 +317,7 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 1.3,
+      "percent": 1.28,
       "reduction": 29.88
     },
     {
@@ -341,7 +341,7 @@
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 1.27,
+      "percent": 1.24,
       "reduction": 19.47
     },
     {
@@ -353,7 +353,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.24,
+      "percent": 1.22,
       "reduction": 19.29
     },
     {
@@ -366,7 +366,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.18,
+      "percent": 1.15,
       "reduction": 27.47
     },
     {
@@ -378,7 +378,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.13,
+      "percent": 1.11,
       "reduction": 26.94
     },
     {
@@ -395,7 +395,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
-      "percent": 1.05,
+      "percent": 1.03,
       "reduction": 16.73
     },
     {
@@ -410,7 +410,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.95,
+      "percent": 0.93,
       "reduction": 55.21
     },
     {
@@ -432,17 +432,17 @@
         "/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",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.87,
+      "percent": 0.85,
       "reduction": 28.34
     },
     {
@@ -457,7 +457,7 @@
         "/src/adapters/fastify/index.ts",
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 0.83,
+      "percent": 0.81,
       "reduction": 47.59
     },
     {
@@ -473,7 +473,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts"
       ],
-      "percent": 0.81,
+      "percent": 0.79,
       "reduction": 15.08
     },
     {
@@ -487,7 +487,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.77,
+      "percent": 0.76,
       "reduction": 0
     },
     {
@@ -504,7 +504,7 @@
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/next-app-dir/rethrowNextErrors.ts"
       ],
-      "percent": 0.72,
+      "percent": 0.71,
       "reduction": 13.65
     },
     {
@@ -522,7 +522,7 @@
         "/src/unstable-core-do-not-import/stream/sse.ts",
         "/src/unstable-core-do-not-import/stream/utils/createReadableStream.ts"
       ],
-      "percent": 0.72,
+      "percent": 0.7,
       "reduction": 15.69
     },
     {
@@ -539,7 +539,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.57,
+      "percent": 0.56,
       "reduction": 44.37
     },
     {
@@ -551,7 +551,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.55,
+      "percent": 0.54,
       "reduction": 66.9
     },
     {
@@ -567,7 +567,7 @@
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.52,
+      "percent": 0.51,
       "reduction": 21.32
     },
     {
@@ -581,7 +581,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.49,
+      "percent": 0.48,
       "reduction": 0.6
     },
     {
@@ -596,7 +596,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 0.46,
+      "percent": 0.45,
       "reduction": 43.49
     },
     {
@@ -609,7 +609,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.38,
+      "percent": 0.37,
       "reduction": 67.09
     },
     {
@@ -678,7 +678,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.12,
+      "percent": 0.11,
       "reduction": 14.13
     },
     {
@@ -725,9 +725,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -735,9 +735,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],

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

@@ -97,6 +97,9 @@ export declare function jsonlStreamConsumer<THead>(opts: {
     formatError?: (opts: {
         error: unknown;
     }) => Error;
+    /**
+     * This `AbortController` will be triggered when there are no more listeners to the stream.
+     */
     abortController: AbortController | null;
 }): Promise<readonly [Awaited<THead>, {
     readonly controllers: Map<ChunkIndex, {

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

@@ -1 +1 @@
-{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import type { ConsumerOnError } from './jsonl';
+import type { MaybePromise } from '../types';
 import type { inferTrackedOutput } from './tracked';
 type Serialize = (value: any) => any;
 type Deserialize = (value: any) => any;
@@ -43,22 +43,41 @@ export interface SSEStreamProducerOptions {
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
 export declare function sseStreamProducer(opts: SSEStreamProducerOptions): ReadableStream<string>;
-type ConsumerStreamResult<TData> = {
-    ok: true;
+interface ConsumerStreamResultBase {
+    eventSource: EventSource;
+}
+interface ConsumerStreamResultData<TData> extends ConsumerStreamResultBase {
+    type: 'data';
     data: inferTrackedOutput<TData>;
-} | {
-    ok: false;
+}
+interface ConsumerStreamResultError extends ConsumerStreamResultBase {
+    type: 'error';
     error: unknown;
-};
+}
+interface ConsumerStreamResultOpened extends ConsumerStreamResultBase {
+    type: 'opened';
+}
+interface ConsumerStreamResultConnecting extends ConsumerStreamResultBase {
+    type: 'connecting';
+}
+type ConsumerStreamResult<TData> = ConsumerStreamResultData<TData> | ConsumerStreamResultError | ConsumerStreamResultOpened | ConsumerStreamResultConnecting;
+export interface SSEStreamConsumerOptions {
+    url: () => MaybePromise<string>;
+    init: () => MaybePromise<EventSourceInit> | undefined;
+    signal: AbortSignal;
+    shouldRecreateOnError?: (opts: {
+        type: 'event';
+        event: Event;
+    } | {
+        type: 'serialized-error';
+        error: unknown;
+    }) => boolean | Promise<boolean>;
+    deserialize?: Deserialize;
+}
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
-export declare function sseStreamConsumer<TData>(opts: {
-    from: Pick<EventSource, 'addEventListener' | 'readyState'>;
-    onError?: ConsumerOnError;
-    deserialize?: Deserialize;
-    tryHandleError?: (error: Event) => Promise<boolean>;
-}): AsyncIterable<ConsumerStreamResult<TData>>;
+export declare function sseStreamConsumer<TData>(opts: SSEStreamConsumerOptions): AsyncIterable<ConsumerStreamResult<TData>>;
 export declare const sseHeaders: {
     readonly 'Content-Type': "text/event-stream";
     readonly 'Cache-Control': "no-cache, no-transform";

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,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"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,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,UAAU,wBAAwB;IAChC,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,UAAU,wBAAwB,CAAC,KAAK,CAAE,SAAQ,wBAAwB;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACjC;AAED,UAAU,yBAA0B,SAAQ,wBAAwB;IAClE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,0BAA2B,SAAQ,wBAAwB;IACnE,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,8BAA+B,SAAQ,wBAAwB;IACvE,IAAI,EAAE,YAAY,CAAC;CACpB;AAED,KAAK,oBAAoB,CAAC,KAAK,IAC3B,wBAAwB,CAAC,KAAK,CAAC,GAC/B,yBAAyB,GACzB,0BAA0B,GAC1B,8BAA8B,CAAC;AAEnC,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACtD,MAAM,EAAE,WAAW,CAAC;IACpB,qBAAqB,CAAC,EAAE,CACtB,IAAI,EACA;QACE,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,KAAK,CAAC;KACd,GACD;QACE,IAAI,EAAE,kBAAkB,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC;KAChB,KACF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EACrC,IAAI,EAAE,wBAAwB,GAC7B,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAkL5C;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}

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

@@ -105,60 +105,141 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamConsumer(opts) {
-    const { deserialize =(v)=>v  } = opts;
-    const eventSource = opts.from;
+    const { deserialize =(v)=>v , shouldRecreateOnError  } = opts;
+    const signal = opts.signal;
+    let eventSource = null;
+    let lock = null;
     const stream = createReadableStream.createReadableStream();
-    const transform = new TransformStream({
-        async transform (chunk, controller) {
-            const data = deserialize(JSON.parse(chunk.data));
-            if (chunk.type === SERIALIZED_ERROR_EVENT) {
-                controller.enqueue({
-                    ok: false,
-                    error: data
-                });
+    function createEventSource(...args) {
+        const es = new EventSource(...args);
+        if (signal.aborted) {
+            es.close();
+        } else {
+            signal.addEventListener('abort', ()=>es.close());
+        }
+        /**
+     * Dispatch an event to the stream controller
+     *
+     * Will be a no-op if the event source has been replaced
+     */ const dispatch = (fn)=>{
+            utils.run(async ()=>{
+                while(lock){
+                    await lock;
+                }
+                if (es === eventSource) {
+                    await fn(stream.controller);
+                }
+            }).catch((error)=>{
+                stream.controller.error(error);
+            });
+        };
+        const pauseDispatch = async (fn)=>{
+            while(lock){
+                await lock;
+            }
+            if (es !== eventSource) {
                 return;
             }
-            // console.debug('transforming', chunk.type, chunk.data);
-            const def = {
-                data
-            };
-            if (chunk.lastEventId) {
-                def.id = chunk.lastEventId;
+            const deferred = createDeferred.createDeferred();
+            lock = deferred.promise;
+            try {
+                await fn();
+            } finally{
+                lock = null;
+                deferred.resolve();
             }
-            controller.enqueue({
-                ok: true,
-                data: def
+        };
+        es.addEventListener('open', ()=>{
+            dispatch((controller)=>{
+                controller.enqueue({
+                    type: 'opened',
+                    eventSource: es
+                });
             });
-        }
-    });
-    let errorLock = undefined;
-    eventSource.addEventListener('message', (msg)=>{
-        stream.controller.enqueue(msg);
-    });
-    eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (msg)=>{
-        stream.controller.enqueue(msg);
-    });
-    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);
-        }
+        });
+        es.addEventListener(SERIALIZED_ERROR_EVENT, (msg)=>{
+            dispatch(async ()=>{
+                if (shouldRecreateOnError) {
+                    await pauseDispatch(async ()=>{
+                        const recreate = await shouldRecreateOnError({
+                            type: SERIALIZED_ERROR_EVENT,
+                            error: deserialize(JSON.parse(msg.data))
+                        });
+                        if (recreate) {
+                            await recreateEventSource();
+                        }
+                    });
+                }
+                dispatch((controller)=>{
+                    controller.enqueue({
+                        type: 'error',
+                        error: deserialize(JSON.parse(msg.data)),
+                        eventSource: es
+                    });
+                });
+            });
+        });
+        es.addEventListener('error', (event)=>{
+            dispatch(async ()=>{
+                if (shouldRecreateOnError) {
+                    await pauseDispatch(async ()=>{
+                        const recreate = await shouldRecreateOnError({
+                            type: 'event',
+                            event
+                        });
+                        if (recreate) {
+                            await recreateEventSource();
+                        }
+                    });
+                }
+                dispatch((controller)=>{
+                    if (es.readyState === EventSource.CLOSED) {
+                        controller.error(event);
+                    } else {
+                        controller.enqueue({
+                            type: 'connecting',
+                            eventSource: es
+                        });
+                    }
+                });
+            });
+        });
+        es.addEventListener('message', (msg)=>{
+            dispatch((controller)=>{
+                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: es
+                });
+            });
+        });
+        return es;
+    }
+    async function recreateEventSource() {
+        eventSource?.close();
+        const [url, init] = await Promise.all([
+            opts.url(),
+            opts.init()
+        ]);
+        eventSource = createEventSource(url, init);
+        stream.controller.enqueue({
+            type: 'connecting',
+            eventSource
+        });
+    }
+    recreateEventSource().catch(()=>{
+    // prevent unhandled promise rejection
     });
-    const readable = stream.readable.pipeThrough(transform);
     return {
         [Symbol.asyncIterator] () {
-            const reader = readable.getReader();
+            const reader = stream.readable.getReader();
             const iterator = {
                 async next () {
                     const value = await reader.read();

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

@@ -103,60 +103,141 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamConsumer(opts) {
-    const { deserialize =(v)=>v  } = opts;
-    const eventSource = opts.from;
+    const { deserialize =(v)=>v , shouldRecreateOnError  } = opts;
+    const signal = opts.signal;
+    let eventSource = null;
+    let lock = null;
     const stream = createReadableStream();
-    const transform = new TransformStream({
-        async transform (chunk, controller) {
-            const data = deserialize(JSON.parse(chunk.data));
-            if (chunk.type === SERIALIZED_ERROR_EVENT) {
-                controller.enqueue({
-                    ok: false,
-                    error: data
-                });
+    function createEventSource(...args) {
+        const es = new EventSource(...args);
+        if (signal.aborted) {
+            es.close();
+        } else {
+            signal.addEventListener('abort', ()=>es.close());
+        }
+        /**
+     * Dispatch an event to the stream controller
+     *
+     * Will be a no-op if the event source has been replaced
+     */ const dispatch = (fn)=>{
+            run(async ()=>{
+                while(lock){
+                    await lock;
+                }
+                if (es === eventSource) {
+                    await fn(stream.controller);
+                }
+            }).catch((error)=>{
+                stream.controller.error(error);
+            });
+        };
+        const pauseDispatch = async (fn)=>{
+            while(lock){
+                await lock;
+            }
+            if (es !== eventSource) {
                 return;
             }
-            // console.debug('transforming', chunk.type, chunk.data);
-            const def = {
-                data
-            };
-            if (chunk.lastEventId) {
-                def.id = chunk.lastEventId;
+            const deferred = createDeferred();
+            lock = deferred.promise;
+            try {
+                await fn();
+            } finally{
+                lock = null;
+                deferred.resolve();
             }
-            controller.enqueue({
-                ok: true,
-                data: def
+        };
+        es.addEventListener('open', ()=>{
+            dispatch((controller)=>{
+                controller.enqueue({
+                    type: 'opened',
+                    eventSource: es
+                });
             });
-        }
-    });
-    let errorLock = undefined;
-    eventSource.addEventListener('message', (msg)=>{
-        stream.controller.enqueue(msg);
-    });
-    eventSource.addEventListener(SERIALIZED_ERROR_EVENT, (msg)=>{
-        stream.controller.enqueue(msg);
-    });
-    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);
-        }
+        });
+        es.addEventListener(SERIALIZED_ERROR_EVENT, (msg)=>{
+            dispatch(async ()=>{
+                if (shouldRecreateOnError) {
+                    await pauseDispatch(async ()=>{
+                        const recreate = await shouldRecreateOnError({
+                            type: SERIALIZED_ERROR_EVENT,
+                            error: deserialize(JSON.parse(msg.data))
+                        });
+                        if (recreate) {
+                            await recreateEventSource();
+                        }
+                    });
+                }
+                dispatch((controller)=>{
+                    controller.enqueue({
+                        type: 'error',
+                        error: deserialize(JSON.parse(msg.data)),
+                        eventSource: es
+                    });
+                });
+            });
+        });
+        es.addEventListener('error', (event)=>{
+            dispatch(async ()=>{
+                if (shouldRecreateOnError) {
+                    await pauseDispatch(async ()=>{
+                        const recreate = await shouldRecreateOnError({
+                            type: 'event',
+                            event
+                        });
+                        if (recreate) {
+                            await recreateEventSource();
+                        }
+                    });
+                }
+                dispatch((controller)=>{
+                    if (es.readyState === EventSource.CLOSED) {
+                        controller.error(event);
+                    } else {
+                        controller.enqueue({
+                            type: 'connecting',
+                            eventSource: es
+                        });
+                    }
+                });
+            });
+        });
+        es.addEventListener('message', (msg)=>{
+            dispatch((controller)=>{
+                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: es
+                });
+            });
+        });
+        return es;
+    }
+    async function recreateEventSource() {
+        eventSource?.close();
+        const [url, init] = await Promise.all([
+            opts.url(),
+            opts.init()
+        ]);
+        eventSource = createEventSource(url, init);
+        stream.controller.enqueue({
+            type: 'connecting',
+            eventSource
+        });
+    }
+    recreateEventSource().catch(()=>{
+    // prevent unhandled promise rejection
     });
-    const readable = stream.readable.pipeThrough(transform);
     return {
         [Symbol.asyncIterator] () {
-            const reader = readable.getReader();
+            const reader = stream.readable.getReader();
             const iterator = {
                 async next () {
                     const value = await reader.read();

package/package.json

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

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

@@ -436,6 +436,9 @@ export async function jsonlStreamConsumer<THead>(opts: {
   deserialize?: Deserialize;
   onError?: ConsumerOnError;
   formatError?: (opts: { error: unknown }) => Error;
+  /**
+   * This `AbortController` will be triggered when there are no more listeners to the stream.
+   */
   abortController: AbortController | null;
 }) {
   const { deserialize = (v) => v } = opts;

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

@@ -1,6 +1,6 @@
 import { getTRPCErrorFromUnknown } from '../error/TRPCError';
+import type { MaybePromise } from '../types';
 import { run } from '../utils';
-import type { ConsumerOnError } from './jsonl';
 import type { inferTrackedOutput } from './tracked';
 import { isTrackedEnvelope } from './tracked';
 import { createDeferred, createTimeoutPromise } from './utils/createDeferred';
@@ -175,98 +175,212 @@ export function sseStreamProducer(opts: SSEStreamProducerOptions) {
   );
 }
 
-type ConsumerStreamResult<TData> =
-  | {
-      ok: true;
-      data: inferTrackedOutput<TData>;
-    }
-  | {
-      ok: false;
-      error: unknown;
-    };
+interface ConsumerStreamResultBase {
+  eventSource: EventSource;
+}
+
+interface ConsumerStreamResultData<TData> extends ConsumerStreamResultBase {
+  type: 'data';
+  data: inferTrackedOutput<TData>;
+}
+
+interface ConsumerStreamResultError extends ConsumerStreamResultBase {
+  type: 'error';
+  error: unknown;
+}
 
+interface ConsumerStreamResultOpened extends ConsumerStreamResultBase {
+  type: 'opened';
+}
+
+interface ConsumerStreamResultConnecting extends ConsumerStreamResultBase {
+  type: 'connecting';
+}
+
+type ConsumerStreamResult<TData> =
+  | ConsumerStreamResultData<TData>
+  | ConsumerStreamResultError
+  | ConsumerStreamResultOpened
+  | ConsumerStreamResultConnecting;
+
+export interface SSEStreamConsumerOptions {
+  url: () => MaybePromise<string>;
+  init: () => MaybePromise<EventSourceInit> | undefined;
+  signal: AbortSignal;
+  shouldRecreateOnError?: (
+    opts:
+      | {
+          type: 'event';
+          event: Event;
+        }
+      | {
+          type: 'serialized-error';
+          error: unknown;
+        },
+  ) => boolean | Promise<boolean>;
+  deserialize?: Deserialize;
+}
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
-export function sseStreamConsumer<TData>(opts: {
-  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;
-
-  const stream = createReadableStream<MessageEvent>();
-
-  const transform = new TransformStream<
-    MessageEvent,
-    ConsumerStreamResult<TData>
-  >({
-    async transform(chunk, controller) {
-      const data = deserialize(JSON.parse(chunk.data));
-      if (chunk.type === SERIALIZED_ERROR_EVENT) {
-        controller.enqueue({
-          ok: false,
-          error: data,
-        });
-        return;
-      }
-      // console.debug('transforming', chunk.type, chunk.data);
-      const def: SSEvent = {
-        data,
-      };
+export function sseStreamConsumer<TData>(
+  opts: SSEStreamConsumerOptions,
+): AsyncIterable<ConsumerStreamResult<TData>> {
+  const { deserialize = (v) => v, shouldRecreateOnError } = opts;
 
-      if (chunk.lastEventId) {
-        def.id = chunk.lastEventId;
-      }
+  const signal = opts.signal;
 
-      controller.enqueue({
-        ok: true,
-        data: def as inferTrackedOutput<TData>,
-      });
-    },
-  });
+  let eventSource: EventSource | null = null;
+  let lock: Promise<void> | null = null;
 
-  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', 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 stream = createReadableStream<ConsumerStreamResult<TData>>();
 
-    const resolvable = createDeferred<void | 'CANCEL_ALL'>();
-    errorLock = resolvable.promise;
+  function createEventSource(
+    ...args: ConstructorParameters<typeof EventSource>
+  ) {
+    const es = new EventSource(...args);
 
-    const handled = await opts.tryHandleError?.(cause);
+    if (signal.aborted) {
+      es.close();
+    } else {
+      signal.addEventListener('abort', () => es.close());
+    }
 
-    resolvable.resolve();
+    /**
+     * Dispatch an event to the stream controller
+     *
+     * Will be a no-op if the event source has been replaced
+     */
+    const dispatch = (
+      fn: (controller: typeof stream.controller) => void | Promise<void>,
+    ): void => {
+      run(async () => {
+        while (lock) {
+          await lock;
+        }
+        if (es === eventSource) {
+          await fn(stream.controller);
+        }
+      }).catch((error) => {
+        stream.controller.error(error);
+      });
+    };
 
-    if (handled === true) {
-      return;
-    }
+    const pauseDispatch = async (fn: () => Promise<void>): Promise<void> => {
+      while (lock) {
+        await lock;
+      }
+      if (es !== eventSource) {
+        return;
+      }
 
-    if (eventSource.readyState === EventSource.CLOSED) {
-      stream.controller.error(cause);
-    }
-  });
+      const deferred = createDeferred<void>();
+      lock = deferred.promise;
+      try {
+        await fn();
+      } finally {
+        lock = null;
+        deferred.resolve();
+      }
+    };
 
-  const readable = stream.readable.pipeThrough(transform);
+    es.addEventListener('open', () => {
+      dispatch((controller) => {
+        controller.enqueue({
+          type: 'opened',
+          eventSource: es,
+        });
+      });
+    });
+
+    es.addEventListener(SERIALIZED_ERROR_EVENT, (msg) => {
+      dispatch(async () => {
+        if (shouldRecreateOnError) {
+          await pauseDispatch(async () => {
+            const recreate = await shouldRecreateOnError({
+              type: SERIALIZED_ERROR_EVENT,
+              error: deserialize(JSON.parse(msg.data)),
+            });
+            if (recreate) {
+              await recreateEventSource();
+            }
+          });
+        }
+        dispatch((controller) => {
+          controller.enqueue({
+            type: 'error',
+            error: deserialize(JSON.parse(msg.data)),
+            eventSource: es,
+          });
+        });
+      });
+    });
+    es.addEventListener('error', (event) => {
+      dispatch(async () => {
+        if (shouldRecreateOnError) {
+          await pauseDispatch(async () => {
+            const recreate = await shouldRecreateOnError({
+              type: 'event',
+              event,
+            });
+            if (recreate) {
+              await recreateEventSource();
+            }
+          });
+        }
 
+        dispatch((controller) => {
+          if (es.readyState === EventSource.CLOSED) {
+            controller.error(event);
+          } else {
+            controller.enqueue({
+              type: 'connecting',
+              eventSource: es,
+            });
+          }
+        });
+      });
+    });
+    es.addEventListener('message', (msg) => {
+      dispatch((controller) => {
+        const chunk = deserialize(JSON.parse(msg.data));
+
+        const def: SSEvent = {
+          data: chunk,
+        };
+        if (msg.lastEventId) {
+          def.id = msg.lastEventId;
+        }
+        controller.enqueue({
+          type: 'data',
+          data: def as inferTrackedOutput<TData>,
+          eventSource: es,
+        });
+      });
+    });
+    return es;
+  }
+  async function recreateEventSource() {
+    eventSource?.close();
+    const [url, init] = await Promise.all([opts.url(), opts.init()]);
+    eventSource = createEventSource(url, init);
+    stream.controller.enqueue({
+      type: 'connecting',
+      eventSource,
+    });
+  }
+
+  recreateEventSource().catch(() => {
+    // prevent unhandled promise rejection
+  });
   return {
     [Symbol.asyncIterator]() {
-      const reader = readable.getReader();
+      const reader = stream.readable.getReader();
 
       const iterator: AsyncIterator<ConsumerStreamResult<TData>> = {
         async next() {
           const value = await reader.read();
+
           if (value.done) {
             return {
               value: undefined,