@trpc/server 11.0.0-rc.608 → 11.0.0-rc.621

package/dist/@trpc/server/http.d.ts

@@ -4,5 +4,5 @@ export type { BaseHandlerOptions, HTTPBaseHandlerOptions, HTTPErrorHandler,
  * @deprecated Use `HTTPErrorHandler` instead
  */
 HTTPErrorHandler as OnErrorFunction, ResolveHTTPRequestOptionsContextFn, ResponseMeta, ResponseMetaFn, TRPCRequestInfo, } from '../../unstable-core-do-not-import';
-export { getBatchStreamFormatter, octetInputParser, parseConnectionParamsFromUnknown, parseConnectionParamsFromString, toURL, } from '../../unstable-core-do-not-import';
+export { getBatchStreamFormatter, octetInputParser, parseConnectionParamsFromUnknown, parseConnectionParamsFromString, } from '../../unstable-core-do-not-import';
 //# sourceMappingURL=http.d.ts.map

package/dist/@trpc/server/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB;AAChB;;GAEG;AACH,gBAAgB,IAAI,eAAe,EACnC,kCAAkC,EAClC,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,gCAAgC,EAChC,+BAA+B,EAC/B,KAAK,GACN,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB;AAChB;;GAEG;AACH,gBAAgB,IAAI,eAAe,EACnC,kCAAkC,EAClC,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,mCAAmC,CAAC"}

package/dist/adapters/fetch/fetchRequestHandler.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
-var toURL = require('../../unstable-core-do-not-import/http/toURL.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 
 /**
@@ -27,7 +26,7 @@ async function fetchRequestHandler(opts) {
             ...innerOpts
         });
     };
-    const url = toURL.toURL(opts.req.url);
+    const url = new URL(opts.req.url);
     const pathname = trimSlashes(url.pathname);
     const endpoint = trimSlashes(opts.endpoint);
     const path = trimSlashes(pathname.slice(endpoint.length));

package/dist/adapters/fetch/fetchRequestHandler.mjs

@@ -1,5 +1,4 @@
 import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
-import { toURL } from '../../unstable-core-do-not-import/http/toURL.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 
 /**
@@ -25,7 +24,7 @@ async function fetchRequestHandler(opts) {
             ...innerOpts
         });
     };
-    const url = toURL(opts.req.url);
+    const url = new URL(opts.req.url);
     const pathname = trimSlashes(url.pathname);
     const endpoint = trimSlashes(opts.endpoint);
     const path = trimSlashes(pathname.slice(endpoint.length));

package/dist/adapters/node-http/incomingMessageToRequest.d.ts

@@ -5,6 +5,7 @@ export interface IncomingMessageWithBody extends http.IncomingMessage {
      */
     body?: unknown;
 }
+export declare function createURL(req: http.IncomingMessage): URL;
 /**
  * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  */

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

@@ -1 +1 @@
-{"version":3,"file":"incomingMessageToRequest.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/incomingMessageToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAIlC,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,eAAe;IACnE;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA+CD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CA4BT"}
+{"version":3,"file":"incomingMessageToRequest.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/incomingMessageToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAGlC,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,eAAe;IACnE;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAiED,wBAAgB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,GAAG,CAkBxD;AAwBD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CAkCT"}

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

@@ -1,76 +1,115 @@
 'use strict';
 
 var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
-var toURL = require('../../unstable-core-do-not-import/http/toURL.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 
-/**
- * Convert an incoming message to a body stream with a max size
- */ function incomingMessageToBodyStream(req, opts) {
+function createBody(req, opts) {
+    // Some adapters will pre-parse the body and add it to the request object
+    if ('body' in req) {
+        // If the body is already a string, return it directly
+        if (typeof req.body === 'string') {
+            return req.body;
+        } else if (req.body !== undefined) {
+            return JSON.stringify(req.body);
+        }
+        // If body property exists but is undefined, return undefined
+        return undefined;
+    }
     let size = 0;
-    const maxBodySize = opts.maxBodySize;
     let hasClosed = false;
-    const stream = new ReadableStream({
+    return new ReadableStream({
         start (controller) {
-            req.on('data', (chunk)=>{
+            const onData = (chunk)=>{
                 size += chunk.length;
-                if (maxBodySize != null && size > maxBodySize) {
-                    controller.error(new TRPCError.TRPCError({
-                        code: 'PAYLOAD_TOO_LARGE'
-                    }));
-                    // an error is thrown if we try to close the controller after
-                    // erroring, so track the closure
-                    hasClosed = true;
+                if (!opts.maxBodySize || size <= opts.maxBodySize) {
+                    controller.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
                     return;
                 }
-                controller.enqueue(chunk);
-            });
-            req.once('end', ()=>{
+                controller.error(new TRPCError.TRPCError({
+                    code: 'PAYLOAD_TOO_LARGE'
+                }));
+                hasClosed = true;
+                req.off('data', onData);
+                req.off('end', onEnd);
+            };
+            const onEnd = ()=>{
                 if (hasClosed) {
                     return;
                 }
                 hasClosed = true;
+                req.off('data', onData);
+                req.off('end', onEnd);
                 controller.close();
-            });
+            };
+            req.on('data', onData);
+            req.on('end', onEnd);
         },
         cancel () {
             req.destroy();
         }
     });
-    return stream;
 }
-const bodyMethods = [
-    'POST',
-    'PUT',
-    'PATCH'
-];
+function createURL(req) {
+    try {
+        const protocol = req.socket && 'encrypted' in req.socket && req.socket.encrypted ? 'https:' : 'http:';
+        const host = req.headers.host ?? 'localhost';
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        return new URL(req.url, `${protocol}//${host}`);
+    } catch (cause) {
+        throw new TRPCError.TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'Invalid URL',
+            cause
+        });
+    }
+}
+function createHeaders(incoming) {
+    const headers = new Headers();
+    for(const key in incoming){
+        const value = incoming[key];
+        if (typeof key === 'string' && key.startsWith(':')) {
+            continue;
+        }
+        if (Array.isArray(value)) {
+            for (const item of value){
+                headers.append(key, item);
+            }
+        } else if (value != null) {
+            headers.append(key, value);
+        }
+    }
+    return headers;
+}
 /**
  * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  */ function incomingMessageToRequest(req, opts) {
     const ac = new AbortController();
-    const headers = new Headers(req.headers);
-    const url = toURL.toURL(`http://${headers.get('host')}${req.url}`);
-    req.once('aborted', ()=>{
+    const onAbort = ()=>{
         ac.abort();
-    });
+        req.off('aborted', onAbort);
+        req.off('close', onAbort);
+    };
+    req.once('aborted', onAbort);
+    req.socket?.once('close', onAbort);
+    // Get host from either regular header or HTTP/2 pseudo-header
+    const url = createURL(req);
     const init = {
-        headers,
+        headers: createHeaders(req.headers),
         method: req.method,
-        signal: ac.signal,
-        // @ts-expect-error this is fine
-        duplex: 'half'
+        signal: ac.signal
     };
-    if (req.method && bodyMethods.includes(req.method)) {
-        if (!('body' in req)) {
-            init.body = incomingMessageToBodyStream(req, opts);
-        } else if (typeof req.body === 'string') {
-            init.body = req.body;
-        } else if (req.body !== undefined) {
-            init.body = JSON.stringify(req.body);
-        }
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+        init.body = createBody(req, opts);
+        // init.duplex = 'half' must be set when body is a ReadableStream, and Node follows the spec.
+        // However, this property is not defined in the TypeScript types for RequestInit, so we have
+        // to cast it here in order to set it without a type error.
+        // See https://fetch.spec.whatwg.org/#dom-requestinit-duplex
+        // @ts-expect-error this is fine
+        init.duplex = 'half';
     }
     const request = new Request(url, init);
     return request;
 }
 
+exports.createURL = createURL;
 exports.incomingMessageToRequest = incomingMessageToRequest;

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

@@ -1,74 +1,112 @@
 import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
-import { toURL } from '../../unstable-core-do-not-import/http/toURL.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 
-/**
- * Convert an incoming message to a body stream with a max size
- */ function incomingMessageToBodyStream(req, opts) {
+function createBody(req, opts) {
+    // Some adapters will pre-parse the body and add it to the request object
+    if ('body' in req) {
+        // If the body is already a string, return it directly
+        if (typeof req.body === 'string') {
+            return req.body;
+        } else if (req.body !== undefined) {
+            return JSON.stringify(req.body);
+        }
+        // If body property exists but is undefined, return undefined
+        return undefined;
+    }
     let size = 0;
-    const maxBodySize = opts.maxBodySize;
     let hasClosed = false;
-    const stream = new ReadableStream({
+    return new ReadableStream({
         start (controller) {
-            req.on('data', (chunk)=>{
+            const onData = (chunk)=>{
                 size += chunk.length;
-                if (maxBodySize != null && size > maxBodySize) {
-                    controller.error(new TRPCError({
-                        code: 'PAYLOAD_TOO_LARGE'
-                    }));
-                    // an error is thrown if we try to close the controller after
-                    // erroring, so track the closure
-                    hasClosed = true;
+                if (!opts.maxBodySize || size <= opts.maxBodySize) {
+                    controller.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
                     return;
                 }
-                controller.enqueue(chunk);
-            });
-            req.once('end', ()=>{
+                controller.error(new TRPCError({
+                    code: 'PAYLOAD_TOO_LARGE'
+                }));
+                hasClosed = true;
+                req.off('data', onData);
+                req.off('end', onEnd);
+            };
+            const onEnd = ()=>{
                 if (hasClosed) {
                     return;
                 }
                 hasClosed = true;
+                req.off('data', onData);
+                req.off('end', onEnd);
                 controller.close();
-            });
+            };
+            req.on('data', onData);
+            req.on('end', onEnd);
         },
         cancel () {
             req.destroy();
         }
     });
-    return stream;
 }
-const bodyMethods = [
-    'POST',
-    'PUT',
-    'PATCH'
-];
+function createURL(req) {
+    try {
+        const protocol = req.socket && 'encrypted' in req.socket && req.socket.encrypted ? 'https:' : 'http:';
+        const host = req.headers.host ?? 'localhost';
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        return new URL(req.url, `${protocol}//${host}`);
+    } catch (cause) {
+        throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'Invalid URL',
+            cause
+        });
+    }
+}
+function createHeaders(incoming) {
+    const headers = new Headers();
+    for(const key in incoming){
+        const value = incoming[key];
+        if (typeof key === 'string' && key.startsWith(':')) {
+            continue;
+        }
+        if (Array.isArray(value)) {
+            for (const item of value){
+                headers.append(key, item);
+            }
+        } else if (value != null) {
+            headers.append(key, value);
+        }
+    }
+    return headers;
+}
 /**
  * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  */ function incomingMessageToRequest(req, opts) {
     const ac = new AbortController();
-    const headers = new Headers(req.headers);
-    const url = toURL(`http://${headers.get('host')}${req.url}`);
-    req.once('aborted', ()=>{
+    const onAbort = ()=>{
         ac.abort();
-    });
+        req.off('aborted', onAbort);
+        req.off('close', onAbort);
+    };
+    req.once('aborted', onAbort);
+    req.socket?.once('close', onAbort);
+    // Get host from either regular header or HTTP/2 pseudo-header
+    const url = createURL(req);
     const init = {
-        headers,
+        headers: createHeaders(req.headers),
         method: req.method,
-        signal: ac.signal,
-        // @ts-expect-error this is fine
-        duplex: 'half'
+        signal: ac.signal
     };
-    if (req.method && bodyMethods.includes(req.method)) {
-        if (!('body' in req)) {
-            init.body = incomingMessageToBodyStream(req, opts);
-        } else if (typeof req.body === 'string') {
-            init.body = req.body;
-        } else if (req.body !== undefined) {
-            init.body = JSON.stringify(req.body);
-        }
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+        init.body = createBody(req, opts);
+        // init.duplex = 'half' must be set when body is a ReadableStream, and Node follows the spec.
+        // However, this property is not defined in the TypeScript types for RequestInit, so we have
+        // to cast it here in order to set it without a type error.
+        // See https://fetch.spec.whatwg.org/#dom-requestinit-duplex
+        // @ts-expect-error this is fine
+        init.duplex = 'half';
     }
     const request = new Request(url, init);
     return request;
 }
 
-export { incomingMessageToRequest };
+export { createURL, incomingMessageToRequest };

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

@@ -7,4 +7,5 @@ var incomingMessageToRequest = require('./incomingMessageToRequest.js');
 
 exports.internal_exceptionHandler = nodeHTTPRequestHandler.internal_exceptionHandler;
 exports.nodeHTTPRequestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
+exports.createURL = incomingMessageToRequest.createURL;
 exports.incomingMessageToRequest = incomingMessageToRequest.incomingMessageToRequest;

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

@@ -1,2 +1,2 @@
 export { internal_exceptionHandler, nodeHTTPRequestHandler } from './nodeHTTPRequestHandler.mjs';
-export { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
+export { createURL, incomingMessageToRequest } from './incomingMessageToRequest.mjs';

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

@@ -1 +1 @@
-{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GACtC,IAAI,CAAC,eAAe,CAyBtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAGxC"}
+{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GACtC,IAAI,CAAC,eAAe,CAyBtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAGxC"}

package/dist/adapters/standalone.js

@@ -2,9 +2,9 @@
 
 var http = require('node:http');
 var utils = require('../unstable-core-do-not-import/utils.js');
-var toURL = require('../unstable-core-do-not-import/http/toURL.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
+var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js');
 
 /**
  * @internal
@@ -12,7 +12,7 @@ var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
     return (req, res)=>{
         let path = '';
         utils.run(async ()=>{
-            const url = toURL.toURL(req.url);
+            const url = incomingMessageToRequest.createURL(req);
             // get procedure path and remove the leading slash
             // /procedure -> procedure
             path = url.pathname.slice(1);

package/dist/adapters/standalone.mjs

@@ -1,8 +1,8 @@
 import http from 'node:http';
 import { run } from '../unstable-core-do-not-import/utils.mjs';
-import { toURL } from '../unstable-core-do-not-import/http/toURL.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { nodeHTTPRequestHandler, internal_exceptionHandler } from './node-http/nodeHTTPRequestHandler.mjs';
+import { createURL } from './node-http/incomingMessageToRequest.mjs';
 
 /**
  * @internal
@@ -10,7 +10,7 @@ import { nodeHTTPRequestHandler, internal_exceptionHandler } from './node-http/n
     return (req, res)=>{
         let path = '';
         run(async ()=>{
-            const url = toURL(req.url);
+            const url = createURL(req);
             // get procedure path and remove the leading slash
             // /procedure -> procedure
             path = url.pathname.slice(1);

package/dist/adapters/ws.d.ts

@@ -3,7 +3,7 @@ import type ws from 'ws';
 import type { AnyRouter, CreateContextCallback, inferRouterContext } from '../@trpc/server';
 import { type BaseHandlerOptions } from '../@trpc/server/http';
 import { type MaybePromise } from '../unstable-core-do-not-import';
-import type { NodeHTTPCreateContextFnOptions } from './node-http';
+import { type NodeHTTPCreateContextFnOptions } from './node-http';
 /**
  * @public
  */

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,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAExC,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;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAKV,EAAE,CAAC,SAAS,OAAO,eAAe,mBAqYzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwCjC"}
+{"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,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAa/D,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQ7E;;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;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAKV,EAAE,CAAC,SAAS,OAAO,eAAe,mBAqYzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwCjC"}

package/dist/adapters/ws.js

@@ -9,9 +9,9 @@ var observable = require('../observable/observable.js');
 var unpromise = require('../vendor/unpromise/unpromise.js');
 var tracked = require('../unstable-core-do-not-import/stream/tracked.js');
 var transformer = require('../unstable-core-do-not-import/transformer.js');
-var toURL = require('../unstable-core-do-not-import/http/toURL.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var router = require('../unstable-core-do-not-import/router.js');
+var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js');
 
 /**
  * Importing ws causes a build error
@@ -80,7 +80,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' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
+     */ let ctxPromise = incomingMessageToRequest.createURL(req).searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
         async function handleRequest(msg) {
             const { id , jsonrpc  } = msg;
             /* istanbul ignore next -- @preserve */ if (id === null) {

package/dist/adapters/ws.mjs

@@ -7,9 +7,9 @@ import { isObservable, observableToAsyncIterable } from '../observable/observabl
 import { Unpromise } from '../vendor/unpromise/unpromise.mjs';
 import { isTrackedEnvelope } from '../unstable-core-do-not-import/stream/tracked.mjs';
 import { transformTRPCResponse } from '../unstable-core-do-not-import/transformer.mjs';
-import { toURL } from '../unstable-core-do-not-import/http/toURL.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { callProcedure } from '../unstable-core-do-not-import/router.mjs';
+import { createURL } from './node-http/incomingMessageToRequest.mjs';
 
 /**
  * Importing ws causes a build error
@@ -78,7 +78,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' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
+     */ let ctxPromise = createURL(req).searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
         async function handleRequest(msg) {
             const { id , jsonrpc  } = msg;
             /* istanbul ignore next -- @preserve */ if (id === null) {