@trpc/server 11.0.0-alpha-tmp-issues-5851-take-two.488 → 11.0.0-alpha-tmp-issues-5851-take-two.490

package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI7E,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAsElE"}
+{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI7E,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAwElE"}

package/dist/adapters/node-http/nodeHTTPRequestHandler.js

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

package/dist/adapters/node-http/nodeHTTPRequestHandler.mjs

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

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAS,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAatE,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,EAAE,CAAC,SAAS,OAAO,eAAe,mBAkUzD;AAiCD,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA+BjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAS,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAatE,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,EAAE,CAAC,SAAS,OAAO,eAAe,mBAmUzD;AAiCD,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA+BjC"}

package/dist/adapters/ws.js

@@ -21,12 +21,13 @@ function getWSConnectionHandler(opts) {
     const { transformer: transformer$1  } = router$1._def._config;
     return async (client, req)=>{
         const clientSubscriptions = new Map();
+        const abortController = new AbortController();
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformer.transformTRPCResponse(router$1._def._config, untransformedJSON)));
         }
-        function createCtxPromise(getConnectionParams) {
-            return utils.run(async ()=>{
-                ctx = await createContext?.({
+        async function createCtxPromise(getConnectionParams) {
+            try {
+                return await createContext?.({
                     req,
                     res: client,
                     info: {
@@ -34,11 +35,11 @@ function getWSConnectionHandler(opts) {
                         calls: [],
                         isBatchCall: false,
                         accept: null,
-                        type: 'unknown'
+                        type: 'unknown',
+                        signal: abortController.signal
                     }
                 });
-                return ctx;
-            }).catch((cause)=>{
+            } catch (cause) {
                 const error = TRPCError.getTRPCErrorFromUnknown(cause);
                 opts.onError?.({
                     error,
@@ -64,7 +65,7 @@ function getWSConnectionHandler(opts) {
                     client.close();
                 });
                 throw error;
-            });
+            }
         }
         /**
      * promise for initializing the context
@@ -72,7 +73,7 @@ function getWSConnectionHandler(opts) {
      * - the context promise will be created immediately on connection if no connectionParams are expected
      * - if connection params are expected, they will be created once received
      */ let ctxPromise = toURL.toURL(req.url ?? '').searchParams.get('connectionParams') === '1' ? unsetContextSymbol : createCtxPromise(()=>null);
-        let ctx = undefined;
+        const ctx = undefined;
         async function handleRequest(msg) {
             const { id , jsonrpc  } = msg;
             /* istanbul ignore next -- @preserve */ if (id === null) {
@@ -310,6 +311,7 @@ function getWSConnectionHandler(opts) {
                 sub.abort();
             }
             clientSubscriptions.clear();
+            abortController.abort();
         });
         if (ctxPromise !== unsetContextSymbol) {
             // prevent unhandled promise rejection errors

package/dist/adapters/ws.mjs

@@ -1,6 +1,6 @@
 import { getErrorShape } from '../unstable-core-do-not-import/error/getErrorShape.mjs';
 import { TRPCError, getTRPCErrorFromUnknown } from '../unstable-core-do-not-import/error/TRPCError.mjs';
-import { run, isAsyncIterable, isObject } from '../unstable-core-do-not-import/utils.mjs';
+import { isAsyncIterable, run, isObject } from '../unstable-core-do-not-import/utils.mjs';
 import { parseConnectionParamsFromUnknown } from '../unstable-core-do-not-import/http/parseConnectionParams.mjs';
 import { parseTRPCMessage } from '../unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
 import { isObservable, observableToAsyncIterable } from '../observable/observable.mjs';
@@ -19,12 +19,13 @@ function getWSConnectionHandler(opts) {
     const { transformer  } = router._def._config;
     return async (client, req)=>{
         const clientSubscriptions = new Map();
+        const abortController = new AbortController();
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformTRPCResponse(router._def._config, untransformedJSON)));
         }
-        function createCtxPromise(getConnectionParams) {
-            return run(async ()=>{
-                ctx = await createContext?.({
+        async function createCtxPromise(getConnectionParams) {
+            try {
+                return await createContext?.({
                     req,
                     res: client,
                     info: {
@@ -32,11 +33,11 @@ function getWSConnectionHandler(opts) {
                         calls: [],
                         isBatchCall: false,
                         accept: null,
-                        type: 'unknown'
+                        type: 'unknown',
+                        signal: abortController.signal
                     }
                 });
-                return ctx;
-            }).catch((cause)=>{
+            } catch (cause) {
                 const error = getTRPCErrorFromUnknown(cause);
                 opts.onError?.({
                     error,
@@ -62,7 +63,7 @@ function getWSConnectionHandler(opts) {
                     client.close();
                 });
                 throw error;
-            });
+            }
         }
         /**
      * promise for initializing the context
@@ -70,7 +71,7 @@ function getWSConnectionHandler(opts) {
      * - the context promise will be created immediately on connection if no connectionParams are expected
      * - if connection params are expected, they will be created once received
      */ let ctxPromise = toURL(req.url ?? '').searchParams.get('connectionParams') === '1' ? unsetContextSymbol : createCtxPromise(()=>null);
-        let ctx = undefined;
+        const ctx = undefined;
         async function handleRequest(msg) {
             const { id , jsonrpc  } = msg;
             /* istanbul ignore next -- @preserve */ if (id === null) {
@@ -308,6 +309,7 @@ function getWSConnectionHandler(opts) {
                 sub.abort();
             }
             clientSubscriptions.clear();
+            abortController.abort();
         });
         if (ctxPromise !== unsetContextSymbol) {
             // prevent unhandled promise rejection errors

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 131082,
-  "bundleOrigSize": 180516,
-  "bundleReduction": 27.38,
+  "bundleSize": 131324,
+  "bundleOrigSize": 180714,
+  "bundleReduction": 27.33,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/stream/jsonl.ts",
@@ -17,7 +17,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 13.23,
+      "percent": 13.2,
       "reduction": 4.22
     },
     {
@@ -31,13 +31,13 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 13.03,
+      "percent": 13,
       "reduction": 0
     },
     {
       "id": "/src/adapters/ws.ts",
-      "size": 14274,
-      "origSize": 13514,
+      "size": 14376,
+      "origSize": 13603,
       "renderedExports": [
         "getWSConnectionHandler",
         "applyWSSHandler"
@@ -46,13 +46,13 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.89,
+      "percent": 10.95,
       "reduction": 0
     },
     {
       "id": "/src/unstable-core-do-not-import/http/contentType.ts",
-      "size": 7592,
-      "origSize": 7530,
+      "size": 7688,
+      "origSize": 7608,
       "renderedExports": [
         "getRequestInfo"
       ],
@@ -61,7 +61,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.79,
+      "percent": 5.85,
       "reduction": 0
     },
     {
@@ -79,7 +79,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.87,
+      "percent": 4.86,
       "reduction": 39.77
     },
     {
@@ -94,7 +94,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.83,
+      "percent": 4.82,
       "reduction": 60.06
     },
     {
@@ -113,7 +113,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 4.3,
+      "percent": 4.29,
       "reduction": 24.48
     },
     {
@@ -147,7 +147,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.14,
+      "percent": 3.13,
       "reduction": 0
     },
     {
@@ -201,32 +201,32 @@
       "reduction": 45.94
     },
     {
-      "id": "/src/unstable-core-do-not-import/initTRPC.ts",
-      "size": 2704,
-      "origSize": 4576,
+      "id": "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
+      "size": 2732,
+      "origSize": 2931,
       "renderedExports": [
-        "initTRPC"
+        "nodeHTTPRequestHandler"
       ],
       "removedExports": [],
       "dependents": [
-        "/src/unstable-core-do-not-import.ts"
+        "/src/adapters/node-http/index.ts"
       ],
-      "percent": 2.06,
-      "reduction": 40.91
+      "percent": 2.08,
+      "reduction": 6.79
     },
     {
-      "id": "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
-      "size": 2688,
-      "origSize": 2900,
+      "id": "/src/unstable-core-do-not-import/initTRPC.ts",
+      "size": 2704,
+      "origSize": 4576,
       "renderedExports": [
-        "nodeHTTPRequestHandler"
+        "initTRPC"
       ],
       "removedExports": [],
       "dependents": [
-        "/src/adapters/node-http/index.ts"
+        "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 2.05,
-      "reduction": 7.31
+      "percent": 2.06,
+      "reduction": 40.91
     },
     {
       "id": "/src/unstable-core-do-not-import/middleware.ts",
@@ -261,7 +261,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.78,
+      "percent": 1.77,
       "reduction": 0
     },
     {
@@ -340,7 +340,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.21,
+      "percent": 1.2,
       "reduction": 21.04
     },
     {
@@ -352,7 +352,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.18,
+      "percent": 1.17,
       "reduction": 26.94
     },
     {
@@ -418,12 +418,12 @@
         "/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/stream/sse.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"
@@ -722,9 +722,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -732,9 +732,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -742,9 +742,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],

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

@@ -1 +1 @@
-{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,SAAS,CAAC;AAEjE,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAqQF,wBAAgB,cAAc,CAAC,IAAI,EAAE,qBAAqB,GAAG,eAAe,CAG3E"}
+{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,SAAS,CAAC;AAEjE,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAwQF,wBAAgB,cAAc,CAAC,IAAI,EAAE,qBAAqB,GAAG,eAAe,CAG3E"}

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

@@ -128,7 +128,8 @@ const jsonContentTypeHandler = {
             accept: req.headers.get('trpc-accept'),
             calls,
             type,
-            connectionParams: connectionParamsStr === null ? null : parseConnectionParams.parseConnectionParamsFromString(connectionParamsStr)
+            connectionParams: connectionParamsStr === null ? null : parseConnectionParams.parseConnectionParamsFromString(connectionParamsStr),
+            signal: req.signal
         };
         return info;
     }
@@ -161,7 +162,8 @@ const formDataContentTypeHandler = {
             ],
             isBatchCall: false,
             type: 'mutation',
-            connectionParams: null
+            connectionParams: null,
+            signal: req.signal
         };
     }
 };
@@ -192,7 +194,8 @@ const octetStreamContentTypeHandler = {
             isBatchCall: false,
             accept: null,
             type: 'mutation',
-            connectionParams: null
+            connectionParams: null,
+            signal: req.signal
         };
     }
 };

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

@@ -126,7 +126,8 @@ const jsonContentTypeHandler = {
             accept: req.headers.get('trpc-accept'),
             calls,
             type,
-            connectionParams: connectionParamsStr === null ? null : parseConnectionParamsFromString(connectionParamsStr)
+            connectionParams: connectionParamsStr === null ? null : parseConnectionParamsFromString(connectionParamsStr),
+            signal: req.signal
         };
         return info;
     }
@@ -159,7 +160,8 @@ const formDataContentTypeHandler = {
             ],
             isBatchCall: false,
             type: 'mutation',
-            connectionParams: null
+            connectionParams: null,
+            signal: req.signal
         };
     }
 };
@@ -190,7 +192,8 @@ const octetStreamContentTypeHandler = {
             isBatchCall: false,
             accept: null,
             type: 'mutation',
-            connectionParams: null
+            connectionParams: null,
+            signal: req.signal
         };
     }
 };

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

@@ -83,6 +83,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;
 }
 /**
  * Inner createContext function for `resolveResponse` used to forward `TRPCRequestInfo` to `createContext`

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-alpha-tmp-issues-5851-take-two.488+33ec2950b",
+  "version": "11.0.0-alpha-tmp-issues-5851-take-two.490+8c0dddb9c",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "33ec2950bd3d9da1f49796cbe512c6e27fc3b1fb"
+  "gitHead": "8c0dddb9c79ebbd92493838a5c447d093105a335"
 }

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(
@@ -106,11 +107,11 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
       );
     }
 
-    function createCtxPromise(
+    async function createCtxPromise(
       getConnectionParams: () => TRPCRequestInfo['connectionParams'],
     ): Promise<inferRouterContext<TRouter>> {
-      return run(async () => {
-        ctx = await createContext?.({
+      try {
+        return await createContext?.({
           req,
           res: client,
           info: {
@@ -119,11 +120,10 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
             isBatchCall: false,
             accept: null,
             type: 'unknown',
+            signal: abortController.signal,
           },
         });
-
-        return ctx;
-      }).catch((cause) => {
+      } catch (cause) {
         const error = getTRPCErrorFromUnknown(cause);
         opts.onError?.({
           error,
@@ -151,7 +151,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         });
 
         throw error;
-      });
+      }
     }
 
     /**
@@ -165,7 +165,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         ? unsetContextSymbol
         : createCtxPromise(() => null);
 
-    let ctx: inferRouterContext<TRouter> | undefined = undefined;
+    const ctx: inferRouterContext<TRouter> | undefined = undefined;
 
     async function handleRequest(msg: TRPCClientOutgoingMessage) {
       const { id, jsonrpc } = msg;
@@ -410,6 +410,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         sub.abort();
       }
       clientSubscriptions.clear();
+      abortController.abort();
     });
 
     if (ctxPromise !== unsetContextSymbol) {

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/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;
 }
 
 /**